Merge branch 'dev' into blandine

package-lock.json

@@ -14196,6 +14196,12 @@
       "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.8.1.tgz",
       "integrity": "sha512-IXUqislddPJfwq6H+2nTkHyr9epO9h6u1AG0OZCx616w+TgzeoCjfmI3qJMQqt1J586gN2IxzB4M99Ip4sTZ1w=="
     },
+    "bootstrap-icons": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.8.1.tgz",
+      "integrity": "sha512-IXUqislddPJfwq6H+2nTkHyr9epO9h6u1AG0OZCx616w+TgzeoCjfmI3qJMQqt1J586gN2IxzB4M99Ip4sTZ1w=="
+    },
+  
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",

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

@@ -12,7 +12,8 @@
         </div>
         <div class="row align-items-center">
             <div class="col-md-6 offset-md-3">
-                <img style="max-height: 12% ; max-width: 12%" src="../../../assets/images/contact-1.png"/>
+                <p class="fiche-contact" > 
+                    {{ personne.couleur }}</p>
                 <p class="fiche-contact" >{{ personne.prenom }} {{ personne.nom }}</p>
                 <p class="fiche-contact" ><img style="max-height: 12% ; max-width: 12%" src="../../../assets/images/phone.png"/>
                     {{ personne.telephone }}</p>

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

@@ -14,6 +14,7 @@ export class FicheContactComponent implements OnInit {
   ngOnInit(): void {}
 
   onClickDelete(numPerson: number){
+    window.alert("Le contact à bien été supprimé!")
     this.clickDelete.emit(numPerson);
   }
 }

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

@@ -1,40 +1,55 @@
+<input
+  type="text"
+  class="todo-title"
+  placeholder="Titre"
+  value = "{{todo.nom}}"
+/>
+<div>
+  <button (click)="effacerList()">Effacer la To Do List</button>
+</div>
 <input
   type="text"
   class="todo-input"
-  placeholder="Ajoute une nouvelle Tâche"
+  placeholder="+ Nouvelle Tâche"
   [(ngModel)]="todoTitle"
-  (keyup.enter)="addTitle()"
+  (keyup.enter)="addTache(todo.id)"
 />
 
-<div class="element" *ngFor="let todo of todosFilter()">
+
+
+<div class="element" *ngFor="let tache of todo.taches">
   <div class="element-gauche">
     <input
       type="checkbox"
-      [(ngModel)]="todo.completed"
-      (change)="doneEdit(todo)"
+      [(ngModel)]="tache.etat"
+      (change)="doneEdit(tache)"
+      checked="checked"
     />
     <div
-      *ngIf="!todo.editing; else editingTodo"
+      *ngIf="!tache.editing; else editingTodo"
       class="nomTache"
-      [ngClass]="{ completed: todo.completed }"
-      (dblclick)="modifier(todo)"
+      [ngClass]="{ completed: tache.etat }"
+      (dblclick)="modifier(tache)"
     >
-      {{ todo.title }}
+      {{ tache.texte }}
     </div>
     <ng-template #editingTodo>
       <input
         type="text"
         class="modifier-element"
-        [(ngModel)]="todo.title"
-        (blur)="doneEdit(todo)"
-        (keyup.enter)="doneEdit(todo)"
-        (keyup.esc)="cancelEdit(todo)"
+        [(ngModel)]="tache.texte"
+        (blur)="doneEdit(tache)"
+        (keyup.enter)="doneEdit(tache)"
+        (keyup.esc)="cancelEdit(tache)"
         autofocus
       />
     </ng-template>
   </div>
-  <div class="deleteTache" (click)="deleteTodo(todo.id)">&times;</div>
+  <div class="deleteTache" (click)="deleteTodo(tache.id)">&times;</div>
 </div>
+
+
+
 <div class="extra-container">
   <div>
     <label
@@ -48,7 +63,7 @@
   <div>{{ toDoRest() }} tâches</div>
 </div>
 <div class="extra-container">
-  <div>
+  <!-- <div>
     <button [ngClass]="{ active: filter === 'tous' }" (click)="filter = 'tous'">
       Toutes la To Do List
     </button>
@@ -65,8 +80,6 @@
       Terminées
     </button>
   </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,5 +1,15 @@
+.todo-title {
+  width: 25%;
+  padding: 10px 18px;
+  font-size: xx-large;
+  margin-bottom: 16px;
+  &:focus {
+    outline: 0;
+  }
+}
+
 .todo-input {
-  width: 100%;
+  width: 20%;
   padding: 10px 18px;
   font-size: 18px;
   margin-bottom: 16px;
@@ -7,6 +17,8 @@
     outline: 0;
   }
 }
+
+
 .element {
   margin-bottom: 12px;
   display: flex;
@@ -16,6 +28,7 @@
 }
 
 .deleteTache {
+  width: 75%;
   cursor: pointer;
   margin-left: 14px;
   &:hover {
@@ -40,11 +53,12 @@
   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;
 
   &:focus {
     outline: none;
+    background-color:aquamarine;
   }
 }
 
@@ -53,15 +67,6 @@
   color: grey;
 }
 
-.extra-container {
-  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;

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

@@ -1,5 +1,9 @@
-import { Component, OnInit } from '@angular/core';
-import { Todo } from 'src/app/interfaces/todo';
+import { Component, Input, OnInit } from '@angular/core';
+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,78 @@ export class ToDoListComponent implements OnInit {
     this.filter='tous';
     this.idTodo = 4;
     this.todoTitle = '';
-    this.todos = [
-      {
-        id: 1,
-        title: 'Finish Angular Screencast',
-        completed: false,
-        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;
+
+  addTache(idTodoList : number) {//idTodoList id que la todoList que l'on récupère
+console.log(idTodoList);
+    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.todos.push({
-      id: this.idTodo,
-      title: this.todoTitle,
-      completed: false,
-      editing: false,
-    });
-    this.todoTitle = '';
-    this.idTodo++;
-  }
+
 
   //modifier la tâche
-  modifier(todo: Todo): void {
-    this.beforeEditCache = todo.title;
-    todo.editing = true;
+  modifier(tache: Tache): void {
+    this.beforeEditCache = tache.texte;
+    tache.editing = true;
   }
 
   // modifier l'apparence focus
-  doneEdit(todo: Todo): void {
-    if (todo.title.trim().length === 0) {
-      todo.title = this.beforeEditCache;
+  doneEdit(tache: Tache): void {
+    if (tache.texte.trim().length === 0) {
+      tache.texte = this.beforeEditCache;
     }
     this.casesRestantes= this.casesQuiRestes();
-    todo.editing = false;
+    tache.editing = false;
   }
 
   // annuler la modification
-  cancelEdit(todo: Todo): void {
-    todo.title = this.beforeEditCache;
-    todo.editing = false;
+  cancelEdit(tache: Tache): void {
+    tache.texte = this.beforeEditCache;
+    tache.editing = false;
   }
 
   //supprimer la tache
-  deleteTodo(id: number): void {
-    this.todos = this.todos.filter((todo) => todo.id !== id);
+  deleteTodo(id: number) {
+    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++) {
-      this.todos[i].completed = this.masterSelected;
+    for (var i = 0; i < this.todo.taches.length; i++) {
+      this.todo.taches[i].etat = this.masterSelected;
     }
     this.cocherAllTodoList();
   }
@@ -123,16 +120,16 @@ 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.todos
+      return this.todo.taches.filter((tache: Tache)=>tache.etat)
     }
+    return this.todo
+    } */
   }
 
 

src/app/interfaces/todo.ts

@@ -1,7 +1,7 @@
 export interface Todo {
   id : number,
-  title : string,
-  completed: boolean,
-  editing: boolean
+  texte : string,
+  etat: 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/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,11 @@
+import { Tache } from './tache';
 import { Team } from './team';
 
 export interface ToDoList {
   nom: string;
   team: Team;
-  tache: string;
+  taches: Tache [];
+  id:number;
 }
+
+

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

@@ -3,10 +3,14 @@
     <app-side-bar></app-side-bar>
 </div>
 <div class="ajoutContact-form text-center">
+    <h1>Ajouter un contact</h1>
     <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" 

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
   ) {
@@ -42,24 +44,25 @@ export class PageAjoutContactComponent implements OnInit {
   }
 
   public onSubmit(): void {
-    console.log('value : ', this.ajoutContactForm.value);
-    console.log('form : ', this.ajoutContactForm);
+    const couleurValue = this.ajoutContactForm.value['couleurFc'];
     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 +70,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-modifier-contact/page-modifier-contact.component.html

@@ -4,10 +4,14 @@
 </div>
 
 <div class="modifContact-form text-center">
+    <h1>Modifier ce contact</h1>
     <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">
+            </div>
 
             <div class="form-floating">
                 <input type="text" 

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

@@ -71,8 +71,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);
-    console.log('form : ', this.modifContactForm);
+    const couleurValue = this.modifContactForm.value[''];
     const firstNameValue = this.modifContactForm.value['firstNameFc'];
     const lastNameValue = this.modifContactForm.value['lastNameFc'];
     const telephoneValue = this.modifContactForm.value['telephoneFc'];
@@ -82,6 +81,7 @@ export class PageModifierContactComponent implements OnInit {
 
     const contact: Contact = {
       id: this.personneid,
+      couleur: couleurValue,
       nom: lastNameValue,
       prenom: firstNameValue,
       telephone: telephoneValue,

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

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

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

@@ -7,9 +7,16 @@
   margin: auto;
 }
 
-.input-group mb-3 {
-  width: 100%;
+.input-group.mb-3 {
+  width: 50%;
   max-width: 330px;
   padding: 15px;
   margin: auto;
+  display: flex;
+  flex-direction: row;
+}
+
+;h4 {
+  color: black;
+  font-weight: bold;
 }

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

@@ -33,16 +33,6 @@ export class PageRepertoireComponent implements OnInit {
       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,15 +53,20 @@ 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;
   }
 
-
-  onClickDelete(contact: Contact){
-    this.repertoireService.deleteContact(contact).subscribe((resp) => {
+  // Méthode qui au click va supprimer un contact
+  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/']);
     });
   }

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

@@ -1,5 +1,9 @@
 <app-header></app-header>
 <app-side-bar></app-side-bar>
-<div class="container">
-  <app-to-do-list></app-to-do-list>
+<div class="d-flex align-items-stretch">
+  <div class="row">
+    <div class="col" *ngFor="let todos of result">
+      <app-to-do-list [todo]="todos"> </app-to-do-list>
+    </div>
+  </div>
 </div>

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

@@ -1,4 +1,7 @@
 import { Component, OnInit } from '@angular/core';
+import { TodoService } from 'src/app/services/todo.service';
+
+
 
 @Component({
   selector: 'app-page-to-do-list',
@@ -6,10 +9,18 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./page-to-do-list.component.scss']
 })
 export class PageToDoListComponent implements OnInit {
+  public result : any;
 
-  constructor() { }
+  constructor(private TodoService : TodoService) { }
 
   ngOnInit(): void {
+    this.TodoService.getToDoListByTeamId().subscribe((data :any)=>{
+
+      this.result = data;
+      console.log(data);
+    });
+
+
   }
 
 }

src/app/services/repertoire.service.ts

@@ -3,6 +3,8 @@ import { HttpClient } from '@angular/common/http';
 import { map, Observable } from 'rxjs';
 import { environment } from 'src/environments/environment';
 import { Contact } from '../models/contact';
+import { Router } from '@angular/router';
+import { TokenService } from './token.service';
 
 @Injectable({
   providedIn: 'root',
@@ -11,14 +13,15 @@ export class RepertoireService {
   apiUrl: string;
   tokenKey: string;
 
-  constructor(private http: HttpClient) {
+  constructor(private http: HttpClient, private router: Router,  private tokenService: TokenService) {
     // On se sert des variables d'environnement de notre application
     this.apiUrl = environment.apiUrl;
     this.tokenKey = environment.tokenKey;
   }
 
   getContact(): Observable<any> {
-    return this.http.get(`${this.apiUrl}/contacts/team/1`);
+    const teamId = this.tokenService.getCurrentTeamId()
+    return this.http.get(`${this.apiUrl}/contacts/team/${teamId}`);
   }
 
   getContactById(id: any): Observable<any> {
@@ -26,16 +29,15 @@ export class RepertoireService {
   }
 
   addContact(contact: Contact): Observable<any> {
-    console.log(contact);
-
+    const teamId = this.tokenService.getCurrentTeamId()
     return this.http.post(`${this.apiUrl}/contacts/add`, contact);
   }
 
-  deleteContact(contact: Contact): Observable<any> {
-    return this.http.delete(`${this.apiUrl}/contacts/delete/1`);
+  deleteContact(contactId: number): Observable<any> {
+    return this.http.delete(`${this.apiUrl}/contacts/delete/${contactId}`);
   }
 
   updateContact(contact: Contact): Observable<any> {
-    return this.http.put(`${this.apiUrl}/contacts/update/1`, contact);
+    return this.http.put(`${this.apiUrl}/contacts/update/`, contact);
   }
 }

src/app/services/todo-service.service.ts

@@ -1,43 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { environment } from 'src/environments/environment';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class TodoServiceService {
-  private toDoList: any;
-  private apiUrl: string;
-
-
-  constructor(private http: HttpClient) {
-    this.apiUrl = environment.apiUrl;
-  }
-
-  //consulter toDoList
-  getToDoList(){
-    this.toDoList = this.http.get(`${this.apiUrl}/todolist/team/{team_id}`);
-    return this.toDoList;
-    console.log(this.toDoList)
-}
-
-//ajouter une tache
-  addTitle(title:string){
-    this.toDoList.push({
-      title:title,
-      isChecked: false
-    });
-  }
-// cocher et décocher la checkbox
-  checkOrUnCheckTitle($key: string,flag: boolean){
-    this.toDoList.update($key,{isChecked:flag});
-  }
-
-//supprimer la tache
-removeTitle($key : string){
-  this.toDoList.remove($key);
-}
-
-
-
-}

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

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

src/app/services/todo.service.ts

@@ -0,0 +1,31 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+import { Tache } from '../models/tache';
+import { ToDoList } from '../models/to-do-list';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TodoService {
+  private toDoList: any;
+  private apiUrl: string;
+
+  constructor(private http: HttpClient) {
+    this.apiUrl = environment.apiUrl;
+  }
+
+  getToDoListByTeamId(): Observable<any> {
+    return this.http.get(`${this.apiUrl}/todolist/team/1`);
+  }
+
+  deleteTacheById(idTache: any): Observable<any> {
+    return this.http.delete(`${this.apiUrl}/taches/delete/${idTache}`,{responseType:'text'});
+  }
+
+  addTache(newtache: Tache,idTodoList:number): Observable<any> {
+    console.log(newtache +'gkggg');
+    return this.http.post(`${this.apiUrl}/taches/add/${idTodoList}`, newtache);
+  }
+}

src/app/todo-list.ts

@@ -0,0 +1,2 @@
+export interface TodoList {
+}