Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Us04 #10

Merged
merged 120 commits into from
Jul 29, 2024
Merged

Us04 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
19819a8
Merge pull request #1 from fga-eps-mds/devel
ingridSCarvalho May 21, 2024
d052d5c
Merge pull request #2 from fga-eps-mds/devel
ingridSCarvalho May 22, 2024
cb96d43
[feat : 17] - Estrutura do formulário de filiação
MilenaFRocha Jul 13, 2024
b6a629c
[fix:17] - Filiação dados pessoais
MilenaFRocha Jul 14, 2024
491dbf5
[fix:17] - alinhamento do formulario no css
storch7 Jul 15, 2024
d1b0649
[fix:17] - Campo de datas corretos
MilenaFRocha Jul 15, 2024
d4cd4f7
[fix:17] - Campo de datas corretos
MilenaFRocha Jul 15, 2024
a55dc8c
[fix:17] - Correção do CSS
MilenaFRocha Jul 15, 2024
c34c1fe
criação de novos componentes
storch7 Jul 16, 2024
35f9958
[fix:17] - Adicionando botão de dependente
MilenaFRocha Jul 16, 2024
94e7b0f
[fix:17] - Adicionando componentes
MilenaFRocha Jul 17, 2024
80a5b78
Alteração das configurações de css do formulário
storch7 Jul 17, 2024
00a3ea6
Alinhamento dos campos do formulário de filiação
storch7 Jul 18, 2024
4e323fa
realinhamento dos campos do formulário de filiação
storch7 Jul 18, 2024
bb31956
adicionando novos campos aos dependentes
storch7 Jul 18, 2024
c88d99a
[fix:17] - Alinhando front e back
MilenaFRocha Jul 18, 2024
ac605c4
us33-route
Jul 18, 2024
e419728
[fix:1] - setting-coauthor
Jul 18, 2024
92bc624
[fix:2] - add user view title and personal data section
jevprado Jul 18, 2024
df8d694
[fix:3] - autenticacao de usuario
Diogo-Barboza Jul 18, 2024
2bf0a67
[fix:17] - Modificação do html para atender a responsividade
storch7 Jul 18, 2024
39beb27
[fix:4] - caixas e estilizacao
Diogo-Barboza Jul 18, 2024
abadb57
[fix:5] - adicionando propriedade disabled nos campos
jevprado Jul 18, 2024
1d7d1d6
Mensagem do commit
Gam13 Jul 19, 2024
7a69f7f
[fix:6] - correcao de campos bloqueados
Diogo-Barboza Jul 19, 2024
0b079c1
new number masked component, FieldNumber
Gam13 Jul 19, 2024
bd6cef0
componente de lista com checkbox Co-authored-by: Jagaima <davinobre.i…
Gam13 Jul 19, 2024
0c40b4b
Delete src/Components/Lista directory
Gam13 Jul 19, 2024
26dcd55
Componente de checklist
Gam13 Jul 19, 2024
46fc37e
Componente de checklist
Gam13 Jul 19, 2024
074e4dd
Componente de checklist
Gam13 Jul 19, 2024
ac80d78
[fix:7] - mascara do campo celular
jevprado Jul 20, 2024
3770b2f
Prototiping
Gam13 Jul 20, 2024
82684f2
adição de cor no background do fieldtext e ajuste de posição do texto
jevprado Jul 20, 2024
933827b
[fix:33] - Campos pré-preenchidos
Diogo-Barboza Jul 20, 2024
42143bd
Merge branch 'us33-profile-update' of https://github.com/fga-eps-mds/…
Diogo-Barboza Jul 20, 2024
37607fe
[fix:33] - correção css e adição de status de login na pagina
jevprado Jul 20, 2024
5891cc1
Prototípo 1 da pagina feito, ainda não está no padrão de cores do pro…
Gam13 Jul 20, 2024
8ee4647
Algumas mudanças no CSS
Gam13 Jul 20, 2024
75fc70a
[fix:33] - correção direcionamento da home e adição do botão logout
jevprado Jul 20, 2024
96a4d00
Ajuste no css quando reduz o tamanho da tela
Gam13 Jul 20, 2024
4a08809
Pagina de Visualizar dados de um usuário
Gam13 Jul 20, 2024
5826531
Tela de visualizar usuário
Gam13 Jul 20, 2024
612ec2d
Arrumando coisas no CSS
Gam13 Jul 20, 2024
a1a8430
Arrumando coisas no CSS
Gam13 Jul 20, 2024
ba2c6ba
Criando a integração com o backend
Jagaima Jul 20, 2024
0d6e8d2
Merge branch 'US04' of https://github.com/fga-eps-mds/2024.1-SENTINEL…
Jagaima Jul 20, 2024
2eabd38
fix3: css
Gam13 Jul 20, 2024
e9e0a0b
Pagina de redirecionamento
Gam13 Jul 21, 2024
23b4eb3
Criando pagina de listar usuários e alguns fix
Gam13 Jul 21, 2024
61ecd76
[feat:33] - adicao de botoes funcionais
Diogo-Barboza Jul 21, 2024
489127a
Pagina que mostra a lista de usuários prototipada
Gam13 Jul 21, 2024
9bd75fa
fix
Gam13 Jul 21, 2024
c5fb5ae
fix
Gam13 Jul 21, 2024
15d7326
merge fix
Jagaima Jul 21, 2024
0b274a3
Merge branch 'US04' of https://github.com/fga-eps-mds/2024.1-SENTINEL…
Jagaima Jul 21, 2024
d9b7c22
fix
Jagaima Jul 21, 2024
0d00f0a
fix definitivo
Jagaima Jul 21, 2024
68098cf
[fix:33] - ajuste css e correção de botões
jevprado Jul 21, 2024
f6b159f
iniciando filtragem
Jagaima Jul 21, 2024
bee19b5
[fix:33] - ajuste de formatação dos textos e cores
jevprado Jul 22, 2024
14ab98e
Revert "iniciando filtragem"
Gam13 Jul 22, 2024
3d14690
Reapply "iniciando filtragem"
Jagaima Jul 22, 2024
6275f01
[feat:33] - implementação da nova sidebar na tela de visualização de …
jevprado Jul 22, 2024
1ad4f45
Pagina Cadastro
Gam13 Jul 22, 2024
48c889f
iniciando merge
Jagaima Jul 22, 2024
43200d8
Merge branch 'US04' of https://github.com/fga-eps-mds/2024.1-SENTINEL…
Jagaima Jul 22, 2024
976d3ab
corrigindo rotas do João
Jagaima Jul 22, 2024
32be571
validando o token eu userlist
Jagaima Jul 22, 2024
f335d62
[fix:33] - correcao da requisicao de usuario
Diogo-Barboza Jul 22, 2024
7b69f0b
[fix:33] - ajuste no sidebutton e rota do botão home
jevprado Jul 22, 2024
82b2874
implementando view (ainda não funcional)
Jagaima Jul 22, 2024
70ec5f4
Pequenas alterações nas cores de alguns botões e nos botões mostrados…
Gam13 Jul 23, 2024
a647df0
Pequenas alterações nas cores de alguns botões e nos botões mostrados…
Gam13 Jul 23, 2024
37bab71
Pagina para debugar o front
Gam13 Jul 23, 2024
58fd427
[fix:33] - correção CSS e de ícones na tela
jevprado Jul 23, 2024
e7ab9c0
[feat:33] - Implementação do modal funcional
jevprado Jul 23, 2024
1f799b2
[fix:33] - correção do botão logout
jevprado Jul 23, 2024
cb8eb48
[feat:33] - Validacao do field numbero
Diogo-Barboza Jul 23, 2024
f78547d
progresso significativo em obter dados para viewuser
Jagaima Jul 24, 2024
97a29f7
Merge branch 'US04' of https://github.com/fga-eps-mds/2024.1-SENTINEL…
Jagaima Jul 24, 2024
5640e52
Delete src/Pages/Public/TesteComponentes directory
Gam13 Jul 24, 2024
a02dc1c
Salvar e Deletar funcionais
Jagaima Jul 24, 2024
cfdb0a5
[fix:33] - ajuste do campo email e CSS
jevprado Jul 24, 2024
e1b2fbe
alterações
Jagaima Jul 24, 2024
cb42bd9
[feat:33] - implementação da mascara de email
jevprado Jul 24, 2024
56192b4
nomes e links reajustados
Gam13 Jul 24, 2024
1f784d8
Merge remote-tracking branch 'origin/us33-profile-update' into US04
Gam13 Jul 24, 2024
887f8ec
Testando Modal
Gam13 Jul 24, 2024
01a325d
testando botões lateráis
Gam13 Jul 24, 2024
a1e913b
tentando adicionar botão de logout
Gam13 Jul 24, 2024
78c4e50
alterando barra lateral
Jagaima Jul 24, 2024
6e0b9c0
[fix:04] - fixing modal on page
Jagaima Jul 24, 2024
55ccb69
[fix:4] - only letters in namefield
Gam13 Jul 24, 2024
981e097
[fix:04] - Adding fixes to names text fields
Jagaima Jul 24, 2024
f0caed0
[fix:04] - making modal accept more than one button
Jagaima Jul 24, 2024
f2c4068
[fix:4] - Changes for more modal buttons and finishing viewuser page
Gam13 Jul 24, 2024
08d5480
[fix:04] - making modal accept more than one button
Jagaima Jul 24, 2024
113ab4b
[fix:04] - fixing side-bar
Jagaima Jul 25, 2024
ef6f51a
[fix:04] - responsive bar
Jagaima Jul 25, 2024
2e301b2
[fix:04] - removing console.logs
Jagaima Jul 25, 2024
4805d31
[fix:04] - Finishing email validation, error menssage
Gam13 Jul 25, 2024
ada53f2
Merge remote-tracking branch 'origin/US04' into US04
Gam13 Jul 25, 2024
6ed5372
Revert "Merge remote-tracking branch 'origin/US04' into US04"
Gam13 Jul 25, 2024
bfbfec5
[fix:04] - Finishing email validation, error menssage
Gam13 Jul 25, 2024
d30b883
[fix: 04] Passando nome pro url da página
Jagaima Jul 26, 2024
21a3a57
[fix:7] - Fixing Routes, and minor fix on sidebar for dynamic URLs
Gam13 Jul 26, 2024
faf0693
[fix:7] - Adjusts in the CSS
Gam13 Jul 26, 2024
93058be
[fix:7] - Adjusts in the CSS
Gam13 Jul 26, 2024
c65413a
[fix:7] - Adjusts in the CSS
Gam13 Jul 26, 2024
393b62c
[fix:7] - Adjusts in the CSS
Gam13 Jul 26, 2024
9eb24bc
[fix:7] - Adjusts in the CSS
Gam13 Jul 26, 2024
7faf668
[fix:7] - Adjusts in the CSS
Gam13 Jul 26, 2024
4ecdc98
[fix:04] - corrections for merge.
yukioz Jul 27, 2024
79a3801
Merge remote-tracking branch 'origin' into US04
yukioz Jul 27, 2024
14d23da
Merge branch 'devel' into US04
yukioz Jul 27, 2024
206a76c
[04] - fix eslint and merge problems.
yukioz Jul 27, 2024
5549fe5
[04] - fix more eslint erros.
yukioz Jul 27, 2024
1d212f7
[fix:04] Corrigindo conflitos + componentes
AlGouvea Jul 29, 2024
d617d5b
[fix:04] Corrigindo teste
AlGouvea Jul 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
329 changes: 260 additions & 69 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,23 @@
"postinstall": "node_modules/.bin/husky install"
},
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/material": "^5.15.17",
"@testing-library/react": "^14.0.0",
"@vitest/coverage-v8": "^2.0.4",
"@emotion/react": "^11.13.0",
"@emotion/styled": "^11.13.0",
"@mui/icons-material": "^5.16.4",
"@mui/material": "^5.16.4",
"@mui/x-date-pickers": "^7.10.0",
"axios": "^1.7.2",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"prettier": "^3.3.3",
"dayjs": "^1.11.11",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^5.2.1",
"react-number-format": "^5.4.0",
"react-router-dom": "^6.23.1",
"@testing-library/react": "^14.0.0",
"@vitest/coverage-v8": "^2.0.4",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"prettier": "^3.3.3",
"vitest-sonar-reporter": "^2.0.0"
},
"devDependencies": {
Expand Down
46 changes: 46 additions & 0 deletions src/Components/Checklist/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import Checkbox from "@mui/material/Checkbox";
import List from "@mui/material/List";
import ListItem from "@mui/material/ListItem";
import ListItemText from "@mui/material/ListItemText";
import Divider from "@mui/material/Divider";
import React from "react";
import PropTypes from "prop-types";

export default function CheckList({ items, value, onChange }) {
const handleToggle = (e) => () => {
const currentIndex = value.indexOf(e);
const newChecked = [...value];

if (currentIndex === -1) {
newChecked.push(e);
} else {
newChecked.splice(currentIndex, 1);
}

onChange(newChecked);
};
return (
<List>
{items.map((item, index) => (
<React.Fragment key={item}>
<ListItem onClick={handleToggle(item)}>
<Checkbox
edge="start"
checked={value.indexOf(item) !== -1}
tabIndex={-1}
disableRipple
/>
<ListItemText primary={item} />
</ListItem>
{index !== items.length - 1 && <Divider />}
</React.Fragment>
))}
</List>
);
}

CheckList.propTypes = {
items: PropTypes.any,
value: PropTypes.any,
onChange: PropTypes.any,
};
28 changes: 28 additions & 0 deletions src/Components/DataSelect/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
import { DatePicker } from "@mui/x-date-pickers/DatePicker";
import { TextField } from "@mui/material";
import PropTypes from "prop-types";

export default function DataSelect({ label, value, onChange }) {
return (
<LocalizationProvider dateAdapter={AdapterDayjs}>
<DatePicker
label={label}
value={value}
onChange={onChange}
format="DD/MM/YYYY" // Define o formato desejado
renderInput={(params) => <TextField {...params} variant="filled" />}
sx={{
margin: ".7rem",
}}
/>
</LocalizationProvider>
);
}

DataSelect.propTypes = {
label: PropTypes.any,
value: PropTypes.any,
onChange: PropTypes.any,
};
35 changes: 35 additions & 0 deletions src/Components/FieldNumber/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import PropTypes from "prop-types";
import FieldText from "../FieldText";
import { PatternFormat } from "react-number-format";

export default function FieldNumber({
label,
value,
onChange,
disabled,
format,
}) {
return (
<PatternFormat
format={format}
mask="_"
allowEmptyFormatting
patternChar="#"
type="tel"
customInput={FieldText}
label={label}
value={value}
onChange={onChange}
disabled={disabled}
variant="filled"
id="filled-basic"
/>
);
}
FieldNumber.propTypes = {
label: PropTypes.string.isRequired,
value: PropTypes.string.isRequired,
onChange: PropTypes.func.isRequired,
disabled: PropTypes.bool,
format: PropTypes.string.isRequired,
};
62 changes: 62 additions & 0 deletions src/Components/FieldSelect/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import theme from "../../Styles/global";
import { FormControl, InputLabel, MenuItem, Select } from "@mui/material";
import "dayjs/locale/pt-br";
import PropTypes from "prop-types";

function FieldSelect({ label, value, onChange, options }) {
return (
<FormControl
fullWidth
sx={{
margin: ".7rem",
backgroundColor: "#f5f5f5",
borderRadius: "5px",
width: "inherit",
}}
>
<InputLabel id={`label-${label}`}>{label}</InputLabel>
<Select
labelId={`label-${label}`}
id={`select-${label}`}
value={value}
onChange={onChange}
label={label}
sx={{
background: "#e0d4cc",
backgroundColor: "#e0d4cc",
"& .MuiSelect-select": {
borderColor: theme.palette.main,
},
"& .MuiOutlinedInput-notchedOutline": {
borderColor: theme.palette.main,
},
"&:hover .MuiOutlinedInput-notchedOutline": {
borderColor: theme.palette.main,
},
"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
borderColor: theme.palette.main,
},
}}
>
{options.map((option) => (
<MenuItem
key={option}
value={option}
sx={{ padding: "10px", backgroundColor: "#e0e0e0" }}
>
{option}
</MenuItem>
))}
</Select>
</FormControl>
);
}

FieldSelect.propTypes = {
label: PropTypes.any,
value: PropTypes.any,
onChange: PropTypes.any,
options: PropTypes.any,
};

export default FieldSelect;
51 changes: 51 additions & 0 deletions src/Components/FieldText/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import PropTypes from "prop-types";
import theme from "../../Styles/global";
import TextField from "@mui/material/TextField";

export default function FieldText({ label, value, onChange, disabled }) {
return (
<TextField
id="filled-basic"
label={label}
value={value}
variant="filled"
onChange={onChange}
disabled={disabled}
sx={{
margin: ".7rem",
background: "#EAE3D7",
backgroundColor: "#EAE3D7",
borderRadius: "5px",
"& .MuiInput-underline:before": {
borderBottomColor: theme.palette.main, // Cor da borda inferior antes do foco
},
"& .MuiInput-underline:hover:before": {
borderBottomColor: theme.palette.main, // Cor da borda inferior ao passar o mouse
},
"& .MuiInput-underline:after": {
borderBottomColor: theme.palette.main, // Cor da borda inferior após o foco
},
"& .MuiInputBase-input": {
color: theme.palette.contrastText, // Cor do texto
},
"& .MuiInputLabel-root": {
color: theme.palette.main,
fontFamily: '"Noto Sans", sans-serif',
},
"& .MuiInputLabel-root.Mui-focused": {
color: theme.palette.main, // Cor do rótulo quando focado
},
"& .MuiInputBase-input::placeholder": {
fontFamily: '"Overpass", sans-serif', // Fonte do placeholder
},
}}
/>
);
}

FieldText.propTypes = {
label: PropTypes.string.isRequired,
value: PropTypes.string.isRequired,
onChange: PropTypes.func.isRequired,
disabled: PropTypes.bool,
};
6 changes: 4 additions & 2 deletions src/Components/Modal/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
display: flex;
flex-direction: column;
align-items: center;
width: 338px;
height: 284px;
background: #eae3d7;
padding: 40px;
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
position: relative;
width: auto;
max-width: 90%;
max-height: 90vh;
overflow-y: auto;
}
21 changes: 6 additions & 15 deletions src/Components/Modal/index.jsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
import "./index.css";
import PropTypes from "prop-types";
import { Alert, AlertTitle } from "@mui/material";
import SecondaryButton from "../SecondaryButton";
import { useNavigate } from "react-router-dom";
import theme from "../../Styles/global";

export default function Modal({ show, children, text, width }) {
const navigate = useNavigate();

export default function Modal({ show, children, alertTitle }) {
if (!show) {
return null;
}
const handleLoginPage = () => {
navigate("/");
};

return (
<div className="modal-overlay">
Expand All @@ -22,29 +15,27 @@ export default function Modal({ show, children, text, width }) {
severity="success"
variant="filled"
sx={{
backgroundColor: theme.pallete.button,
backgroundColor: theme.palette.button,
"& .MuiAlertTitle-root": {
fontFamily: theme.typography.fontFamilyPrimary,
},
"& .MuiAlert-message": {
fontFamily: theme.typography.fontFamilySecondary,
},
width: "270px",
width: "100%", // Ajusta para 100% da largura do modal
}}
>
<AlertTitle>Solicitação enviada</AlertTitle>
Você deve receber um e-mail em breve com mais informações.
<AlertTitle>{alertTitle}</AlertTitle>
</Alert>
<SecondaryButton text={text} onClick={handleLoginPage} width={width} />

{children}
</div>
</div>
);
}

Modal.propTypes = {
text: PropTypes.string.isRequired,
width: PropTypes.string.isRequired,
show: PropTypes.bool.isRequired,
children: PropTypes.node.isRequired,
alertTitle: PropTypes.string.isRequired,
};
4 changes: 2 additions & 2 deletions src/Components/SecondaryButton/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ export default function SecondaryButton({ text, onClick, maxWidth }) {

SecondaryButton.propTypes = {
text: PropTypes.string.isRequired,
maxWidth: PropTypes.string.isRequired,
onClick: PropTypes.func,
maxWidth: PropTypes.string,
onClick: PropTypes.func.isRequired,
};
9 changes: 5 additions & 4 deletions src/Components/SideButton/index.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import PropTypes from "prop-types";
import theme from "../../Styles/global";
import { Button } from "@mui/material";

const rgbaValue01 = `rgba(174, 136, 60, 0.1);`;

export default function SideButton({ itemKey, text, onClick }) {
return (
<Button
onClick={onClick}
key={itemKey}
sx={{
"&amp;:hover": {
backgroundColor: theme.palette.content,
backgroundColor: rgbaValue01,
},
}}
>
Expand All @@ -19,7 +20,7 @@ export default function SideButton({ itemKey, text, onClick }) {
}

SideButton.propTypes = {
itemKey: PropTypes.string,
text: PropTypes.string.isRequired,
onClick: PropTypes.func,
onClick: PropTypes.func.isRequired,
itemKey: PropTypes.string,
};
Loading
Loading