Merge branch 'dev' into aline

README.md

@@ -4,6 +4,8 @@ This project was generated with [Angular CLI](https://github.com/angular/angular
 
 ## Development server
 
+Run npm install
+
 Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
 ## Code scaffolding

package.json

@@ -25,7 +25,7 @@
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~13.0.3",
+    "@angular-devkit/build-angular": "^13.1.4",
     "@angular/cli": "~13.0.3",
     "@angular/compiler-cli": "~13.0.0",
     "@types/jasmine": "~3.10.0",

src/app/app-routing.module.ts

@@ -5,6 +5,7 @@ import { PageAccueilComponent } from './pages/page-accueil/page-accueil.componen
 import { PageAddMemberComponent } from './pages/page-add-member/page-add-member.component';
 import { PageAgendaComponent } from './pages/page-agenda/page-agenda.component';
 import { PageAjoutContactComponent } from './pages/page-ajout-contact/page-ajout-contact.component';
+import { PageCreationTeamComponent } from './pages/page-creation-team/page-creation-team.component';
 import { PageDashboardComponent } from './pages/page-dashboard/page-dashboard.component';
 import { PageDeleteMemberComponent } from './pages/page-delete-member/page-delete-member.component';
 import { PageForgotPasswordComponent } from './pages/page-forgot-password/page-forgot-password.component';
@@ -27,12 +28,13 @@ const routes: Routes = [
   { path: 'password-oublie', component: PageForgotPasswordComponent },
   { path: 'menu', component: PageMenuSemaineComponent },
   { path: 'repertoire', component: PageRepertoireComponent },
-  { path: 'reinitialisation-password', component: PageResetPasswordComponent },
+  { path: 'reset-password', component: PageResetPasswordComponent },
   { path: 'creation-compte', component: PageSignupComponent },
   { path: 'to-do-list', component: PageToDoListComponent },
   { path: 'modifier-membre', component: PageUpdateMemberComponent },
   { path: 'ajouter-contact', component: PageAjoutContactComponent },
   { path: 'modifier-contact', component: PageAjoutContactComponent },
+  { path: 'creation-team', component : PageCreationTeamComponent},
   { path: '**', component: PageNotFoundComponent },
 ];
 

src/app/app.module.ts

@@ -35,6 +35,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
 import { PageAjoutContactComponent } from './pages/page-ajout-contact/page-ajout-contact.component';
 import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component';
+import { PageCreationTeamComponent } from './pages/page-creation-team/page-creation-team.component';
 
 @NgModule({
   declarations: [
@@ -69,6 +70,7 @@ import { PageModifierContactComponent } from './pages/page-modifier-contact/page
     CreneauComponent,
     PageAjoutContactComponent,
     PageModifierContactComponent,
+    PageCreationTeamComponent,
   ],
   imports: [
     BrowserModule,

src/app/models/membre.ts

@@ -1,10 +1,12 @@
 export interface Membre {
-  firstName: string;
+  nom: string;
-  lastName: string;
+  prenom: string;
   email: string;
   password: string;
   dateNaissance: Date;
-  teamName: string;
   profil: boolean;
+  roleList: string[];
+
   passwordConfirm: string;
+  roleList: string[];
 }

src/app/models/team.ts

@@ -0,0 +1,3 @@
+export interface Team {
+  nom : string;
+}

src/app/pages/page-add-member/page-add-member.component.html

@@ -1 +1,109 @@
 <app-header></app-header>
+<app-side-bar></app-side-bar>
+<div class="signup-form text-center">
+  <main class="form-signup">
+      <form  (ngSubmit)="onSubmit()" [formGroup]="addMemberForm">
+          <h1>J'inscris un nouveau membre</h1>
+          <div class="form-floating">
+            <input type="text"
+                    class="form-control"
+                    id="floatingInputlastName"
+                    placeholder=""
+                    name="lastName"
+                    formControlName="lastNameFc"
+                    [ngClass]="{'is-valid' : addMemberForm.controls['lastNameFc'].touched && addMemberForm.controls['lastNameFc'].valid,
+                                'is-invalid':  addMemberForm.controls['lastNameFc'].touched && !addMemberForm.controls['lastNameFc'].valid}">
+            <label for="floatingInputlastName">Avatar</label>
+        </div>
+          <div class="form-floating">
+              <input type="text"
+                      class="form-control"
+                      id="floatingInputlastName"
+                      placeholder=""
+                      name="lastName"
+                      formControlName="lastNameFc"
+                      [ngClass]="{'is-valid' : addMemberForm.controls['lastNameFc'].touched && addMemberForm.controls['lastNameFc'].valid,
+                                  'is-invalid':  addMemberForm.controls['lastNameFc'].touched && !addMemberForm.controls['lastNameFc'].valid}">
+              <label for="floatingInputlastName">Nom</label>
+          </div>
+          <div class="form-floating">
+              <input type="text"
+                      class="form-control"
+                      id="floatingInputfirstName"
+                      placeholder=""
+                      name="firstName"
+                      formControlName="firstNameFc"
+                      [ngClass]="{'is-valid' : addMemberForm.controls['firstNameFc'].touched && addMemberForm.controls['firstNameFc'].valid,
+                                  'is-invalid':  addMemberForm.controls['firstNameFc'].touched && !addMemberForm.controls['firstNameFc'].valid}">
+              <label for="floatingInputfirstName">Prénom</label>
+          </div>
+          <div class="form-floating">
+              <input type="date"
+                      class="form-control"
+                      id="floatingInputdateNaissance"
+                      placeholder=""
+                      name="dateNaissance"
+                      formControlName="dateNaissanceFc"
+                      [ngClass]="{'is-valid' : addMemberForm.controls['dateNaissanceFc'].touched && addMemberForm.controls['dateNaissanceFc'].valid,
+                                  'is-invalid':  addMemberForm.controls['dateNaissanceFc'].touched && !addMemberForm.controls['dateNaissanceFc'].valid}">
+              <label for="floatingInputfirstName">Date de naissance</label>
+          </div>
+          <div class="form-floating">
+              <select type="text"
+                      class="form-control"
+                      id="floatingInputprofil"
+                      name="profil"
+                      formControlName="profilFc"
+                      [ngClass]="{'is-valid' : addMemberForm.controls['profilFc'].touched && addMemberForm.controls['profilFc'].valid,
+                                  'is-invalid':  addMemberForm.controls['profilFc'].touched && !addMemberForm.controls['profilFc'].valid}">
+                              <option>Adulte</option>
+                              <option>Enfant</option>
+              </select>
+              <label for="floatingInputfirstName">Profil</label>
+          </div>
+          <div class="form-floating">
+              <input type="email"
+                      class="form-control"
+                      id="floatingInput"
+                      placeholder=""
+                      name="email"
+                      formControlName="emailFc"
+                      [ngClass]="{'is-valid' : addMemberForm.controls['emailFc'].touched && addMemberForm.controls['emailFc'].valid,
+                                  'is-invalid':  addMemberForm.controls['emailFc'].touched && !addMemberForm.controls['emailFc'].valid}">
+              <label for="floatingInput">Adresse email</label>
+          </div>
+          <div class="form-floating">
+              <input type="password"
+                      class="form-control"
+                      id="floatingPassword"
+                      placeholder=""
+                      name="password"
+                      formControlName="passwordFc"
+                      [ngClass]="{'is-valid' : addMemberForm.controls['passwordFc'].touched && addMemberForm.controls['passwordFc'].valid,
+                                  'is-invalid':  addMemberForm.controls['passwordFc'].touched && !addMemberForm.controls['passwordFc'].valid}">
+              <label for="floatingPassword">Mot de passe</label>
+          </div>
+          <div class="form-floating">
+              <input type="passwordConfirm"
+                      class="form-control"
+                      id="floatingpasswordConfirm"
+                      placeholder=""
+                      name="passwordConfirm"
+                      formControlName="passwordConfirmFc"
+                      [ngClass]="{'is-valid' : addMemberForm.controls['passwordConfirmFc'].touched && addMemberForm.controls['passwordConfirmFc'].valid,
+                                  'is-invalid':  addMemberForm.controls['passwordConfirmFc'].touched && !addMemberForm.controls['passwordConfirmFc'].valid}">
+              <label for="floatingPassword">Confirmer mot de passe</label>
+          </div>
+
+          <button class="w-100 btn btn-lg btn-success"
+                  type="submit"
+                  [disabled]="addMemberForm.invalid">Je confirme l'ajout de ce membre à ma team !</button>
+          <p>
+              Value : {{ addMemberForm.value | json }}
+          </p>
+          <p>
+              Form valid : {{ addMemberForm.valid }}
+          </p>
+
+      </form>
+  </main>

src/app/pages/page-add-member/page-add-member.component.scss

@@ -0,0 +1,32 @@
+.login-form {
+  height: 100vh;
+  padding-top: 40px;
+  background-color: #f5f5f5;
+}
+
+.form-signup {
+  width: 100%;
+  max-width: 330px;
+  padding: 15px;
+  margin: auto;
+}
+
+.form-signup .checkbox {
+  font-weight: 400;
+}
+
+.form-signup .form-floating:focus-within {
+  z-index: 2;
+}
+
+.form-signup input[type="email"] {
+  margin-bottom: -1px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.form-signup input[type="password"] {
+  margin-bottom: 10px;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}

src/app/pages/page-add-member/page-add-member.component.ts

@@ -1,4 +1,8 @@
 import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { Membre } from 'src/app/models/membre';
+import { AuthService } from 'src/app/services/auth.service';
 
 @Component({
   selector: 'app-page-add-member',
@@ -7,9 +11,92 @@ import { Component, OnInit } from '@angular/core';
 })
 export class PageAddMemberComponent implements OnInit {
 
-  constructor() { }
+  public addMemberForm: FormGroup;
-
+  constructor(
-  ngOnInit(): void {
+    private authService: AuthService,
+    private router: Router,
+    private fb: FormBuilder
+  ) {
+    this.addMemberForm = new FormGroup({});
   }
 
+  ngOnInit(): void {
+    // *********************************pensser a changer group car déprécié********************************
+    this.addMemberForm = this.fb.group(
+      {
+        firstNameFc: new FormControl('', [Validators.required]),
+        lastNameFc: new FormControl('', [Validators.required]),
+        dateNaissanceFc: new FormControl('', [Validators.required]),
+        profilFc: new FormControl('', [Validators.required]),
+        emailFc: new FormControl('', [
+          Validators.email,
+          Validators.required,
+          Validators.pattern(/^([\w\.\-_]+)?\w+@[\w-_]+(\.\w+){1,}/gim),
+        ]), // chercher une meilleure regex
+        passwordFc: new FormControl('', [
+          Validators.minLength(8),
+          Validators.required,
+        ]),
+        passwordConfirmFc: new FormControl('', [
+          Validators.minLength(8),
+          Validators.required,
+        ]),
+      },
+      {
+        validator: this.ConfirmedValidator('passwordFc', 'passwordConfirmFc'),
+      }
+    );
+  }
+
+  public onSubmit(): void {
+    console.log('value : ', this.addMemberForm.value);
+    console.log('form : ', this.addMemberForm);
+    const firstNameValue = this.addMemberForm.value['firstNameFc'];
+    const lastNameValue = this.addMemberForm.value['lastNameFc'];
+    const emailValue = this.addMemberForm.value['emailFc'];
+    const passwordValue = this.addMemberForm.value['passwordFc'];
+    const dateNaissanceValue = this.addMemberForm.value['dateNaissanceFc'];
+    const teamNameValue = this.addMemberForm.value['teamNameFc'];
+    const profilValue = this.addMemberForm.value['profilFc'];
+    const passwordConfirmValue = this.addMemberForm.value['passwordConfirmFc'];
+    const teamValue = [''];
+
+    const membre: Membre = {
+      nom: firstNameValue,
+      prenom: lastNameValue,
+      email: emailValue,
+      password: passwordValue,
+      dateNaissance: dateNaissanceValue,
+      profil: profilValue,
+      passwordConfirm: passwordConfirmValue,
+      roleList: ["ROLE_PARENT"]
+    };
+
+
+    if (membre.email !== '' && membre.password !== '') {
+      this.authService.signup(membre).subscribe((resp) => {
+        this.router.navigate(['account/signin']);
+      });
+    } else {
+      // affichage erreur
+    }
+  }
+
+  ConfirmedValidator(controlName: string, matchingControlName: string) {
+    return (formGroup: FormGroup) => {
+      const control = formGroup.controls[controlName];
+      const matchingControl = formGroup.controls[matchingControlName];
+      if (
+        matchingControl.errors &&
+        !matchingControl.errors['confirmedValidator']
+      ) {
+        return;
+      }
+      if (control.value !== matchingControl.value) {
+        matchingControl.setErrors({ confirmedValidator: true });
+      } else {
+        matchingControl.setErrors(null);
+      }
+    };
+  }
 }

src/app/pages/page-creation-team/page-creation-team.component.html

@@ -0,0 +1,30 @@
+<app-header></app-header>
+<app-side-bar></app-side-bar>
+<div class="signup-form text-center">
+    <main class="form-signup">
+        <form  (ngSubmit)="onSubmit()" [formGroup]="teamForm">
+            <h1>Créer votre team!</h1>
+            <div class="form-floating">
+                <input type="text"
+                        class="form-control"
+                        id="floatingInputName"
+                        placeholder=""
+                        name="name"
+                        formControlName="nameFc"
+                        [ngClass]="{'is-valid' : teamForm.controls['nameFc'].touched && teamForm.controls['nameFc'].valid,
+                                    'is-invalid':  teamForm.controls['nameFc'].touched && !teamForm.controls['nameFc'].valid}">
+                <label for="floatingInputName">Nom</label>
+            </div>
+            <button class="w-100 btn btn-lg btn-success"
+                    type="submit"
+                    [disabled]="teamForm.invalid">Je crée ma team</button>
+            <p>
+                Value : {{ teamForm.value | json }}
+            </p>
+            <p>
+                Form valid : {{ teamForm.valid }}
+            </p>
+
+        </form>
+    </main>
+</div>

src/app/pages/page-creation-team/page-creation-team.component.scss

@@ -0,0 +1,32 @@
+.login-form {
+  height: 100vh;
+  padding-top: 40px;
+  background-color: #f5f5f5;
+}
+
+.form-signup {
+  width: 100%;
+  max-width: 330px;
+  padding: 15px;
+  margin: auto;
+}
+
+.form-signup .checkbox {
+  font-weight: 400;
+}
+
+.form-signup .form-floating:focus-within {
+  z-index: 2;
+}
+
+.form-signup input[type="email"] {
+  margin-bottom: -1px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.form-signup input[type="password"] {
+  margin-bottom: 10px;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}

src/app/pages/page-creation-team/page-creation-team.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PageCreationTeamComponent } from './page-creation-team.component';
+
+describe('PageCreationTeamComponent', () => {
+  let component: PageCreationTeamComponent;
+  let fixture: ComponentFixture<PageCreationTeamComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PageCreationTeamComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PageCreationTeamComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/page-creation-team/page-creation-team.component.ts

@@ -0,0 +1,72 @@
+import { Component, OnInit } from '@angular/core';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  Validators,
+} from '@angular/forms';
+import { Router } from '@angular/router';
+import { Team } from 'src/app/models/team';
+import { AuthService } from '../../services/auth.service';
+
+@Component({
+  selector: 'app-page-creation-team',
+  templateUrl: './page-creation-team.component.html',
+  styleUrls: ['./page-creation-team.component.scss'],
+})
+export class PageCreationTeamComponent implements OnInit {
+  public teamForm: FormGroup;
+  constructor(
+    private authService: AuthService,
+    private router: Router,
+    private fb: FormBuilder
+  ) {
+    this.teamForm = new FormGroup({});
+  }
+
+  ngOnInit(): void {
+    // *********************************penser a changer group car déprécié********************************
+    this.teamForm = new FormGroup({
+      nameFc : new FormControl('', [Validators.required])
+    });
+  }
+
+  public onSubmit(): void {
+    console.log('value : ', this.teamForm.value);
+    console.log('form : ', this.teamForm);
+    const nameValue = this.teamForm.value['nameFc'];
+
+    const team: Team = {
+      nom : nameValue,
+    };
+
+
+
+    if (team.nom !== '' ) {
+      this.authService.creationTeam(team).subscribe((resp) => {
+        this.router.navigate(['compte']);
+      });
+    } else {
+      // affichage erreur
+    }
+  }
+
+  ConfirmedValidator(controlName: string, matchingControlName: string) {
+    return (formGroup: FormGroup) => {
+      const control = formGroup.controls[controlName];
+      const matchingControl = formGroup.controls[matchingControlName];
+      if (
+        matchingControl.errors &&
+        !matchingControl.errors['confirmedValidator']
+      ) {
+        return;
+      }
+      if (control.value !== matchingControl.value) {
+        matchingControl.setErrors({ confirmedValidator: true });
+      } else {
+        matchingControl.setErrors(null);
+      }
+    };
+  }
+}
+

src/app/pages/page-forgot-password/page-forgot-password.component.html

@@ -1,2 +1,23 @@
 <app-header></app-header>
+<div class="signin-form text-center">
+  <main class="form-forgot">
+    <form (ngSubmit)="onSubmit(forgotForm)" #forgotForm="ngForm">
+      <div class="form-floating">
+        <input type="email" class="form-control" id="floatingInput" placeholder="" name="email" ngModel required
+          [ngClass]="{'is-valid': forgotForm.form.touched && forgotForm.form.value['email'] != '' ,
+                                    'is-invalid': forgotForm.form.touched && forgotForm.form.value['email'] == ''}">
+        <label for="floatingInput">Adresse email</label>
+      </div>
+
+      <button class="w-100 btn btn-lg btn-success"  type="submit" [disabled]="forgotForm.invalid" routerLink="../reinitialisation-password"
+        routerLinkActive="active-custom">Ré-initialiser mon mot de passe</button>
+
+    </form>
+
+    <div *ngIf="errorForm">
+      <p class="text-danger">Il manque des informations dans le formulaire...</p>
+    </div>
+  </main>
+</div>
+
 

src/app/pages/page-forgot-password/page-forgot-password.component.scss

@@ -0,0 +1,25 @@
+.forgot-form {
+  height: 100vh;
+  padding-top: 40px;
+  background-color: #f5f5f5;
+}
+
+.form-forgot {
+  width: 100%;
+  max-width: 330px;
+  padding: 15px;
+  margin: auto;
+  .checkbox {
+    font-weight: 400;
+  }
+
+  .form-floating:focus-within {
+    z-index: 2;
+  }
+
+  input[type="email"] {
+    margin-bottom: -1px;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+}

src/app/pages/page-forgot-password/page-forgot-password.component.ts

@@ -1,4 +1,12 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { AuthService } from '../../services/auth.service';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  Validators,
+} from '@angular/forms';
 
 @Component({
   selector: 'app-page-forgot-password',
@@ -6,10 +14,25 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./page-forgot-password.component.scss']
 })
 export class PageForgotPasswordComponent implements OnInit {
-
+public errorForm: boolean;
-  constructor() { }
+  constructor(private authService: AuthService, private router: Router) {
-
+     this.errorForm = false;
-  ngOnInit(): void {
   }
 
+  ngOnInit(): 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;
+    }
+  }
+
+
 }

src/app/pages/page-signup/page-signup.component.html

@@ -2,107 +2,77 @@
 <div class="signup-form text-center">
     <main class="form-signup">
         <form  (ngSubmit)="onSubmit()" [formGroup]="signupForm">
-            <h1>Merci de vous inscrire</h1>
+            <h1>Incrivez-vous !</h1>
             <div class="form-floating">
-                <input type="text" 
+                <input type="text"
-                        class="form-control" 
+                        class="form-control"
-                        id="floatingInputlastName" 
+                        id="floatingInputlastName"
-                        placeholder="" 
+                        placeholder=""
-                        name="lastName" 
+                        name="lastName"
                         formControlName="lastNameFc"
-                        [ngClass]="{'is-valid' : signupForm.controls['lastNameFc'].touched && signupForm.controls['lastNameFc'].valid, 
+                        [ngClass]="{'is-valid' : signupForm.controls['lastNameFc'].touched && signupForm.controls['lastNameFc'].valid,
                                     'is-invalid':  signupForm.controls['lastNameFc'].touched && !signupForm.controls['lastNameFc'].valid}">
                 <label for="floatingInputlastName">Nom</label>
             </div>
             <div class="form-floating">
-                <input type="text" 
+                <input type="text"
-                        class="form-control" 
+                        class="form-control"
-                        id="floatingInputfirstName" 
+                        id="floatingInputfirstName"
-                        placeholder="" 
+                        placeholder=""
-                        name="firstName" 
+                        name="firstName"
                         formControlName="firstNameFc"
-                        [ngClass]="{'is-valid' : signupForm.controls['firstNameFc'].touched && signupForm.controls['firstNameFc'].valid, 
+                        [ngClass]="{'is-valid' : signupForm.controls['firstNameFc'].touched && signupForm.controls['firstNameFc'].valid,
                                     'is-invalid':  signupForm.controls['firstNameFc'].touched && !signupForm.controls['firstNameFc'].valid}">
                 <label for="floatingInputfirstName">Prénom</label>
             </div>
             <div class="form-floating">
-                <input type="date" 
+                <input type="date"
-                        class="form-control" 
+                        class="form-control"
-                        id="floatingInputdateNaissance" 
+                        id="floatingInputdateNaissance"
-                        placeholder="" 
+                        placeholder=""
-                        name="dateNaissance" 
+                        name="dateNaissance"
                         formControlName="dateNaissanceFc"
-                        [ngClass]="{'is-valid' : signupForm.controls['dateNaissanceFc'].touched && signupForm.controls['dateNaissanceFc'].valid, 
+                        [ngClass]="{'is-valid' : signupForm.controls['dateNaissanceFc'].touched && signupForm.controls['dateNaissanceFc'].valid,
                                     'is-invalid':  signupForm.controls['dateNaissanceFc'].touched && !signupForm.controls['dateNaissanceFc'].valid}">
                 <label for="floatingInputfirstName">Date de naissance</label>
             </div>
             <div class="form-floating">
-                <input type="text" 
+                <input type="email"
-                        class="form-control" 
+                        class="form-control"
-                        id="floatingInputteamName" 
+                        id="floatingInput"
-                        placeholder="" 
+                        placeholder=""
-                        name="teamName" 
+                        name="email"
-                        formControlName="teamNameFc"
-                        [ngClass]="{'is-valid' : signupForm.controls['teamNameFc'].touched && signupForm.controls['teamNameFc'].valid, 
-                                    'is-invalid':  signupForm.controls['teamNameFc'].touched && !signupForm.controls['teamNameFc'].valid}">
-                <label for="floatingInputfirstName">Ma team</label>
-            </div>
-            <div class="form-floating">
-                <select type="text" 
-                        class="form-control" 
-                        id="floatingInputprofil" 
-                        name="profil" 
-                        formControlName="profilFc"
-                        [ngClass]="{'is-valid' : signupForm.controls['profilFc'].touched && signupForm.controls['profilFc'].valid, 
-                                    'is-invalid':  signupForm.controls['profilFc'].touched && !signupForm.controls['profilFc'].valid}">
-                                <option>Adulte</option>
-                                <option>Enfant</option>
-                </select>
-                <label for="floatingInputfirstName">Profil</label>
-            </div>
-            <div class="form-floating">
-                <input type="email" 
-                        class="form-control" 
-                        id="floatingInput" 
-                        placeholder="" 
-                        name="email" 
                         formControlName="emailFc"
-                        [ngClass]="{'is-valid' : signupForm.controls['emailFc'].touched && signupForm.controls['emailFc'].valid, 
+                        [ngClass]="{'is-valid' : signupForm.controls['emailFc'].touched && signupForm.controls['emailFc'].valid,
                                     'is-invalid':  signupForm.controls['emailFc'].touched && !signupForm.controls['emailFc'].valid}">
                 <label for="floatingInput">Adresse email</label>
             </div>
             <div class="form-floating">
-                <input type="password" 
+                <input type="password"
-                        class="form-control" 
+                        class="form-control"
-                        id="floatingPassword" 
+                        id="floatingPassword"
-                        placeholder="" 
+                        placeholder=""
-                        name="password" 
+                        name="password"
                         formControlName="passwordFc"
-                        [ngClass]="{'is-valid' : signupForm.controls['passwordFc'].touched && signupForm.controls['passwordFc'].valid, 
+                        [ngClass]="{'is-valid' : signupForm.controls['passwordFc'].touched && signupForm.controls['passwordFc'].valid,
                                     'is-invalid':  signupForm.controls['passwordFc'].touched && !signupForm.controls['passwordFc'].valid}">
                 <label for="floatingPassword">Mot de passe</label>
             </div>
             <div class="form-floating">
-                <input type="passwordConfirm" 
+                <input type="passwordConfirm"
-                        class="form-control" 
+                        class="form-control"
-                        id="floatingpasswordConfirm" 
+                        id="floatingpasswordConfirm"
-                        placeholder="" 
+                        placeholder=""
-                        name="passwordConfirm" 
+                        name="passwordConfirm"
                         formControlName="passwordConfirmFc"
-                        [ngClass]="{'is-valid' : signupForm.controls['passwordConfirmFc'].touched && signupForm.controls['passwordConfirmFc'].valid, 
+                        [ngClass]="{'is-valid' : signupForm.controls['passwordConfirmFc'].touched && signupForm.controls['passwordConfirmFc'].valid,
                                     'is-invalid':  signupForm.controls['passwordConfirmFc'].touched && !signupForm.controls['passwordConfirmFc'].valid}">
                 <label for="floatingPassword">Confirmer mot de passe</label>
             </div>
 
-            <button class="w-100 btn btn-lg btn-success" 
+            <button class="w-100 btn btn-lg btn-success"
-                    type="submit" 
+                    type="submit"
                     [disabled]="signupForm.invalid">Je m'inscris !</button>
-            <p>
-                Value : {{ signupForm.value | json }}
-            </p>
-            <p>
-                Form valid : {{ signupForm.valid }}
-            </p>
 
         </form>
     </main>

src/app/pages/page-signup/page-signup.component.ts

@@ -5,7 +5,7 @@ import {
   FormGroup,
   Validators,
 } from '@angular/forms';
-import { Router } from '@angular/router';
+import { Router, RouterLink } from '@angular/router';
 import { Membre } from '../../models/membre';
 import { AuthService } from '../../services/auth.service';
 
@@ -25,14 +25,13 @@ export class PageSignupComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    // *********************************pensser a changer group car déprécié********************************
+    // *********************************penser a changer group car déprécié********************************
     this.signupForm = this.fb.group(
       {
         firstNameFc: new FormControl('', [Validators.required]),
         lastNameFc: new FormControl('', [Validators.required]),
         dateNaissanceFc: new FormControl('', [Validators.required]),
-        teamNameFc: new FormControl('', [Validators.required]),
+        roleFc: new FormControl(''),
-        profilFc: new FormControl('', [Validators.required]),
         emailFc: new FormControl('', [
           Validators.email,
           Validators.required,
@@ -56,29 +55,41 @@ export class PageSignupComponent implements OnInit {
   public onSubmit(): void {
     console.log('value : ', this.signupForm.value);
     console.log('form : ', this.signupForm);
-    const firstNameValue = this.signupForm.value['firstNameFc'];
+    const prenomValue = this.signupForm.value['firstNameFc'];
-    const lastNameValue = this.signupForm.value['lastNameFc'];
+    const nomValue = this.signupForm.value['lastNameFc'];
     const emailValue = this.signupForm.value['emailFc'];
     const passwordValue = this.signupForm.value['passwordFc'];
     const dateNaissanceValue = this.signupForm.value['dateNaissanceFc'];
-    const teamNameValue = this.signupForm.value['teamNameFc'];
-    const profilValue = this.signupForm.value['profilFc'];
     const passwordConfirmValue = this.signupForm.value['passwordConfirmFc'];
 
+    const roleValue = ['ROLE_PARENT'];
+
     const membre: Membre = {
-      firstName: firstNameValue,
+      prenom: prenomValue,
-      lastName: lastNameValue,
+      nom: nomValue,
+      email: emailValue,
+      password: passwordValue,
+      dateNaissance: dateNaissanceValue,
+      passwordConfirm: passwordConfirmValue,
+      roleList: roleValue,
+
+    const teamValue = '';
+
+    const membre: Membre = {
+      nom: firstNameValue,
+      prenom: lastNameValue,
       email: emailValue,
       password: passwordValue,
       dateNaissance: dateNaissanceValue,
-      teamName: teamNameValue,
       profil: profilValue,
       passwordConfirm: passwordConfirmValue,
+      roleList: ["ROLE_PARENT"]
+
     };
 
     if (membre.email !== '' && membre.password !== '') {
       this.authService.signup(membre).subscribe((resp) => {
-        this.router.navigate(['account/signin']);
+        this.router.navigate(['accueil']);
       });
     } else {
       // affichage erreur

src/app/services/auth.service.ts

@@ -3,6 +3,7 @@ import { Injectable } from '@angular/core';
 import { map, Observable } from 'rxjs';
 import { environment } from 'src/environments/environment';
 import { Membre } from '../models/membre';
+import { Team } from '../models/team';
 
 @Injectable({
   providedIn: 'root',
@@ -23,6 +24,7 @@ export class AuthService {
     return this.http.post(`${this.apiUrl}/membres/sign-up`, membre);
   }
 
+
   signin(email: string, password: string): Observable<any> {
     const body = {
       email: email,
@@ -35,7 +37,7 @@ export class AuthService {
     // - pour pouvoir stocker dans le localstorage notre accesstoken
     // - Sous la clé "TOKEN-LBP"
 
-    return this.http.post(`${this.apiUrl}/login`, body).pipe(
+    return this.http.post(`${this.apiUrl}/membres/sign-in`, body).pipe(
       map((x: any) => {
         console.log('Service : ', x.accessToken);
         // Modification à faire ici
@@ -45,14 +47,26 @@ export class AuthService {
     );
   }
 
-  forgotPassword(email: string, password: string): Observable<any> {
+  forgotPassword(email: string): Observable<any> {
     const body = {
       email: email,
-      password: password,
     };
-
+    return this.http.post(`${this.apiUrl}/membres/forgot-password`, body);
-    console.log('Mon body : ', body);
-
-    return this.http.post(`${this.apiUrl}/forgot-psw`, body);
   }
+
+
+  creationTeam(team: Team): Observable<any> {
+    console.log(team);
+
+    return this.http.post(`${this.apiUrl}/creation-compte`, team);
+  }
+
+
+
+  addMember(membre: Membre): Observable<any> {
+    console.log(membre);
+
+    return this.http.post(`${this.apiUrl}/tableau-de-bord`, membre);
+  }
+
 }