From 2f5705e76602ea7b09b0790f375ebe4b53936f74 Mon Sep 17 00:00:00 2001 From: Blandine Bajard <83599148+BlandineBajard@users.noreply.github.com> Date: Mon, 14 Feb 2022 12:25:49 +0100 Subject: [PATCH 1/2] page d'accueil fixed --- .../page-accueil/page-accueil.component.html | 2 ++ .../page-accueil/page-accueil.component.scss | 22 ++++++++++++------ .../page-forgot-password.component.html | 4 ++-- .../page-forgot-password.component.ts | 23 ++++++++----------- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/app/pages/page-accueil/page-accueil.component.html b/src/app/pages/page-accueil/page-accueil.component.html index db73446..738a91d 100644 --- a/src/app/pages/page-accueil/page-accueil.component.html +++ b/src/app/pages/page-accueil/page-accueil.component.html @@ -1,5 +1,6 @@ +

BIENVENUE

@@ -13,6 +14,7 @@ lu, nous sommes là pour vous aider !

+
diff --git a/src/app/pages/page-accueil/page-accueil.component.scss b/src/app/pages/page-accueil/page-accueil.component.scss index dd89c90..6df081c 100644 --- a/src/app/pages/page-accueil/page-accueil.component.scss +++ b/src/app/pages/page-accueil/page-accueil.component.scss @@ -1,10 +1,15 @@ +.container { + display: flex; +} + .bienvenue { float: left; - display: inline; + // display: inline-block; + // height: 300px; border: 4px solid #5d5fef; border-radius: 10px; margin-top: 50px; - margin-left: 200px; + // margin-left: 200px; padding-right: 10px; padding-left: 10px; } @@ -18,17 +23,20 @@ p { line-height: 2em; } .connexion { - float: right; + // float: right; + height: 350px; display: inline; margin-top: -40px; - margin-right: 200px; + margin-left: 10px; + // margin-right: 200px; } .pub { - padding-top: 100px; - padding-right: 100px; - padding-left: 200px; display: flex; + flex-wrap: wrap; + padding-top: 100px; + padding-right: 200px; + padding-left: 200px; justify-content: space-between; } diff --git a/src/app/pages/page-forgot-password/page-forgot-password.component.html b/src/app/pages/page-forgot-password/page-forgot-password.component.html index 9e01a57..d34857a 100644 --- a/src/app/pages/page-forgot-password/page-forgot-password.component.html +++ b/src/app/pages/page-forgot-password/page-forgot-password.component.html @@ -13,10 +13,10 @@ routerLinkActive="active-custom">Ré-initialiser mon mot de passe - +
diff --git a/src/app/pages/page-forgot-password/page-forgot-password.component.ts b/src/app/pages/page-forgot-password/page-forgot-password.component.ts index 5d3140f..d763ea7 100644 --- a/src/app/pages/page-forgot-password/page-forgot-password.component.ts +++ b/src/app/pages/page-forgot-password/page-forgot-password.component.ts @@ -14,25 +14,20 @@ import { styleUrls: ['./page-forgot-password.component.scss'] }) export class PageForgotPasswordComponent implements OnInit { -public errorForm: boolean; constructor(private authService: AuthService, private router: Router) { - this.errorForm = false; + } ngOnInit(): void {} - public onSubmit(submittedForm: any): void { + + public onSubmit(submittedForm: any): void { console.log(submittedForm.form.value); + const email = submittedForm.form.value['email']; - if (email !== '') { - this.authService.forgotPassword(email).subscribe((resp) => { - console.log('Component : PageForgotPassword ', resp); - this.router.navigate(['reinitialisation-password']); - }); - } else { - // afficher une erreur à l'utilisateur - this.errorForm = true; - } + console.log(email); + window.alert("Vous allez recevoir un email pour re-initialiser votre mot de passe !") + this.router.navigate(['reinitialisation-password']); + ; + } } - -} From d89214db19668767bd82bda996b3c37dbd68d052 Mon Sep 17 00:00:00 2001 From: Blandine Bajard <83599148+BlandineBajard@users.noreply.github.com> Date: Mon, 14 Feb 2022 12:59:15 +0100 Subject: [PATCH 2/2] component meteo --- src/app/components/meteo/meteo.component.html | 5 +---- src/app/components/meteo/meteo.component.scss | 1 + src/app/pages/page-account/page-account.component.html | 3 +++ src/app/pages/page-account/page-account.component.scss | 5 +++++ .../page-forgot-password.component.ts | 8 ++++---- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/app/components/meteo/meteo.component.html b/src/app/components/meteo/meteo.component.html index d722216..a4a8996 100644 --- a/src/app/components/meteo/meteo.component.html +++ b/src/app/components/meteo/meteo.component.html @@ -1,7 +1,4 @@
- - - -
diff --git a/src/app/components/meteo/meteo.component.scss b/src/app/components/meteo/meteo.component.scss index e69de29..8b13789 100644 --- a/src/app/components/meteo/meteo.component.scss +++ b/src/app/components/meteo/meteo.component.scss @@ -0,0 +1 @@ + diff --git a/src/app/pages/page-account/page-account.component.html b/src/app/pages/page-account/page-account.component.html index 09a4426..6889b9e 100644 --- a/src/app/pages/page-account/page-account.component.html +++ b/src/app/pages/page-account/page-account.component.html @@ -1,5 +1,8 @@ +
+ +