From 3326b48eab5650b4c0b0aa740d72edaceff942f0 Mon Sep 17 00:00:00 2001
From: Sana EL HIRI <sanaze.elhiri@gmail.com>
Date: Sun, 13 Mar 2022 18:45:28 +0100
Subject: [PATCH] coms
---
src/app/app.module.ts | 2 +-
.../card-member/card-member.component.html | 1 +
.../card-member/card-member.component.ts | 4 +-
.../components/signin/signin.component.html | 45 +++++++------------
.../page-add-member.component.html | 1 +
.../page-add-member.component.ts | 7 +++
.../page-signup/page-signup.component.html | 2 +-
.../page-signup/page-signup.component.ts | 14 +++++-
8 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 8f8e633..f7a2acf 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -77,7 +77,7 @@ registerLocaleData(localeFr)
DeconnexionComponent,
HumeurComponent,
AlertComponent,
- PageAjoutEvenementsComponent,
+ PageAjoutEvenementsComponent,
PageSupportComponent
],
imports: [
diff --git a/src/app/components/card-member/card-member.component.html b/src/app/components/card-member/card-member.component.html
index 0cf60b5..5da641b 100644
--- a/src/app/components/card-member/card-member.component.html
+++ b/src/app/components/card-member/card-member.component.html
@@ -6,6 +6,7 @@
<div class="text-center"><div class="rounded-circle"id="couleur"[style.background-color]="membre.couleur"></div></div>
<div class="text-center mt-3">
<h3 class="mt-2 mb-0">{{membre.prenom }} {{membre.nom }}</h3>
+ <!-- [hidden] pour cacher le bouton si le membre a un profil enfant-->
<div class="buttons text-center"><button button type="button" class="btn btn-outline-primary px-4"
routerLink="../modifier-membre/{{membre.id}}"
routerLinkActive="active-custom"
diff --git a/src/app/components/card-member/card-member.component.ts b/src/app/components/card-member/card-member.component.ts
index fd1d07d..7867524 100644
--- a/src/app/components/card-member/card-member.component.ts
+++ b/src/app/components/card-member/card-member.component.ts
@@ -16,15 +16,13 @@ export class CardMemberComponent implements OnInit {
ngOnInit(): void {
/** Récupérer le rôle de l'uilisateur connecté pour lui imposer des limitations s'il a un ROLE_ENFANT **/
- /** Il s'agit de cacher les boutons qui permettent de modifier et supprimer les profils (html)**/
+ /** Il s'agit de cacher les boutons qui permettent de modifier et supprimer les profils ([hidden] dans html)**/
const userRole = this.tokenService.getRole();
if(userRole == "ROLE_PARENT"){
this.parent = true;
- console.log('Rôle : ' + userRole);
}
else if(userRole== "ROLE_ENFANT"){
this.parent = false;
- console.log('Rôle : ' + userRole);
}
}
diff --git a/src/app/components/signin/signin.component.html b/src/app/components/signin/signin.component.html
index 7c782da..7ea8c8a 100644
--- a/src/app/components/signin/signin.component.html
+++ b/src/app/components/signin/signin.component.html
@@ -2,38 +2,27 @@
<main class="form-signin">
<form (ngSubmit)="onSubmit(signinForm)" #signinForm="ngForm">
<div class="connexion">
- <div class="form-floating">
- <input type="email" class="form-control" id="floatingInput" placeholder="" name="email" ngModel required
- [ngClass]="{'is-valid': signinForm.form.touched && signinForm.form.value['email'] != '' ,
- 'is-invalid': signinForm.form.touched && signinForm.form.value['email'] == ''}">
- <label for="floatingInput">Adresse email</label>
+ <div class="form-floating">
+ <input type="email" class="form-control" id="floatingInput" placeholder=""
+ name="email" ngModel required
+ [ngClass]="{'is-valid': signinForm.form.touched && signinForm.form.value['email'] != '' ,
+ 'is-invalid': signinForm.form.touched && signinForm.form.value['email'] == ''}">
+ <label for="floatingInput">Adresse email</label>
+ </div>
+ <div class="form-floating">
+ <input type="password" class="form-control" id="floatingPassword" placeholder="" name="password" ngModel
+ required [ngClass]="{'is-valid': signinForm.form.touched && signinForm.form.value['password'] != '' ,
+ 'is-invalid': signinForm.form.touched && signinForm.form.value['password'] == ''}">
+ <label for="floatingPassword">Mot de passe</label>
+ </div>
+ <button class="w-100 btn btn-lg btn-outline-success" type="submit" [disabled]="signinForm.invalid">Se
+ connecter
+ </button>
</div>
- <div class="form-floating">
- <input type="password" class="form-control" id="floatingPassword" placeholder="" name="password" ngModel
- required [ngClass]="{'is-valid': signinForm.form.touched && signinForm.form.value['password'] != '' ,
- 'is-invalid': signinForm.form.touched && signinForm.form.value['password'] == ''}">
- <label for="floatingPassword">Mot de passe</label>
- </div>
-
- <button class="w-100 btn btn-lg btn-outline-success" type="submit" [disabled]="signinForm.invalid">Se
- connecter</button>
-</div>
-
<button class="w-100 btn btn-lg btn-outline-success" routerLink="../creation-compte"
- routerLinkActive="active-custom">S'inscrire</button>
-
+ routerLinkActive="active-custom">S'inscrire</button>
</form>
<a routerLink="/password-oublie" routerLinkActive="active-custom" class="nav-link">password perdu ?</a>
- <!-- <div *ngIf="errorForm">
- <p class="text-danger">Il manque des informations dans le formulaire...</p>
- </div> -->
-
<app-alert *ngIf="isShow" [alert]="alert" (eventClose)="onClickCloseAlert();"></app-alert>
-
- <!-- <div *ngIf="isShow">
- <div class="alert alert-{{alert.type}}" role="alert">
- {{alert.content}}
- </div>
- </div> -->
</main>
</div>
diff --git a/src/app/pages/page-add-member/page-add-member.component.html b/src/app/pages/page-add-member/page-add-member.component.html
index c7f3c72..77b3960 100644
--- a/src/app/pages/page-add-member/page-add-member.component.html
+++ b/src/app/pages/page-add-member/page-add-member.component.html
@@ -157,6 +157,7 @@
Ajouter le membre
</button>
</form>
+ <app-alert *ngIf="isShow" [alert]="alert" (eventClose)="onClickCloseAlert();"></app-alert>
</div>
</div>
</div>
diff --git a/src/app/pages/page-add-member/page-add-member.component.ts b/src/app/pages/page-add-member/page-add-member.component.ts
index c9209e1..1bd4cf5 100644
--- a/src/app/pages/page-add-member/page-add-member.component.ts
+++ b/src/app/pages/page-add-member/page-add-member.component.ts
@@ -28,6 +28,7 @@ export class PageAddMemberComponent implements OnInit {
private fb: FormBuilder
) {
this.addMemberForm = new FormGroup({});
+ this.isShow = false;
}
ngOnInit(): void {
@@ -130,4 +131,10 @@ export class PageAddMemberComponent implements OnInit {
}
};
}
+
+ //fermeture du message d'alerte
+ onClickCloseAlert(){
+ console.log('fermeture');
+ this.isShow = ! this.isShow;
+ }
}
diff --git a/src/app/pages/page-signup/page-signup.component.html b/src/app/pages/page-signup/page-signup.component.html
index 7d2a6ca..dd44f6b 100644
--- a/src/app/pages/page-signup/page-signup.component.html
+++ b/src/app/pages/page-signup/page-signup.component.html
@@ -149,7 +149,7 @@
[disabled]="signupForm.invalid">
CREER MON COMPTE
</button>
-
</form>
+ <app-alert *ngIf="isShow" [alert]="alert" (eventClose)="onClickCloseAlert();"></app-alert>
</main>
</div>
diff --git a/src/app/pages/page-signup/page-signup.component.ts b/src/app/pages/page-signup/page-signup.component.ts
index 288acfd..01562e1 100644
--- a/src/app/pages/page-signup/page-signup.component.ts
+++ b/src/app/pages/page-signup/page-signup.component.ts
@@ -18,6 +18,8 @@ import { AuthService } from '../../services/auth.service';
})
export class PageSignupComponent implements OnInit {
public signupForm: FormGroup;
+ alert: any;
+ isShow!: boolean;
constructor(
private authService: AuthService,
@@ -26,10 +28,11 @@ export class PageSignupComponent implements OnInit {
private fb: FormBuilder
) {
this.signupForm = new FormGroup({});
+ this.isShow = false;
}
ngOnInit(): void {
- // *********************************pensser a changer group car déprécié********************************
+ // ********************************* Pour V2 : changer group car déprécié********************************
this.signupForm = this.fb.group(
{
teamNameFc: new FormControl('', [Validators.required]),
@@ -101,7 +104,8 @@ export class PageSignupComponent implements OnInit {
});
} else {
- // affichage erreur
+ this.alert={"type":"danger", "content":"Votre profil n'a pas été créé"};
+ this.isShow = true;
}
}
/** Méthode pour compare le mot de passe et la confirmation de mot de passe **/
@@ -122,4 +126,10 @@ export class PageSignupComponent implements OnInit {
}
};
}
+
+ //fermeture du message d'alerte
+ onClickCloseAlert(){
+ console.log('fermeture');
+ this.isShow = ! this.isShow;
+ }
}