From 2be6c5494842be3ab1f5cca8bfc1ea608fd9d7a9 Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Thu, 27 Oct 2022 16:55:29 +0200
Subject: [PATCH 1/4] fix review design
---
src/app/profile/edit/edit.component.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/profile/edit/edit.component.ts b/src/app/profile/edit/edit.component.ts
index 925001c88..9b64854b7 100644
--- a/src/app/profile/edit/edit.component.ts
+++ b/src/app/profile/edit/edit.component.ts
@@ -39,7 +39,7 @@ export class EditComponent implements OnInit {
public initialUserProfile: User;
private emailModal = false;
private passwordModal = false;
- private deleteAccountModal = false;
+ public deleteAccountModal = false;
private newEmail = '';
private newEmailConfirm = '';
private oldPassword = '';
--
GitLab
From ac0ce8d46abb1472890ee29f0f94c009a234f7ea Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Thu, 27 Oct 2022 16:55:46 +0200
Subject: [PATCH 2/4] fix review design
---
.../login-modal/login-modal.component.scss | 2 +-
.../mediation-recap/mediation-recap.component.scss | 8 +++++++-
src/app/profile/edit/edit.component.scss | 11 ++++++++++-
.../structure-members-management.component.html | 2 +-
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.scss b/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.scss
index 0903809a1..0a4a5eb62 100644
--- a/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.scss
+++ b/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.scss
@@ -40,7 +40,7 @@ h3 {
.fullWidth {
width: 100% !important;
}
-::ng-deep .tertiary {
+.contentModal ::ng-deep .tertiary {
border-radius: 4px !important;
width: 100% !important;
}
diff --git a/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.scss b/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.scss
index 0f1dc1176..10d657283 100644
--- a/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.scss
+++ b/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.scss
@@ -6,6 +6,9 @@
display: flex;
gap: 1.5rem;
padding: 1rem 0;
+ max-width: 680px;
+ width: 100%;
+ margin: auto;
* {
-webkit-print-color-adjust: exact;
}
@@ -47,13 +50,16 @@
}
}
.date {
- max-width: 350px;
+ max-width: 680px;
+ width: 100%;
+ box-sizing: border-box;
margin: 1rem auto 2rem auto;
@include lato-bold-18;
}
.service-info {
max-width: 680px;
width: 100%;
+ box-sizing: border-box;
border-radius: 24px;
border: 1.5px solid $black;
display: flex;
diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss
index 767434139..75475de9d 100644
--- a/src/app/profile/edit/edit.component.scss
+++ b/src/app/profile/edit/edit.component.scss
@@ -120,6 +120,13 @@
}
}
}
+ .credentialsTab ::ng-deep .secondary {
+ width: 250px !important;
+ }
+ .credentialsTab ::ng-deep .secondary .text {
+ place-content: center center !important;
+ align-items: center !important;
+ }
.descriptionTab {
p.descriptionLength {
@@ -130,7 +137,9 @@
margin-top: 8px;
}
}
-
+ .search-structure input {
+ width: 600px;
+ }
.structureResults {
position: absolute;
width: 600px;
diff --git a/src/app/profile/structure-members-management/structure-members-management.component.html b/src/app/profile/structure-members-management/structure-members-management.component.html
index 8d393238f..471e74300 100644
--- a/src/app/profile/structure-members-management/structure-members-management.component.html
+++ b/src/app/profile/structure-members-management/structure-members-management.component.html
@@ -17,7 +17,7 @@
</div>
</div>
<div *ngIf="structureWithOwners && tempUsers">
- <div fxLayout="column" fxLayoutGap="8px" fxLayoutAlign="baseline baseline">
+ <div fxLayout="column" fxLayoutGap="16px" fxLayoutAlign="baseline baseline">
<div *ngFor="let member of structureWithOwners.owners" class="member-card">
<div fxLayout="row" fxLayoutAlign="space-between center" fxFill>
<div fxLayout="row" fxLayoutAlign="start center" class="user">
--
GitLab
From b21356a8a4555739b11eb09eab6f5b0e2ba3db5e Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Fri, 28 Oct 2022 10:05:08 +0200
Subject: [PATCH 3/4] fix border
---
.../multi-radio-form/multi-radio-form.component.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.scss b/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.scss
index 978b88ecd..5617385e8 100644
--- a/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.scss
+++ b/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.scss
@@ -8,7 +8,7 @@
gap: 1rem;
height: 85px;
background-color: $grey-8;
- border: none;
+ border: solid 3px transparent;
font-size: 1rem;
padding: 1.5rem 1rem;
box-sizing: border-box;
--
GitLab
From 596c4b17f0bba10ef4f77155491aa1f9a1af5d3d Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Mon, 31 Oct 2022 10:32:04 +0100
Subject: [PATCH 4/4] fix retours
---
.../print-header/print-header.component.scss | 8 +++
.../mediation-beneciary-info.component.html | 51 +++++++++++++------
.../mediation-recap.component.html | 1 -
src/app/profile/edit/edit.component.scss | 3 +-
4 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/src/app/form/orientation-form-view/global-components/print-header/print-header.component.scss b/src/app/form/orientation-form-view/global-components/print-header/print-header.component.scss
index 43eb14ed4..a80630433 100644
--- a/src/app/form/orientation-form-view/global-components/print-header/print-header.component.scss
+++ b/src/app/form/orientation-form-view/global-components/print-header/print-header.component.scss
@@ -1,17 +1,25 @@
@import '../../../../../assets/scss/color';
+@import '../../../../../assets/scss/typography';
.header-infos {
display: flex;
align-items: flex-start;
+ h3 {
+ @include lato-bold-16;
+ margin-top: 0.25rem;
+ }
img {
margin-right: 3rem;
width: 160px;
}
}
.date {
+ @include lato-regular-13;
text-align: right;
text-transform: capitalize;
font-style: italic;
+ margin-bottom: 0.5rem;
+ color: $grey-3;
}
hr {
height: 1px;
diff --git a/src/app/form/orientation-form-view/online-demarch/mediation-beneciary-info/mediation-beneciary-info.component.html b/src/app/form/orientation-form-view/online-demarch/mediation-beneciary-info/mediation-beneciary-info.component.html
index 3d9388032..1323afbf3 100644
--- a/src/app/form/orientation-form-view/online-demarch/mediation-beneciary-info/mediation-beneciary-info.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/mediation-beneciary-info/mediation-beneciary-info.component.html
@@ -10,11 +10,18 @@
class="form-input"
(input)="updatedForm('name', $event.target.value)"
/>
- <img
- *ngIf="form.get('name').invalid && form.get('name').value"
- src="../../assets/form/notValidate.svg"
- alt="logo invalid"
- />
+ <app-svg-icon
+ *ngIf="form.get('name').valid"
+ [iconClass]="'validation'"
+ [type]="'form'"
+ [icon]="'validate'"
+ ></app-svg-icon>
+ <app-svg-icon
+ *ngIf="form.get('name').value && !form.get('name').valid"
+ [iconClass]="'validation'"
+ [type]="'form'"
+ [icon]="'notValidate'"
+ ></app-svg-icon>
</div>
</div>
<div class="form-group" fxLayout="column">
@@ -27,11 +34,18 @@
class="form-input"
(input)="updatedForm('surname', $event.target.value)"
/>
- <img
- *ngIf="form.get('surname').invalid && form.get('surname').value"
- src="../../assets/form/notValidate.svg"
- alt="logo invalid"
- />
+ <app-svg-icon
+ *ngIf="form.get('surname').valid"
+ [iconClass]="'validation'"
+ [type]="'form'"
+ [icon]="'validate'"
+ ></app-svg-icon>
+ <app-svg-icon
+ *ngIf="form.get('surname').value && !form.get('surname').valid"
+ [iconClass]="'validation'"
+ [type]="'form'"
+ [icon]="'notValidate'"
+ ></app-svg-icon>
</div>
</div>
<div class="form-group" fxLayout="column">
@@ -44,11 +58,18 @@
formControlName="phone"
class="form-input"
/>
- <img
- *ngIf="form.get('phone').invalid && form.get('phone').value"
- src="../../assets/form/notValidate.svg"
- alt="logo invalid"
- />
+ <app-svg-icon
+ *ngIf="form.get('phone').valid"
+ [iconClass]="'validation'"
+ [type]="'form'"
+ [icon]="'validate'"
+ ></app-svg-icon>
+ <app-svg-icon
+ *ngIf="form.get('phone').value && !form.get('phone').valid"
+ [iconClass]="'validation'"
+ [type]="'form'"
+ [icon]="'notValidate'"
+ ></app-svg-icon>
</div>
</div>
</form>
diff --git a/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.html b/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.html
index fdc6c9b75..81622f838 100644
--- a/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.html
@@ -1,6 +1,5 @@
<app-print-header></app-print-header>
<div class="container">
- <!-- <div class="oriented" *ngIf="profile"><h3>Orienté par</h3></div> -->
<div class="beneficiary">
<h3>Bénéficiaire</h3>
<div class="content">
diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss
index 75475de9d..bff7a9089 100644
--- a/src/app/profile/edit/edit.component.scss
+++ b/src/app/profile/edit/edit.component.scss
@@ -121,11 +121,10 @@
}
}
.credentialsTab ::ng-deep .secondary {
- width: 250px !important;
+ width: 220px !important;
}
.credentialsTab ::ng-deep .secondary .text {
place-content: center center !important;
- align-items: center !important;
}
.descriptionTab {
--
GitLab