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.

Sign up for GitHub

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

Fix Perfil #27

Merged
merged 11 commits into from
Dec 1, 2023
Merged

Fix Perfil #27

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3d0f26d
Correcao de cor
cansancaojennifer Nov 27, 2023
533604b
Criacao do botao de alterar senha
cansancaojennifer Nov 27, 2023
e24c320
Alinhamento dos itens
cansancaojennifer Nov 27, 2023
6939deb
Alinhamento de texto deleteUser, changePassword e logout
cansancaojennifer Nov 29, 2023
09906d4
Alinhamento altura logout, changePassword e deleteUser
cansancaojennifer Nov 29, 2023
45d5262
Texto "Perfil" na caixinha
cansancaojennifer Nov 29, 2023
71ea3e2
Mudanca de ordem entre vinculo e email
cansancaojennifer Nov 29, 2023
df935c5
Adicionar linha cinza
cansancaojennifer Nov 29, 2023
3ce4085
Merge branch 'develop' into fix-perfil
GabrielaTiago Nov 30, 2023
5cfcb9f
Alterações de layout na tela de perfil
GabrielaTiago Dec 1, 2023
7e23c02
Formata a string de vinculo do usuário
GabrielaTiago Dec 1, 2023
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
69 changes: 69 additions & 0 deletions src/app/pages/profile/profile.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
.rectangle-45 {
box-sizing: border-box;
background: #FFFFFF;
border: 0.15px solid #969696;
border-radius: 9px;
}

.perfil {
color: #0087C8;
font-size: 13px;
font-family: "unb-pro", sans-serif;
}

.textoCaixinha {
color: #3C3C3B;
font-size: 11px;
font-family: "unb-pro", sans-serif;
}

.editUser {
width: 103px;
height: 30px;
top: 408px;
left: 129px;

}


.deleteUser {
color: #0087C8;
font-family: "unb-pro", sans-serif;
font-size: 11px;
width: 1205px;
height: 13px;
top: 500px;
left: 20px;
line-height: 100px;
}

.logout {
color: #0087C8;
font-family: "unb-pro", sans-serif;
width: 1115px;
height: 13px;
top: 501px;
left: 20px;
font-size: 11px;
line-height: 300px;
}

.changePassword {
color: #0087C8;
font-family: "unb-pro", sans-serif;
width: 1160px;
height: 13px;
top: 567px;
left: 20px;
font-size: 11px;
font-weight: 400;
line-height: 200px;

}

.linha-cinza {
border: 0.05px solid #969696;
width: 220px;

}

49 changes: 31 additions & 18 deletions src/app/pages/profile/profile.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,54 @@

<div class="flex justify-center items-center flex-col">
<div class="text-center">
<div class="text-center .rectangle-45">
<div
class="mb-4 flex flex-col justify-start items-center bg-zinc-300 p-4 rounded-xl shadow-md"
class="mb-4 flex flex-col justify-start items-center rectangle-45 p-4 rounded-xl"
*ngIf="user"
>
<div class="flex flex-row">
<div class="font-bold">Nome:&nbsp;</div>
{{ user.name }}
<div class="flex flex-row perfil font-bold">
Perfil
</div>
<div class="flex flex-row">
<div class="font-bold">Vínculo:&nbsp;</div>
{{ user.connection }}
<div class="linha-cinza"></div>
<div class="flex flex-row textoCaixinha font-bold">
{{ user.name }}
</div>
<div class="flex flex-row">
<div class="font-bold">Email:&nbsp;</div>
<div class="flex flex-row textoCaixinha">
{{ user.email }}
</div>
</div>
<div class="linha-cinza"></div>
<div class="flex flex-row textoCaixinha">
{{ user.connection }}
</div>
</div>
<button id="editUser"
class="p-2 bg-blue-brand rounded-lg justify-center my-8 text-white md:h-10 md:w-32"
class="bg-blue-brand rounded-lg my-8 text-white editUser"
(click)="navigatorEdit()"
>
Editar perfil
Editar
</button>
</div>
<div class="flex items-center justify-center">
</div>
<div class="flex flex-col">
<div class="flex deleteUser">
<button id="deleteUser"
class="p-2 bg-blue-brand rounded-lg justify-center my-8 text-white md:h-10 md:w-32"
class="deleteUser rounded-lg"
(click)="deleteUser()"
>
Deletar usuário
Deseja excluir o perfil?
</button>
</div>
<div class="flex changePassword">
<button
id="changePassword"
class="changePassword"
>
Alterar senha
</button>
</div>
<div class="flex items-center justify-center">
<div class="flex logout">
<button
id="logout"
class="p-2 bg-blue-brand rounded-lg justify-center my-8 text-white md:h-10 md:w-16"
class="logout"
(click)="logoutUser()"
>
Sair
Expand Down
Loading