+
+
+
diff --git a/src/app/pages/page-to-do-list/page-to-do-list.component.html b/src/app/pages/page-to-do-list/page-to-do-list.component.html
index 9eed39a..f58dc34 100644
--- a/src/app/pages/page-to-do-list/page-to-do-list.component.html
+++ b/src/app/pages/page-to-do-list/page-to-do-list.component.html
@@ -1,5 +1,9 @@
-
+
diff --git a/src/app/pages/page-to-do-list/page-to-do-list.component.ts b/src/app/pages/page-to-do-list/page-to-do-list.component.ts
index c7240b0..81ebd86 100644
--- a/src/app/pages/page-to-do-list/page-to-do-list.component.ts
+++ b/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);
+ });
+
+
}
}
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 7075133..cb305fc 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -41,9 +41,9 @@ export class AuthService {
return this.http.post(`${this.apiUrl}/membres/sign-in`, body).pipe(
map((x: any) => {
- console.log('Service : ', x.accessToken);
+ console.log('Service : ', x.token);
// Modification à faire ici
- localStorage.setItem(this.tokenKey, x.accessToken);
+ localStorage.setItem(this.tokenKey, x.token);
return x; // permet de renvoyer la réponse à l'initiateur (page Signin) après le traitement du map
})
);
diff --git a/src/app/services/menus.service.spec.ts b/src/app/services/menus.service.spec.ts
new file mode 100644
index 0000000..def27f5
--- /dev/null
+++ b/src/app/services/menus.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { MenusService } from './menus.service';
+
+describe('MenusService', () => {
+ let service: MenusService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(MenusService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/menus.service.ts b/src/app/services/menus.service.ts
new file mode 100644
index 0000000..a762025
--- /dev/null
+++ b/src/app/services/menus.service.ts
@@ -0,0 +1,51 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { map, Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+import { Menu } from '../models/menu';
+import { Router } from '@angular/router';
+import { TokenService } from './token.service';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class MenusService {
+
+apiUrl: string;
+
+
+ constructor(private http: HttpClient, private router: Router, private tokenService: TokenService) {
+ // On se sert des variables d'environnement de notre application
+ this.apiUrl = environment.apiUrl;
+ }
+
+ //on affiche les menus d'une team
+ getMenu(): Observable
| void {
+ const teamId = this.tokenService.getCurrentTeamId();
+ if (teamId){
+ return this.http.get(`${this.apiUrl}/menus/team/${teamId}`);
+ }else {
+ this.router.navigate(['accueil']);
+ }
+ }
+
+ getMenuById(id: any): Observable {
+ return this.http.get(`${this.apiUrl}/menus/` + id);
+ }
+
+ addMenu(menu: Menu): Observable {
+ console.log(menu);
+
+ return this.http.post(`${this.apiUrl}/menus/add`, menu);
+ }
+
+ deleteMenu(id: any): Observable {
+ return this.http.delete(`${this.apiUrl}/menus/delete/`+ id);
+ }
+
+ updateMenu(menu: Menu): Observable {
+ return this.http.put(`${this.apiUrl}/contacts/update/`, menu);
+ }
+}
+
+
diff --git a/src/app/services/todo-service.service.ts b/src/app/services/todo-service.service.ts
deleted file mode 100644
index e0d597a..0000000
--- a/src/app/services/todo-service.service.ts
+++ /dev/null
@@ -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);
-}
-
-
-
-}
diff --git a/src/app/services/todo.service.spec.ts b/src/app/services/todo.service.spec.ts
new file mode 100644
index 0000000..41eb649
--- /dev/null
+++ b/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();
+ });
+});
diff --git a/src/app/services/todo.service.ts b/src/app/services/todo.service.ts
new file mode 100644
index 0000000..f208bdd
--- /dev/null
+++ b/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 {
+ return this.http.get(`${this.apiUrl}/todolist/team/1`);
+ }
+
+ deleteTacheById(idTache: any): Observable {
+ return this.http.delete(`${this.apiUrl}/taches/delete/${idTache}`,{responseType:'text'});
+ }
+
+ addTache(newtache: Tache,idTodoList:number): Observable {
+ console.log(newtache);
+ return this.http.post(`${this.apiUrl}/taches/add/${idTodoList}`, newtache);
+ }
+}
diff --git a/src/app/services/token.service.spec.ts b/src/app/services/token.service.spec.ts
new file mode 100644
index 0000000..7930902
--- /dev/null
+++ b/src/app/services/token.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { TokenService } from './token.service';
+
+describe('TokenService', () => {
+ let service: TokenService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(TokenService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/token.service.ts b/src/app/services/token.service.ts
new file mode 100644
index 0000000..ef13ff6
--- /dev/null
+++ b/src/app/services/token.service.ts
@@ -0,0 +1,45 @@
+import { Injectable } from '@angular/core';
+import { environment } from 'src/environments/environment';
+import jwt_decode from 'jwt-decode';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class TokenService {
+tokenKey = environment.tokenKey;
+
+ constructor() { }
+
+ public getToken(): string | null {
+ const token = localStorage.getItem(this.tokenKey);
+ if(token) {
+ return token;
+ } else {
+ return null;
+ }
+ }
+
+ public getCurrentMembreId(): number | null {
+ const token = this.getToken();
+ if(token) {
+ const decodedToken = jwt_decode(token);
+ const userId = decodedToken.sub;
+ return userId;
+ } else {
+ return null;
+ }
+ }
+
+ public getCurrentTeamId(): number | null {
+ const token = this.getToken();
+ if(token){
+ const decodedToken = jwt_decode(token);
+ const teamId = decodedToken.teamId;
+ return teamId ;
+
+ }else {
+return null;
+ }
+
+ }
+}
diff --git a/src/app/todo-list.ts b/src/app/todo-list.ts
new file mode 100644
index 0000000..f99121f
--- /dev/null
+++ b/src/app/todo-list.ts
@@ -0,0 +1,2 @@
+export interface TodoList {
+}