merge avec dev

src/app/app-routing.module.ts

@@ -13,42 +13,43 @@ import { PageForgotPasswordComponent } from './pages/page-forgot-password/page-f
 import { PageMenuSemaineComponent } from './pages/page-menu-semaine/page-menu-semaine.component';
 import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component';
 import { PageNotFoundComponent } from './pages/page-not-found/page-not-found.component';
-import { PageHumeurComponent} from './pages/page-humeur/page-humeur.component';
 import { PageRepertoireComponent } from './pages/page-repertoire/page-repertoire.component';
 import { PageResetPasswordComponent } from './pages/page-reset-password/page-reset-password.component';
 import { PageSignupComponent } from './pages/page-signup/page-signup.component';
 import { PageToDoListComponent } from './pages/page-to-do-list/page-to-do-list.component';
 import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component';
 import { PageUpdateMemberComponent } from './pages/page-update-member/page-update-member.component';
+import { PageSupportComponent } from './pages/page-support/page-support.component';
 import { FooterComponent } from './components/footer/footer.component';
+import { AuthGuard } from './auth.guard';
 
 const routes: Routes = [
   { path: '', redirectTo: 'accueil', pathMatch: 'full' },
-  { path: 'modifier-contact/:id', component: PageModifierContactComponent },
+  { path: 'modifier-contact/:id', canActivate: [AuthGuard], component: PageModifierContactComponent },
-  { path: 'compte', component: PageAccountComponent },
+  { path: 'compte', canActivate: [AuthGuard], component: PageAccountComponent },
   { path: 'accueil', component: PageAccueilComponent },
-  { path: 'ajout-membre', component: PageAddMemberComponent },
+  { path: 'ajout-membre', canActivate: [AuthGuard], component: PageAddMemberComponent },
-  { path: 'agenda', component: PageAgendaComponent },
+  { path: 'agenda', canActivate: [AuthGuard], component: PageAgendaComponent },
-  { path: 'tableau-de-bord', component: PageDashboardComponent },
+  { path: 'tableau-de-bord', canActivate: [AuthGuard], component: PageDashboardComponent },
-  { path: 'supprimer-membre', component: PageDeleteMemberComponent },
+  { path: 'supprimer-membre', canActivate: [AuthGuard], component: PageDeleteMemberComponent },
-  { path: 'supprimer-compte', component: PageDeleteAccountComponent },
+  { path: 'supprimer-compte', canActivate: [AuthGuard], component: PageDeleteAccountComponent },
   { path: 'password-oublie', component: PageForgotPasswordComponent },
-  { path: 'menu', component: PageMenuSemaineComponent },
+  { path: 'menu', canActivate: [AuthGuard], component: PageMenuSemaineComponent },
-  { path: 'repertoire', component: PageRepertoireComponent },
+  { path: 'repertoire', canActivate: [AuthGuard], component: PageRepertoireComponent },
-  { path: 'reinitialisation-password', component: PageResetPasswordComponent },
+  { path: 'reinitialisation-password/:uuid', component: PageResetPasswordComponent },
   { path: 'creation-compte', component: PageSignupComponent },
-  { path: 'to-do-list', component: PageToDoListComponent },
+  { path: 'page-support', component: PageSupportComponent},
-  { path: 'modifier-membre', component: PageUpdateMemberComponent },
+  { path: 'to-do-list', canActivate: [AuthGuard], component: PageToDoListComponent },
-  { path: 'modifier-compte', component: PageUpdateAccountComponent },
+  { path: 'modifier-membre', canActivate: [AuthGuard], component: PageUpdateMemberComponent },
-  { path: 'ajouter-contact', component: PageAjoutContactComponent },
+  { path: 'modifier-compte', canActivate: [AuthGuard], component: PageUpdateAccountComponent },
-  { path: 'creation-team', component: PageCreationTeamComponent },
+  { path: 'ajouter-contact', canActivate: [AuthGuard], component: PageAjoutContactComponent },
-  { path: 'humeur', component: PageHumeurComponent },
+  { path: 'creation-team', canActivate: [AuthGuard], component: PageCreationTeamComponent },
   { path: 'footer', component: FooterComponent},
   { path: '**', component: PageNotFoundComponent },
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [RouterModule.forRoot(routes, {onSameUrlNavigation:'reload'})],
   exports: [RouterModule],
 })
 export class AppRoutingModule {}

src/app/app.module.ts

@@ -1,6 +1,5 @@
-import { NgModule } from '@angular/core';
+import { NgModule, LOCALE_ID } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { PageAccueilComponent } from './pages/page-accueil/page-accueil.component';
@@ -35,11 +34,16 @@ import { PageAjoutContactComponent } from './pages/page-ajout-contact/page-ajout
 import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component';
 import { PageCreationTeamComponent } from './pages/page-creation-team/page-creation-team.component';
 import { AutofocusFixModule  } from 'ngx-autofocus-fix';
-import { PageHumeurComponent } from './pages/page-humeur/page-humeur.component';
 import { FooterComponent } from './components/footer/footer.component';
 import { PageDeleteAccountComponent } from './pages/page-delete-account/page-delete-account.component';
 import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component';
 import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular";
+import { registerLocaleData } from '@angular/common';
+import localeFr from '@angular/common/locales/fr';
+import { CardAvatarComponent } from './components/card-avatar/card-avatar.component';
+import { HumeurComponent } from './components/humeur/humeur.component';
+import { DeconnexionComponent } from './components/deconnexion/deconnexion.component';
+registerLocaleData(localeFr)
 
 @NgModule({
   declarations: [
@@ -62,7 +66,6 @@ import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular";
     SigninComponent,
     PageDashboardComponent,
     MeteoComponent,
-    PageHumeurComponent,
     CalendrierComponent,
     CardMemberComponent,
     ToDoListComponent,
@@ -74,10 +77,13 @@ import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular";
     PageAjoutContactComponent,
     PageModifierContactComponent,
     PageCreationTeamComponent,
-    PageHumeurComponent,
     FooterComponent,
     PageDeleteAccountComponent,
     PageUpdateAccountComponent,
+    CardAvatarComponent,
+    DeconnexionComponent,
+    HumeurComponent
+
   ],
   imports: [
     BrowserModule,
@@ -86,9 +92,10 @@ import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular";
     HttpClientModule,
     FormsModule,
     AutofocusFixModule.forRoot(),
-    DayPilotModule
+    DayPilotModule,
   ],
   providers: [
+{provide: LOCALE_ID, useValue: "fr-FR" }
 
   ],
   bootstrap: [AppComponent],

src/app/auth.guard.ts

@@ -39,7 +39,7 @@ export class AuthGuard implements CanActivate {
         const dateExp = new Date(decodedToken.exp * 1000);
         if (new Date() >= dateExp) {
           // le token a expiré, je n'autorise pas l'accès
-          this.router.navigate(['account/signin']);
+          this.router.navigate(['accueil']);
           return false;
         }
       }
@@ -48,7 +48,7 @@ export class AuthGuard implements CanActivate {
       return true;
     } else {
       console.log('You shall not pass !!!!');
-      this.router.navigate(['account/signin']); // redirection de notre utilisateur vers une url de notre application (dans notre code TS)
+      this.router.navigate(['accueil']); // redirection de notre utilisateur vers une url de notre application (dans notre code TS)
       return false;
     }
   }

src/app/components/card-avatar/card-avatar.component.html

@@ -0,0 +1,13 @@
+<div class="container mt-5 membre">
+  <div class="row d-flex justify-content-center">
+      <div class="col-md-auto">
+          <div class="card p-3 py-4 align-items">
+            <!-- récuperer couleur du back-->
+            <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>
+              </div>
+            </div>
+          </div>
+  </div>
+</div>

src/app/components/card-avatar/card-avatar.component.scss

@@ -0,0 +1,20 @@
+#couleur{
+  width: 60px;
+  height: 60px;
+  margin: 0 auto;
+  background: black;
+
+}
+
+.card {
+  min-height: 8px;
+  border: none;
+  overflow: hidden;
+  border-radius: 8px;
+  justify-content: center;
+}
+
+
+h3 {
+  font-size: small;
+}

src/app/components/card-avatar/card-avatar.component.spec.ts

@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { PageHumeurComponent } from './page-humeur.component';
+import { CardAvatarComponent } from './card-avatar.component';
 
-describe('PageHumeurComponent', () => {
+describe('CardAvatarComponent', () => {
-  let component: PageHumeurComponent;
+  let component: CardAvatarComponent;
-  let fixture: ComponentFixture<PageHumeurComponent>;
+  let fixture: ComponentFixture<CardAvatarComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ PageHumeurComponent ]
+      declarations: [ CardAvatarComponent ]
     })
     .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(PageHumeurComponent);
+    fixture = TestBed.createComponent(CardAvatarComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/components/card-avatar/card-avatar.component.ts

@@ -0,0 +1,17 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-card-avatar',
+  templateUrl: './card-avatar.component.html',
+  styleUrls: ['./card-avatar.component.scss']
+})
+export class CardAvatarComponent implements OnInit {
+  @Input() membre: any;
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+
+}

src/app/components/card-menu/card-menu.component.html

@@ -1,46 +1,135 @@
-<div class="menu">
-<div *ngFor="let menu of listMenus">
-  <p>{{ menu.dateMenu }} {{ menu.libelle }}</p>
-</div>
-
 <ng-template #content let-modal>
   <div class="modal-header">
-    <h4 class="modal-title" id="modal-basic-title">
+    <h4 class="modal-title" id="modal-basic-title">Ajouter un menu</h4>
-      Ajouter un menu
+    <button
-    </h4>
+      type="button"
-    <button type="button" class="close" aria-label="Close" (click)="modal.dismiss('Cross click')">
+      class="close"
-
+      aria-label="Close"
-      <span aria-hidden="true">
+      (click)="modal.dismiss('Cross click')"
-        ×
+    >
-      </span>
+      <span aria-hidden="true"> × </span>
     </button>
   </div>
   <div class="modal-body">
     <form [formGroup]="menuForm">
       <div class="form-group">
-        <label for="dateMenu">
-          Date
-        </label>
         <div class="input-group">
-          <input id="dateMenu" class="form-control" formControlName="dateMenuFc" placeholder="yyyy-mm-dd" name="date"
+          <input
-          >
+            type="date"
-<input id="libelle" class="form-control" formControlName="libelleFc" placeholder="" name="libelle"
+            id="dateMenu"
->
+            class="form-control"
+            formControlName="dateMenuFc"
+            placeholder="Date"
+            name="date"
+          />
+
+          <input
+            id="repasMidi"
+            class="form-control"
+            formControlName="repasMidiFc"
+            placeholder="Repas du midi"
+            name="repasMidi"
+          />
+
+          <input
+            id="repasSoir"
+            class="form-control"
+            formControlName="repasSoirFc"
+            placeholder="Repas du soir"
+            name="repasSoir"
+          />
         </div>
       </div>
     </form>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-outline-dark" (click)="modal.close(saveMenu())">
+    <button
-      Save
+      type="button"
+      class="btn btn-outline-warning"
+      (click)="modal.close(saveMenu())"
+    >
+      Enregistrer
     </button>
   </div>
 </ng-template>
 
-<button class="btn btn-lg btn-outline-primary" (click)="open(content)">
+<button type="button" class="btn btn-outline-warning" (click)="open(content)">
- Ajouter un menu
+  Ajouter un menu
 </button>
 
-
+<div class="container mt-5 menu">
-
+  <div class="row d-flex justify-content-center">
+    <div class="col-md-auto" *ngFor="let menu of listMenus">
+      <div class="card p-3 py-4 align-items" style="width: 14rem">
+        <p class="jour">{{ menu.dateMenu | date: "EEEE":"fr" }}</p>
+        <div class="tag">
+          <p class="repas">Midi</p>
+          <p>{{ menu.repasMidi }}</p>
+        </div>
+        <div class="tag">
+          <p class="repas">Soir</p>
+          <p>{{ menu.repasSoir }}</p>
+        </div>
+        <ng-template #content let-modal>
+          <div class="modal-header">
+            <h4 class="modal-title" id="modal-basic-title">
+              Mettre à jour un menu
+            </h4>
+            <button
+              type="button"
+              class="close"
+              aria-label="Close"
+              (click)="modal.dismiss('Cross click')"
+            >
+              <span aria-hidden="true"> × </span>
+            </button>
+          </div>
+          <div class="modal-body">
+            <form [formGroup]="upMenuForm">
+              <div class="form-group">
+                <div class="input-group">
+                  <input
+                    type="date"
+                    id="dateMenu"
+                    class="form-control"
+                    formControlName="dateMenuFc"
+                    value="{{ menu.dateMenu }}"
+                    placeholder="Date"
+                    name="date"
+                  />
+                  <input
+                    id="repasMidi"
+                    class="form-control"
+                    formControlName="repasMidiFc"
+                    value="{{ menu.repasMidi }}"
+                    placeholder="Repas du midi"
+                    name="repasMidi"
+                  />
+                  <input
+                    id="repasSoir"
+                    class="form-control"
+                    formControlName="repasSoirFc"
+                    value="{{ menu.repasSoir }}"
+                    placeholder="Repas du soir"
+                    name="repasSoir"
+                  />
+                </div>
+              </div>
+            </form>
+          </div>
+          <div class="modal-footer">
+            <button
+              type="button"
+              class="btn btn-outline-warning"
+              (click)="modal.close(updateMenu(menu.id))"
+            >
+              Mettre à jour
+            </button>
+          </div>
+        </ng-template>
+        <i class="bi bi-pencil-square" (click)="open(content)"></i>
+        <i class="bi bi-trash3" (click)="deleteMenu(menu.id)"></i>
+      </div>
+    </div>
+  </div>
 </div>

src/app/components/card-menu/card-menu.component.scss

@@ -1,3 +1,36 @@
-.menu {
+.card {
-  margin-left: 500px;
+  min-height: 22rem;
+  margin-left: 75px;
+  margin-bottom: 30px;
+  border: 1px solid #f7c02b;
+  border-radius: 8px;
+  position: relative;
+  overflow: hidden;
+  box-shadow: 5px 5px 5px gray;
+}
+
+.tag {
+  margin-top: 20px;
+  background-color: #fad980;
+  margin-left: -8px;
+  width: 13rem;
+  border: 1px solid #fad980;
+  border-radius: 8px;
+}
+.bi {
+  margin-top: 10px;
+}
+
+.btn {
+  margin-top: 10px;
+  color: black;
+  box-shadow: 5px 5px 5px gray;
+}
+
+.jour {
+  font-weight: bolder;
+  font-size: 25px;
+}
+.repas {
+  font-weight: bold;
 }

src/app/components/card-menu/card-menu.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Menu } from 'src/app/models/menu';
 import { MenusService } from 'src/app/services/menus.service';
@@ -22,6 +22,8 @@ closeResult = '';
 public listMenus:any[];
 public menuId : any;
 public menuForm : FormGroup;
+public upMenuForm : FormGroup;
+
 
   constructor(
     private menusService: MenusService,
@@ -31,9 +33,52 @@ public menuForm : FormGroup;
     private fb: FormBuilder
   ) {
     this.listMenus=[];
-    this.menuId=0;
     this.menuForm = new FormGroup({});
-   }
+    this.upMenuForm = new FormGroup({});
+    this.upMenuForm = this.initForm();
+     }
+
+//Méthode qui initialise les champs du formulaire avec les infos de la BDD
+  private initForm(menu?: Menu): FormGroup {
+    return this.fb.group({
+      dateMenu: [menu ? menu.dateMenu : ''],
+      repasMidi: [menu ? menu.repasMidi : ''],
+      repasSoir: [menu ? menu.repasSoir : ''],
+
+    });
+  }
+
+  //delete d'un menu
+  deleteMenu(id_menu : number): void {
+  window.alert("Le menu a bien été supprimé!")
+this.menusService.deleteMenu(id_menu)?.subscribe((resp) => {
+  // this.router.navigate(['menu']);
+});
+window.location.reload();
+}
+
+//updateMenu
+updateMenu(id_menu : number): void {
+
+    const dateValue = this.upMenuForm.value['dateMenuFc'];
+    const repasMidiValue = this.upMenuForm.value['repasMidiFc'];
+    const repasSoirValue = this.upMenuForm.value['repasSoirFc'];
+
+
+    const menu: Menu = {
+      dateMenu: dateValue,
+      repasMidi: repasMidiValue,
+      repasSoir: repasSoirValue,
+      id: 0
+    };
+
+    console.log(id_menu);
+
+    this.menusService.updateMenu(menu, id_menu)?.subscribe((resp) => {
+      console.log(menu, id_menu);
+      });
+    window.location.reload();
+  }
 
 
 
@@ -41,22 +86,27 @@ public menuForm : FormGroup;
 saveMenu(): void {
 
     const dateValue = this.menuForm.value['dateMenuFc'];
-    const libelleValue = this.menuForm.value['libelleFc'];
+    const repasMidiValue = this.menuForm.value['repasMidiFc'];
+    const repasSoirValue = this.menuForm.value['repasSoirFc'];
+
 
     const menu: Menu = {
       dateMenu: dateValue,
-      libelle: libelleValue,
+      repasMidi: repasMidiValue,
+      repasSoir: repasSoirValue,
+      id: 0
     };
 
-    // if (menu.dateMenu != undefined && menu.libelle != '') {
+  if (menu.dateMenu !=='') {
 
-    console.log(dateValue);
+    console.log(menu.dateMenu);
       this.menusService.addMenu(menu)?.subscribe((resp) => {
-        this.router.navigate(['menu']);
+        window.location.reload();
+
       });
-    // } else {
+    } else {
-    //   this.router.navigate(['menu']);
+      this.router.navigate(['accueil']);
-    // }
+    }
 }
 
 
@@ -66,14 +116,29 @@ saveMenu(): void {
 this.menusService.getMenu()?.subscribe((listMenus: any[])=>{
   console.log(listMenus);
   this.listMenus=listMenus;
+
 });
 
+
   this.menuForm = this.fb.group(
   {
     dateMenuFc: new FormControl('',[Validators.required]),
-    libelleFc: new FormControl('',[Validators.required]),
+    repasMidiFc: new FormControl('',[Validators.required]),
+    repasSoirFc: new FormControl('',[Validators.required]),
   }
 );
+
+
+  this.upMenuForm = this.fb.group(
+  {
+    dateMenuFc: new FormControl('',[Validators.required]),
+    repasMidiFc: new FormControl('',[Validators.required]),
+    repasSoirFc: new FormControl('',[Validators.required]),
+  }
+);
+
+
+
   }
 
 open(content: any) {
@@ -99,11 +164,3 @@ open(content: any) {
 
 
 
-//modif d'un menu
-// this.menuId=this.route.snapshot.paramMap.get('id');
-// this.menusService.getMenuById(this.menuId)
-// .subscribe((this.listMenus:any)=>)
-
-//delete d'un menu
-
-

src/app/components/deconnexion/deconnexion.component.html

@@ -0,0 +1,7 @@
+<button
+  type="button"
+  class="btn btn-outline-primary btn-circle btn-xl"
+  (click)="onClickDeco()"
+>
+  Se déconnecter
+</button>

src/app/components/deconnexion/deconnexion.component.scss

@@ -0,0 +1,10 @@
+.btn-circle.btn-xl {
+  width: 80px;
+  height: 80px;
+  padding: 10px 16px;
+  border-radius: 40px;
+  font-size: 10px;
+  text-align: center;
+  float: right;
+  margin-right: 20px;
+}

src/app/components/deconnexion/deconnexion.component.spec.ts

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

src/app/components/deconnexion/deconnexion.component.ts

@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { TokenService } from 'src/app/services/token.service';
+
+@Component({
+  selector: 'app-deconnexion',
+  templateUrl: './deconnexion.component.html',
+  styleUrls: ['./deconnexion.component.scss']
+})
+export class DeconnexionComponent implements OnInit {
+
+  constructor(private tokenService: TokenService,
+              private router: Router,
+              private route: ActivatedRoute) { }
+
+  ngOnInit(): void {
+  }
+
+
+  onClickDeco(){
+    this.tokenService.eraseToken();
+    this.router.navigate(['accueil']);
+
+  }
+
+}

src/app/components/fiche-contact/fiche-contact.component.html

@@ -4,13 +4,17 @@
             <div class="couleur col-7" [style.background-color]="personne.couleur"></div>
             <div class="col-5">
                 <div class="col">
-                    <button routerLink="../modifier-contact/{{personne.id}}"
+                    <button 
+                        *ngIf="parent" 
+                        routerLink="../modifier-contact/{{personne.id}}"
                         class=" btn btn-sm btn-rounded btn-secondary mb-2">
                         Modifier
                     </button>
                 </div>
                 <div class="col">
-                    <button class=" btn btn-sm btn-rounded btn-secondary" (click)="onClickDelete(personne.id)">
+                    <button 
+                    *ngIf="parent" 
+                    class=" btn btn-sm btn-rounded btn-secondary" (click)="onClickDelete(personne.id)">
                         Supprimer
                     </button>
                 </div>

src/app/components/fiche-contact/fiche-contact.component.ts

@@ -1,4 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { TokenService } from 'src/app/services/token.service';
 
 @Component({
   selector: 'app-fiche-contact',
@@ -8,10 +9,20 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 export class FicheContactComponent implements OnInit {
   @Input() personne: any;
   @Output() clickDelete = new EventEmitter();
+  parent: boolean;
 
-  constructor() {}
 
-  ngOnInit(): void {}
+  constructor(private tokenService: TokenService) {
+    this.parent = false;
+  }
+
+  ngOnInit(): void {
+    const roleUser = this.tokenService.getRole();
+
+    if(roleUser == "ROLE_PARENT"){
+      this.parent = true;
+    }
+  }
 
   onClickDelete(numPerson: number){
     window.alert("Le contact à bien été supprimé!")

src/app/components/footer/footer.component.html

@@ -1,19 +1,12 @@
-<body>
+<div class="footer text-center" >
-
+<h3>Plan du site</h3>
-<p>footer works!</p>
+<div class="liens">
-<h2>PLAN DU SITE</h2>
+<a routerLink="../accueil" routerLinkActive="active-custom" class="nav-link">Page d'accueil</a> 
-
+<a routerLink="../tableau-de-bord" routerLinkActive="active-custom" class="nav-link">Tableau de bord</a>
-
-
-<a routerLink="../accueil" routerLinkActive="active-custom" class="nav-link">Page d'accueil</a>
 <a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">Ma Team</a>
 <a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">Répertoire</a>
 <a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">To-Do-List</a>
+<a routerLink="../agenda" routerLinkActive="active-custom" class="nav-link">Agenda</a>
 <a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">Menus</a>
-<a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">Ma Team</a>
+</div>
-<a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">Répertoire</a>
+</div>
-<a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">To-Do-List</a>
-<a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">Menus</a>
-
-
-</body>

src/app/components/footer/footer.component.scss

@@ -1,7 +1,10 @@
-body {
+.liens {
-    background-color: pink;
+display: flex;
-    text-align: left;
+justify-content: center;
+color : blue;
+font-size: smaller;
 }
-h2 {
+
-    color : blue
+.footer {
+    margin-top: 20px;
 }

src/app/components/header/header.component.html

@@ -1,10 +1,17 @@
-<nav class="navbar sticky-top navbar-expand-lg navbar-light bg-light shadow py-0 ">
+<nav
-    <div class="container-fluid">
+  class="navbar sticky-top navbar-expand-lg navbar-light bg-light shadow py-0"
-        <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
+>
-            <div class="navbar-nav">
+  <div class="container-fluid">
-                <img id="img" routerLink="accueil" routerLinkActive="active-custom" src="../../../assets/images/logo-organizee.png"/>
+    <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
-            </div>
+      <div class="navbar-nav">
-        </div>
+        <img
-        <a class="navbar-brand" href="#">Organizee</a>
+          id="img"
+          routerLink="accueil"
+          routerLinkActive="active-custom"
+          src="../../../assets/images/logo-organizee.png"
+        />
+      </div>
     </div>
+    <a class="navbar-brand" href="#">Organizee</a>
+  </div>
 </nav>

src/app/components/header/header.component.scss

@@ -1,6 +1,6 @@
 .navbar-brand {
-  position: absolute;
+  position: relative;
-  margin-left: 12%;
+  margin-right: 70%;
   font-family: Arial, Helvetica, sans-serif;
   font-weight: bold;
   font-size: 3rem;
@@ -29,5 +29,8 @@ a:active {
 }
 
 #img {
-  margin-left: 50%;
+  position: absolute;
+  max-width: 5%;
+  margin-left: 5%;
+  margin-top: 10px;
 }

src/app/components/header/header.component.ts

@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
+
 @Component({
   selector: 'app-header',
   templateUrl: './header.component.html',
@@ -7,9 +8,12 @@ import { Component, OnInit } from '@angular/core';
 })
 export class HeaderComponent implements OnInit {
 
-  constructor() { }
+  constructor(){
+
+              }
 
   ngOnInit(): void {
   }
 
-}
+  }
+

src/app/components/humeur/humeur.component.html

@@ -0,0 +1,22 @@
+
+<div>
+
+    <h2>Mon humeur :</h2>
+    
+    
+    
+    
+    <p><img src="{{monHumeurLien}}"  alt="{{monHumeurTitle}}" *ngIf="monHumeurLien" ></p> 
+    
+    <p>Je modifie mon avatar :</p>
+    
+    
+    <div class="humeur" *ngFor="let humor of tabHumeur; let i=index">
+        <img src="{{humor.lien}}" alt="{{humor.title}}"  (click)="onChoixHumeur(i)">
+    </div> 
+    
+    
+    <div >
+        
+    
+    </div> </div>

src/app/components/humeur/humeur.component.scss

@@ -1,6 +1,3 @@
-
-
-
 p>img {
 	width: 85px;
 	height: 85px;
@@ -9,15 +6,13 @@ p>img {
 img {
 	width: 50px;
 	height: 50px;
-	
-
 }
 
 .humeur {
 display: inline;
 }
 
-body {
+div {
-	background-color: grey;
+	background-color: #87AFC7;
 text-align: center;
 }

src/app/components/humeur/humeur.component.spec.ts

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

src/app/components/humeur/humeur.component.ts

@@ -1,14 +1,14 @@
 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'app-page-humeur',
+  selector: 'app-humeur',
-  templateUrl: './page-humeur.component.html',
+  templateUrl: './humeur.component.html',
-  styleUrls: ['./page-humeur.component.scss']
+  styleUrls: ['./humeur.component.scss']
 })
+export class HumeurComponent implements OnInit {
 
-export class PageHumeurComponent implements OnInit {
+
-  
+  monHumeurLien! : string[];
- monHumeurLien! : string[];
  monHumeurTitle! : string[] ;
 
 
@@ -17,7 +17,7 @@ export class PageHumeurComponent implements OnInit {
       { title : "Je pleure", lien : "assets/images/emoticon-pleurer.png"},
       { title : "Je suis fatigué", lien : "assets/images/emoticon-fatigue.png"},
       { title : "Je suis en colère", lien : "assets/images/emoticon-insulter.png"},
-      { title : "Je suis malade", lien : "assets/images/emoticon-vomir.png"}  ]
+      { title : "Je suis en joie", lien : "assets/images/emoticon-feter.png"}  ]
 
   constructor() {    }
 
@@ -31,9 +31,6 @@ console.log("humeur titre est : ", this.monHumeurTitle);
 console.log("humeur lien est : ", this.monHumeurLien);
 console.log("index humeur est : ", numero );
 
-}
-
-
 
 }
-
+}

src/app/components/meteo/meteo.component.scss

@@ -1 +0,0 @@
-

src/app/components/signin/signin.component.html

@@ -23,7 +23,7 @@
         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>

src/app/components/signin/signin.component.ts

@@ -28,7 +28,12 @@ export class SigninComponent implements OnInit {
     if (email !== '' && password !== '') {
       this.authService.signin(email, password).subscribe((resp) => {
         console.log('Component Signin: ', resp);
-        this.router.navigate(['tableau-de-bord']);
+        //if(resp == ){
+          this.router.navigate(['tableau-de-bord']);
+        //}else{
+         // window.alert("Votre identifiant/mot de passe est erroné");
+        //}
+        console.log('Component Signin: ', resp);
       });
     } else {
       // afficher une erreur à l'utilisateur

src/app/models/mail.ts

@@ -0,0 +1,5 @@
+export interface Mail {
+  recipient: string;
+  subject: string;
+  message: string;
+}

src/app/models/menu.ts

@@ -2,6 +2,8 @@ import { Membre } from './membre';
 import { Team } from './team';
 
 export interface Menu {
-  libelle: string;
+  dateMenu: string;
-  dateMenu: Date;
+  repasMidi: string;
+  repasSoir: string;
+  id: number;
 }

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

@@ -1,31 +1,48 @@
 <app-header></app-header>
+<app-deconnexion></app-deconnexion>
 <div class="container-fluid">
   <div class="row">
     <app-side-bar></app-side-bar>
     <div class="col-9 offset-2" id="main">
-          <h1>Ma team</h1>
+      <h1>Ma team</h1>
-          <div class="d-flex justify-content-center">
+      <div class="d-flex justify-content-center">
-            <button button type="button" class="btn btn-primary btn-lg"
+        <button
-                    routerLink="../modifier-compte"
+          button
-                    routerLinkActive="active-custom">Modifier mon compte</button>
+          type="button"
-          </div>
+          class="btn btn-primary btn-lg"
-          <div class="d-flex justify-content-center">
+          routerLink="../modifier-compte"
-            <button button type="button" class="btn btn-primary btn-lg"
+          routerLinkActive="active-custom"
-                    routerLink="../supprimer-compte"
+        >
-                    routerLinkActive="active-custom">Supprimer mon compte</button>
+          Modifier mon compte
-          </div>
+        </button>
-          <div class="d-flex justify-content-center">
-            <button button type="button" class="btn btn-primary btn-lg"
-                    routerLink="../ajout-membre"
-                    routerLinkActive="active-custom">Ajouter un membre</button>
-          </div>
-          <div class="row">
-            <div class="col" *ngFor="let membreData of listMembres">
-                <app-card-member [membre]="membreData">
-                </app-card-member>
-            </div>
-          </div>
       </div>
+      <div class="d-flex justify-content-center">
+        <button
+          button
+          type="button"
+          class="btn btn-primary btn-lg"
+          routerLink="../supprimer-compte"
+          routerLinkActive="active-custom"
+        >
+          Supprimer mon compte
+        </button>
+      </div>
+      <div class="d-flex justify-content-center">
+        <button
+          button
+          type="button"
+          class="btn btn-primary btn-lg"
+          routerLink="../ajout-membre"
+          routerLinkActive="active-custom"
+        >
+          Ajouter un membre
+        </button>
+      </div>
+      <div class="row">
+        <div class="col" *ngFor="let membreData of listMembres">
+          <app-card-member [membre]="membreData"> </app-card-member>
+        </div>
+      </div>
+    </div>
   </div>
 </div>
-

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

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { MembreService } from 'src/app/services/membre.service';
-import { TeamService } from 'src/app/services/team.service';
+
 
 @Component({
   selector: 'app-page-account',
@@ -10,14 +10,15 @@ import { TeamService } from 'src/app/services/team.service';
 export class PageAccountComponent implements OnInit {
   public listMembres: any[];
 
-  constructor(private teamService: TeamService, private membreService: MembreService) {
+  constructor(private membreService: MembreService) {
     this.listMembres = [];
    }
 
   ngOnInit(): void {
-    this.membreService.getMembres().subscribe((membres: any[]) => {
+    this.membreService.getMembresByTeamId()?.subscribe((membres: any[]) => {
+      console.log(membres);
       this.listMembres = membres;
-    });
-  }
 
+  });
+  }
 }

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

@@ -1,4 +1,7 @@
+import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { TokenService } from 'src/app/services/token.service';
 
 @Component({
   selector: 'app-page-accueil',
@@ -7,9 +10,15 @@ import { Component, OnInit } from '@angular/core';
 })
 export class PageAccueilComponent implements OnInit {
 
-  constructor() { }
+  constructor(private http: HttpClient, private router: Router,  private tokenService: TokenService) { 
+
+  }
 
   ngOnInit(): void {
+    const token = this.tokenService.getToken();
+    if(token){
+      this.router.navigate(['tableau-de-bord']);
+    }
   }
 
 }

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

@@ -1,4 +1,5 @@
 <app-header></app-header>
+
 <div class="container-fluid">
   <div class="row">
     <app-side-bar></app-side-bar>
@@ -6,12 +7,14 @@
       <div class="form-addMember">
         <form (ngSubmit)="onSubmit()" [formGroup]="addMemberForm">
           <div class="form-floating">
-            <input type="color"
+            <input
-            class="form-control"
+              type="color"
-            id="floatingInputcouleur"
+              class="form-control"
-            placeholder=""
+              id="floatingInputcouleur"
-            name="couleur"
+              placeholder=""
-            formControlName="couleurFc">
+              name="couleur"
+              formControlName="couleurFc"
+            />
           </div>
           <div class="form-floating">
             <input
@@ -68,7 +71,9 @@
                   !addMemberForm.controls['dateNaissanceFc'].valid
               }"
             />
-            <label for="floatingInputdateNaissance">VOTRE DATE DE NAISSANCE</label>
+            <label for="floatingInputdateNaissance"
+              >VOTRE DATE DE NAISSANCE</label
+            >
           </div>
           <div class="form-floating">
             <input
@@ -87,7 +92,20 @@
                   !addMemberForm.controls['emailFc'].valid
               }"
             />
-            <label for="floatingInputemail">VOTRE EMAIL</label>
+            <label for="floatingInputemail">Votre Email</label>
+          </div>
+          <div class="form-floating">
+            <select
+              class="form-control"
+              id="floatingInputRole"
+              placeholder=""
+              name="Role"
+              formControlName="roleFc"
+            >
+              <option value="ROLE_PARENT">Adulte</option>
+              <option value="ROLE_ENFANT">Enfant</option>
+            </select>
+            <label value="ROLE_PARENT">Sélectionner un profil</label>
           </div>
           <div class="form-floating">
             <input
@@ -125,17 +143,20 @@
                   !addMemberForm.controls['passwordConfirmFc'].valid
               }"
             />
-            <label for="floatingPasswordConfirm">CONFIRMEZ VOTRE MOT DE PASSE</label>
+            <label for="floatingPasswordConfirm"
+              >CONFIRMEZ VOTRE MOT DE PASSE</label
+            >
           </div>
 
           <button
             class="w-100 btn btn-lg btn-outline-success"
             type="submit"
             [disabled]="addMemberForm.invalid"
-          >Ajouter le membre</button>
+          >
+            Ajouter le membre
+          </button>
         </form>
       </div>
     </div>
   </div>
 </div>
-

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

@@ -1,8 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
+import { Mail } from 'src/app/models/mail';
 import { Membre } from 'src/app/models/membre';
 import { AuthService } from 'src/app/services/auth.service';
+import { MailService } from 'src/app/services/mail.service';
 import { MembreService } from 'src/app/services/membre.service';
 
 @Component({
@@ -15,6 +17,7 @@ export class PageAddMemberComponent implements OnInit {
   public addMemberForm: FormGroup;
   constructor(
     private membreService: MembreService,
+    private mailService: MailService,
     private authService: AuthService,
     private router: Router,
     private fb: FormBuilder
@@ -29,6 +32,7 @@ export class PageAddMemberComponent implements OnInit {
         firstNameFc: new FormControl('', [Validators.required]),
         lastNameFc: new FormControl('', [Validators.required]),
         dateNaissanceFc: new FormControl('', [Validators.required]),
+        roleFc: new FormControl('', []),
         couleurFc: new FormControl('', []),
         emailFc: new FormControl('', [
           Validators.email,
@@ -53,9 +57,10 @@ export class PageAddMemberComponent implements OnInit {
   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 firstNameValue = this.addMemberForm.value['firstNameFc'];
     const emailValue = this.addMemberForm.value['emailFc'];
+    const roleValue = this.addMemberForm.value['roleFc'];
     const passwordValue = this.addMemberForm.value['passwordFc'];
     const dateNaissanceValue = this.addMemberForm.value['dateNaissanceFc'];
     const couleurValue = this.addMemberForm.value['couleurFc'];
@@ -63,19 +68,31 @@ export class PageAddMemberComponent implements OnInit {
 
 
     const membre: Membre = {
-      nom: firstNameValue,
+      nom: lastNameValue,
-      prenom: lastNameValue,
+      prenom: firstNameValue,
       email: emailValue,
       password: passwordValue,
       couleur: couleurValue,
       dateNaissance: dateNaissanceValue,
       passwordConfirm: passwordConfirmValue,
-      roleList: ["ROLE_PARENT"]
+      roleList: [roleValue]
+    };
+
+    const mail: Mail = {
+      recipient: emailValue,
+      subject: "Votre mot de passe Organizee",
+      //message: 'Votre mot de passe'
+      message: `Bonjour ${firstNameValue}!\n Voici vos identifiants de connexion : \n
+      Identifiant : ${emailValue}
+      Mot de passe : ${passwordValue}`
     };
 
 
     if (membre.email !== '' && membre.password !== '') {
-      this.membreService.addMembre(membre).subscribe((resp) => {
+      this.membreService.addMembre(membre)?.subscribe((resp) => {
+        this.mailService.envoiMailText(mail)?.subscribe((respMail) =>{
+          console.log("Mail envoyé");
+        })
         this.router.navigate(['compte']);
       });
     } else {

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

@@ -1,37 +1,80 @@
 <app-header></app-header>
 <app-side-bar></app-side-bar>
 
-<div class="alert alert-{{alert.type}}" role="alert" style="position:absolute;z-index:999;top:50%;left:40%; width: 500px;" *ngIf="isShow" id="showAlert">
+<div
-    {{alert.content}}
+  class="alert alert-{{ alert.type }}"
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close" (click)="onClickCloseAlert()">
+  role="alert"
-        <span aria-hidden="true">&times;</span>
+  style="position: absolute; z-index: 999; top: 50%; left: 40%; width: 500px"
-    </button>
+  *ngIf="isShow"
+  id="showAlert"
+>
+  {{ alert.content }}
+  <button
+    type="button"
+    class="close"
+    data-dismiss="alert"
+    aria-label="Close"
+    (click)="onClickCloseAlert()"
+  >
+    <span aria-hidden="true">&times;</span>
+  </button>
 </div>
 
-<div style="display: flex;">
+<div style="display: flex">
-    <div style="width:150px;">
+  <div style="width: 150px">
-        <app-side-bar></app-side-bar>
+    <app-side-bar></app-side-bar>
-    </div>
+  </div>
-    
+
-    <div style="width: 100%;">
+  <div style="width: 100%">
-        <div class="wrap">
+    <div class="wrap">
-            <div class="left">
+      <div class="left">
-                <daypilot-navigator [config]="navigatorConfig" [(date)]="date" #navigator></daypilot-navigator>
+        <daypilot-navigator
-            </div>
+          [config]="navigatorConfig"
-            <div class="main">
+          [(date)]="date"
-                <div style="width:100%; margin:10px">
+          #navigator
-                    <a href="#" class="btn btn-sm btn-primary" style="margin-right:5px;" (click)="navigatePrevious($event)">Previous</a>
+        ></daypilot-navigator>
-                    <a href="#" class="btn btn-sm btn-primary" style="margin-right:5px;" (click)="navigateToday($event)">Today</a>
+      </div>
-                    <a href="#" class="btn btn-sm btn-primary" style="margin-right:5px;" (click)="navigateNext($event)">Next</a>
+      <div class="main">
-                    team : {{teamId}} - user: {{userId}} - role: {{role}}
+        <div style="width: 100%; margin: 10px">
-                    <span style="float:right"><a href="#" class="btn btn-sm btn-primary" style="margin-right:5px;">Ajouter un évènement</a></span>
+          <a
-                    
+            href="#"
-                </div>
+            class="btn btn-sm btn-primary"
-                
+            style="margin-right: 5px"
-                    <daypilot-calendar [config]="config" [events]="events" #calendar (viewChange)="viewChange()"></daypilot-calendar>
+            (click)="navigatePrevious($event)"
-                
+            >Previous</a
-            </div>
+          >
+          <a
+            href="#"
+            class="btn btn-sm btn-primary"
+            style="margin-right: 5px"
+            (click)="navigateToday($event)"
+            >Today</a
+          >
+          <a
+            href="#"
+            class="btn btn-sm btn-primary"
+            style="margin-right: 5px"
+            (click)="navigateNext($event)"
+            >Next</a
+          >
+          team : {{ teamId }} - user: {{ userId }} - role: {{ role }}
+          <span style="float: right"
+            ><a
+              href="#"
+              class="btn btn-sm btn-primary"
+              style="margin-right: 5px"
+              >Ajouter un évènement</a
+            ></span
+          >
         </div>
+
+        <daypilot-calendar
+          [config]="config"
+          [events]="events"
+          #calendar
+          (viewChange)="viewChange()"
+        ></daypilot-calendar>
+      </div>
     </div>
-    
+  </div>
-</div>
+</div>

src/app/pages/page-ajout-contact/page-ajout-contact.component.html

@@ -1,86 +1,147 @@
-<div>
+<app-header></app-header>
-    <app-header></app-header>
+<div class="row">
+  <div class="col-md-auto">
     <app-side-bar></app-side-bar>
-</div>
+  </div>
-<div class="ajoutContact-form text-center">
+  <div class="ajoutContact-form text-center">
-    <h1>Ajouter un contact</h1>
+    <h3>Ajouter un contact</h3>
     <main class="form-ajoutContact">
-        <form  (ngSubmit)="onSubmit()" [formGroup]="ajoutContactForm">
+      <form (ngSubmit)="onSubmit()" [formGroup]="ajoutContactForm">
-            
+        <div class="form-floating">
-            <div class="form-floating">
+          <input
-            <input type="color" class="form-control" id="floatingInputcouleur" placeholder="" name="couleur"
+            type="color"
-              formControlName="couleurFc">
+            class="form-control"
-            </div>
+            id="floatingInputcouleur"
+            placeholder=""
+            name="couleur"
+            formControlName="couleurFc"
+          />
+        </div>
 
-            <div class="form-floating">
+        <div class="form-floating">
-                <input type="text" 
+          <input
-                        class="form-control" 
+            type="text"
-                        id="floatingInputlastName" 
+            class="form-control"
-                        placeholder="" 
+            id="floatingInputlastName"
-                        name="lastName" 
+            placeholder=""
-                        formControlName="lastNameFc">
+            name="lastName"
-                <label for="floatingInputlastName">Nom</label>
+            formControlName="lastNameFc"
+          />
+          <label for="floatingInputlastName">Nom</label>
+        </div>
+        <div class="form-floating">
+          <input
+            type="text"
+            class="form-control"
+            id="floatingInputfirstName"
+            placeholder=""
+            name="firstName"
+            formControlName="firstNameFc"
+          />
+          <label for="floatingInputfirstName">Prénom</label>
+        </div>
+        <div class="form-floating">
+          <input
+            type="text"
+            class="form-control"
+            id="floatingInputTelephone"
+            placeholder=""
+            name="telephone"
+            formControlName="telephoneFc"
+          />
+          <label for="floatingInputfirstName">Téléphone</label>
+        </div>
+        <div class="form-floating">
+          <input
+            type="email"
+            class="form-control"
+            id="floatingInput"
+            placeholder=""
+            name="email"
+            formControlName="emailFc"
+          />
+          <label for="floatingInput">Adresse email</label>
+        </div>
 
+        <div class="form-floating">
+          <input
+            type="date"
+            class="form-control"
+            id="floatingInputdateNaissance"
+            placeholder=""
+            name="dateNaissance"
+            formControlName="dateNaissanceFc"
+          />
+          <label for="floatingInputfirstName">Date de naissance</label>
+        </div>
 
-            </div>
+        <div class="form-floating">
-            <div class="form-floating">
+          <input
-                <input type="text" 
+            type="text"
-                        class="form-control" 
+            class="form-control"
-                        id="floatingInputfirstName" 
+            id="floatingInputAdresse"
-                        placeholder="" 
+            placeholder=""
-                        name="firstName" 
+            name="adresse"
-                        formControlName="firstNameFc">
+            formControlName="adresseFc"
-                <label for="floatingInputfirstName">Prénom</label>
+          />
+          <label for="floatingInputfirstName">Adresse</label>
+        </div>
 
+        <div class="form-floating">
+          <input
+            type="text"
+            class="form-control"
+            id="floatingInputTelephone"
+            placeholder=""
+            name="telephone"
+            formControlName="telephoneFc"
+          />
+          <label for="floatingInputfirstName">Téléphone</label>
+        </div>
+        <div class="form-floating">
+          <input
+            type="email"
+            class="form-control"
+            id="floatingInput"
+            placeholder=""
+            name="email"
+            formControlName="emailFc"
+          />
+          <label for="floatingInput">Adresse email</label>
+        </div>
 
-            </div>
+        <div class="form-floating">
-            <div class="form-floating">
+          <input
-                <input type="text" 
+            type="date"
-                        class="form-control" 
+            class="form-control"
-                        id="floatingInputTelephone" 
+            id="floatingInputdateNaissance"
-                        placeholder="" 
+            placeholder=""
-                        name="telephone" 
+            name="dateNaissance"
-                        formControlName="telephoneFc">
+            formControlName="dateNaissanceFc"
-                <label for="floatingInputfirstName">Téléphone</label>
+          />
+          <label for="floatingInputfirstName">Date de naissance</label>
+        </div>
 
+        <div class="form-floating">
+          <input
+            type="text"
+            class="form-control"
+            id="floatingInputAdresse"
+            placeholder=""
+            name="adresse"
+            formControlName="adresseFc"
+          />
+          <label for="floatingInputfirstName">Adresse</label>
+        </div>
 
-            </div>
+        <button
-            <div class="form-floating">
+          class="w-100 btn btn-lg btn-secondary"
-                <input type="email" 
+          type="submit"
-                        class="form-control" 
+          [disabled]="ajoutContactForm.invalid"
-                        id="floatingInput" 
+        >
-                        placeholder="" 
+          Valider
-                        name="email" 
+        </button>
-                        formControlName="emailFc">
+      </form>
-                <label for="floatingInput">Adresse email</label>
-            </div>
-
-
-            <div class="form-floating">
-                <input type="date" 
-                        class="form-control" 
-                        id="floatingInputdateNaissance" 
-                        placeholder="" 
-                        name="dateNaissance" 
-                        formControlName="dateNaissanceFc">
-                <label for="floatingInputfirstName">Date de naissance</label>
-            </div>
-
-
-            <div class="form-floating">
-                <input type="text" 
-                        class="form-control" 
-                        id="floatingInputAdresse" 
-                        placeholder="" 
-                        name="adresse" 
-                        formControlName="adresseFc">
-                <label for="floatingInputfirstName">Adresse</label>
-            </div>
-
-            <button class="w-100 btn btn-lg btn-secondary" 
-                    type="submit" 
-                    [disabled]="ajoutContactForm.invalid">Valider</button>
-
-        </form>
     </main>
-</div>
+  </div>
+</div>

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

@@ -1,27 +1,40 @@
 <app-header></app-header>
-  <div class="row">
+
-    <div class="col-md-auto">
+<div class="row">
-      <app-side-bar></app-side-bar>
+  <div class="col-md-auto">
-    </div>
+    <app-side-bar></app-side-bar>
-    <div class=" col team-form text-center">
-      <h1>Créer votre team</h1>
-      <main class="form-team">
-          <form  (ngSubmit)="onSubmit()" [formGroup]="teamForm">
-              <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>
-          </form>
-      </main>
-    </div>
   </div>
+  <div class="col team-form text-center">
+    <h1>Créer votre team</h1>
+    <main class="form-team">
+      <form (ngSubmit)="onSubmit()" [formGroup]="teamForm">
+        <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>
+      </form>
+    </main>
+  </div>
+</div>

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

@@ -7,6 +7,7 @@ import {
 } from '@angular/forms';
 import { Router } from '@angular/router';
 import { Team } from 'src/app/models/team';
+import { MembreService } from 'src/app/services/membre.service';
 import { TeamService } from 'src/app/services/team.service';
 
 @Component({
@@ -18,6 +19,7 @@ export class PageCreationTeamComponent implements OnInit {
   public teamForm: FormGroup;
   constructor(
     private teamService: TeamService,
+    private membreService: MembreService,
     private router: Router,
     private fb: FormBuilder
   ) {
@@ -39,9 +41,6 @@ export class PageCreationTeamComponent implements OnInit {
     const team: Team = {
       nom : nameValue,
     };
-
-
-
     if (team.nom !== '' ) {
       this.teamService.addTeam(team).subscribe((resp) => {
         this.router.navigate(['compte']);

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

@@ -1,9 +1,35 @@
 <app-header></app-header>
 <app-side-bar></app-side-bar>
-<app-meteo></app-meteo>
 
 
-<div class="d-flex justify-content-center">
+<app-deconnexion></app-deconnexion>
-  <button button type="button" class="btn btn-primary btn-lg" routerLink="../creation-team"
+
-    routerLinkActive="active-custom">Créer ma team</button>
+<div class="container">
+  <div>
+    <h3 class="titre">Bienvenue {{ conectedUser.prenom }}!!</h3>
+  </div>
+  <div class="row d-flex align-items-center flex-row">
+    <div class="col-sm-3 col-xs-6 box border" id="boxThree">
+      <app-meteo></app-meteo>
+    </div>
+    <div class="col-sm-3 col-xs-6 box border" id="boxTwo">
+      <app-calendrier>A venir</app-calendrier>
+    </div>
+
+    <div class="row">
+      <div class="col-sm-3 col-xs-6 box border" id="boxFour">
+        <div>
+          <app-humeur></app-humeur>
+        </div>
+      </div>
+    </div>
+
+    <div class="row avatar">
+      <div class="col" *ngFor="let membreData of listMembres">
+        <app-card-avatar [membre]="membreData"> </app-card-avatar>
+      </div>
+    </div>
+  </div>
 </div>
+
+<app-footer></app-footer>

src/app/pages/page-dashboard/page-dashboard.component.scss

@@ -1,5 +1,50 @@
+.titre{
+  display: inline-flex;
+  margin-left: 20px;
+  text-align: center;
+  font-weight: bold;
+}
+
 .meteo {
-  display: flex;
+  margin-left: 500px;
-  margin-left: 300px;
   margin-top: -60px;
 }
+
+.container {
+  display: flex;
+  padding: 20px;
+
+}
+
+button{
+  margin-bottom: 5px;
+}
+
+.calendrier{
+  align-content: flex-end;
+}
+
+#boxFour{
+  height: 150px;
+  margin-top: -99px;
+  width: fit-content;
+}
+
+#boxThree{
+  margin-top: -85px;
+  height: 150px;
+  width: fit-content;
+}
+
+#boxTwo{
+  margin-top: 50px;
+  margin-left: 150px;
+  height: 50%;
+  width: fit-content;
+}
+
+.avatar{
+  margin-top: -50px;
+  justify-content: space-between;
+  margin: 0;
+}

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

@@ -1,4 +1,8 @@
+import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { MembreService } from 'src/app/services/membre.service';
+import { TokenService } from 'src/app/services/token.service';
 
 @Component({
   selector: 'app-page-dashboard',
@@ -7,9 +11,27 @@ import { Component, OnInit } from '@angular/core';
 })
 export class PageDashboardComponent implements OnInit {
 
-  constructor() { }
+  conectedUser: any;
+  listMembres: any[];
+
+  constructor(private membreService: MembreService,
+    private http: HttpClient, 
+    private router: Router,  
+    private tokenService: TokenService) { 
+      this.listMembres = [];
+}
 
   ngOnInit(): void {
+    this.membreService.getMembreId(this.tokenService.getCurrentMembreId()).subscribe((result) => {
+      this.conectedUser = result ;
+      console.log(result);
+    })
+
+    this.membreService.getMembresByTeamId()?.subscribe((membres: any[]) => {
+      console.log(membres);
+      this.listMembres = membres;
+  });
   }
 
 }
+

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

@@ -1,12 +1,11 @@
 <app-header></app-header>
+
 <div class="row">
   <div class="col-md-auto">
     <app-side-bar></app-side-bar>
   </div>
-  <div class=" col compte text-center">
+  <div class="col compte text-center">
     <h1>Supprimer ce membre</h1>
-    <main class="contenu-compte">
+    <main class="contenu-compte"></main>
-
-    </main>
   </div>
 </div>

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

@@ -9,10 +9,22 @@
         <label for="floatingInput">Adresse email</label>
       </div>
 
-      <button class="w-100 btn btn-lg btn-success"  type="submit" [disabled]="forgotForm.invalid" routerLink="../reinitialisation-password"
+      <!-- <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>
+        routerLinkActive="active-custom">Ré-initialiser mon mot de passe</button> -->
 
+        <button
+        class="w-100 btn btn-lg btn-outline-success"
+        type="submit"
+        [disabled]="forgotForm.invalid">
+        Ré-initialiser mon mot de passe
+      </button>
     </form>
+    <br/> <br/>
+    <div *ngIf="isShow">
+      <div class="alert alert-{{alert.type}}" role="alert">
+        {{alert.content}}
+      </div>
+    </div>
 <!--
     <div *ngIf="errorForm">
       <p class="text-danger">Il manque des informations dans le formulaire...</p>

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

@@ -7,6 +7,9 @@ import {
   FormGroup,
   Validators,
 } from '@angular/forms';
+import { Membre } from 'src/app/models/membre';
+import { MailService } from 'src/app/services/mail.service';
+import { Mail } from 'src/app/models/mail';
 
 @Component({
   selector: 'app-page-forgot-password',
@@ -14,18 +17,76 @@ import {
   styleUrls: ['./page-forgot-password.component.scss']
 })
 export class PageForgotPasswordComponent implements OnInit {
-  constructor(private authService: AuthService, private router: Router) {
 
+  alert : any;
+  isShow : boolean;
+  
+  constructor(private authService: AuthService, private router: Router, private mailService: MailService,) {
+    this.alert = "";
+    this.isShow = false;
   }
 
   ngOnInit(): void {}
 
     public onSubmit(submittedForm: any): void {
-    console.log(submittedForm.form.value);
+      const membre: Membre = {
+        nom: "",
+        prenom: "",
+        dateNaissance: new Date(),
+        email: submittedForm.form.value.email,
+        password: "",
+        roleList: ["ROLE_PARENT"],
+        couleur: "",
+        passwordConfirm: ""
+      };
+
+    console.log(membre);
+    // this.authService.forgotPassword(membre).subscribe((resp) => {
+    //   console.log('----'+resp)
+    // });
+
+    this.authService.forgotPassword(membre).subscribe(
+      {
+        next: result => {
+          this.alert={"type":"success", "content":"Un mail à été envoyé !"};
+          this.isShow = true;
+          const mail: Mail = {
+            recipient: submittedForm.form.value.email,
+            subject: "Votre mot de passe Organizee",
+            //message: 'Votre mot de passe'
+            message: `
+            Bonjour!\n
+            Vous avez fait une demande de ré-initialisation de mot de passe. \n
+            Cliquez sur le lien pour définir un nouveau mot de passe: \n
+            Lien  : http://192.168.1.16:4200/reinitialisation-password/${result}`
+          };
+          this.mailService.envoiMailText(mail)?.subscribe((respMail) =>{
+            console.log("Mail envoyé");
+          })
+        },
+        error: err => {
+          this.alert={"type":"danger", "content":"Le mail a merdé, ou il n'y a personne ds la bdd !"};
+          this.isShow = true;
+        },
+        complete: () => console.log('DONE!')
+      }
+    ); 
+
+
+
+
+
+    // service resetpassword
+    // creer un random et le mettre dans password
+    //service envoi de mail // envoyer un lien avec ce random
+    // nouveau formulaire de reset password
+    // update du password
+
+
 
     // const email = submittedForm.form.value['email'];
     // console.log(email);
-      window.alert("Vous allez recevoir un email pour re-initialiser votre mot de passe !")
+      //window.alert("Vous allez recevoir un email pour re-initialiser votre mot de passe !")
       // this.router.navigate(['reinitialisation-password']);
 
   }

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

@@ -1,22 +0,0 @@
-
-<body>
-
-<h2>Mon humeur :</h2>
-
-
-
-
-<p><img src="{{monHumeurLien}}"  *ngIf="monHumeurLien" ></p> 
-
-<p>Je modifie mon avatar :</p>
-
-
-<div class="humeur" *ngFor="let humor of tabHumeur; let i=index">
-    <img src="{{humor.lien}}" alt="{{humor.title}}"  (click)="onChoixHumeur(i)">
-</div> 
-
-
-<div >
-    
-
-</div> </body>

src/app/pages/page-menu-semaine/page-menu-semaine.component.html

@@ -1,29 +1,13 @@
 <app-header></app-header>
+
 <div class="row">
   <div class="col-md-auto">
-    <app-side-bar></app-side-bar>
+    <app-side-bar class="sidebarMenu"></app-side-bar>
   </div>
-  <div class=" col compte text-center">
+  <div class="col menu text-center">
-    <h1>Menu de la semaine</h1>
+    <h2>Menu de la semaine</h2>
-    <main class="contenu-compte">
+    <main class="contenu-menu">
       <app-card-menu></app-card-menu>
-      <div class="d-flex justify-content-center">
-
-      </div>
-      <div class="d-flex justify-content-center">
-
-      </div>
-      <div class="d-flex justify-content-center">
-
-      </div>
-      <div class="d-flex justify-content-center">
-
-      </div>
-      <div class="d-flex justify-content-center">
-
-      </div>
-      <div class="d-flex justify-content-center">
-
-      </div>
     </main>
   </div>
+</div>

src/app/pages/page-menu-semaine/page-menu-semaine.component.scss

@@ -0,0 +1 @@
+

src/app/pages/page-modifier-contact/page-modifier-contact.component.html

@@ -1,10 +1,11 @@
-<div>
+<app-header></app-header>
-    <app-header></app-header>
+<div class="row">
-    <app-side-bar></app-side-bar>
+    <div class="col-md-auto">
-</div>
+        <app-side-bar></app-side-bar>
+    </div>
 
 <div class="modifContact-form text-center">
-    <h1>Modifier ce contact</h1>
+    <h3>Modifier ce contact</h3>
     <main class="form-modifContact">
         <form  (ngSubmit)="onSubmit()" [formGroup]="modifContactForm">
             
@@ -84,4 +85,5 @@
 
         </form>
     </main>
+</div>
 </div> 

src/app/pages/page-not-found/page-not-found.component.spec.ts

@@ -23,3 +23,4 @@ describe('PageNotFoundComponent', () => {
     expect(component).toBeTruthy();
   });
 });
+

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

@@ -1,41 +1,61 @@
 <app-header></app-header>
+
 <div class="row">
-    <div class="col-md-auto">
+  <div class="col-md-auto">
-        <app-side-bar></app-side-bar>
+    <app-side-bar></app-side-bar>
-    </div>
+  </div>
 
-    <div class=" col compte text-center py-3 border">
+  <div class="col compte text-center py-3 border">
-        <div>
+    <div>
-            <button class="btn btn-sm btn-rounded btn-secondary m-3" type="submit">Tous les contacts
+      <button
-            </button>
+        *ngIf="parent" 
-            <button routerLink="/ajouter-contact" class="btn btn-sm btn-rounded btn-secondary m-3">
+        routerLink="/ajouter-contact"
-                Ajouter un contact
+        class="btn btn-sm btn-rounded btn-secondary m-3"
-            </button>
+      >
+        Ajouter un contact
+      </button>
 
-            <div class="input-group mb-3 d-flex justify-content-center">
+      <div class="input-group mb-3 d-flex justify-content-center">
-                <input type="text" class="form-control" placeholder="Rechercher un contact"
+        <input
-                    aria-label="Rechercher un contact" aria-describedby="basic-addon2" #word
+          type="text"
-                    (keyup)="onSearchChange(word.value)">
+          class="form-control"
+          placeholder="Rechercher un contact"
+          aria-label="Rechercher un contact"
+          aria-describedby="basic-addon2"
+          #word
+          (keyup)="onSearchChange(word.value)"
+        />
 
-                <div class="input-group-append"></div>
+        <div class="input-group-append"></div>
-            </div>
+      </div>
-            <div>
+      <div>
-                <h4>Liste des Contacts</h4>
+        <h4>Liste des Contacts</h4>
-            </div>
+      </div>
-            <div class="row justify-content-evenly">
+      <div class="row justify-content-evenly">
-                <div class="col-4">
+        <div class="col-4">
-                    <div class="row my-3 d-flex justify-content-center flex-row" *ngFor="let personne of listContact"
+          <div
-                        (click)="onClick(personne)">
+            class="row my-3 d-flex justify-content-center flex-row"
-                        <div class="couleur col-4" [style.background-color]="personne.couleur"></div>
+            *ngFor="let personne of listContact"
-                        <span class="fiche-contact col-7">{{ personne.prenom }} {{ personne.nom }}</span>
+            (click)="onClick(personne)"
-                    </div>
+          >
-                </div>
+            <div
-
+              class="couleur col-4"
-                <div class="col-4" *ngIf="openDetails">
+              [style.background-color]="personne.couleur"
-                    <app-fiche-contact [personne]="openDetails" (clickDelete)="onClickDelete($event)">
+            ></div>
-                    </app-fiche-contact>
+            <span class="fiche-contact col-7"
-                </div>
+              >{{ personne.prenom }} {{ personne.nom }}</span
-            </div>
+            >
+          </div>
         </div>
+
+        <div class="col-4" *ngIf="openDetails">
+          <app-fiche-contact
+            [personne]="openDetails"
+            (clickDelete)="onClickDelete($event)"
+          >
+          </app-fiche-contact>
+        </div>
+      </div>
     </div>
-</div>
+  </div>
+</div>

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

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Contact } from 'src/app/models/contact';
 import { RepertoireService } from 'src/app/services/repertoire.service';
+import { TokenService } from 'src/app/services/token.service';
 
 @Component({
   selector: 'app-page-repertoire',
@@ -15,18 +16,27 @@ export class PageRepertoireComponent implements OnInit {
   public personneid: any;
   keyword: any;
   openDetails: any;
+  parent: boolean;
 
   constructor(
     private repertoireService: RepertoireService,
     private router: Router,
-    private route: ActivatedRoute
+    private route: ActivatedRoute,
+    private tokenService: TokenService
   ) {
     this.listContact = [];
     this.listFull = [];
     this.listContactInfo = '';
+    this.parent = false;
   }
 
   ngOnInit(): void {
+    const roleUser = this.tokenService.getRole();
+
+    if(roleUser == "ROLE_PARENT"){
+      this.parent = true;
+    }
+
     //récupère tout les contact et leurs info
     this.repertoireService.getContact().subscribe((listContact: any[]) => {
       console.log(listContact);
@@ -69,5 +79,6 @@ export class PageRepertoireComponent implements OnInit {
       }
       this.router.navigate(['repertoire/']);
     });
+    window.location.reload();
   }
 }

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

@@ -1,19 +1,45 @@
 <app-header></app-header>
 <div class="reset-form text-center">
   <main class="form-reset">
-    <form (ngSubmit)="onSubmit(resetForm)" #resetForm="ngForm">
+    <form (ngSubmit)="onSubmit()" [formGroup]="resetForm">
       <h3>Entrez ici votre email et votre nouveau mot de passe</h3>
       <div class="form-floating">
-        <input type="email" class="form-control" id="floatingEmail" placeholder="" name="email" ngModel required
+        <input
-          [ngClass]="{'is-valid': resetForm.form.touched && resetForm.form.value['email'] != '' ,
+          type="password"
-                                          'is-invalid': resetForm.form.touched && resetForm.form.value['email'] == ''}">
+          class="form-control"
-        <label for="floatingEmail">Email</label>
+          id="floatingPassword"
+          placeholder=""
+          name="password"
+          formControlName="passwordFc"
+          [ngClass]="{
+            'is-valid':
+              resetForm.controls['passwordFc'].touched &&
+              resetForm.controls['passwordFc'].valid,
+            'is-invalid':
+            resetForm.controls['passwordFc'].touched &&
+              !resetForm.controls['passwordFc'].valid
+          }"
+        />
+        <label for="floatingPassword">MOT DE PASSE</label>
       </div>
       <div class="form-floating">
-        <input type="password" class="form-control" id="floatingPassword" placeholder="" name="password" ngModel
+        <input
-          required [ngClass]="{'is-valid': resetForm.form.touched && resetForm.form.value['password'] != '' ,
+          type="password"
-                                    'is-invalid': resetForm.form.touched && resetForm.form.value['password'] == ''}">
+          class="form-control"
-        <label for="floatingPassword">Mot de passe</label>
+          id="floatingpasswordConfirm"
+          placeholder=""
+          name="passwordConfirm"
+          formControlName="passwordConfirmFc"
+          [ngClass]="{
+            'is-valid':
+            resetForm.controls['passwordConfirmFc'].touched &&
+            resetForm.controls['passwordConfirmFc'].valid,
+            'is-invalid':
+            resetForm.controls['passwordConfirmFc'].touched &&
+              !resetForm.controls['passwordConfirmFc'].valid
+          }"
+        />
+        <label for="floatingPasswordConfirm">CONFIRMEZ VOTRE MOT DE PASSE</label>
       </div>
     <button class="w-100 btn btn-outline-success" type="submit" [disabled]="resetForm.invalid">Enregistrer</button>
 

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

@@ -1,5 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Membre } from 'src/app/models/membre';
 import { AuthService } from 'src/app/services/auth.service';
 
 
@@ -9,20 +11,80 @@ import { AuthService } from 'src/app/services/auth.service';
   styleUrls: ['./page-reset-password.component.scss']
 })
 export class PageResetPasswordComponent implements OnInit {
+  public resetForm: FormGroup;
+  uuid:string;
+  constructor(private authService: AuthService, private router: Router,private fb: FormBuilder, private activatedRoute: ActivatedRoute) {
+    this.resetForm = new FormGroup({});
+    this.uuid = this.activatedRoute.snapshot.params['uuid'];
+  }
 
-  constructor(private authService: AuthService, private router: Router,) { }
+  ngOnInit(): void {
+    this.resetForm = this.fb.group(
+      {
+        passwordFc: new FormControl('', [
+          Validators.minLength(8),
+          Validators.required,
+        ]),
+        passwordConfirmFc: new FormControl('', [
+          Validators.minLength(8),
+          Validators.required,
+        ]),
+      },
+      {
+        validator: this.ConfirmedValidator('passwordFc', 'passwordConfirmFc'),
+      }
+    );
+  }
 
-  ngOnInit(): void { }
+  // public onSubmit(submittedForm: any): void {
+  //   console.log(submittedForm.form.value);
+  //   const password = submittedForm.form.value['password'];
+  //   console.log(email);
+  //   this.authService.resetPassword(email, password).subscribe((resp: any) => {
+  //     window.alert("Votre mot de passe est bien ré-initialisé !")
+  //     this.router.navigate(['accueil']);
 
-  public onSubmit(submittedForm: any): void {
+  //   });
-    console.log(submittedForm.form.value);
+  // }
-    const password = submittedForm.form.value['password'];
-    const email = submittedForm.form.value['email'];
-    console.log(email);
-    this.authService.resetPassword(email, password).subscribe((resp: any) => {
-      window.alert("Votre mot de passe est bien ré-initialisé !")
-      this.router.navigate(['accueil']);
 
-    });
+  public onSubmit(): void {
+    console.log('value : ', this.resetForm.value);
+    console.log('form : ', this.resetForm);
+    const passwordValue = this.resetForm.value['passwordFc'];
+    const passwordConfirmValue = this.resetForm.value['passwordConfirmFc'];
+
+    const membre: Membre = {
+      nom: "",
+      prenom: "",
+      dateNaissance: new Date(),
+      email: "",
+      password: passwordValue,
+      roleList: ["ROLE_PARENT"],
+      couleur: "",
+      passwordConfirm: ""
+    };
+
+
+      this.authService.resetPassword(membre,this.uuid).subscribe((resp) => {
+        this.router.navigate(['accueil']);
+      });
+  }
+
+  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-support/page-support.component.html

@@ -0,0 +1,31 @@
+<!--  <div>
+<app-header></app-header>
+<app-side-bar></app-side-bar>
+</div>   -->
+
+
+<div>
+    <h2>Demande support</h2>
+    <form action="/demande_support" method="post">
+
+        <label for="name">Nom :</label>
+        <div>
+            <input type="text" id="name" value="Votre nom" name="user_name">
+        </div>
+
+        <label for="mail">E-mail :</label>
+        <div>
+            <input type="email" id="mail" name="user_mail" value="Votre adresse mail">
+        </div>
+        <label for="msg">Message :</label>
+        <div>
+
+            <textarea id="msg" name="user_message">Formulez votre demande ici</textarea>
+        </div>
+        <div class="button">
+            
+            <button class="btn btn-primary">Envoyez votre message</button>
+            <button type="button" class="btn btn-danger">Effacer</button>
+        </div>
+    </form>
+</div>

src/app/pages/page-support/page-support.component.scss

@@ -0,0 +1,39 @@
+form {
+  background-color: rgb(184, 202, 235);
+  width: 600px;
+  border: 3px solid blue;
+  margin: 0 auto;
+  border-radius: 1em;
+  padding:3em;
+  }
+
+  input, textarea {
+    width: 500px;
+    color :rgb(153, 171, 208)
+  }
+
+button {
+  margin-left: .9em;
+  }
+
+  h2{
+    text-align: center;
+    color : blue;
+  }
+  
+  label {
+    color : rgb(65, 47, 221);
+    text-align: left;
+    width: 90px;
+  }
+
+  textarea {
+    height: 8em;
+    color :rgb(153, 171, 208)
+  }
+  
+  .button {
+    text-align: center;
+  }
+  
+ 

src/app/pages/page-support/page-support.component.spec.ts

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

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

@@ -0,0 +1,19 @@
+import { Component, OnInit } from '@angular/core';
+
+//DRIVEN FORM
+@Component({
+  selector: 'app-page-support',
+  templateUrl: './page-support.component.html',
+  styleUrls: ['./page-support.component.scss']
+})
+export class PageSupportComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+
+}
+
+

src/app/pages/page-to-do-list/page-to-do-list.component.html

@@ -1,5 +1,6 @@
 <app-header></app-header>
 <app-side-bar></app-side-bar>
+
 <div class="d-flex align-items-stretch">
   <div class="row">
     <div class="col" *ngFor="let todos of result">

src/app/pages/page-update-account/page-update-account.component.html

@@ -1,12 +1,11 @@
 <app-header></app-header>
+
 <div class="row">
   <div class="col-md-auto">
     <app-side-bar></app-side-bar>
   </div>
-  <div class=" col compte text-center">
+  <div class="col compte text-center">
     <h1>Modifier votre compte</h1>
-    <main class="contenu-compte">
+    <main class="contenu-compte"></main>
-
-    </main>
   </div>
 </div>

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

@@ -1,12 +1,11 @@
 <app-header></app-header>
+
 <div class="row">
   <div class="col-md-auto">
     <app-side-bar></app-side-bar>
   </div>
-  <div class=" col compte text-center">
+  <div class="col compte text-center">
     <h1>Modifier ce membre</h1>
-    <main class="contenu-compte">
+    <main class="contenu-compte"></main>
-
-    </main>
   </div>
 </div>

src/app/services/auth.interceptor.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AuthInterceptor } from './auth.interceptor';
+
+describe('AuthInterceptor', () => {
+  beforeEach(() => TestBed.configureTestingModule({
+    providers: [
+      AuthInterceptor
+      ]
+  }));
+
+  it('should be created', () => {
+    const interceptor: AuthInterceptor = TestBed.inject(AuthInterceptor);
+    expect(interceptor).toBeTruthy();
+  });
+});

src/app/services/auth.interceptor.ts

@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import {
+  HttpRequest,
+  HttpHandler,
+  HttpEvent,
+  HttpInterceptor
+} from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { TokenService } from './token.service';
+
+@Injectable()
+export class AuthInterceptor implements HttpInterceptor {
+
+  constructor(private tokenService: TokenService) {}
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+    console.log('Coucou je suis le videur ! ');
+    const token = this.tokenService.getToken();
+      if(token) {
+
+      const authReq = request.clone(
+        {
+          headers : request.headers.set('Authorization', `Bearer ${token}`)
+        }
+        )
+        return next.handle(authReq);
+    } else {
+    return next.handle(request);
+  }
+}
+}

src/app/services/auth.service.ts

@@ -14,7 +14,7 @@ export class AuthService {
   private tokenKey: string;
 
   constructor(private http: HttpClient) {
-    // On se sert des variables d'environnement de notre application
+
     this.apiUrl = environment.apiUrl;
     this.tokenKey = environment.tokenKey;
   }
@@ -34,32 +34,23 @@ export class AuthService {
     };
 
     console.log('Mon body : ', body);
-
-    // Modifier cette partie ci-dessous :
-    // - pour pouvoir stocker dans le localstorage notre accesstoken
-    // - Sous la clé "TOKEN-LBP"
-
     return this.http.post(`${this.apiUrl}/membres/sign-in`, body).pipe(
       map((x: any) => {
         console.log('Service : ', x.token);
-        // Modification à faire ici
         localStorage.setItem(this.tokenKey, x.token);
         return x; // permet de renvoyer la réponse à l'initiateur (page Signin) après le traitement du map
       })
     );
+
   }
 
-  forgotPassword(email: string): Observable<any> {
+  forgotPassword(membre: Membre): Observable<any> {
-    const body = {
+     return this.http.post(`${this.apiUrl}/membres/forgot-password`, membre, {responseType: "text"});
-      email: email,
-    };
-    return this.http.get(`${this.apiUrl}/membres/forgot-password`);
   }
 
-    resetPassword(email: string, password: string): Observable<any> {
+  resetPassword(membre: Membre, uuid:string): Observable<any> {
-    const body = password;
+    console.log('--'+uuid+' / '+membre);
-     console.log(password);
+   return this.http.put(`${this.apiUrl}/membres/reset-password/${uuid}`, membre);
-   return this.http.put(`${this.apiUrl}/membres/reset-password/${email}`, body);
   }
 
   creationTeam(team: Team): Observable<any> {

src/app/services/mail.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { MailService } from './mail.service';
+
+describe('MailService', () => {
+  let service: MailService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(MailService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/services/mail.service.ts

@@ -0,0 +1,29 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+import { Mail } from '../models/mail';
+import { TokenService } from './token.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MailService {
+  apiUrl: string;
+  tokenKey: string;
+
+  constructor(private http: HttpClient, private tokenService: TokenService, private router: Router) {
+    this.apiUrl = environment.apiUrl;
+    this.tokenKey = environment.tokenKey;
+  }
+
+  envoiMailText(mail: Mail): Observable<any> | void{
+    return this.http.post(`${this.apiUrl}/sendmail/text`, mail, {
+      responseType: "text"
+    });
+  }
+
+
+
+}

src/app/services/membre.service.ts

@@ -1,8 +1,10 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { environment } from 'src/environments/environment';
 import { Membre } from '../models/membre';
+import { TokenService } from './token.service';
 
 @Injectable({
   providedIn: 'root'
@@ -11,7 +13,7 @@ export class MembreService {
   apiUrl: string;
   tokenKey: string;
 
-  constructor(private http: HttpClient) {
+  constructor(private http: HttpClient, private tokenService: TokenService, private router: Router) {
     this.apiUrl = environment.apiUrl;
     this.tokenKey = environment.tokenKey;
    }
@@ -20,14 +22,27 @@ export class MembreService {
     return this.http.get(`${this.apiUrl}/membres/all`);
   }
 
-  getMembreId(id: any): Observable<any> {
+  getMembresByTeamId(): Observable<any> | void{
-    return this.http.get(`${this.apiUrl}/membres/1` + id);
+    const teamId = this.tokenService.getCurrentTeamId();
+    if (teamId){
+    return this.http.get(`${this.apiUrl}/membres/team/${teamId}`);
+    }else {
+      this.router.navigate(['accueil']);
+    }
+
   }
 
-  addMembre(membre: Membre): Observable<any> {
+  getMembreId(id: any): Observable<any> {
-    console.log(membre);
+    return this.http.get(`${this.apiUrl}/membres/` + id);
+  }
 
-    return this.http.post(`${this.apiUrl}/membres/sign-up`, membre);
+  addMembre(membre: Membre): Observable<any> | void{
+    const teamId = this.tokenService.getCurrentTeamId();
+    if (teamId){
+    return this.http.post(`${this.apiUrl}/membres/add/${teamId}`, membre);
+    }else {
+      this.router.navigate(['accueil']);
+    }
   }
 
   deleteMembre(membre: Membre): Observable<any> {

src/app/services/menus.service.ts

@@ -44,13 +44,18 @@ apiUrl: string;
 
   }
 
-  deleteMenu(id: any): Observable<any> {
+  deleteMenu(id:number): Observable<any> {
-    return this.http.delete(`${this.apiUrl}/menus/delete/`+ id);
+    return this.http.delete(`${this.apiUrl}/menus/delete/${id}`);
   }
 
-  updateMenu(menu: Menu): Observable<any> {
+
-    return this.http.put(`${this.apiUrl}/contacts/update/`, menu);
+  updateMenu(menu: Menu, id:number): Observable<any> | void {
-  }
+    const teamId = this.tokenService.getCurrentTeamId();
+    if (teamId){
+    return this.http.put(`${this.apiUrl}/menus/update/${teamId}/${id}`, menu);
+  }else {
+      this.router.navigate(['accueil']);
+    }
 }
 
-
+}

src/app/services/team.service.ts

@@ -1,8 +1,10 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { environment } from 'src/environments/environment';
 import { Team } from '../models/team';
+import { TokenService } from './token.service';
 
 @Injectable({
   providedIn: 'root'
@@ -12,7 +14,7 @@ export class TeamService {
   tokenKey: string;
 
 
-  constructor(private http: HttpClient) {
+  constructor(private http: HttpClient, private tokenService: TokenService, private router: Router) {
     this.apiUrl = environment.apiUrl;
     this.tokenKey = environment.tokenKey;
   }
@@ -20,8 +22,13 @@ export class TeamService {
     return this.http.get(`${this.apiUrl}/teams/all`);
   }
 
-  getTeamById(id: any): Observable<any> {
+  getTeamById(): Observable<any> | void {
-    return this.http.get(`${this.apiUrl}/teams/1`);
+    const teamId = this.tokenService.getCurrentTeamId();
+    if (teamId){
+    return this.http.get(`${this.apiUrl}/teams/${teamId}`);
+    } else {
+      this.router.navigate(['accueil']);
+    }
   }
 
   addTeam(team: Team): Observable<any> {

src/app/services/token.service.ts

@@ -20,11 +20,22 @@ tokenKey = environment.tokenKey;
     }
   }
 
+    public eraseToken(): string | null {
+    const token = localStorage.getItem(this.tokenKey);
+    if(token) {
+        this.tokenKey = '';
+        return token;
+      }else {
+      return null;
+    }
+      }
+
+
   public getCurrentMembreId(): number | null {
     const token = this.getToken();
     if(token) {
       const decodedToken = jwt_decode<any>(token);
-      const userId = decodedToken.sub;
+      const userId = decodedToken.userId;
       return userId;
     } else {
       return null;