merge avec dev

package.json

@@ -19,7 +19,9 @@
     "@angular/platform-browser-dynamic": "~13.0.0",
     "@angular/router": "~13.0.0",
     "@daypilot/daypilot-lite-angular": "^3.2.0",
+    "@ng-bootstrap/ng-bootstrap": "^12.0.0",
     "bootstrap": "^5.1.3",
+    "bootstrap-icons": "^1.8.1",
     "jwt-decode": "^3.1.2",
     "ngx-autofocus-fix": "^1.0.4",
     "rxjs": "~7.4.0",

src/app/app-routing.module.ts

@@ -7,6 +7,7 @@ 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 { PageDeleteAccountComponent } from './pages/page-delete-account/page-delete-account.component';
 import { PageDeleteMemberComponent } from './pages/page-delete-member/page-delete-member.component';
 import { PageForgotPasswordComponent } from './pages/page-forgot-password/page-forgot-password.component';
 import { PageMenuSemaineComponent } from './pages/page-menu-semaine/page-menu-semaine.component';
@@ -16,31 +17,39 @@ import { PageRepertoireComponent } from './pages/page-repertoire/page-repertoire
 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', 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: 'ajouter-contact', component: PageAjoutContactComponent },
+  { path: 'modifier-membre', canActivate: [AuthGuard], component: PageUpdateMemberComponent },
-  { path: 'creation-team', component: PageCreationTeamComponent },
+  { path: 'modifier-compte', canActivate: [AuthGuard], component: PageUpdateAccountComponent },
+  { path: 'ajouter-contact', canActivate: [AuthGuard], component: PageAjoutContactComponent },
+  { 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';
@@ -21,9 +20,7 @@ import { PageUpdateMemberComponent } from './pages/page-update-member/page-updat
 import { SigninComponent } from './components/signin/signin.component';
 import { PageDashboardComponent } from './pages/page-dashboard/page-dashboard.component';
 import { MeteoComponent } from './components/meteo/meteo.component';
-import { HumeurComponent } from './components/humeur/humeur.component';
 import { CalendrierComponent } from './components/calendrier/calendrier.component';
-import { AvatarComponent } from './components/avatar/avatar.component';
 import { CardMemberComponent } from './components/card-member/card-member.component';
 import { ToDoListComponent } from './components/to-do-list/to-do-list.component';
 import { TacheComponent } from './components/tache/tache.component';
@@ -32,14 +29,21 @@ import { FicheContactComponent } from './components/fiche-contact/fiche-contact.
 import { PaginationComponent } from './components/pagination/pagination.component';
 import { CreneauComponent } from './components/creneau/creneau.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { HttpClientModule } from '@angular/common/http';
+import { HttpClientModule, HTTP_INTERCEPTORS } 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';
 import { AutofocusFixModule  } from 'ngx-autofocus-fix';
-import { EmoticonComponent } from './emoticon/emoticon.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 { AlertComponent } from './components/alert/alert.component';
+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,9 +66,7 @@ import { AlertComponent } from './components/alert/alert.component';
     SigninComponent,
     PageDashboardComponent,
     MeteoComponent,
-    HumeurComponent,
     CalendrierComponent,
-    AvatarComponent,
     CardMemberComponent,
     ToDoListComponent,
     TacheComponent,
@@ -75,8 +77,12 @@ import { AlertComponent } from './components/alert/alert.component';
     PageAjoutContactComponent,
     PageModifierContactComponent,
     PageCreationTeamComponent,
-    EmoticonComponent,
+    FooterComponent,
-    AlertComponent,
+    PageDeleteAccountComponent,
+    PageUpdateAccountComponent,
+    CardAvatarComponent,
+    DeconnexionComponent,
+    HumeurComponent
   ],
   imports: [
     BrowserModule,
@@ -85,9 +91,12 @@ import { AlertComponent } from './components/alert/alert.component';
     HttpClientModule,
     FormsModule,
     AutofocusFixModule.forRoot(),
-    DayPilotModule
+    DayPilotModule,
+  ],
+  providers: [
+{provide: LOCALE_ID, useValue: "fr-FR" }
+
   ],
-  providers: [],
   bootstrap: [AppComponent],
 })
 export class AppModule {}

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/avatar/avatar.component.html

@@ -1 +0,0 @@
-<p>avatar works!</p>

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

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

src/app/components/calendrier/calendrier.component.html

@@ -1 +1 @@
-<p>calendrier works!</p>
+<daypilot-calendar [config]="config" [events]="events"></daypilot-calendar>

src/app/components/calendrier/calendrier.component.ts

@@ -1,4 +1,7 @@
 import { Component, OnInit } from '@angular/core';
+import { DayPilot } from "@daypilot/daypilot-lite-angular";
+import { EvenementService } from 'src/app/services/evenement.service';
+import { TokenService } from 'src/app/services/token.service';
 
 @Component({
   selector: 'app-calendrier',
@@ -7,9 +10,48 @@ import { Component, OnInit } from '@angular/core';
 })
 export class CalendrierComponent implements OnInit {
 
-  constructor() { }
+  constructor(private evenementService:EvenementService, private tokenService: TokenService) { }
+  
+  get date(): DayPilot.Date {
+    return this.config.startDate as DayPilot.Date;
+  }
+
+  set date(value: DayPilot.Date) {
+    this.config.startDate = value;
+  }
+
+  events: DayPilot.EventData[] = [];
+  
+  config: DayPilot.CalendarConfig = {
+    viewType: "Day",
+    timeRangeSelectedHandling: "Disabled",
+    eventDeleteHandling: "Disabled",
+    eventMoveHandling: "Disabled",
+    eventResizeHandling: "Disabled",
+    eventClickHandling: "Disabled"
+  }
 
   ngOnInit(): void {
+    const teamId = this.tokenService.getCurrentTeamId();
+    this.evenementService.getEvenementsByIdTeam(teamId).subscribe((data: any) => {
+      Object.keys(data).map((key, index) => {
+        data[key] = {
+          barColor:data[key].membre.couleur,
+          backColor: data[key].membre.couleur,
+          id: data[key].id,
+          start: data[key].start,
+          end: data[key].end,
+          text: data[key].text.toUpperCase()+'\r('+data[key].membre.prenom+')',
+          tags : {
+            membre: data[key].membre.id
+          }
+        };
+      });
+      this.events = data;
+      console.log(data);
+      console.log(this.events);
+    });
+
   }
 
 }

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 { EmoticonComponent } from './emoticon.component';
+import { CardAvatarComponent } from './card-avatar.component';
 
-describe('EmoticonComponent', () => {
+describe('CardAvatarComponent', () => {
-  let component: EmoticonComponent;
+  let component: CardAvatarComponent;
-  let fixture: ComponentFixture<EmoticonComponent>;
+  let fixture: ComponentFixture<CardAvatarComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ EmoticonComponent ]
+      declarations: [ CardAvatarComponent ]
     })
     .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(EmoticonComponent);
+    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-member/card-member.component.html

@@ -1 +1,23 @@
-<p>card-member works!</p>
+<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 class="buttons text-center"><button button type="button" class="btn btn-outline-primary px-4"
+                        routerLink="../modifier-membre"
+                        routerLinkActive="active-custom">
+                        Modifier
+                </button><button button type="button" class="btn btn-primary px-4"
+                        routerLink="../supprimer-membre"
+                        routerLinkActive="active-custom">
+                        Supprimer
+                </button>
+              </div>
+            </div>
+          </div>
+      </div>
+  </div>
+</div>

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

@@ -0,0 +1,56 @@
+#couleur{
+  width: 100px;
+  height: 100px;
+  margin: 0 auto;
+  background: black;
+
+}
+
+.card {
+  min-height: 22rem;
+  border: none;
+  position: relative;
+  overflow: hidden;
+  border-radius: 8px;
+  cursor: pointer
+}
+
+
+.fonts {
+  font-size: 11px
+}
+
+.buttons button:nth-child(1) {
+  margin-top: 5px;
+  border: 1px solid #7879F1 !important;
+  color: #7879F1;
+  height: 40px;
+  width: 150px;
+}
+
+.buttons button:nth-child(1):hover {
+  margin-top: 5px;
+  border: 1px solid #7879F1 !important;
+  color: #fff;
+  height: 40px;
+  width: 150px;
+  background-color: #7879F1
+}
+
+.buttons button:nth-child(2) {
+  margin-top: 5px;
+  border: 1px solid #7879F1 !important;
+  background-color: #7879F1;
+  color: #fff;
+  height: 40px;
+  width: 150px;
+}
+
+.buttons button:nth-child(2):hover {
+  margin-top: 5px;
+  border: 1px solid #bd4646 !important;
+  background-color: #bd4646;
+  color: #fff;
+  height: 40px;
+  width: 150px;
+}

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

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
   selector: 'app-card-member',
@@ -6,10 +6,12 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./card-member.component.scss']
 })
 export class CardMemberComponent implements OnInit {
+  @Input() membre: any;
 
   constructor() { }
 
   ngOnInit(): void {
   }
 
+
 }

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

@@ -1 +1,135 @@
-<p>card-menu works!</p>
+<ng-template #content let-modal>
+  <div class="modal-header">
+    <h4 class="modal-title" id="modal-basic-title">Ajouter 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]="menuForm">
+      <div class="form-group">
+        <div class="input-group">
+          <input
+            type="date"
+            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-warning"
+      (click)="modal.close(saveMenu())"
+    >
+      Enregistrer
+    </button>
+  </div>
+</ng-template>
+
+<button type="button" class="btn btn-outline-warning" (click)="open(content)">
+  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

@@ -0,0 +1,36 @@
+.card {
+  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,16 @@
-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';
+import {NgbModal, ModalDismissReasons} from '@ng-bootstrap/ng-bootstrap';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  Validators,
+} from '@angular/forms';
+
+
 
 @Component({
   selector: 'app-card-menu',
@@ -6,10 +18,150 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./card-menu.component.scss']
 })
 export class CardMenuComponent implements OnInit {
+closeResult = '';
+public listMenus:any[];
+public menuId : any;
+public menuForm : FormGroup;
+public upMenuForm : FormGroup;
+
+
+  constructor(
+    private menusService: MenusService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private modalService: NgbModal,
+    private fb: FormBuilder
+  ) {
+    this.listMenus=[];
+    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();
+      });
+  }
+
+
+
+//ajout d'un menu
+saveMenu(): void {
+
+    const dateValue = this.menuForm.value['dateMenuFc'];
+    const repasMidiValue = this.menuForm.value['repasMidiFc'];
+    const repasSoirValue = this.menuForm.value['repasSoirFc'];
+
+
+    const menu: Menu = {
+      dateMenu: dateValue,
+      repasMidi: repasMidiValue,
+      repasSoir: repasSoirValue,
+      id: 0
+    };
+
+  if (menu.dateMenu !=='') {
+
+    console.log(menu.dateMenu);
+      this.menusService.addMenu(menu)?.subscribe((resp) => {
+        window.location.reload();
+
+      });
+    } else {
+      this.router.navigate(['accueil']);
+    }
+}
+
 
-  constructor() { }
 
   ngOnInit(): void {
+//affichage des menus d'une team
+this.menusService.getMenu()?.subscribe((listMenus: any[])=>{
+  console.log(listMenus);
+  this.listMenus=listMenus;
+
+});
+
+
+  this.menuForm = this.fb.group(
+  {
+    dateMenuFc: 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) {
+    this.modalService.open(content,
+{ariaLabelledBy: 'menu'}).result.then((result)=> {
+      this.closeResult = `Closed with: ${result}`;
+    }, (reason) => {
+      this.closeResult =
+`Dismissed ${this.getDismissReason(reason)}`;
+    });
+  }
+
+  private getDismissReason(reason: any): string {
+    if (reason === ModalDismissReasons.ESC) {
+      return 'by pressing ESC';
+    } else if (reason === ModalDismissReasons.BACKDROP_CLICK) {
+      return 'by clicking on a backdrop';
+    } else {
+      return `with: ${reason}`;
+    }
+  }
+}
+
+
+

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

@@ -1,29 +1,47 @@
 <div class="container">
     <div class="row">
-        <div class="col-sm">  
+        <div class="row d-flex justify-content-end align-items-center flex-row">
-            <button routerLink="../modifier-contact/{{personne.id}}"  class="w-100 btn btn-lg btn-rounded btn-secondary">
+            <div class="couleur col-7" [style.background-color]="personne.couleur"></div>
+            <div class="col-5">
+                <div class="col">
+                    <button 
+                        *ngIf="parent" 
+                        routerLink="../modifier-contact/{{personne.id}}"
+                        class=" btn btn-sm btn-rounded btn-secondary mb-2">
                         Modifier
                     </button>
                 </div>
-        <div class="col-sm">
+                <div class="col">
-            <button class="w-100 btn btn-lg btn-rounded btn-secondary">
+                    <button 
+                    *ngIf="parent" 
+                    class=" btn btn-sm btn-rounded btn-secondary" (click)="onClickDelete(personne.id)">
                         Supprimer
                     </button>
                 </div>
+            </div>
+        </div>
         <div class="row align-items-center">
-            <div class="col-md-6 offset-md-3">
+            <div class="col-md-12">
-                <img style="max-height: 12% ; max-width: 12%" src="../../../assets/images/contact-1.png"/>
+                <div class="row my-3 d-flex justify-content-center flex-row">
-                <p class="fiche-contact" >{{ personne.prenom }} {{ personne.nom }}</p>
+                    <span class="fiche-contact col-7">{{ personne.prenom }} {{ personne.nom }} </span>
-                <p class="fiche-contact" ><img style="max-height: 12% ; max-width: 12%" src="../../../assets/images/phone.png"/>
+                </div>
-                    {{ personne.telephone }}</p>
+                <div class="row my-3 d-flex justify-content-center flex-row">
-                <p class="fiche-contact" ><img style="max-height: 12% ; max-width: 12%" src="../../../assets/images/logo-gmail.png"/>
+                    <span i class="col-4 bi bi-telephone-inbound"></span>
-                    {{ personne.email }}</p>
+                    <span class="fiche-contact col-7">{{ personne.telephone }}</span>
-                <p class="fiche-contact" ><img style="max-height: 12% ; max-width: 12%" src="../../../assets/images/gateau.png"/>
+                </div>
-                    {{ personne.dateNaissance }}</p>
+                <div class="row my-3 d-flex justify-content-center flex-row">
-                    <p class="fiche-contact" >
+                    <i class="col-4 bi bi-envelope"></i>
-                        {{ personne.adresse }}</p>
+                    <span class="fiche-contact col-7">{{ personne.email }}</span>
+                </div>
+                <div class="row my-3 d-flex justify-content-center flex-row">
+                    <i class="col-4 bi bi-calendar-heart"></i>
+                    <span class="fiche-contact col-7">{{ personne.dateNaissance }}</span>
+                </div>
+                <div class="row my-3 d-flex justify-content-center flex-row">
+                    <i class="col-4 bi bi-map"></i>
+                    <span class="fiche-contact col-7">{{ personne.adresse }}</span>
+                </div>
             </div>
         </div>
-        
     </div>
 </div>

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

@@ -1,10 +1,26 @@
 .btn-secondary {
   color: #fff;
   background-color: #5a1e63 !important;
-  width: 100%;
+  min-width: 100px;
-  max-width: 150px;
+  border-radius: 55px;
-  padding: 15px;
+}
-  margin: auto;
+
+.couleur{
+  border: none;
+  border-radius: 50%;
+  width: 110px;
+  height: 110px;
+}
+
+.info{
+display:flex;
+justify-content: center;
+}
+
+.fiche-contact{
+  display:flex;
+  justify-content: center;
+  flex-direction: row;
 }
 
 .container {

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

@@ -1,4 +1,5 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { TokenService } from 'src/app/services/token.service';
 
 @Component({
   selector: 'app-fiche-contact',
@@ -7,8 +8,24 @@ import { Component, Input, OnInit } 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é!")
+    this.clickDelete.emit(numPerson);
+  }
 }

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

@@ -0,0 +1,12 @@
+<div class="footer text-center" >
+<h3>Plan du site</h3>
+<div class="liens">
+<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="../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>
+</div>
+</div>

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

@@ -0,0 +1,10 @@
+.liens {
+display: flex;
+justify-content: center;
+color : blue;
+font-size: smaller;
+}
+
+.footer {
+    margin-top: 20px;
+}

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

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

src/app/components/footer/footer.component.ts

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

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

@@ -1,10 +1,18 @@
-<nav class="navbar sticky-top navbar-expand-lg navbar-light bg-light shadow py-0 ">
+<nav
+  class="navbar sticky-top navbar-expand-lg navbar-light bg-light shadow py-0"
+>
   <div class="container-fluid">
     <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
       <div class="navbar-nav">
-                <img id="img" routerLink="accueil" routerLinkActive="active-custom" src="../../../assets/images/logo-organizee.png"/>
+        <img
+          id="img"
+          routerLink="accueil"
+          routerLinkActive="active-custom"
+          src="../../../assets/images/logo-organizee.png"
+        />
       </div>
     </div>
     <a class="navbar-brand" href="#">Organizee</a>
   </div>
+  <app-deconnexion *ngIf="isLogged"></app-deconnexion>
 </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,4 +1,6 @@
 import { Component, OnInit } from '@angular/core';
+import { TokenService } from 'src/app/services/token.service';
+
 
 @Component({
   selector: 'app-header',
@@ -6,10 +8,20 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./header.component.scss']
 })
 export class HeaderComponent implements OnInit {
+isLogged=false;
 
-  constructor() { }
+
+  constructor(public tokenService : TokenService){
+
+  }
 
   ngOnInit(): void {
+
+    if(this.tokenService.getToken()){
+      this.isLogged=true;
     }
 
   }
+
+  }
+

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

@@ -1,6 +1,22 @@
-<p>Mon humeur est :</p>
 
-<p>Affichage des items du tableau des humeurs</p>
+<div>
 
-<app-emoticon> *ngFor ="let tabHumeur of tabHumeur" 
+    <h2>Mon humeur :</h2>
-    [tabHumeur]="tabHumeur"></app-emoticon>
+    
+    
+    
+    
+    <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

@@ -0,0 +1,18 @@
+p>img {
+	width: 85px;
+	height: 85px;
+}
+
+img {
+	width: 50px;
+	height: 50px;
+}
+
+.humeur {
+display: inline;
+}
+
+div {
+	background-color: #87AFC7;
+text-align: center;
+}

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

@@ -8,22 +8,29 @@ import { Component, OnInit } from '@angular/core';
 export class HumeurComponent implements OnInit {
 
 
+  monHumeurLien! : string[];
+ monHumeurTitle! : string[] ;
 
 
+  tabHumeur= [
+      { title : "Je vais bien", lien : "assets/images/emoticon-heureux.png"},
+      { 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 en joie", lien : "assets/images/emoticon-feter.png"}  ]
 
+  constructor() {    }
 
-  constructor() {
+  ngOnInit(): void { }
 
+onChoixHumeur(numero: number){
+ this.monHumeurTitle= [this.tabHumeur[numero].title];
+ this.monHumeurLien= [this.tabHumeur[numero].lien];
 
+console.log("humeur titre est : ", this.monHumeurTitle);
+console.log("humeur lien est : ", this.monHumeurLien);
+console.log("index humeur est : ", numero );
 
 
 }
-
-  ngOnInit(): void {
-
-
-
-
-  }
-
 }

src/app/components/meteo/meteo.component.html

@@ -1,7 +1,4 @@
 <div class="meteo">
-  <input type="text" id="ville">
+  <iframe id="widget_autocomplete_preview" width="400" height="150" frameborder="1" border-radius="5"
-  <label for="ville">Entrez votre code postal</label>
-  <button id="meteo-button">Ok !</button>
-  <iframe id="widget_autocomplete_preview" width="150" height="300" frameborder="0"
     src="https://meteofrance.com/widget/prevision/751010"> </iframe>
 </div>

src/app/components/side-bar/side-bar.component.html

@@ -1,11 +1,29 @@
-<nav class="custom-side-bar flex-shrink-0 bg-white">
+<nav class="wrapper  md-auto position-fixed ">
-    <div  id="navbarNavAltMarkup">
+  <ul class="nav flex-column" id="sticky-sidebar">
-        <div class="navbar-nav">
+    <li class="nav-item" ngbNavItem="maTeam" >
-            <a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">Ma Team</a>
+      <a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">
-            <a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">Répertoire</a>
+        <i class="bi bi-people-fill"></i>
-            <a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">To-Do-List</a>
+        Ma Team</a>
-            <a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">Menus</a>
+    </li>
-            <a routerLink="../agenda" routerLinkActive="active-custom" class="nav-link">Agenda</a>
+    <li class="nav-item">
-        </div>
+      <a routerLink="/repertoire" routerLinkActive="active-custom" class="nav-link">
-    </div>
+        <i class="bi bi-person-rolodex"></i>
+        Répertoire</a>
+    </li>
+    <li class="nav-item">
+      <a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">
+        <i class="bi bi-check2-square"></i>
+        To-Do-List</a>
+    </li>
+    <li class="nav-item">
+      <a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">
+        <i class='fas fa-pizza-slice'></i>
+        Menus</a>
+    </li>
+    <li class="nav-item">
+      <a routerLink="../agenda" routerLinkActive="active-custom" class="nav-link">
+        <i class="bi bi-calendar-event"></i>
+        Agenda</a>
+    </li>
+  </ul>
 </nav>

src/app/components/side-bar/side-bar.component.scss

@@ -0,0 +1,23 @@
+.wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: left;
+  width: auto;
+  height: 100%;
+  position: absolute;
+  background-color: rgb(238, 238, 238);
+}
+.nav{
+  margin-top: 20px;
+  align-items: left;
+}
+
+li {
+  margin-bottom: 5px;
+}
+
+
+a{
+  color: black;
+  font-weight: bold;
+}

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

@@ -23,9 +23,14 @@
         routerLinkActive="active-custom">S'inscrire</button>
 
     </form>
-
+    <a routerLink="/password-oublie" routerLinkActive="active-custom" class="nav-link">password perdu ?</a>
-    <div *ngIf="errorForm">
+    <!-- <div *ngIf="errorForm">
       <p class="text-danger">Il manque des informations dans le formulaire...</p>
+    </div> -->
+    <div *ngIf="isShow">
+      <div class="alert alert-{{alert.type}}" role="alert">
+        {{alert.content}}
+      </div>
     </div>
   </main>
 </div>

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

@@ -14,9 +14,10 @@ import {
   styleUrls: ['./signin.component.scss'],
 })
 export class SigninComponent implements OnInit {
-  public errorForm: boolean;
+  alert : any;
+  isShow : boolean;
   constructor(private authService: AuthService, private router: Router) {
-    this.errorForm = false;
+    this.isShow = false;
   }
 
   ngOnInit(): void {}
@@ -26,13 +27,21 @@ export class SigninComponent implements OnInit {
     const email = submittedForm.form.value['email'];
     const password = submittedForm.form.value['password'];
     if (email !== '' && password !== '') {
-      this.authService.signin(email, password).subscribe((resp) => {
+      this.authService.signin(email, password).subscribe(
-        console.log('Component Signin: ', resp);
+        {
+          next: resp => {
             this.router.navigate(['tableau-de-bord']);
+          },
+          error: err => {
+            this.alert={"type":"danger", "content":"Le login ou paswword est invalide"};
+            this.isShow = true;
+          },
+          complete: () => console.log('DONE!')
         });
     } else {
       // afficher une erreur à l'utilisateur
-      this.errorForm = true;
+      this.alert={"type":"danger", "content":"Le login ou password est invalide"};
+      this.isShow = true;
     }
   }
 }

src/app/components/to-do-list/to-do-list.component.html

@@ -1,53 +1,69 @@
+<div class="container">
   <input
     type="text"
-  class="todo-input"
+    class="todo-title btn btn-outline-success"
-  placeholder="Ajoute une nouvelle Tâche"
+    placeholder="Titre"
-  [(ngModel)]="todoTitle"
+    value="{{ todo.nom }}"
-  (keyup.enter)="addTitle()"
+    [(ngModel)]="todo.nom"
+    (keyup.enter)="updateTodo(todo)"
   />
 
-<div class="element" *ngFor="let todo of todosFilter()">
+  <i class="bi bi-trash3" (click)="deleteTodo(todo.id)"></i>
+  <div class="row justify-align">
+    <input
+      type="text"
+      class="todo-input shadow justify-center"
+      placeholder="+ Nouvelle Tâche"
+      [(ngModel)]="todoTitle"
+      (keyup.enter)="addTache(todo.id)"
+    />
+  </div>
+  <div
+    class="element btn btn-outline-success shadow"
+    *ngFor="let tache of todo.taches"
+  >
     <div class="element-gauche">
       <input
         type="checkbox"
-      [(ngModel)]="todo.completed"
+        [(ngModel)]="tache.etat"
-      (change)="doneEdit(todo)"
+        (change)="doneEdit(tache)"
+        checked="checked"
       />
       <div
-      *ngIf="!todo.editing; else editingTodo"
+        *ngIf="!tache.editing; else editingTodo"
         class="nomTache"
-      [ngClass]="{ completed: todo.completed }"
+        [ngClass]="{ completed: tache.etat }"
-      (dblclick)="modifier(todo)"
+        (dblclick)="modifier(tache)"
       >
-      {{ todo.title }}
+        {{ tache.texte }}
       </div>
       <ng-template #editingTodo>
         <input
           type="text"
           class="modifier-element"
-        [(ngModel)]="todo.title"
+          [(ngModel)]="tache.texte"
-        (blur)="doneEdit(todo)"
+          (blur)="doneEdit(tache)"
-        (keyup.enter)="doneEdit(todo)"
+          (keyup.enter)="doneEdit(tache)"
-        (keyup.esc)="cancelEdit(todo)"
+          (keyup.esc)="cancelEdit(tache)"
           autofocus
         />
       </ng-template>
     </div>
-  <div class="deleteTache" (click)="deleteTodo(todo.id)">&times;</div>
+    <div class="deleteTache" (click)="deleteTache(tache.id)">&times;</div>
   </div>
-<div class="extra-container">
+  <div class="selection">
-  <div>
+    <label>
-    <label
+      <input
-      ><input
+        class="selection"
         type="checkbox"
         (change)="cocherAllTodoList()"
         [(ngModel)]="masterSelected"
       />Selectionner toutes les tâches</label
     >
+    <div class="casesRestantes">{{ toDoRest() }} tâche(s) restante(s)</div>
   </div>
-  <div>{{ toDoRest() }} tâches</div>
 </div>
-<div class="extra-container">
+<!--<div class="extra-container">
    <div>
     <button [ngClass]="{ active: filter === 'tous' }" (click)="filter = 'tous'">
       Toutes la To Do List
@@ -66,7 +82,4 @@
     </button>
   </div>
 
-  <div>
+</div> -->
-    <button (click)="effacerList()">Effacer la To Do List</button>
-  </div>
-</div>

src/app/components/to-do-list/to-do-list.component.scss

@@ -1,21 +1,64 @@
+.container {
+  border: 3px #4e9e7b solid;
+  padding: 5%;
+  min-width: 300px;
+  max-width: 30%;
+  margin: 5%;
+  border-radius: 5%;
+  margin-bottom: 20% !important;
+}
+
+.todo-title {
+  width: 75%;
+  padding: 10px 18px;
+  font-size: large !important;
+  font-weight: bold !important;
+  color: #4e9e7b !important;
+  border-top-color: #4e9e7b !important;
+  border-left-color: #4e9e7b !important;
+  border-radius: 5% !important;
+  margin-top: 0%;
+  margin-bottom: 5%;
+  margin-right: 3% !important;
+  color: black;
+  box-shadow: 5px 5px 5px gray;
+  &:focus {
+    outline: 0;
+    background-color: lightgray;
+  }
+}
+
 .todo-input {
-  width: 100%;
+  width: 75%;
   padding: 10px 18px;
   font-size: 18px;
   margin-bottom: 16px;
+  color: white !important;
+  background-color: #4e9e7b !important;
+  border-radius: 5%;
+  margin-left: 4%;
   &:focus {
     outline: 0;
+    background-color: lightgray;
   }
 }
+
 .element {
   margin-bottom: 12px;
   display: flex;
   align-items: center;
   justify-content: space-between;
   animation-duration: 0.3s;
+  color: black;
+  background-color: #4e9e7b;
+}
+
+::placeholder {
+  color: white;
 }
 
 .deleteTache {
+  width: 75%;
   cursor: pointer;
   margin-left: 14px;
   &:hover {
@@ -23,64 +66,66 @@
   }
 }
 
-.element-gauche { // later
+.element-gauche {
   display: flex;
   align-items: center;
 }
 
 .nomTache {
   padding: 10px;
-  border: 1px solid white;
   margin-left: 12px;
 }
 
 .modifier-element {
   font-size: 24px;
-  color: #2c3e50;
+  color: white;
   margin-left: 12px;
   width: 100%;
   padding: 10px;
-  border: 1px solid #ccc; //override defaults
+  border: 1px solid rgb(204, 204, 204); //override defaults
-  font-family: 'Avenir', Helvetica, Arial, sans-serif;
+  font-family: "Avenir", Helvetica, Arial, sans-serif;
 
   &:focus {
     outline: none;
+    background-color: grey;
   }
 }
 
+.selection {
+  margin-left: 0%;
+  text-align: left;
+  font-size: medium;
+  font-weight: bold;
+  color: #4e9e7b;
+}
+
 .completed {
   text-decoration: line-through;
-  color: grey;
+  color: white !important;
+}
+.casesRestantes {
+  color: #4cc690;
 }
 
-.extra-container {
+/* button {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 16px;
-  border-top: 1px solid lightgrey;
-  padding-top: 14px;
-  margin-bottom: 14px;
-}
-
-button {
   font-size: 14px;
   background-color: white;
   appearance: none;
 
   &:hover {
-    background: lightgreen;
+    background: grey;
   }
 
   &:focus {
     outline: none;
   }
-}
+} */
 
-.active {
+/* .active {
-  background: lightgreen;
+  background: grey;
-}
+} */
-.completed {
+/* .completed {
   text-decoration: line-through;
   color: grey;
 }
+ */

src/app/components/to-do-list/to-do-list.component.ts

@@ -1,5 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
-import { Todo } from 'src/app/interfaces/todo';
+import { Router } from '@angular/router';
+import { Tache } from 'src/app/models/tache';
+import { ToDoList } from 'src/app/models/to-do-list';
+import { TodoService } from 'src/app/services/todo.service';
+import { TodoList } from 'src/app/todo-list';
 
 @Component({
   selector: 'app-to-do-list',
@@ -7,22 +11,26 @@ import { Todo } from 'src/app/interfaces/todo';
   styleUrls: ['./to-do-list.component.scss'],
 })
 export class ToDoListComponent implements OnInit {
+  @Input() todo!: ToDoList;
   public beforeEditCache: string;
-  public todos: Todo[];
+  //public todos: ToDoList[];
   public todoTitle: string;
   public idTodo: number;
   public filter: string;
   public casesRestantes: boolean;
   public masterSelected: boolean;
+  public result: any;
+  public tache: Tache[];
 
-  constructor() {
+  constructor(private TodoService: TodoService, private router: Router) {
     this.beforeEditCache = '';
-    this.todos = [];
+    //this.todos = [];
     this.todoTitle = '';
     this.idTodo = 0;
     this.filter = '';
     this.casesRestantes = true;
     this.masterSelected = false;
+    this.tache = [];
   }
 
   ngOnInit(): void {
@@ -31,89 +39,89 @@ export class ToDoListComponent implements OnInit {
     this.filter = 'tous';
     this.idTodo = 4;
     this.todoTitle = '';
-    this.todos = [
+  }
-      {
+  //supprimer la todoList
-        id: 1,
+  deleteTodo(id: number): void {
-        title: 'Finish Angular Screencast',
+    this.TodoService.deleteTodoById(id).subscribe((resp) => {
-        completed: false,
+      window.location.reload();
-        editing: false,
+    });
-      },
-      {
-        id: 2,
-        title: 'Take over world',
-        completed: false,
-        editing: false,
-      },
-      {
-        id: 3,
-        title: 'One more thing',
-        completed: false,
-        editing: false,
-      },
-    ];
   }
   //ajouter tache
-  addTitle(): void {
-    if (this.todoTitle.trim().length === 0) {
-      return;
-    }
 
-    this.todos.push({
+  addTache(idTodoList: number) {
-      id: this.idTodo,
+    //idTodoList id que la todoList que l'on récupère
-      title: this.todoTitle,
+    console.log(idTodoList);
-      completed: false,
+    const tache: Tache = {
+      id: 0,
+      texte: this.todoTitle,
+      etat: false,
       editing: false,
+    };
+    console.log(this.tache);
+    this.TodoService.addTache(tache, idTodoList).subscribe((resp) => {
+      window.location.reload();
     });
-    this.todoTitle = '';
-    this.idTodo++;
   }
 
-  //modifier la tâche
+  //modifier le titre de la to-do-list
-  modifier(todo: Todo): void {
+  updateTodo(todoList: ToDoList): void {
-    this.beforeEditCache = todo.title;
+    this.TodoService.updateTodo(todoList)?.subscribe((resp) => {
-    todo.editing = true;
+      window.location.reload();
+    });
   }
 
-  // modifier l'apparence focus
+  //modifier par l'input
-  doneEdit(todo: Todo): void {
+  modifier(tache: Tache): void {
-    if (todo.title.trim().length === 0) {
+    this.beforeEditCache = tache.texte;
-      todo.title = this.beforeEditCache;
+    tache.editing = true;
+  }
+
+  // ajouter la modification dans la liste
+  doneEdit(tache: Tache): void {
+    if (tache.texte.trim().length === 0) {
+      tache.texte = this.beforeEditCache;
     }
     this.casesRestantes = this.casesQuiRestes();
-    todo.editing = false;
+    tache.editing = false;
+    this.TodoService.updateTache(tache).subscribe((resp) => {
+      console.log(tache);
+      window.location.reload();
+    });
   }
 
   // annuler la modification
-  cancelEdit(todo: Todo): void {
+  cancelEdit(tache: Tache): void {
-    todo.title = this.beforeEditCache;
+    tache.texte = this.beforeEditCache;
-    todo.editing = false;
+    tache.editing = false;
   }
 
   //supprimer la tache
-  deleteTodo(id: number): void {
+  deleteTache(id: number) {
-    this.todos = this.todos.filter((todo) => todo.id !== id);
+    this.TodoService.deleteTacheById(id).subscribe((resp) => {
+      window.location.reload();
+    });
   }
 
   //nombre de tâches restantes
   toDoRest(): number {
-    return this.todos.filter(todo=> !todo.completed).length;
+    return this.todo.taches.filter((tache: Tache) => !tache.etat).length;
   }
 
   //Cocher toutes les tâches de la liste
   listComplete(): boolean {
-    return this.todos.filter(todo=> todo.completed).length>0;
+    return this.todo.taches.filter((tache: Tache) => tache).length > 0;
   }
 
   //Effacer la to do list
 
   effacerList(): void {
-    this.todos = [];
+    //this.todo = [];
   }
 
   //cocher toutes les cases de la todoList
   cocherAllTodoList(): void {
-    for (var i = 0; i < this.todos.length; i++) {
+    for (var i = 0; i < this.todo.taches.length; i++) {
-      this.todos[i].completed = this.masterSelected;
+      this.todo.taches[i].etat = this.masterSelected;
     }
     this.cocherAllTodoList();
   }
@@ -123,16 +131,14 @@ export class ToDoListComponent implements OnInit {
   }
 
   //barre de filtre des tâches
-  todosFilter(): Todo[] {
+  /*  todosFilter(): ToDoList[] {
     if(this.filter === 'tous'){
-      return this.todos
+      return this.todo.taches
     }else if (this.filter === 'active'){
-      return this.todos.filter(todo=> !todo.completed)
+      return this.todo.taches.filter((tache: Tache)=> !tache.etat)
     }else if (this.filter === 'complete'){
-      return this.todos.filter(todo=>todo.completed)
+      return this.todo.taches.filter((tache: Tache)=>tache.etat)
     }
-    return this.todos
+    return this.todo
+    } */
 }
-  }
-
-

src/app/emoticon/emoticon.component.html

@@ -1,6 +0,0 @@
-<p>emoticon des humeurs</p>
-<div *ngFor="let humor of tabHumeur">{{humor.title}}</div>
-<div *ngFor="let humor of tabHumeur"> <img src="{{humor.lien}}" alt="{{humor.title}}"></div>
-
-
-

src/app/emoticon/emoticon.component.ts

@@ -1,26 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-emoticon',
-  templateUrl: './emoticon.component.html',
-  styleUrls: ['./emoticon.component.scss']
-})
-export class EmoticonComponent implements OnInit {
-
-     //declaration du tableau
-     tabHumeur= [
-      { title : "Je pleure", lien : "../../../assets/images/emoticon-pleurer.png"},
-      { title : "Je suis en colère", lien : "../../../assets/images/emoticon-insulter.png"},
-      { title : "Je suis malade", lien : "../../../assets/images/emoticon-vomir.png"}
-    ]
-
-
-  constructor() { }
-
-  ngOnInit(): void {
-
-
-console.log("tab humeurs ==>", this.tabHumeur)
-  }
-
-}

src/app/interfaces/todo.ts

@@ -1,7 +1,7 @@
 export interface Todo {
   id : number,
-  title : string,
+  texte : string,
-  completed: boolean,
+  etat: boolean,
-  editing: boolean
+  // todoListId: number // FK
 }
 

src/app/models/contact.ts

@@ -1,5 +1,6 @@
 export interface Contact {
   id: string;
+  couleur: string;
   nom: string;
   prenom: string;
   telephone: string;

src/app/models/mail.ts

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

src/app/models/membre.ts

@@ -6,5 +6,6 @@ export interface Membre {
   dateNaissance: Date;
   couleur: string;
   passwordConfirm: string;
+ // smiley: string;
   roleList: string[];
 }

src/app/models/menu.ts

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

src/app/models/tache.ts

@@ -0,0 +1,10 @@
+
+import { ToDoList } from './to-do-list';
+
+
+export interface Tache {
+  id : number,
+  texte: string,
+  etat : boolean,
+  editing : boolean
+}

src/app/models/to-do-list.ts

@@ -1,7 +1,8 @@
+import { Tache } from './tache';
 import { Team } from './team';
 
 export interface ToDoList {
   nom: string;
-  team: Team;
+  taches: Tache[];
-  tache: string;
+  id: number;
 }

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

@@ -1,7 +1,47 @@
 <app-header></app-header>
+<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>
       <div class="d-flex justify-content-center">
-  <button button type="button" class="btn btn-primary btn-lg"
+        <button
-          routerLink="../creation-team"
+          button
-          routerLinkActive="active-custom">Créer ma team</button>
+          type="button"
+          class="btn btn-primary btn-lg"
+          routerLink="../modifier-compte"
+          routerLinkActive="active-custom"
+        >
+          Modifier mon compte
+        </button>
+      </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.scss

@@ -0,0 +1,3 @@
+button{
+  margin-bottom: 5px;
+}

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

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

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

@@ -1,5 +1,6 @@
 <app-header></app-header>
 <body>
+  <div class="container">
 <div class="bienvenue">
   <h2 class="titre">BIENVENUE</h2>
 <p>
@@ -13,6 +14,7 @@ lu, nous sommes là pour vous aider !</p>
 <div class="connexion">
 <app-signin></app-signin>
 </div>
+</div>
 <div class="pub">
   <img src="../../../assets/images/menu.png" />
   <img src="../../../assets/images/repertoire.png" />

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

@@ -1,10 +1,15 @@
+.container {
+  display: flex;
+}
+
 .bienvenue {
   float: left;
-  display: inline;
+  // display: inline-block;
+  // height: 300px;
   border: 4px solid #5d5fef;
   border-radius: 10px;
   margin-top: 50px;
-  margin-left: 200px;
+  // margin-left: 200px;
   padding-right: 10px;
   padding-left: 10px;
 }
@@ -18,17 +23,20 @@ p {
   line-height: 2em;
 }
 .connexion {
-  float: right;
+  // float: right;
+  height: 350px;
   display: inline;
   margin-top: -40px;
-  margin-right: 200px;
+  margin-left: 10px;
+  // margin-right: 200px;
 }
 
 .pub {
-  padding-top: 100px;
-  padding-right: 100px;
-  padding-left: 200px;
   display: flex;
+  flex-wrap: wrap;
+  padding-top: 100px;
+  padding-right: 200px;
+  padding-left: 200px;
   justify-content: space-between;
 }
 

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,101 +1,162 @@
 <app-header></app-header>
+
+<div class="container-fluid">
+  <div class="row">
     <app-side-bar></app-side-bar>
-<div class="signup-form text-center">
+    <div class="col-9 offset-2" id="main">
-  <main class="form-signup">
+      <div class="form-addMember">
         <form (ngSubmit)="onSubmit()" [formGroup]="addMemberForm">
-          <h1>J'inscris un nouveau membre</h1>
           <div class="form-floating">
-            <input type="color" class="form-control" id="floatingInputcouleur" placeholder="" name="couleur"
+            <input
-                    formControlName="couleurFc">
+              type="color"
-                  <label for="floatingInputcouleur">Choisissez une couleur !</label>
+              class="form-control"
+              id="floatingInputcouleur"
+              placeholder=""
+              name="couleur"
+              formControlName="couleurFc"
+            />
           </div>
-          <!-- <div class="form-floating">
+          <div class="form-floating">
-            <input type="text"
+            <input
+              type="text"
               class="form-control"
               id="floatingInputlastName"
               placeholder=""
               name="lastName"
               formControlName="lastNameFc"
-                    [ngClass]="{'is-valid' : addMemberForm.controls['lastNameFc'].touched && addMemberForm.controls['lastNameFc'].valid,
+              [ngClass]="{
-                                'is-invalid':  addMemberForm.controls['lastNameFc'].touched && !addMemberForm.controls['lastNameFc'].valid}">
+                'is-valid':
-            <label for="floatingInputlastName">Avatar</label>
+                  addMemberForm.controls['lastNameFc'].touched &&
-        </div> -->
+                  addMemberForm.controls['lastNameFc'].valid,
-          <div class="form-floating">
+                'is-invalid':
-              <input type="text"
+                  addMemberForm.controls['lastNameFc'].touched &&
-                      class="form-control"
+                  !addMemberForm.controls['lastNameFc'].valid
-                      id="floatingInputlastName"
+              }"
-                      placeholder=""
+            />
-                      name="lastName"
+            <label for="floatingInputlastName">VOTRE NOM</label>
-                      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"
+            <input
+              type="text"
               class="form-control"
               id="floatingInputfirstName"
               placeholder=""
               name="firstName"
               formControlName="firstNameFc"
-                      [ngClass]="{'is-valid' : addMemberForm.controls['firstNameFc'].touched && addMemberForm.controls['firstNameFc'].valid,
+              [ngClass]="{
-                                  'is-invalid':  addMemberForm.controls['firstNameFc'].touched && !addMemberForm.controls['firstNameFc'].valid}">
+                'is-valid':
-              <label for="floatingInputfirstName">Prénom</label>
+                  addMemberForm.controls['firstNameFc'].touched &&
+                  addMemberForm.controls['firstNameFc'].valid,
+                'is-invalid':
+                  addMemberForm.controls['firstNameFc'].touched &&
+                  !addMemberForm.controls['firstNameFc'].valid
+              }"
+            />
+            <label for="floatingInputfirstName">VOTRE PRENOM</label>
           </div>
           <div class="form-floating">
-              <input type="date"
+            <input
+              type="date"
               class="form-control"
               id="floatingInputdateNaissance"
               placeholder=""
               name="dateNaissance"
               formControlName="dateNaissanceFc"
-                      [ngClass]="{'is-valid' : addMemberForm.controls['dateNaissanceFc'].touched && addMemberForm.controls['dateNaissanceFc'].valid,
+              [ngClass]="{
-                                  'is-invalid':  addMemberForm.controls['dateNaissanceFc'].touched && !addMemberForm.controls['dateNaissanceFc'].valid}">
+                'is-valid':
-              <label for="floatingInputfirstName">Date de naissance</label>
+                  addMemberForm.controls['dateNaissanceFc'].touched &&
+                  addMemberForm.controls['dateNaissanceFc'].valid,
+                'is-invalid':
+                  addMemberForm.controls['dateNaissanceFc'].touched &&
+                  !addMemberForm.controls['dateNaissanceFc'].valid
+              }"
+            />
+            <label for="floatingInputdateNaissance"
+              >VOTRE DATE DE NAISSANCE</label
+            >
           </div>
           <div class="form-floating">
-              <input type="email"
+            <input
+              type="email"
               class="form-control"
-                      id="floatingInput"
+              id="floatingInputemail"
               placeholder=""
               name="email"
               formControlName="emailFc"
-                      [ngClass]="{'is-valid' : addMemberForm.controls['emailFc'].touched && addMemberForm.controls['emailFc'].valid,
+              [ngClass]="{
-                                  'is-invalid':  addMemberForm.controls['emailFc'].touched && !addMemberForm.controls['emailFc'].valid}">
+                'is-valid':
-              <label for="floatingInput">Adresse email</label>
+                  addMemberForm.controls['emailFc'].touched &&
+                  addMemberForm.controls['emailFc'].valid,
+                'is-invalid':
+                  addMemberForm.controls['emailFc'].touched &&
+                  !addMemberForm.controls['emailFc'].valid
+              }"
+            />
+            <label for="floatingInputemail">Votre Email</label>
           </div>
           <div class="form-floating">
-              <input type="password"
+            <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
+              type="password"
               class="form-control"
               id="floatingPassword"
               placeholder=""
               name="password"
               formControlName="passwordFc"
-                      [ngClass]="{'is-valid' : addMemberForm.controls['passwordFc'].touched && addMemberForm.controls['passwordFc'].valid,
+              [ngClass]="{
-                                  'is-invalid':  addMemberForm.controls['passwordFc'].touched && !addMemberForm.controls['passwordFc'].valid}">
+                'is-valid':
-              <label for="floatingPassword">Mot de passe</label>
+                  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"
+            <input
+              type="password"
               class="form-control"
               id="floatingpasswordConfirm"
               placeholder=""
               name="passwordConfirm"
               formControlName="passwordConfirmFc"
-                      [ngClass]="{'is-valid' : addMemberForm.controls['passwordConfirmFc'].touched && addMemberForm.controls['passwordConfirmFc'].valid,
+              [ngClass]="{
-                                  'is-invalid':  addMemberForm.controls['passwordConfirmFc'].touched && !addMemberForm.controls['passwordConfirmFc'].valid}">
+                'is-valid':
-              <label for="floatingPassword">Confirmer mot de passe</label>
+                  addMemberForm.controls['passwordConfirmFc'].touched &&
+                  addMemberForm.controls['passwordConfirmFc'].valid,
+                'is-invalid':
+                  addMemberForm.controls['passwordConfirmFc'].touched &&
+                  !addMemberForm.controls['passwordConfirmFc'].valid
+              }"
+            />
+            <label for="floatingPasswordConfirm"
+              >CONFIRMEZ VOTRE MOT DE PASSE</label
+            >
           </div>
 
-          <button class="w-100 btn btn-lg btn-success"
+          <button
+            class="w-100 btn btn-lg btn-outline-success"
             type="submit"
-                  [disabled]="addMemberForm.invalid">Je confirme l'ajout de ce membre à ma team !</button>
+            [disabled]="addMemberForm.invalid"
-          <p>
+          >
-              Value : {{ addMemberForm.value | json }}
+            Ajouter le membre
-          </p>
+          </button>
-          <p>
-              Form valid : {{ addMemberForm.valid }}
-          </p>
-
         </form>
-  </main>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -4,29 +4,72 @@
   background-color: #f5f5f5;
 }
 
-.form-signup {
+.form-addMember {
   width: 100%;
   max-width: 330px;
   padding: 15px;
-  margin: auto;
+  margin-top: 50px;
+  margin-left: auto;
+  margin-right: auto;
+  border: solid 1px;
+  border-radius: 10px;
+  background-color: #fcddec;
+  border-color: #ef5da8;
 }
 
-.form-signup .checkbox {
+.form-addMember .checkbox {
   font-weight: 400;
 }
 
-.form-signup .form-floating:focus-within {
+.form-addMember .form-floating:focus-within {
   z-index: 2;
 }
 
-.form-signup input[type="email"] {
+.form-addMember input[type="email"] {
-  margin-bottom: -1px;
+  margin-bottom: 10px;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
 
-.form-signup input[type="password"] {
+.form-addMember input[type="color"] {
+  border: none;
+  margin-bottom: 10px;
+  margin-top: -70px;
+  margin-left: 100px;
+  border-radius: 50%;
+  width: 100px;
+  height: 100px;
+}
+
+.form-addMember input[type="color"]::-webkit-color-swatch {
+  border: none;
+  margin-top: -15px;
+  border-radius: 80%;
+  width: 80px;
+  height: 80px;
+}
+
+.form-addMember input[type="text"] {
+  margin-bottom: 10px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.form-addMember input[type="date"] {
+  margin-bottom: 10px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.form-addMember input[type="password"] {
   margin-bottom: 10px;
   border-top-left-radius: 0;
   border-top-right-radius: 0;
 }
+
+.btn-outline-success {
+  margin-top: 10px;
+  background-color: #ffff;
+  color: #ef5da8 !important;
+  border-color: #ef5da8 !important;
+}

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

@@ -1,8 +1,11 @@
 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({
   selector: 'app-page-add-member',
@@ -13,6 +16,8 @@ export class PageAddMemberComponent implements OnInit {
 
   public addMemberForm: FormGroup;
   constructor(
+    private membreService: MembreService,
+    private mailService: MailService,
     private authService: AuthService,
     private router: Router,
     private fb: FormBuilder
@@ -27,7 +32,8 @@ export class PageAddMemberComponent implements OnInit {
         firstNameFc: new FormControl('', [Validators.required]),
         lastNameFc: new FormControl('', [Validators.required]),
         dateNaissanceFc: new FormControl('', [Validators.required]),
-        couleurFc: new FormControl('', [Validators.required]),
+        roleFc: new FormControl('', []),
+        couleurFc: new FormControl('', []),
         emailFc: new FormControl('', [
           Validators.email,
           Validators.required,
@@ -51,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'];
@@ -61,20 +68,32 @@ 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.authService.signup(membre).subscribe((resp) => {
+      this.membreService.addMembre(membre)?.subscribe((resp) => {
-        this.router.navigate(['account/signin']);
+        this.mailService.envoiMailText(mail)?.subscribe((respMail) =>{
+          console.log("Mail envoyé");
+        })
+        this.router.navigate(['compte']);
       });
     } else {
       // affichage erreur

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

@@ -1,29 +1,84 @@
 <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"
+>
+  {{ alert.content }}
+  <button
+    type="button"
+    class="close"
+    data-dismiss="alert"
+    aria-label="Close"
+    (click)="onClickCloseAlert()"
+  >
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
 
-<app-alert *ngIf="alert" id="showAlert" [alert]="alert" (eventClose)="closeAlert($event)"></app-alert>
+<div style="display: flex">
-
+  <div style="width: 150px">
-<div style="display: flex;">
-    <div style="width:150px;">
     <app-side-bar></app-side-bar>
   </div>
 
-    <div style="width: 100%;">
+  <div style="width: 100%">
     <div class="wrap">
       <div class="left">
-                <daypilot-navigator [config]="navigatorConfig" [(date)]="date" #navigator></daypilot-navigator>
+        <daypilot-navigator
+          [config]="navigatorConfig"
+          [(date)]="date"
+          #navigator
+        ></daypilot-navigator>
       </div>
       <div class="main">
-                <div>
+        <div style="width: 100%; margin: 10px">
-                    <a href="#" class="btn btn-sm btn-primary" style="margin-right:5px;" (click)="navigatePrevious($event)">Previous</a>
+          <a
-                    <a href="#" class="btn btn-sm btn-primary" style="margin-right:5px;" (click)="navigateToday($event)">Today</a>
+            href="#"
-                    <a href="#" class="btn btn-sm btn-primary" style="margin-right:5px;" (click)="navigateNext($event)">Next</a>
+            class="btn btn-sm btn-primary"
+            style="margin-right: 5px"
+            (click)="navigatePrevious($event)"
+            >Previous</a
+          >
+          <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
+          >
+          
+          <!-- DEBUT : Pour le debugage -->
+          <span *ngIf="debug">team : {{ teamId }} - user: {{ userId }} - role: {{ role }}</span>
+          <!-- FIN : Pour le debugage -->
+
+          <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>
+        <daypilot-calendar
-                
+          [config]="config"
+          [events]="events"
+          #calendar
+          (viewChange)="viewChange()"
+        ></daypilot-calendar>
       </div>
     </div>
   </div>
-    
 </div>

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

@@ -1,5 +1,6 @@
 .wrap {
   display: flex;
+  margin: 10px;
 }
 
 .left {

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

@@ -2,7 +2,7 @@ import { Component, OnInit, AfterViewInit, ViewChild } from '@angular/core';
 import { DayPilot, DayPilotCalendarComponent, DayPilotNavigatorComponent } from "@daypilot/daypilot-lite-angular";
 import { EvenementService } from 'src/app/services/evenement.service';
 import { environment } from 'src/environments/environment';
-import jwt_decode from 'jwt-decode';
+import { TokenService } from 'src/app/services/token.service';
 
 @Component({
   selector: 'app-page-agenda',
@@ -10,16 +10,20 @@ import jwt_decode from 'jwt-decode';
   styleUrls: ['./page-agenda.component.scss']
 })
 export class PageAgendaComponent implements AfterViewInit {
-
+  debug: boolean;
   userId : any;
   teamId : any;
+  role:any;
+  isShow: boolean;
   alert:any;
 
   @ViewChild("navigator") navigator!: DayPilotNavigatorComponent;
   @ViewChild("calendar") calendar!: DayPilotCalendarComponent;
 
-  constructor(private evenementService:EvenementService) {
+  constructor(private evenementService:EvenementService, private tokenService: TokenService) {
+    this.isShow = false;
     this.alert = "";
+    this.debug = environment.debug;
   }
 
   get date(): DayPilot.Date {
@@ -31,8 +35,8 @@ export class PageAgendaComponent implements AfterViewInit {
   }
 
   navigatorConfig: DayPilot.NavigatorConfig = {
-    showMonths: 2,
+    showMonths: 1,
-    skipMonths: 2,
+    skipMonths: 1,
     locale: "fr-fr",
     selectMode: "Week",
     cellWidth: 30,
@@ -43,23 +47,24 @@ export class PageAgendaComponent implements AfterViewInit {
 
   events: DayPilot.EventData[] = [];
 
-  closeAlert(value:any){
+  onClickCloseAlert(){
-    //console.log('fermeture'+value);
+    console.log('fermeture');
-    this.alert="";
+    this.isShow = ! this.isShow;
   }
 
   ngAfterViewInit(): void {
   }
   
   ngOnInit(): void {
-    const token = localStorage.getItem(environment.tokenKey);
+    this.userId = this.tokenService.getCurrentMembreId();
-    if(token) {
+    this.teamId = this.tokenService.getCurrentTeamId();
-      const decodedToken = jwt_decode<any>(token);
-      this.userId = decodedToken.userId;
-      this.teamId = decodedToken.teamId;
-    }else{
-      //
   }
+
+  // petite triche pour eviter la repetition du nom dans le RDV
+  rdvSplit(rdv:any){
+    let titleRDV = rdv.split('\r');
+    console.log(titleRDV[0]);
+    return titleRDV[0];
   }
 
   config: DayPilot.CalendarConfig = {
@@ -70,30 +75,39 @@ export class PageAgendaComponent implements AfterViewInit {
     cellHeight: 30,
     headerHeight: 30,
     hourWidth: 60,
-    onEventMoved: args => {
+    onEventMoved: (args) => {
-      console.log("Event moved:"+args.e.id()+" - "+args.e.text()+" - "+args.e.end()+" - "+args.e.start());
+      console.log("Event moved:"+args.e.id()+" - "+args.e.text()+" - "+args.e.end()+" - "+args.e.start()+' - '+args.e.data.tags.membre);
       let event = {
         start: args.e.start(),
         end: args.e.end(),
         id: args.e.id(),
         barColor: "#555555",
-        text: args.e.text(),
+        text: this.rdvSplit(args.e.text()),
-        membre: {id:this.userId},
+        membre: {id:args.e.data.tags.membre},
         team: {id:this.teamId}
       }
+      if( (args.e.data.tags.membre == this.userId) || (this.role == 'ROLE_PARENT')){ // mettre role parent en variable
         this.evenementService.updateEvenements(event).subscribe(
           {
             next: result => {
               this.viewChange();
               this.alert={"type":"success", "content":"L'évènement à bien été modifié"};
+              this.isShow = true;
             },
             error: err => {
               this.viewChange();
               this.alert={"type":"danger", "content":"Problème lors de la modification de l'évenment"};
+              this.isShow = true;
             },
             complete: () => console.log('DONE!')
           }
         );  
+      }else{
+        this.viewChange();
+        this.alert={"type":"danger", "content":"Vous ne pouvez pas modifié cet évènement !"};
+        this.isShow = true;  
+      }
+
     },
     onTimeRangeSelected: async (args) => {
       const modal = await DayPilot.Modal.prompt("Create a new event:", "Nouveau RDV");
@@ -126,11 +140,13 @@ export class PageAgendaComponent implements AfterViewInit {
       this.evenementService.addEvenements(event).subscribe({
         next: result => {
           this.viewChange();
-          this.alert={"type":"success", "content":"L'évènement à correctement été  ajouté au calendrier"};
+          this.alert={"type":"success", "content":"L'évènement à été correctement ajouté au calendrier"};
+          this.isShow = true;
         },
         error: err => {
           this.viewChange();
           this.alert={"type":"danger", "content":"Problème lors de l'ajout de l'évenment"};
+          this.isShow = true;
         },
         complete: () => console.log('DONE!')
       });
@@ -138,17 +154,25 @@ export class PageAgendaComponent implements AfterViewInit {
     eventDeleteHandling: "Update",
     onEventDeleted: (args) => {
       console.log("Event deleted: " + args.e.id());
+      if( (args.e.data.tags.membre == this.userId) || (this.role == 'ROLE_PARENT')){ // mettre role parent en variable
         this.evenementService.deleteEvenements(Number(args.e.id())).subscribe({
           next: result => {
             this.viewChange();
-          this.alert={"type":"success", "content":"L'évènement à correctement été supprimé du calendrier"};
+            this.alert={"type":"success", "content":"L'évènement à été correctement supprimé du calendrier"};
+            this.isShow = true;
           },
           error: err => {
             this.viewChange();
             this.alert={"type":"danger", "content":"Problème lors de la suppression de l'évenment"};
+            this.isShow = true;
           },
           complete: () => console.log('DONE!')
         })
+      }else{
+        this.viewChange();
+        this.alert={"type":"danger", "content":"Vous ne pouvez pas suprimé cet évènement !"};
+        this.isShow = true;  
+      }
     },
     eventResizeHandling: "Update",
     onEventResized: (args) => {
@@ -158,23 +182,31 @@ export class PageAgendaComponent implements AfterViewInit {
         end: args.e.end(),
         id: args.e.id(),
         barColor: "#555555",
-        text: args.e.text(),
+        text: this.rdvSplit(args.e.text()),
-        membre: {id:this.userId},
+        membre: {id:args.e.data.tags.membre},
         team: {id:this.teamId}
       }
+      if( (args.e.data.tags.membre == this.userId) || (this.role == 'ROLE_PARENT')){ // mettre role parent en variable
         this.evenementService.updateEvenements(event).subscribe(
           {
             next: result => {
               this.viewChange();
-            this.alert={"type":"success", "content":"L'évènement à bien été modifié"};
+              this.alert={"type":"success", "content":"L'évènement à bien été déplacé"};
+              this.isShow = true;
             },
             error: err => {
               this.viewChange();
-            this.alert={"type":"danger", "content":"Problème lors de la modification de l'évenment"};
+              this.alert={"type":"danger", "content":"Problème lors de la modification de l'évenement"};
+              this.isShow = true;
             },
             complete: () => console.log('DONE!')
           }
         );
+      }else{
+        this.viewChange();
+        this.alert={"type":"danger", "content":"Vous ne pouvez pas déplacé cet évènement !"};
+        this.isShow = true;  
+      }
     }
   }
 
@@ -204,10 +236,13 @@ export class PageAgendaComponent implements AfterViewInit {
           data[key] = {
             barColor:data[key].membre.couleur,
             backColor: this.adjust(data[key].membre.couleur, 90),
-            "id": data[key].id,
+            id: data[key].id,
-            "start": data[key].start,
+            start: data[key].start,
-            "end": data[key].end,
+            end: data[key].end,
-            "text": data[key].text
+            text: data[key].text.toUpperCase()+'\r('+data[key].membre.prenom+')',
+            tags : {
+              membre: data[key].membre.id
+            }
           };
         });
         this.events = data;

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

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

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

@@ -1,14 +1,20 @@
 .login-form {
   height: 100vh;
   padding-top: 40px;
-  background-color: #f5f5f5;
+  background-color: #e286d3;
 }
 
 .form-ajoutContact {
   width: 100%;
   max-width: 330px;
   padding: 15px;
-  margin: auto;
+  margin-top: 50px;
+  margin-left: auto;
+  margin-right: auto;
+  border: solid 1px;
+  border-radius: 10px;
+  background-color: #fcddec;
+  border-color: #81164d;
 }
 
 .form-ajoutContact .checkbox {
@@ -20,12 +26,45 @@
 }
 
 .form-ajoutContact input[type="email"] {
-  margin-bottom: -1px;
+  margin-bottom: 10px;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
 
+.form-ajoutContact input[type="color"] {
+  border: none;
+  margin-bottom: 10px;
+  margin-top: -70px;
+  margin-left: 100px;
+  border-radius: 50%;
+  width: 100px;
+  height: 100px;
+}
+
+.form-ajoutContact input[type="color"]::-webkit-color-swatch {
+  border: none;
+  margin-top: -15px;
+  border-radius: 80%;
+  width: 80px;
+  height: 80px;
+}
+
+.form-ajoutContact input[type="text"] {
+  margin-bottom: 10px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.form-ajoutContact input[type="date"] {
+  margin-bottom: 10px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+
 .btn-secondary {
-  color: #fff;
+  margin-top: 10px;
+  background-color: #ffff;
+  color: rgb(255, 255, 255);
   background-color: #5a1e63 !important;
 }

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

@@ -6,6 +6,7 @@ import {
   Validators,
 } from '@angular/forms';
 import { Router } from '@angular/router';
+import { TokenService } from 'src/app/services/token.service';
 import { Contact } from '../../models/contact';
 import { RepertoireService } from '../../services/repertoire.service';
 
@@ -19,6 +20,7 @@ export class PageAjoutContactComponent implements OnInit {
 
   constructor(
     private repertoireService: RepertoireService,
+    private tokenService: TokenService,
     private router: Router,
     private fb: FormBuilder
   ) {
@@ -28,6 +30,7 @@ export class PageAjoutContactComponent implements OnInit {
   ngOnInit(): void {
     // *********************************pensser à changer group car déprécié********************************
     this.ajoutContactForm = this.fb.group({
+      couleurFc: new FormControl('', [Validators.required]),
       lastNameFc: new FormControl('', [Validators.required]),
       firstNameFc: new FormControl('', [Validators.required]),
       telephoneFc: new FormControl('', [Validators.required]),
@@ -42,24 +45,25 @@ export class PageAjoutContactComponent implements OnInit {
   }
 
   public onSubmit(): void {
-    console.log('value : ', this.ajoutContactForm.value);
+    const couleurValue = this.ajoutContactForm.value['couleurFc'];
-    console.log('form : ', this.ajoutContactForm);
     const firstNameValue = this.ajoutContactForm.value['firstNameFc'];
     const lastNameValue = this.ajoutContactForm.value['lastNameFc'];
     const telephoneValue = this.ajoutContactForm.value['telephoneFc'];
     const emailValue = this.ajoutContactForm.value['emailFc'];
     const dateNaissanceValue = this.ajoutContactForm.value['dateNaissanceFc'];
     const adresseValue = this.ajoutContactForm.value['adresseFc'];
+    const teamId = this.tokenService.getCurrentTeamId()
 
     const contact: Contact = {
       id: '',
+      couleur: couleurValue,
       nom: lastNameValue,
       prenom: firstNameValue,
       telephone: telephoneValue,
       email: emailValue,
       dateNaissance: dateNaissanceValue,
       adresse: adresseValue,
-      team: { id: '1' }, // changer l'id quand la personne est logé => recuperer l'id de la team du membre
+      team: { id: teamId }, // changer l'id quand la personne est logé => recuperer l'id de la team du membre
     };
 
     if (contact.nom !== '') {
@@ -67,7 +71,7 @@ export class PageAjoutContactComponent implements OnInit {
         this.router.navigate(['repertoire/']);
       });
     } else {
-      // affichage erreur
+      window.alert("Le contact ne peut pas être ajouté!")
     }
   }
 }

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

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

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

@@ -1,31 +1,40 @@
+.team-form{
+  margin-top: 20px;
+  align-content: center;
+
+}
+
+button{
+  margin-top: 10px;
+}
 .login-form {
   height: 100vh;
   padding-top: 40px;
   background-color: #f5f5f5;
 }
 
-.form-signup {
+.form-team {
   width: 100%;
-  max-width: 330px;
+  max-width: 500px;
   padding: 15px;
   margin: auto;
 }
 
-.form-signup .checkbox {
+.form-team .checkbox {
   font-weight: 400;
 }
 
-.form-signup .form-floating:focus-within {
+.form-team .form-floating:focus-within {
   z-index: 2;
 }
 
-.form-signup input[type="email"] {
+.form-team input[type="email"] {
   margin-bottom: -1px;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
 
-.form-signup input[type="password"] {
+.form-team 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.ts

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

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

@@ -1,4 +1,32 @@
 <app-header></app-header>
 <app-side-bar></app-side-bar>
-<app-meteo></app-meteo>
 
+<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

@@ -0,0 +1,50 @@
+.titre{
+  display: inline-flex;
+  margin-left: 20px;
+  text-align: center;
+  font-weight: bold;
+}
+
+.meteo {
+  margin-left: 500px;
+  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-account/page-delete-account.component.html

@@ -0,0 +1,12 @@
+<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">
+    <h1>Supprimer votre compte</h1>
+    <main class="contenu-compte">
+
+    </main>
+  </div>
+</div>

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

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

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

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

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

@@ -1 +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">
+    <h1>Supprimer ce membre</h1>
+    <main class="contenu-compte"></main>
+  </div>
+</div>

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

@@ -9,14 +9,26 @@
         <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>
-    </div>
+    </div> -->
   </main>
 </div>
 

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,25 +17,78 @@ import {
   styleUrls: ['./page-forgot-password.component.scss']
 })
 export class PageForgotPasswordComponent implements OnInit {
-public errorForm: boolean;
+
-  constructor(private authService: AuthService, private router: Router) {
+  alert : any;
-     this.errorForm = false;
+  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 = {
-    const email = submittedForm.form.value['email'];
+        nom: "",
-    if (email !== '') {
+        prenom: "",
-      this.authService.forgotPassword(email).subscribe((resp) => {
+        dateNaissance: new Date(),
-        console.log('Component : PageForgotPassword ', resp);
+        email: submittedForm.form.value.email,
-        this.router.navigate(['reinitialisation-password']);
+        password: "",
-      });
+        roleList: ["ROLE_PARENT"],
-    } else {
+        couleur: "",
-      // afficher une erreur à l'utilisateur
+        passwordConfirm: ""
-      this.errorForm = true;
+      };
+
+    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 !")
+      // this.router.navigate(['reinitialisation-password']);
+
   }
   }
 
-
-}

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

@@ -1,2 +1,13 @@
 <app-header></app-header>
-<app-side-bar></app-side-bar>
+
+<div class="row">
+  <div class="col-md-auto">
+    <app-side-bar class="sidebarMenu"></app-side-bar>
+  </div>
+  <div class="col menu text-center">
+    <h2>Menu de la semaine</h2>
+    <main class="contenu-menu">
+      <app-card-menu></app-card-menu>
+    </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,13 +1,18 @@
-<div>
 <app-header></app-header>
+<div class="row">
+    <div class="col-md-auto">
         <app-side-bar></app-side-bar>
     </div>
 
 <div class="modifContact-form text-center">
+    <h3>Modifier ce contact</h3>
     <main class="form-modifContact">
         <form  (ngSubmit)="onSubmit()" [formGroup]="modifContactForm">
-            <h1>Modifier ce contact</h1>
             
+            <div class="form-floating">
+            <input type="color" class="form-control" id="floatingInputcouleur" placeholder="" name="couleur"
+            formControlName="couleurFc" value= "{{ listContactInfo.couleur }}">
+            </div>
 
             <div class="form-floating">
                 <input type="text" 
@@ -81,3 +86,4 @@
         </form>
     </main>
 </div>
+</div> 

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

@@ -8,7 +8,13 @@
   width: 100%;
   max-width: 330px;
   padding: 15px;
-  margin: auto;
+  margin-top: 50px;
+  margin-left: auto;
+  margin-right: auto;
+  border: solid 1px;
+  border-radius: 10px;
+  background-color: #fcddec;
+  border-color: #81164d;
 }
 
 .form-modifContact .checkbox {
@@ -25,7 +31,40 @@
   border-bottom-left-radius: 0;
 }
 
+.form-modifContact input[type="color"] {
+  border: none;
+  margin-bottom: 10px;
+  margin-top: -70px;
+  margin-left: 100px;
+  border-radius: 50%;
+  width: 100px;
+  height: 100px;
+}
+
+.form-modifContact input[type="color"]::-webkit-color-swatch {
+  border: none;
+  margin-top: -15px;
+  border-radius: 80%;
+  width: 80px;
+  height: 80px;
+}
+
+.form-modifContact input[type="text"] {
+  margin-bottom: 10px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.form-modifContact input[type="date"] {
+  margin-bottom: 10px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+
 .btn-secondary {
-  color: #fff;
+  margin-top: 10px;
+  background-color: #ffff;
+  color: rgb(255, 255, 255);
   background-color: #5a1e63 !important;
 }

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

@@ -44,6 +44,7 @@ export class PageModifierContactComponent implements OnInit {
 
     // *********************************pensser à changer group car déprécié********************************
     this.modifContactForm = this.fb.group({
+      couleurFc: new FormControl('', [Validators.required]),
       lastNameFc: new FormControl('', [Validators.required]),
       firstNameFc: new FormControl('', [Validators.required]),
       telephoneFc: new FormControl('', [Validators.required]),
@@ -71,8 +72,7 @@ export class PageModifierContactComponent implements OnInit {
 
   //Méthode qui envoie les champs modifiés pour mise à jour
   public onSubmit(): void {
-    console.log('value : ', this.modifContactForm.value);
+    const couleurValue = this.modifContactForm.value['couleurFc'];
-    console.log('form : ', this.modifContactForm);
     const firstNameValue = this.modifContactForm.value['firstNameFc'];
     const lastNameValue = this.modifContactForm.value['lastNameFc'];
     const telephoneValue = this.modifContactForm.value['telephoneFc'];
@@ -82,6 +82,7 @@ export class PageModifierContactComponent implements OnInit {
 
     const contact: Contact = {
       id: this.personneid,
+      couleur: couleurValue,
       nom: lastNameValue,
       prenom: firstNameValue,
       telephone: telephoneValue,

src/app/pages/page-not-found/page-not-found.component.html

@@ -1,15 +1,19 @@
 <app-header></app-header>
-
+<app-side-bar></app-side-bar>
 <div>
 
   <div class="ctn-link min-vh-100">
  <div class="text-center">
- <p> Page introuvable</p>
+ 
 
 
       <a routerLink="" routerLinkActive="!active">Je retourne à l'accueil</a>
-    </div>
+      <p></p>
-    
+      
+
+    
+     <img src="/assets/images/404.gif" alt="Page introuvable">
+    </div>
   </div>
 
 </div>

src/app/pages/page-not-found/page-not-found.component.scss

@@ -11,6 +11,9 @@ p{
 
 .min-vh-100  {
     font-weight: bold;
-    background-image: linear-gradient(to left top, #051937, #004d7a, #008793, #e2ebe7, #f8faf5);
+    //background-image: linear-gradient(to left top, #051937, #004d7a, #008793, #e2ebe7, #f8faf5);
     //max-width: max-content;
 }
+
+img {justify-content: center;
+}

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,31 +1,61 @@
 <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 py-3 border">
     <div>
-    <button class="w-100 btn btn-lg btn-secondary " 
+      <button
-        type="submit">Tous les contacts
+        *ngIf="parent" 
-    </button>
+        routerLink="/ajouter-contact"
-
+        class="btn btn-sm btn-rounded btn-secondary m-3"
-    <button routerLink="/ajouter-contact" class="w-100 btn btn-lg btn-rounded btn-secondary">
+      >
         Ajouter un contact
       </button>
 
-    <div class="input-group mb-3">
+      <div class="input-group mb-3 d-flex justify-content-center">
-        <input type="text" class="form-control" 
+        <input
+          type="text"
+          class="form-control"
           placeholder="Rechercher un contact"
           aria-label="Rechercher un contact"
           aria-describedby="basic-addon2"
           #word
-            (keyup)="onSearchChange(word.value)">
+          (keyup)="onSearchChange(word.value)"
+        />
 
-        <div class="input-group-append">
+        <div class="input-group-append"></div>
+      </div>
+      <div>
+        <h4>Liste des Contacts</h4>
+      </div>
+      <div class="row justify-content-evenly">
+        <div class="col-4">
+          <div
+            class="row my-3 d-flex justify-content-center flex-row"
+            *ngFor="let personne of listContact"
+            (click)="onClick(personne)"
+          >
+            <div
+              class="couleur col-4"
+              [style.background-color]="personne.couleur"
+            ></div>
+            <span class="fiche-contact col-7"
+              >{{ personne.prenom }} {{ personne.nom }}</span
+            >
           </div>
         </div>
 
-    <div *ngFor="let personne of listContact" (click)="onClick(personne)" >
+        <div class="col-4" *ngIf="openDetails">
-        <img style="max-height: 12% ; max-width: 12%" src="../../../assets/images/contact-1.png"/>
+          <app-fiche-contact
-        <p class="fiche-contact" >{{ personne.prenom }} {{ personne.nom }}</p>
+            [personne]="openDetails"
+            (clickDelete)="onClickDelete($event)"
+          >
+          </app-fiche-contact>
+        </div>
+      </div>
+    </div>
   </div>
-<div *ngIf="openDetails"><app-fiche-contact [personne]="openDetails"></app-fiche-contact></div>
-    
 </div>

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

@@ -2,14 +2,33 @@
   color: #fff;
   background-color: #5a1e63 !important;
   width: 100%;
-  max-width: 330px;
+  max-width: 230px;
   padding: 15px;
   margin: auto;
+  min-width: 100px;
+  border-radius: 55px;
+  font-weight: bold;
 }
 
-.input-group mb-3 {
+.input-group.mb-3 {
-  width: 100%;
+  width: 50%;
   max-width: 330px;
   padding: 15px;
   margin: auto;
+  display: flex;
+  flex-direction: row;
+}
+
+.couleur{
+  border: none;
+  margin-top: -15px;
+  border-radius: 80%;
+  width: 60px;
+  height: 60px;
+  flex-direction: row;
+}
+
+.h4 {
+  color: black;
+  font-weight: bold;
 }

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,34 +16,33 @@ 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);
       this.listContact = listContact;
       this.listFull = listContact;
     });
-
-    this.personneid = this.route.snapshot.paramMap.get('id');
-    console.log(this.personneid);
-
-    this.repertoireService
-      .getContactById(this.personneid)
-      .subscribe((listContactInfo: any) => {
-        console.log(listContactInfo);
-        this.listContactInfo = listContactInfo;
-      });
   }
 
   // Méthode pour récuper ce qui est saisi dans l'input
@@ -63,13 +63,22 @@ export class PageRepertoireComponent implements OnInit {
     this.listContact = prenom;
   }
 
-  // Méthode qui au click va ouvrir les détails d'un contat
+  // Méthode qui au click va ouvrir les détails d'un contact
   onClick(personne: any) {
     console.log(personne);
     this.openDetails = personne;
   }
 
-  // this.repertoireService.deleteContact(contact).subscribe((resp) => {
+  // Méthode qui au click va supprimer un contact
-  //   this.router.navigate(['repertoire/']);
+  onClickDelete(contactId: number){
-  // });
+    this.repertoireService.deleteContact(contactId).subscribe((resp) => {
+      if(contactId) {
+        this.listContact.forEach(contactId => console.log(contactId))
+      }else{
+        window.alert("Le contact ne peut pas être supprimé!")
+      }
+      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'];
+  public onSubmit(): void {
-    console.log(email);
+    console.log('value : ', this.resetForm.value);
-    this.authService.resetPassword(email, password).subscribe((resp: any) => {
+    console.log('form : ', this.resetForm);
-      window.alert("Votre mot de passe est bien ré-initialisé !")
+    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-signup/page-signup.component.html

@@ -1,12 +1,12 @@
 <app-header></app-header>
 <div class="signup-form text-center">
     <h1>Inscrivez-vous !</h1>
+    <label for="floatingInputcouleur">Choisissez une couleur</label>
   <main class="form-signup">
     <form (ngSubmit)="onSubmit()" [formGroup]="signupForm">
           <div class="form-floating">
             <input type="color" class="form-control" id="floatingInputcouleur" placeholder="" name="couleur"
               formControlName="couleurFc">
-
           </div>
       <div class="form-floating">
         <input
@@ -126,10 +126,10 @@
       <button
         class="w-100 btn btn-lg btn-outline-success"
         type="submit"
-        [disabled]="signupForm.invalid"
+        [disabled]="signupForm.invalid">
-      >
         CREER MON COMPTE
       </button>
+
     </form>
   </main>
 </div>

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,27 @@
 <app-header></app-header>
+<div class="row">
+  <div class="col-md-auto">
     <app-side-bar></app-side-bar>
-<div class="container">
+  </div>
-  <app-to-do-list></app-to-do-list>
+  <div class="col menu text-center">
+    <h2>To-Do-List</h2>
+    <div class="d-flex align-items-stretch"></div>
+    <input
+      type="text"
+      class="btn btn-outline-success"
+      placeholder=" Ajouter une To-Do-List"
+      [(ngModel)]="todoListTitle"
+      (keyup.enter)="addTodoByTeamId()"
+    />
+
+    <div class="d-flex align-items-stretch">
+      <div class="custom-main container p-3">
+        <div class="row">
+          <div class="col" *ngFor="let todos of listTodos">
+            <app-to-do-list [todo]="todos"> </app-to-do-list>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>