merge conflicts

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

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

src/app/services/membre.service.ts

@@ -0,0 +1,40 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+import { Membre } from '../models/membre';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MembreService {
+  apiUrl: string;
+  tokenKey: string;
+
+  constructor(private http: HttpClient) {
+    this.apiUrl = environment.apiUrl;
+    this.tokenKey = environment.tokenKey;
+   }
+
+   getMembres(): Observable<any> {
+    return this.http.get(`${this.apiUrl}/membres/all`);
+  }
+
+  getMembreId(id: any): Observable<any> {
+    return this.http.get(`${this.apiUrl}/membres/1` + id);
+  }
+
+  addMembre(membre: Membre): Observable<any> {
+    console.log(membre);
+
+    return this.http.post(`${this.apiUrl}/membres/add`, membre);
+  }
+
+  deleteMembre(membre: Membre): Observable<any> {
+    return this.http.delete(`${this.apiUrl}/membres/delete/1`);
+  }
+
+  updateMembre(membre: Membre): Observable<any> {
+    return this.http.put(`${this.apiUrl}/membres/update/1`, membre);
+  }
+}

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

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

src/app/services/team.service.ts

@@ -0,0 +1,41 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+import { Team } from '../models/team';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class TeamService {
+  apiUrl: string;
+  tokenKey: string;
+
+
+  constructor(private http: HttpClient) {
+    this.apiUrl = environment.apiUrl;
+    this.tokenKey = environment.tokenKey;
+  }
+  getTeams(): Observable<any> {
+    return this.http.get(`${this.apiUrl}/teams/all`);
+  }
+
+  getTeamById(id: any): Observable<any> {
+    return this.http.get(`${this.apiUrl}/teams/1` + id);
+  }
+
+  addTeam(team: Team): Observable<any> {
+    console.log(team);
+
+    return this.http.post(`${this.apiUrl}/teams/add`, team);
+  }
+
+  deleteTeam(team: Team): Observable<any> {
+    return this.http.delete(`${this.apiUrl}/teams/delete/1`);
+  }
+
+  updateTeam(team: Team): Observable<any> {
+    return this.http.put(`${this.apiUrl}/teams/update/1`, team);
+  }
+
+}