From c5612e6b89896eb396e07437ac1ff5561079cb50 Mon Sep 17 00:00:00 2001
From: "kelly.nguyen" <kelly.nguyen@etu.hesge.ch>
Date: Sun, 3 Mar 2024 23:28:35 +0100
Subject: [PATCH] add api call function with token
---
.../app/table-list/table-list.component.ts | 35 +++++++++----------
.../src/app/user-list/user-list.component.ts | 2 +-
AngularApp/src/services/assignment.service.ts | 22 +++++++-----
3 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/AngularApp/src/app/table-list/table-list.component.ts b/AngularApp/src/app/table-list/table-list.component.ts
index c5abfef..923a602 100644
--- a/AngularApp/src/app/table-list/table-list.component.ts
+++ b/AngularApp/src/app/table-list/table-list.component.ts
@@ -1,8 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { Assignment } from 'app/model/assignment';
import { AssignmentService } from 'services/assignment.service';
-import { DatePipe } from '@angular/common';
-
@Component({
selector: 'app-table-list',
@@ -10,28 +8,29 @@ import { DatePipe } from '@angular/common';
styleUrls: ['./table-list.component.css']
})
export class TableListComponent implements OnInit {
- assignments : Assignment[] = []
- data : [] = []
+ assignments : Assignment[];
+ data : [] = [];
formattedDate : string
delStatus : string;
headers : string[] = ['Gitlab ID', 'Name', 'Description', 'Creation date', 'Last Update', 'gitlabLink', 'Options'];
constructor(private service : AssignmentService) { }
-
- delAssignment(id: number) {
- console.log(id);
- this.service.delAssignments(id).subscribe(
- () => {
- this.delStatus = 'Delete successful';
- },
- (error) => {
- console.error('Error deleting assignment:', error);
- this.delStatus = 'Delete failed';
- }
- );
- }
-
+
+ // delAssignment(id: number) {
+ // console.log(id);
+ // this.service.delAssignments(id).subscribe(
+ // () => {
+ // this.delStatus = 'Delete successful';
+ // },
+ // (error) => {
+ // console.error('Error deleting assignment:', error);
+ // this.delStatus = 'Delete failed';
+ // }
+ // );
+ // }
+
+
ngOnInit() {
this.service.getAssignments().subscribe((assignment) => {
this.assignments = assignment
diff --git a/AngularApp/src/app/user-list/user-list.component.ts b/AngularApp/src/app/user-list/user-list.component.ts
index 28d797d..c357ba4 100644
--- a/AngularApp/src/app/user-list/user-list.component.ts
+++ b/AngularApp/src/app/user-list/user-list.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { User } from 'app/model/user';
import { UserService } from '../../services/user.service';
-import UserRole from 'app/model/UserRole';
+import UserRolse from 'app/model/UserRole';
@Component({
selector: 'app-user-list',
diff --git a/AngularApp/src/services/assignment.service.ts b/AngularApp/src/services/assignment.service.ts
index 166b290..b434675 100644
--- a/AngularApp/src/services/assignment.service.ts
+++ b/AngularApp/src/services/assignment.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Assignment } from 'app/model/assignment';
import { Observable } from 'rxjs';
@@ -7,16 +7,22 @@ import { Observable } from 'rxjs';
providedIn: 'root'
})
export class AssignmentService {
- private baseUrl = 'http://192.168.1.156:3000';
+ private baseUrl = 'http://127.0.0.1:3000';
+ private token = '';
constructor(private http: HttpClient) {}
- getAssignments(): Observable<Assignment[]> {
- return this.http.get<Assignment[]>(`${this.baseUrl}/assignments`);
+ getAssignments() : Observable<Assignment[]> {
+ // Create headers and set the Authorization header with the token
+ const headers = new HttpHeaders().set('Authorization', `${this.token}`);
+
+ // Pass the headers as the third argument in the get request
+ // return this.http.get<Assignment[]>(`${this.baseUrl}/assignments`);
+ return this.http.get<Assignment[]>(`${this.baseUrl}/assignmentss`, { headers });
}
- delAssignments(id: number): Observable<any> {
- const url = `${this.baseUrl}/assignments/${id}`;
- return this.http.delete(url);
- }
+ // delAssignments(id: number): Observable<any> {
+ // const url = `${this.baseUrl}/assignments/${id}`;
+ // return this.http.delete(url);
+ // }
}
--
GitLab