tracking files

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

@@ -1,31 +1,48 @@
 <app-header></app-header>
+<app-deconnexion></app-deconnexion>
 <div class="container-fluid">
   <div class="row">
     <app-side-bar></app-side-bar>
     <div class="col-9 offset-2" id="main">
-          <h1>Ma team</h1>
-          <div class="d-flex justify-content-center">
-            <button 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>
+      <h1>Ma team</h1>
+      <div class="d-flex justify-content-center">
+        <button
+          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.ts

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

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

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

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

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

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

@@ -1,2 +1,80 @@
 <app-header></app-header>
-<app-side-bar></app-side-bar>
+<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>
+
+<div style="display: flex">
+  <div style="width: 150px">
+    <app-side-bar></app-side-bar>
+  </div>
+
+  <div style="width: 100%">
+    <div class="wrap">
+      <div class="left">
+        <daypilot-navigator
+          [config]="navigatorConfig"
+          [(date)]="date"
+          #navigator
+        ></daypilot-navigator>
+      </div>
+      <div class="main">
+        <div style="width: 100%; margin: 10px">
+          <a
+            href="#"
+            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
+          >
+          team : {{ teamId }} - user: {{ userId }} - role: {{ role }}
+          <span style="float: right"
+            ><a
+              href="#"
+              class="btn btn-sm btn-primary"
+              style="margin-right: 5px"
+              >Ajouter un évènement</a
+            ></span
+          >
+        </div>
+
+        <daypilot-calendar
+          [config]="config"
+          [events]="events"
+          #calendar
+          (viewChange)="viewChange()"
+        ></daypilot-calendar>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,43 @@
+.wrap {
+  display: flex;
+  margin: 10px;
+}
+
+.left {
+  margin-right: 10px;
+}
+
+.main {
+  flex-grow: 1;
+}
+
+.buttons {
+  margin-bottom: 10px;
+}
+
+.buttons a {
+  display: inline-block;
+  text-align: center;
+  background-color: #3c78d8;
+  border: 1px solid #1155cc;
+  color: #fff;
+  padding: 6px 20px;
+  border-radius: 2px;
+  cursor: pointer;
+  margin-right: 5px;
+  width: 80px;
+  text-decoration: none;
+}
+
+.main-body {
+  position: absolute;
+  left: 0px;
+  right: 0px;
+  top: 0px;
+  bottom: 0px;
+  overflow: hidden;
+}
+
+.fullscreen {
+  position: absolute; top:90px; left: 0px; right: 0px; bottom: 0px;
+}

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

@@ -1,15 +1,269 @@
-import { Component, OnInit } from '@angular/core';
+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';
 
 @Component({
   selector: 'app-page-agenda',
   templateUrl: './page-agenda.component.html',
   styleUrls: ['./page-agenda.component.scss']
 })
-export class PageAgendaComponent implements OnInit {
+export class PageAgendaComponent implements AfterViewInit {
 
-  constructor() { }
+  userId : any;
+  teamId : any;
+  role:any;
+  isShow: boolean;
+  alert:any;
 
-  ngOnInit(): void {
+  @ViewChild("navigator") navigator!: DayPilotNavigatorComponent;
+  @ViewChild("calendar") calendar!: DayPilotCalendarComponent;
+
+  constructor(private evenementService:EvenementService) {
+    this.isShow = false;
+    this.alert = "";
   }
 
+  get date(): DayPilot.Date {
+    return this.config.startDate as DayPilot.Date;
+  }
+
+  set date(value: DayPilot.Date) {
+    this.config.startDate = value;
+  }
+
+  navigatorConfig: DayPilot.NavigatorConfig = {
+    showMonths: 1,
+    skipMonths: 1,
+    locale: "fr-fr",
+    selectMode: "Week",
+    cellWidth: 30,
+    cellHeight: 30,
+    dayHeaderHeight: 30,
+    titleHeight: 30
+  };
+
+  events: DayPilot.EventData[] = [];
+
+  onClickCloseAlert(){
+    console.log('fermeture');
+    this.isShow = ! this.isShow;
+  }
+
+  ngAfterViewInit(): void {
+  }
+  
+  ngOnInit(): void {
+    const token = localStorage.getItem(environment.tokenKey);
+    if(token) {
+      const decodedToken = jwt_decode<any>(token);
+      this.userId = decodedToken.userId;
+      this.teamId = decodedToken.teamId;
+      this.role = decodedToken.auth[0].authority;
+    }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 = {
+    startDate: DayPilot.Date.today(),
+    locale: "fr-fr",
+    viewType: "Week",
+    //heightSpec: "Parent100Pct",
+    cellHeight: 30,
+    headerHeight: 30,
+    hourWidth: 60,
+    onEventMoved: (args) => {
+      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: this.rdvSplit(args.e.text()),
+        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");
+      const dp = args.control;
+      dp.clearSelection();
+      if (!modal.result) { return; }
+      let event = {
+        start: args.start,
+        end: args.end,
+        id: DayPilot.guid(),
+        barColor: "#555555",
+        text: modal.result
+      }
+      dp.events.add(event);
+      Object.assign(event, {id: ""});
+      Object.assign(event, {membre: {id:this.userId}});
+      Object.assign(event, {team: {id:this.teamId}});
+      console.log("Event added: " + event);
+      // let data = dp.events;
+      // Object.keys(data).map(function(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
+      //   };
+      // });
+      this.evenementService.addEvenements(event).subscribe({
+        next: result => {
+          this.viewChange();
+          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!')
+      });
+    },
+    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 à é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) => {
+      console.log("Event resized: " + args.e.id());
+      let event = {
+        start: args.e.start(),
+        end: args.e.end(),
+        id: args.e.id(),
+        barColor: "#555555",
+        text: args.e.text(),
+        membre: {id:this.userId},
+        team: {id:this.teamId}
+      }      
+      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!')
+        }
+      );
+    }
+  }
+
+  adjust(color:string, amount:number) {
+    return '#' + color.replace(/^#/, '').replace(/../g, color =>
+      ('0' + Math.min(255, Math.max(0, parseInt(color, 16) + amount)).toString(16)).substr(-2));
+  }
+
+  viewChange(): void {
+    var from = this.calendar.control.visibleStart();
+    var to = this.calendar.control.visibleEnd();
+
+    console.log("viewChange(): " + from + " " + to);
+
+    // this.ds.getEvents(from, to).subscribe(result => {
+       //this.events = this.evenements;
+       this.evenementService.getEvenementsByIdTeam(this.teamId).subscribe((data: any) => {
+        // this.events = [{
+        //       "id": data[0].id,
+        //       "start": data[0].eventDebut,
+        //       "end": data[0].eventFin,
+        //       "text": data[0].libelle,
+        //       barColor: data[0].membre.couleur,
+        //       //cssClass: "toto"
+        //     }];
+        Object.keys(data).map((key, index) => {
+          data[key] = {
+            barColor:data[key].membre.couleur,
+            backColor: this.adjust(data[key].membre.couleur, 90),
+            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);
+      });
+    // });
+  }
+
+  navigatePrevious(event: MouseEvent): void {
+    event.preventDefault();
+    this.config.startDate = (this.config.startDate as DayPilot.Date).addDays(-7);
+  }
+
+  navigateNext(event: MouseEvent): void {
+    event.preventDefault();
+    this.config.startDate = (this.config.startDate as DayPilot.Date).addDays(7);
+  }
+
+  navigateToday(event: MouseEvent): void {
+    event.preventDefault();
+    this.config.startDate = DayPilot.Date.today();
+  }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,23 +0,0 @@
-
-
-
-p>img {
-	width: 85px;
-	height: 85px;
-}
-
-img {
-	width: 50px;
-	height: 50px;
-	
-
-}
-
-.humeur {
-display: inline;
-}
-
-body {
-	background-color: grey;
-text-align: center;
-}

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

@@ -1,39 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-page-humeur',
-  templateUrl: './page-humeur.component.html',
-  styleUrls: ['./page-humeur.component.scss']
-})
-
-export class PageHumeurComponent 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 malade", lien : "assets/images/emoticon-vomir.png"}  ]
-
-  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 );
-
-}
-
-
-
-}
-

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

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

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

@@ -0,0 +1 @@
+

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

@@ -1,10 +1,11 @@
-<div>
-    <app-header></app-header>
-    <app-side-bar></app-side-bar>
-</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">
-    <h1>Modifier ce contact</h1>
+    <h3>Modifier ce contact</h3>
     <main class="form-modifContact">
         <form  (ngSubmit)="onSubmit()" [formGroup]="modifContactForm">
             
@@ -84,4 +85,5 @@
 
         </form>
     </main>
+</div>
 </div> 

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

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

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

@@ -1,41 +1,63 @@
 <app-header></app-header>
+
 <div class="row">
-    <div class="col-md-auto">
-        <app-side-bar></app-side-bar>
-    </div>
+  <div class="col-md-auto">
+    <app-side-bar></app-side-bar>
+  </div>
 
-    <div class=" col compte text-center py-3 border">
-        <div>
-            <button class="btn btn-sm btn-rounded btn-secondary m-3" type="submit">Tous les contacts
-            </button>
-            <button routerLink="/ajouter-contact" class="btn btn-sm btn-rounded btn-secondary m-3">
-                Ajouter un contact
-            </button>
+  <div class="col compte text-center py-3 border">
+    <div>
+      <button class="btn btn-sm btn-rounded btn-secondary m-3" type="submit">
+        Tous les contacts
+      </button>
+      <button
+        routerLink="/ajouter-contact"
+        class="btn btn-sm btn-rounded btn-secondary m-3"
+      >
+        Ajouter un contact
+      </button>
 
-            <div class="input-group mb-3 d-flex justify-content-center">
-                <input type="text" class="form-control" placeholder="Rechercher un contact"
-                    aria-label="Rechercher un contact" aria-describedby="basic-addon2" #word
-                    (keyup)="onSearchChange(word.value)">
+      <div class="input-group mb-3 d-flex justify-content-center">
+        <input
+          type="text"
+          class="form-control"
+          placeholder="Rechercher un contact"
+          aria-label="Rechercher un contact"
+          aria-describedby="basic-addon2"
+          #word
+          (keyup)="onSearchChange(word.value)"
+        />
 
-                <div class="input-group-append"></div>
-            </div>
-            <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 class="col-4" *ngIf="openDetails">
-                    <app-fiche-contact [personne]="openDetails" (clickDelete)="onClickDelete($event)">
-                    </app-fiche-contact>
-                </div>
-            </div>
+        <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 class="col-4" *ngIf="openDetails">
+          <app-fiche-contact
+            [personne]="openDetails"
+            (clickDelete)="onClickDelete($event)"
+          >
+          </app-fiche-contact>
+        </div>
+      </div>
     </div>
-</div>
+  </div>
+</div>

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

@@ -69,5 +69,6 @@ export class PageRepertoireComponent implements OnInit {
       }
       this.router.navigate(['repertoire/']);
     });
+    window.location.reload();
   }
 }

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

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

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

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

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

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

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

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

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

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