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

US03 e US04 - Página de Login e Vantagens #5

Merged
merged 33 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ca0f968
Adição na pagina de login os botôes para acesso da pagina de vantagen…
rodrigoFAmaral Dec 1, 2024
0b6c34e
Criação do footer e adição em todas as paginas
rodrigoFAmaral Dec 1, 2024
d4a9bbe
Criação da Página de Vantagens e Cards de Vantagem.
JoaoPC10 Dec 1, 2024
70b3eab
Criação do modal das vantagens
SirJorgito Dec 1, 2024
87450ac
Merge branch '82-criacao-pagina-vantagens' of https://github.com/fga-…
JoaoPC10 Dec 1, 2024
96c8a5e
Começo da melhoria da nova página de login - Ela está sendo feita sep…
JoaoPC10 Dec 7, 2024
258ca52
Criação das áreas de login e lead
JoaoPC10 Dec 7, 2024
44876a4
Joâo Igor Pereira da Costa - Adição dos botões no login
JoaoPC10 Dec 7, 2024
96aa003
João Igor Pereira da Costa - Página de login nova finalizada.
JoaoPC10 Dec 7, 2024
f1a1afe
João Igor Pereira da Costa - Renderizando Condicionalmente a SideBar,…
JoaoPC10 Dec 7, 2024
0db9688
João Igor Pereira da Costa - Adicionando as funcionalidades da antiga…
JoaoPC10 Dec 7, 2024
4ec7d8c
Início da implementação da página de vantagens na página de login e a…
SirJorgito Dec 7, 2024
e9e012f
Correção footer tampando botão de logout
rodrigoFAmaral Dec 7, 2024
87dcd34
Implementação da relação entre cards e modal
SirJorgito Dec 8, 2024
8c5228b
Merge branch '82-criacao-pagina-vantagens' of https://github.com/fga-…
SirJorgito Dec 8, 2024
2b976f8
Cards dinâmicos com o banco de dados
SirJorgito Dec 8, 2024
8c5f386
Correção conexão back-front na pagina de login
rodrigoFAmaral Dec 8, 2024
cb325b1
Pequenas alterações no CSS da página de login
SirJorgito Dec 8, 2024
e9deda7
Mudanças na estilização de login, cards e modal
SirJorgito Dec 8, 2024
57475e0
Finalização
JoaoPC10 Dec 9, 2024
4686a38
Merge branch '82-criacao-pagina-vantagens' of https://github.com/fga-…
JoaoPC10 Dec 9, 2024
1b5369c
João Igor - Adição de um botão para voltar ao topo na página de login
JoaoPC10 Dec 9, 2024
338c48e
João Igor - Responsividade
JoaoPC10 Dec 9, 2024
1de4357
Estilização pagina login
rodrigoFAmaral Dec 9, 2024
30adcac
Merge branch '82-criacao-pagina-vantagens' of https://github.com/fga-…
rodrigoFAmaral Dec 9, 2024
2abeb4e
Responsividade e Estilziação pagina login
rodrigoFAmaral Dec 9, 2024
e76a732
Merge branch 'master' into 82-criacao-pagina-vantagens
rodrigoFAmaral Dec 9, 2024
ddba819
Merge branch 'master' into 82-criacao-pagina-vantagens
rodrigoFAmaral Dec 9, 2024
2cf735c
Correção erros lint
rodrigoFAmaral Dec 9, 2024
6abe6a0
Correção problema format prettier
rodrigoFAmaral Dec 9, 2024
666b4a6
Correção problema build
rodrigoFAmaral Dec 9, 2024
1ce7a49
Correção erro test
rodrigoFAmaral Dec 9, 2024
d682b8c
correção erro test
rodrigoFAmaral Dec 9, 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
36 changes: 36 additions & 0 deletions src/Components/AdvantagesCard/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
.containerCard {
width: 291px;
height: 196px;
background-color: #3d160d;
border-radius: 40px;
gap: 22px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
color: #ebdec9;
font-family: "Noto Sans";
text-align: center;
}

.text {
color: #ebdec9;
font-size: 28px;
font-style: normal;
font-weight: 600;
line-height: normal;
letter-spacing: 2px;
}

.link {
color: #e5d8c1;
text-decoration: underline;
font-size: 14px;
font-style: normal;
font-weight: 500;
line-height: normal;
letter-spacing: 2px;
}
.link:hover {
cursor: pointer;
}
20 changes: 20 additions & 0 deletions src/Components/AdvantagesCard/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import PropTypes from "prop-types";
import "./index.css";

export default function AdvantagesCard({ title, onClick }) {
return (
<>
<div className="containerCard">
<p className="text">{title}</p>
<a className="link" onClick={onClick}>
Saber mais
</a>
</div>
</>
);
}

AdvantagesCard.propTypes = {
title: PropTypes.string,
onClick: PropTypes.func,
};
64 changes: 64 additions & 0 deletions src/Components/AdvantagesModal/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
.modal-overlay {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
}

/* Caixa principal do modal */
.modal-box {
display: flex;
flex-direction: column;
position: relative;
align-items: center;
gap: 3rem;
border-radius: 10px;
padding: 3rem;
width: 100%;
max-width: 800px;
max-height: fit-content;
font-family: Noto Sans;
background-color: #3d160d; /* Cor marrom */
color: #ebdec9; /* Texto branco */
}

/* Botão de fechar */
.close-button {
position: absolute;
top: 15px;
right: 15px;
border: none;
background: none;
color: #ebdec9;
font-size: 24px;
cursor: pointer;
padding: 0.5rem;
}

/* Cabeçalho do modal */
.modal-header {
padding-bottom: 1rem;
line-height: 1.6; /* Espaç display: flex;amento entre linhas */
margin-top: 10px;
font-size: 3.125rem;
letter-spacing: 0.1rem; /* Espaçamento entre letras */
font-style: normal;
font-weight: 500;
line-height: normal;
letter-spacing: 2px;
overflow-wrap: anywhere;
}

.modal-main-info {
display: flex;
flex-direction: column;
font-size: 1rem;
font-style: normal;
font-weight: 500;
line-height: normal;
letter-spacing: 2px;
gap: 1.5rem;
overflow-wrap: anywhere;
}
32 changes: 32 additions & 0 deletions src/Components/AdvantagesModal/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import PropTypes from "prop-types";
import "./index.css";

export default function AdvantagesModal({ title, description, onClose }) {
return (
<>
<div className="modal-overlay">
<div className="modal-box">
<button className="close-button" onClick={onClose}>
&times;
</button>

<h2 className="modal-header">{title}</h2>
<div className="modal-main-info">
<p className="modal-description">{description}</p>

<p className="modal-contacts">
Para mais informações, entre em contato com o Sindicato pelo
número <b>(61) 3321-1949</b>.
</p>
</div>
</div>
</div>
</>
);
}

AdvantagesModal.propTypes = {
title: PropTypes.string.isRequired,
description: PropTypes.string.isRequired,
onClose: PropTypes.func.isRequired,
};
130 changes: 65 additions & 65 deletions src/Components/FieldText/index.jsx
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
import PropTypes from "prop-types";
import theme from "../../Styles/global";
import TextField from "@mui/material/TextField";
export default function FieldText({
label,
value,
onChange,
disabled,
onBlur,
erro,
type,
}) {
return (
<TextField
id={`field-${label.replace(/\s+/g, "-").toLowerCase()}`} // Gera um id único baseado no label
label={label}
value={value}
variant="filled"
onChange={onChange}
disabled={disabled}
onBlur={onBlur}
error={erro}
type={type}
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.any.isRequired,
onChange: PropTypes.func.isRequired,
disabled: PropTypes.bool,
onBlur: PropTypes.func, // Added prop type for onBlur
erro: PropTypes.bool, // Added prop type for erro
type: PropTypes.string,
};
import PropTypes from "prop-types";
import theme from "../../Styles/global";
import TextField from "@mui/material/TextField";

export default function FieldText({
label,
value,
onChange,
disabled,
onBlur,
erro,
type,
}) {
return (
<TextField
id={`field-${label.replace(/\s+/g, "-").toLowerCase()}`} // Gera um id único baseado no label
label={label}
value={value}
variant="filled"
onChange={onChange}
disabled={disabled}
onBlur={onBlur}
error={erro}
type={type}
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.any.isRequired,
onChange: PropTypes.func.isRequired,
disabled: PropTypes.bool,
onBlur: PropTypes.func, // Added prop type for onBlur
erro: PropTypes.bool, // Added prop type for erro
type: PropTypes.string,
};
55 changes: 55 additions & 0 deletions src/Components/Footer/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
.footer {
background-color: #f9f6f3;
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
height: 6rem;
z-index: 100;
position: relative;
bottom: 0;
padding: 0 2.813rem;
border-top: 1px solid #dab66f;
}

.copyright {
position: absolute;
justify-items: center;
font-size: 0.75rem;
color: #3d160d;
font-family: "Noto Sans";
font-style: normal;
font-weight: 400;
line-height: normal;
letter-spacing: 0.46px;
left: 50%;
transform: translateX(-50%);
}
.copyright p {
text-align: center;
}

.icons {
justify-content: space-between;
}

@media (max-width: 1175px) {
.copyright {
position: relative;
left: auto;
transform: none;
}
}
@media (max-width: 945px) {
.logoFooter {
display: none;
}
}
@media (max-width: 890px) {
.footer {
height: 10rem;
flex-direction: column;
padding: 2rem 1rem;
gap: 1rem;
}
}
Loading
Loading