From fd24009f87988a3add92c9eb3bf634ad5f535cc6 Mon Sep 17 00:00:00 2001 From: MiharyR Date: Tue, 26 Oct 2021 09:11:17 +0200 Subject: [PATCH] =?UTF-8?q?Page=20de=20connexion=20presque=20pr=C3=AAte.?= =?UTF-8?q?=20Il=20manque=20la=20redirection=20de=20page=20en=20fonction?= =?UTF-8?q?=20du=20role?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page-connexion.component.ts | 15 ---- .../page-register.component.html | 1 - .../page-register.component.scss | 0 .../page-register/page-register.component.ts | 15 ---- .../page-connexion.component.html | 17 ++-- .../page-connexion.component.scss | 15 ++-- .../page-connexion.component.spec.ts | 0 .../page-connexion.component.ts | 43 ++++++++++ .../page-register.component.html | 50 +++++++++++ .../page-register.component.scss | 42 ++++++++++ .../page-register.component.spec.ts | 0 .../page-register/page-register.component.ts | 84 +++++++++++++++++++ .../nav-bar/nav-bar.component.html | 11 +-- .../nav-bar/nav-bar.component.scss | 4 + .../nav-bar/nav-bar.component.spec.ts | 0 .../{ => utils}/nav-bar/nav-bar.component.ts | 0 16 files changed, 249 insertions(+), 48 deletions(-) delete mode 100644 src/app/page-connexion/page-connexion.component.ts delete mode 100644 src/app/page-register/page-register.component.html delete mode 100644 src/app/page-register/page-register.component.scss delete mode 100644 src/app/page-register/page-register.component.ts rename src/app/{ => pourLes3Roles}/page-connexion/page-connexion.component.html (54%) rename src/app/{ => pourLes3Roles}/page-connexion/page-connexion.component.scss (72%) rename src/app/{ => pourLes3Roles}/page-connexion/page-connexion.component.spec.ts (100%) create mode 100644 src/app/pourLes3Roles/page-connexion/page-connexion.component.ts create mode 100644 src/app/pourLes3Roles/register/page-register/page-register.component.html create mode 100644 src/app/pourLes3Roles/register/page-register/page-register.component.scss rename src/app/{ => pourLes3Roles/register}/page-register/page-register.component.spec.ts (100%) create mode 100644 src/app/pourLes3Roles/register/page-register/page-register.component.ts rename src/app/{ => utils}/nav-bar/nav-bar.component.html (57%) rename src/app/{ => utils}/nav-bar/nav-bar.component.scss (90%) rename src/app/{ => utils}/nav-bar/nav-bar.component.spec.ts (100%) rename src/app/{ => utils}/nav-bar/nav-bar.component.ts (100%) diff --git a/src/app/page-connexion/page-connexion.component.ts b/src/app/page-connexion/page-connexion.component.ts deleted file mode 100644 index 38cb706..0000000 --- a/src/app/page-connexion/page-connexion.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-page-connexion', - templateUrl: './page-connexion.component.html', - styleUrls: ['./page-connexion.component.scss'] -}) -export class PageConnexionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/page-register/page-register.component.html b/src/app/page-register/page-register.component.html deleted file mode 100644 index c75653c..0000000 --- a/src/app/page-register/page-register.component.html +++ /dev/null @@ -1 +0,0 @@ -

page-register works!

diff --git a/src/app/page-register/page-register.component.scss b/src/app/page-register/page-register.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/page-register/page-register.component.ts b/src/app/page-register/page-register.component.ts deleted file mode 100644 index fc8fab2..0000000 --- a/src/app/page-register/page-register.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-page-register', - templateUrl: './page-register.component.html', - styleUrls: ['./page-register.component.scss'] -}) -export class PageRegisterComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/page-connexion/page-connexion.component.html b/src/app/pourLes3Roles/page-connexion/page-connexion.component.html similarity index 54% rename from src/app/page-connexion/page-connexion.component.html rename to src/app/pourLes3Roles/page-connexion/page-connexion.component.html index 71d4a40..f77d943 100644 --- a/src/app/page-connexion/page-connexion.component.html +++ b/src/app/pourLes3Roles/page-connexion/page-connexion.component.html @@ -5,32 +5,35 @@

Connexion

+
Email:  
- +
+
Mot de passe:  
- +
+
- +
-
- +
+
+
- Mot de passe oublié ? + Mot de passe oublié ?
-
diff --git a/src/app/page-connexion/page-connexion.component.scss b/src/app/pourLes3Roles/page-connexion/page-connexion.component.scss similarity index 72% rename from src/app/page-connexion/page-connexion.component.scss rename to src/app/pourLes3Roles/page-connexion/page-connexion.component.scss index 5ba32ab..d0d6de0 100644 --- a/src/app/page-connexion/page-connexion.component.scss +++ b/src/app/pourLes3Roles/page-connexion/page-connexion.component.scss @@ -6,12 +6,12 @@ h1 { .boite { margin-left: auto; margin-right: auto; - width: 25%; + width: 450px; margin-top: 50vh; - transform: translateY(-60%); + transform: translateY(-100%); border: solid 3px black; border-radius: 10px; - padding: 20px 10px 20px 10px; + padding: 20px 40px 20px 20px; background-color: #dcdcdc; } @@ -30,12 +30,17 @@ h1 { padding: 0px } +input { + width: 100%; +} + button { - width: 90% + width: 100%; + margin-right: 0px; } .col-6 { - text-align: center; + //text-align: center; } .lien { diff --git a/src/app/page-connexion/page-connexion.component.spec.ts b/src/app/pourLes3Roles/page-connexion/page-connexion.component.spec.ts similarity index 100% rename from src/app/page-connexion/page-connexion.component.spec.ts rename to src/app/pourLes3Roles/page-connexion/page-connexion.component.spec.ts diff --git a/src/app/pourLes3Roles/page-connexion/page-connexion.component.ts b/src/app/pourLes3Roles/page-connexion/page-connexion.component.ts new file mode 100644 index 0000000..a3be2e7 --- /dev/null +++ b/src/app/pourLes3Roles/page-connexion/page-connexion.component.ts @@ -0,0 +1,43 @@ +import { Component, OnInit } from '@angular/core'; +import {MessageService} from "../../utils/message/message.service"; +import {Router} from "@angular/router"; + + +@Component({ + selector: 'app-page-connexion', + templateUrl: './page-connexion.component.html', + styleUrls: ['./page-connexion.component.scss'] +}) +export class PageConnexionComponent implements OnInit +{ + email: string = "" + password: string = "" + + constructor( private messageService: MessageService, + private router: Router) { } + + + ngOnInit(): void {} + + + onSeConnecter(): void + { + let data = { + "email": this.email, + "password": this.password + }; + this.messageService + .sendMessage('connexion', data) + .subscribe( retour => this.maCallback(retour)) + } + + + maCallback(retour): void + { + if(retour.status === "error") console.log(retour.data) + else { + console.log(retour.data) + //this.router.navigateByUrl( '/search' ); + } + } +} diff --git a/src/app/pourLes3Roles/register/page-register/page-register.component.html b/src/app/pourLes3Roles/register/page-register/page-register.component.html new file mode 100644 index 0000000..adf0992 --- /dev/null +++ b/src/app/pourLes3Roles/register/page-register/page-register.component.html @@ -0,0 +1,50 @@ +
+ + + +
+

Inscription

+ + +
+
Pseudo:  
+
+ +
+
+ + +
+
Email:  
+
+ +
+
+ + +
+
Mot de passe:  
+
+ +
+
+ + +
+
Confirmer le mot de passe:  
+
+ +
+
+ + +
+ +
+ + +
+ {{errorMessage}} +
+
+
diff --git a/src/app/pourLes3Roles/register/page-register/page-register.component.scss b/src/app/pourLes3Roles/register/page-register/page-register.component.scss new file mode 100644 index 0000000..4efbdf0 --- /dev/null +++ b/src/app/pourLes3Roles/register/page-register/page-register.component.scss @@ -0,0 +1,42 @@ +h1 { + text-align: center; + margin-bottom: 30px; +} + +.boite { + margin-left: auto; + margin-right: auto; + width: 550px; + margin-top: 50vh; + transform: translateY(-100%); + border: solid 3px black; + border-radius: 10px; + padding: 20px 40px 20px 40px; + background-color: #dcdcdc; +} + +input { + width: 100%; +} + +.row { + margin: 15px 0px 15px 0px +} + +.label { + text-align: right; + margin-right: 0px; + padding: 0px; +} + +.champ { + margin: 0px; + padding: 0px +} + +button { + width: 100%; + margin-right: 0px; + background-color: #969696; + border: solid 2px black; +} diff --git a/src/app/page-register/page-register.component.spec.ts b/src/app/pourLes3Roles/register/page-register/page-register.component.spec.ts similarity index 100% rename from src/app/page-register/page-register.component.spec.ts rename to src/app/pourLes3Roles/register/page-register/page-register.component.spec.ts diff --git a/src/app/pourLes3Roles/register/page-register/page-register.component.ts b/src/app/pourLes3Roles/register/page-register/page-register.component.ts new file mode 100644 index 0000000..5d36a09 --- /dev/null +++ b/src/app/pourLes3Roles/register/page-register/page-register.component.ts @@ -0,0 +1,84 @@ +import { Component, OnInit } from '@angular/core'; +import {MessageService} from "../../outils/message/message.service"; +import {Router} from "@angular/router"; +import {MatDialog} from "@angular/material/dialog"; +import {PopupConfirmationComponent} from "../popup-confirmation/popup-confirmation.component"; + +@Component({ + selector: 'app-page-register', + templateUrl: './page-register.component.html', + styleUrls: ['./page-register.component.scss'] +}) +export class PageRegisterComponent implements OnInit +{ + pseudo: string = ""; + email: string = "" ; + password: string = ""; + confirmPassword: string = ""; + hasError: boolean = false; + errorMessage: string = ""; + + + constructor( private messageService: MessageService, + private router: Router, + public dialog: MatDialog ) { } + + + ngOnInit(): void {} + + + verifierChamps(): void + { + if(this.pseudo.length === 0) { + this.errorMessage = "Veuillez remplir le champ 'pseudo'" + this.hasError = true; + } + else if(this.email.length === 0) + { + this.errorMessage = "Veuillez remplir le champ 'email'" + this.hasError = true; + } + else if(this.password.length === 0) + { + this.errorMessage = "Veuillez remplir le champ 'mot de passe'" + this.hasError = true; + } + else if(this.password !== this.confirmPassword) + { + this.errorMessage = "Le mot de passe est différent de sa confirmation" + this.hasError = true; + } + else { + this.hasError = false; + } + } + + + onValider(): void + { + this.verifierChamps() + console.log(this.hasError) + if(!this.hasError) + { + let data = { "pseudo": this.pseudo, "email": this.email, "password": this.password } + this.messageService + .sendMessage('register', data) + .subscribe(retour => this.maCallback(retour)) + } + } + + + maCallback(retour): void + { + if(retour.status === "error") console.log(retour.data) + else + { + const config = { width: '25%', data: {} } + this.dialog + .open(PopupConfirmationComponent, config ) + .afterClosed() + .subscribe(result => this.router.navigateByUrl( '/connexion' )); + } + } + +} diff --git a/src/app/nav-bar/nav-bar.component.html b/src/app/utils/nav-bar/nav-bar.component.html similarity index 57% rename from src/app/nav-bar/nav-bar.component.html rename to src/app/utils/nav-bar/nav-bar.component.html index 84221d3..ece85d2 100644 --- a/src/app/nav-bar/nav-bar.component.html +++ b/src/app/utils/nav-bar/nav-bar.component.html @@ -1,12 +1,13 @@
diff --git a/src/app/nav-bar/nav-bar.component.scss b/src/app/utils/nav-bar/nav-bar.component.scss similarity index 90% rename from src/app/nav-bar/nav-bar.component.scss rename to src/app/utils/nav-bar/nav-bar.component.scss index 5e84d33..d6337b7 100644 --- a/src/app/nav-bar/nav-bar.component.scss +++ b/src/app/utils/nav-bar/nav-bar.component.scss @@ -1,3 +1,7 @@ +mat-slide-toggle { + margin-top: 20px; +} + ul { list-style-type: none; diff --git a/src/app/nav-bar/nav-bar.component.spec.ts b/src/app/utils/nav-bar/nav-bar.component.spec.ts similarity index 100% rename from src/app/nav-bar/nav-bar.component.spec.ts rename to src/app/utils/nav-bar/nav-bar.component.spec.ts diff --git a/src/app/nav-bar/nav-bar.component.ts b/src/app/utils/nav-bar/nav-bar.component.ts similarity index 100% rename from src/app/nav-bar/nav-bar.component.ts rename to src/app/utils/nav-bar/nav-bar.component.ts