Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Back-end/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ db.connect((err) => {

app.use(express.json());

// Rota de cadastro
// Rota de cadastr
app.post('/signup', async (req, res) => {
const { username, password } = req.body;

Expand Down
2 changes: 1 addition & 1 deletion Front-end/src/Pages/Cadastro/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Cadastro = () => {
<div className="mainCadastro">
<section className="CadastroInfo">
<CadastroInfo/>
<img className="Baleia" src="https://raw.githubusercontent.com/Xuan002/Naut-Bank-/main/src/assets/logo/logo-removebg-preview.svg" alt="baleia do Naut'Bank" />

</section>

<div class="linha-vertical"></div>
Expand Down
40 changes: 27 additions & 13 deletions Front-end/src/Pages/Cadastro/style.css
Original file line number Diff line number Diff line change
@@ -1,31 +1,45 @@
.mainCadastro {
color: #E5E5E5;
position: relative;
color: #0a0a0a;
display: flex;
flex-direction: row;
justify-content: space-between;
}

.CadastroInfo {
margin-top: 10vw;
position: relative;
z-index: 2;
margin-top: 29vw;
margin-left: 8vw;
}

.Cadastro {
margin-top: 3vw;
margin-right: 8vw;
.CardC {
position: relative;
margin-left: 5vw;
width: 420px;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
padding: 40px 10px;
background:#f8f7f7 ;
border-radius: 30px;
box-shadow: 0px 10px 40px #00000056;
}

.Baleia {
position: absolute;
top: 240px;
left: 380px;
height: 34vw;
.Cadastro {
position: relative;
margin-top: 10vw;
margin-right: 38vw;
}


.linha-vertical {
height: 500px;
border-right: 3px solid #1E40AF;
margin-top: 100px;
position: absolute;
margin-top: 300px;
width: 100%;
border-top: 350px solid ;
color: #853535;
}


Expand Down
3 changes: 2 additions & 1 deletion Front-end/src/Pages/Login/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import "./style.css"

const Login = () => {
return (

<div className="mainLogin">
<section className="LoginInfo">
<LoginInfo />
<img className="Baleia" src="src\Pages\Login\baleia.svg" alt="baleia do Naut'Bank" />
</section>

<div class="linha-vertical2"></div>

<div class="container">
<section className="Login">
<LoginForm />
Expand Down
60 changes: 49 additions & 11 deletions Front-end/src/Pages/Login/style.css
Original file line number Diff line number Diff line change
@@ -1,35 +1,73 @@
:root {
--cor-escura: #333;
--cor-escura: #333333;
--cor-clara: #E5E5E5;
--cor-link: #1E40AF;
--cor-link: #3e1adf;
}


.mainLogin {
position: relative;
color: var(--cor-clara);
display: flex;
flex-direction: row;
justify-content: space-between;
justify-content: center;
align-items: center;
background-color: var(--cor-escura); /* Cor de fundo escura */
width: 100vw;
height: 100vh;

}

.LoginInfo {
margin-top: 10vw;
margin-left: 8vw;
z-index: 2;
width: 40vw;
height: 100vh;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;

}

.CardL{
position: relative;
margin-left: 5vw;
width: 420px;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
padding: 40px 10px;
background:#f8f7f7 ;
border-radius: 30px;
box-shadow: 0px 10px 40px #00000056;

}

.Login {
margin-top: 5vw;
margin-right: 8vw;
position: relative;
width: 50vw;
height: 100vh;
display: flex;
justify-content: center;
align-items: start;
flex-direction: column;

}


.Baleia {
width: 35%;
}

.linha-vertical2 {
height: 500px;
border-right: 3px solid var(--cor-link);
margin-top: 100px;
position: absolute;
width: 100%;
border-top: 350px solid ;
color: #853535;



}

@media (max-width: 1340px) {
Expand All @@ -50,7 +88,7 @@
}

@media (max-width: 720px) {
.Baleia,

.mainLogin .linha-vertical2 {
display: none;
}
Expand Down
4 changes: 4 additions & 0 deletions Front-end/src/components/LoginForm/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,20 @@ const LoginForm = () => {
}

}

return (
<div className="CardL">
<div className="loginForm">
<h2>Entrar</h2>
<CampoTexto className="CampoEmail" type="text" placeholder="Digite o seu E-mail"/>
<CampoTexto className="CampoSenha" type="password" placeholder="Digite a sua senha"/>
<a><Link to="/cadastro">Esqueceu sua senha</Link></a>
<Botao funcao={handleSubmit} texto="Entrar"/>



</div>
</div>
);
}

Expand Down
3 changes: 2 additions & 1 deletion Front-end/src/components/LoginForm/loginForm.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
font-size: 30px;
line-height: 45px;
color: #fff; /* Cor do texto branca */
border-radius: 1000px;
}

.CampoEmail {
margin-bottom: 30px;
margin-bottom: 50px;
}

.loginForm a {
Expand Down
4 changes: 2 additions & 2 deletions Front-end/src/components/LoginInfo/loginInfo.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:root {
--cor-texto: #E5E5E5;
--cor-link: #1E40AF;
--cor-link: #080808;
}

.loginInfo h1 {
Expand Down Expand Up @@ -44,6 +44,6 @@
font-weight: 600;
font-size: 16px;
line-height: 24px;
color: var(--cor-link);
color: #1a1919;
cursor: pointer;
}
18 changes: 10 additions & 8 deletions Front-end/src/components/cadastroForm/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@ const CadastroForm = () => {
navigate('/')
}
return (
<div className="cadastroForm">
<h2>Cadastra-se</h2>
<CampoTexto className="CampoTexto" type="text" placeholder="E-mail"/>
<CampoTexto className="CampoTexto" type="text" placeholder="nome e sobrenome"/>
<CampoTexto className="CampoTexto" type="text" placeholder="CPF"/>
<CampoTexto className="CampoTexto" type="text" placeholder="senha"/>
<CampoTexto className="CampoTexto" type="text" placeholder="Confirme a senha"/>
<Botao funcao={handleClick} texto="Registrar"/>
<div className="CardC">
<div className="cadastroForm">
<h2>Cadastra-se</h2>
<CampoTexto className="CampoTexto" type="text" placeholder="E-mail"/>
<CampoTexto className="CampoTexto" type="text" placeholder="nome e sobrenome"/>
<CampoTexto className="CampoTexto" type="text" placeholder="CPF"/>
<CampoTexto className="CampoTexto" type="text" placeholder="senha"/>
<CampoTexto className="CampoTexto" type="text" placeholder="Confirme a senha"/>
<Botao funcao={handleClick} texto="Registrar"/>

</div>
</div>
);
}
Expand Down
1 change: 1 addition & 0 deletions Front-end/src/components/cadastroInfo/cadastroInfo.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@


.cadastroInfo h1{
font-family: 'Poppins';
font-style: normal;
Expand Down
5 changes: 1 addition & 4 deletions Front-end/src/components/cadastroInfo/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ import "./cadastroInfo.css"
const CadastroInfo = () => {
return (
<div className="cadastroInfo">
<h1>Bem-vindo a bordo do Naut Bank!</h1>
<h2>Insira suas credenciais para embarcar em sua jornada financeira.</h2>
<p>Se você tem uma conta</p>
<div className="login">
<p>Você pode</p>
<p>Se você tem uma conta você pode</p>
<a><Link to="/">Entre aqui!</Link></a>
</div>
</div>
Expand Down
6 changes: 6 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.