From 48aa30c00068fc110bcbeefabde6b9ebb207c832 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Thu, 25 Feb 2021 11:56:24 +0100
Subject: [PATCH 1/3] fix(navigation) : add enter key on form
---
src/app/form/footer-form/footer-form.component.html | 1 +
src/app/form/footer-form/footer-form.component.scss | 2 +-
src/app/form/form.component.html | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/app/form/footer-form/footer-form.component.html b/src/app/form/footer-form/footer-form.component.html
index c2e91330f..a2d4f21ff 100644
--- a/src/app/form/footer-form/footer-form.component.html
+++ b/src/app/form/footer-form/footer-form.component.html
@@ -11,6 +11,7 @@
class="btn-primary small next"
(click)="goToNextPage()"
[disabled]="!isValid"
+ type="submit"
[ngClass]="{ invalid: !isValid }"
>
<div class="rowBtn" fxLayout="row" fxLayoutAlign="center center">
diff --git a/src/app/form/footer-form/footer-form.component.scss b/src/app/form/footer-form/footer-form.component.scss
index 31dbd2f3b..6ebf95c44 100644
--- a/src/app/form/footer-form/footer-form.component.scss
+++ b/src/app/form/footer-form/footer-form.component.scss
@@ -25,6 +25,6 @@
.chevronRight {
height: 24px;
width: 24px;
- stroke: $white;
+ stroke: inherit;
margin-left: 10px;
}
diff --git a/src/app/form/form.component.html b/src/app/form/form.component.html
index b88d6be47..42e688ad1 100644
--- a/src/app/form/form.component.html
+++ b/src/app/form/form.component.html
@@ -105,7 +105,7 @@
</ul>
</div>
</div>
- <form [formGroup]="accountForm" *ngIf="accountForm && !profile">
+ <form [formGroup]="accountForm" *ngIf="accountForm && !profile" (keyup.enter)="isPageValid && !isEditMode? nextPage() : null">
<div *ngIf="currentPage == pageTypeEnum.accountInfo" class="page">
<div class="title">
<h3>Qui êtes-vous ?</h3>
@@ -241,7 +241,7 @@
</div>
</div>
</form>
- <form [formGroup]="structureForm" *ngIf="structureForm">
+ <form [formGroup]="structureForm" *ngIf="structureForm" (keyup.enter)="isPageValid && !isEditMode? nextPage() : null">
<div *ngIf="currentPage == pageTypeEnum.structureNameAndAddress" class="page">
<div class="title">
<h3>Quelle structure voulez-vous réferencer ?</h3>
--
GitLab
From 0916fca1547832910516a7d2ae0b45529a29d979 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Thu, 25 Feb 2021 11:56:42 +0100
Subject: [PATCH 2/3] fix(navigation) : add enter key on signup
---
.../components/signup-modal/signup-modal.component.html | 6 +++---
.../components/signup-modal/signup-modal.component.scss | 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/app/shared/components/signup-modal/signup-modal.component.html b/src/app/shared/components/signup-modal/signup-modal.component.html
index 91900cf36..492b39e29 100644
--- a/src/app/shared/components/signup-modal/signup-modal.component.html
+++ b/src/app/shared/components/signup-modal/signup-modal.component.html
@@ -39,13 +39,13 @@
<use [attr.xlink:href]="'assets/form/sprite.svg#notValidate'"></use>
</svg>
</div>
- <div class="invalid" *ngIf="authFailed">Identifiant ou mot de passe invalide</div>
+ <div class="incorrectId" *ngIf="authFailed">Identifiant ou mot de passe invalide</div>
</div>
<div class="footerModal" fxLayout="row" fxLayoutAlign="space-around center">
- <button class="btn confirm" (click)="swithToResetPassword()">Mot de passe oublié</button>
+ <button type="button" class="btn confirm" (click)="swithToResetPassword()">Mot de passe oublié</button>
<button
type="submit"
- class="btn"
+ class="btn-primary"
[disabled]="loginForm.invalid || loading"
[ngClass]="{ invalid: loginForm.invalid || loading }"
>
diff --git a/src/app/shared/components/signup-modal/signup-modal.component.scss b/src/app/shared/components/signup-modal/signup-modal.component.scss
index 2133bd8f4..ecf2f6b56 100644
--- a/src/app/shared/components/signup-modal/signup-modal.component.scss
+++ b/src/app/shared/components/signup-modal/signup-modal.component.scss
@@ -7,9 +7,11 @@
.ico-close {
width: 100%;
}
-.invalid {
+
+.incorrectId {
color: $orange-warning;
}
+
h3 {
@include cn-bold-26;
color: $black;
--
GitLab
From bd67c0f48f01fcded21b48785e9ea5369c30e303 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Thu, 25 Feb 2021 11:57:00 +0100
Subject: [PATCH 3/3] fix(navigation) : fix focus style btn
---
src/assets/scss/_buttons.scss | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/assets/scss/_buttons.scss b/src/assets/scss/_buttons.scss
index 3827c75d7..e17ec875c 100644
--- a/src/assets/scss/_buttons.scss
+++ b/src/assets/scss/_buttons.scss
@@ -73,10 +73,17 @@
height: 40px;
width: 192px;
@include btn-bold;
+ stroke: $white;
&.small {
width: 149px;
}
&.invalid {
opacity: 0.4;
}
+ &:focus {
+ background: $white;
+ color: $secondary-color;
+ border: 1px solid $secondary-color;
+ stroke: $secondary-color;
+ }
}
--
GitLab