diff --git a/src/app/components/pages/client-service/client-service.component.html b/src/app/components/pages/client-service/client-service.component.html index dd48660..fb95f3d 100644 --- a/src/app/components/pages/client-service/client-service.component.html +++ b/src/app/components/pages/client-service/client-service.component.html @@ -12,7 +12,7 @@ - + {{client.client_name}} {{client.delivery_status}} {{client.delivery_type}} diff --git a/src/app/components/pages/client-service/client-service.component.ts b/src/app/components/pages/client-service/client-service.component.ts index e449d57..217efa4 100644 --- a/src/app/components/pages/client-service/client-service.component.ts +++ b/src/app/components/pages/client-service/client-service.component.ts @@ -21,7 +21,6 @@ export class ClientServiceComponent implements OnInit { allDeliveryTasks!: DeliveryModel[]; constructor(private clientDeliveryService: ClientDeliveryService){} - ngOnInit(): void { // if(this.data.delivery_date === this.today) { // console.log("Date Matched") @@ -30,8 +29,7 @@ export class ClientServiceComponent implements OnInit { // console.log(this.data.delivery_date) // console.log(this.today) // } - - this.clientDeliveryService.allDelivery().subscribe(data => { + this.clientDeliveryService.allDelivery().subscribe(data=>{ this.allDeliveryTasks = data; }) } diff --git a/src/app/components/pages/client-service/client-service.service.ts b/src/app/components/pages/client-service/client-service.service.ts index 647f7ad..017bcda 100644 --- a/src/app/components/pages/client-service/client-service.service.ts +++ b/src/app/components/pages/client-service/client-service.service.ts @@ -3,13 +3,15 @@ import { Injectable } from "@angular/core"; import { DeliveryModel } from "./client-service.model"; import { Observable } from "rxjs"; -Injectable({'providedIn': 'root'}) +@Injectable({ + providedIn: 'root' + }) export class ClientDeliveryService { constructor(private httpClient: HttpClient){} allDelivery(): Observable { - return this.httpClient.get("http://localhost:3000/delivery") + return this.httpClient.get("http://localhost:3000/api/delivery") } } \ No newline at end of file diff --git a/src/app/components/pages/dashboard/dashboard-data.ts b/src/app/components/pages/dashboard/dashboard-data.ts index 360ad41..02836e5 100644 --- a/src/app/components/pages/dashboard/dashboard-data.ts +++ b/src/app/components/pages/dashboard/dashboard-data.ts @@ -114,7 +114,7 @@ export const service_links: navLink[] =[ export const shift_tasks = [ { "name" : "Client Delivery", - "url" : "http://118.67.213.117:12180/delivery" + "url" : "http://localhost:12180/delivery" }, { "name": "Monitoring Screenshots list",