From e1aa5de1ff35a4b80674e12cd589f38160840ff9 Mon Sep 17 00:00:00 2001
From: rfo97 <rfa.alobaid@gmail.com>
Date: Thu, 24 Apr 2025 13:17:07 +0300
Subject: [PATCH] feat: calling apis instead of static data

---
 src/app/app.config.ts                         |  4 +--
 .../pet-details/pet-details.component.html    | 12 +++----
 .../pet-details/pet-details.component.ts      | 36 +++++++++++++------
 src/app/pages/pets/pets.component.ts          | 23 +++++++++---
 src/app/shared/services/modal.service.ts      | 31 ++++++++++++++--
 src/app/shared/services/pet.service.spec.ts   | 16 +++++++++
 src/app/shared/services/pet.service.ts        | 34 ++++++++++++++++++
 7 files changed, 130 insertions(+), 26 deletions(-)
 create mode 100644 src/app/shared/services/pet.service.spec.ts
 create mode 100644 src/app/shared/services/pet.service.ts

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 6c6ef60..86430cb 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -1,8 +1,8 @@
 import { ApplicationConfig } from '@angular/core';
 import { provideRouter } from '@angular/router';
-
+import { provideHttpClient } from '@angular/common/http';
 import { routes } from './app.routes';
 
 export const appConfig: ApplicationConfig = {
-  providers: [provideRouter(routes)]
+  providers: [provideRouter(routes), provideHttpClient()],
 };
diff --git a/src/app/pages/pet-details/pet-details.component.html b/src/app/pages/pet-details/pet-details.component.html
index 689c304..d07a67b 100644
--- a/src/app/pages/pet-details/pet-details.component.html
+++ b/src/app/pages/pet-details/pet-details.component.html
@@ -4,17 +4,17 @@
   >
     <div class="h-full w-full md:w-[35%]">
       <img
-        [src]="pet?.image"
-        [alt]="pet?.name"
+        [src]="pet()?.image"
+        [alt]="pet()?.name"
         class="object-contain w-full h-full"
       />
     </div>
     <div class="w-full md:w-[65%] h-full pt-[30px] flex flex-col p-3">
-      <h1>Name: {{ pet?.name }}</h1>
-      <h1>Type: {{ pet?.type }}</h1>
-      <h1>Adopted: {{ pet?.adopted ? "yes" : "no" }}</h1>
+      <h1>Name: {{ pet()?.name }}</h1>
+      <h1>Type: {{ pet()?.type }}</h1>
+      <h1>Adopted: {{ pet()?.adopted ? "yes" : "no" }}</h1>
 
-      @if (!pet?.adopted) {
+      @if (!pet()?.adopted) {
       <button
         class="w-[70px] border border-black rounded-md hover:bg-green-400 my-5"
       >
diff --git a/src/app/pages/pet-details/pet-details.component.ts b/src/app/pages/pet-details/pet-details.component.ts
index 7159e7b..5aa9635 100644
--- a/src/app/pages/pet-details/pet-details.component.ts
+++ b/src/app/pages/pet-details/pet-details.component.ts
@@ -1,26 +1,40 @@
-import { Component } from '@angular/core';
+import { Component, effect, inject, signal } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Pet, pets } from '../../../data/pets';
+import { PetService } from '../../shared/services/pet.service';
+import { HttpClient } from '@angular/common/http';
 
 @Component({
   selector: 'app-pet-details',
   standalone: true,
   imports: [],
   templateUrl: './pet-details.component.html',
-  styleUrl: './pet-details.component.css'
+  styleUrl: './pet-details.component.css',
 })
 export class PetDetailsComponent {
-  pet: Pet | null = null;
-  pets = pets;
+  pet = signal<Pet | undefined>(undefined);
 
-  constructor(private route: ActivatedRoute, private router: Router) {
+  private petService = inject(PetService);
+  pets = signal<Pet[]>([]);
+
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private http: HttpClient
+  ) {
     const id = Number(this.route.snapshot.paramMap.get('id'));
-    const foundPet = pets.find((p) => p.id === id);
 
-    if (!foundPet) {
-      this.router.navigate(['/pets']);
-    } else {
-      this.pet = foundPet;
-    }
+    effect(() => {
+      this.petService.getPetById(id).subscribe((response: Pet) => {
+        console.log(response); // log the response
+        this.pet.set(response); // ✅ Update signal
+      });
+    });
+
+    // if (!foundPet) {
+    //   this.router.navigate(['/pets']);
+    // } else {
+    //   this.pet = foundPet;
+    // }
   }
 }
diff --git a/src/app/pages/pets/pets.component.ts b/src/app/pages/pets/pets.component.ts
index 5628fb3..bd2ac3c 100644
--- a/src/app/pages/pets/pets.component.ts
+++ b/src/app/pages/pets/pets.component.ts
@@ -1,25 +1,38 @@
-import { Component } from '@angular/core';
+import { Component, effect, Inject, inject, signal } from '@angular/core';
 import { PetsHeaderComponent } from '../../components/pets-header/pets-header.component';
 import { PetsListComponent } from '../../components/pets-list/pets-list.component';
-import { pets } from '../../../data/pets';
+import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { PetService } from '../../shared/services/pet.service';
+import { Pet } from '../../../data/pets';
+// import { pets } from '../../../data/pets';
 
 @Component({
   selector: 'app-pets',
   standalone: true,
-  imports: [PetsHeaderComponent, PetsListComponent],
+  imports: [PetsHeaderComponent, PetsListComponent, HttpClientModule],
   templateUrl: './pets.component.html',
   styleUrl: './pets.component.css',
 })
 export class PetsComponent {
   query = '';
-  allPets = pets;
+  private petService = inject(PetService);
+  allPets = signal<Pet[]>([]);
 
   setQuery(query: string) {
     this.query = query;
   }
 
+  constructor(private http: HttpClient) {
+    effect(() => {
+      this.petService.getPets().subscribe((response: Pet[]) => {
+        console.log(response); // log the response
+        this.allPets.set(response); // ✅ Update signal
+      });
+    });
+  }
+
   get filteredPets() {
-    return this.allPets.filter((pet) =>
+    return this.allPets().filter((pet: { name: string }) =>
       pet.name.toLowerCase().includes(this.query.toLowerCase())
     );
   }
diff --git a/src/app/shared/services/modal.service.ts b/src/app/shared/services/modal.service.ts
index bfc6244..c2e8174 100644
--- a/src/app/shared/services/modal.service.ts
+++ b/src/app/shared/services/modal.service.ts
@@ -5,15 +5,17 @@ import {
   createComponent,
   EnvironmentInjector,
   ComponentRef,
-  ViewContainerRef
+  ViewContainerRef,
+  inject,
 } from '@angular/core';
 import { ModalHostComponent } from '../components/modal-host/modal-host.component';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 
 @Injectable({ providedIn: 'root' })
 export class ModalService {
   private hostRef?: ComponentRef<ModalHostComponent>;
   private containerRef?: ViewContainerRef;
-
+  private readonly _http = inject(HttpClient);
   constructor(
     private appRef: ApplicationRef,
     private envInjector: EnvironmentInjector
@@ -49,4 +51,29 @@ export class ModalService {
       this.hostRef = undefined;
     }
   }
+
+  get<T>(url: string, params?: HttpParams, headers?: HttpHeaders) {
+    return this._http.get<T>(url, { params, headers });
+  }
+
+  /**
+   * Generic POST method to add new data
+   */
+  post<T>(url: string, body: T, headers?: HttpHeaders) {
+    return this._http.post<T>(url, body, { headers });
+  }
+
+  /**
+   * Generic PUT method to update data
+   */
+  put<T>(url: string, body: T, headers?: HttpHeaders) {
+    return this._http.put<T>(url, body, { headers });
+  }
+
+  /**
+   * Generic DELETE method to remove data
+   */
+  delete<T>(url: string, params?: HttpParams, headers?: HttpHeaders) {
+    return this._http.delete<T>(url, { params, headers });
+  }
 }
diff --git a/src/app/shared/services/pet.service.spec.ts b/src/app/shared/services/pet.service.spec.ts
new file mode 100644
index 0000000..d56a968
--- /dev/null
+++ b/src/app/shared/services/pet.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { PetService } from './pet.service';
+
+describe('PetService', () => {
+  let service: PetService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(PetService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/services/pet.service.ts b/src/app/shared/services/pet.service.ts
new file mode 100644
index 0000000..547a2ff
--- /dev/null
+++ b/src/app/shared/services/pet.service.ts
@@ -0,0 +1,34 @@
+// post.service.ts
+import { Injectable } from '@angular/core';
+// import { HttpClient } from '@angular/common/http';
+import { ModalService } from './modal.service';
+import { catchError, Observable, of } from 'rxjs';
+import { Pet } from '../../../data/pets';
+
+@Injectable({ providedIn: 'root' })
+export class PetService extends ModalService {
+  private apiUrl = 'https://pets-react-query-backend.eapi.joincoded.com/pets';
+
+  // ✅ No need to inject HttpClient here — it's handled by BaseService via inject()
+  // constructor(_http: HttpClient) {
+  //   super(_http);
+  // }
+
+  getPets(): Observable<Pet[]> {
+    return this.get<Pet[]>(this.apiUrl).pipe(
+      catchError((error) => {
+        console.error('Error fetching posts:', error); // Log the error for debugging
+        return of([]); // Return an empty array to prevent the app from breaking in case of an error
+      })
+    );
+  }
+
+  getPetById(id: number): Observable<Pet> {
+    return this.get<Pet>(this.apiUrl + `/${id}`).pipe(
+      catchError((error) => {
+        console.error('Error fetching posts:', error); // Log the error for debugging
+        return of(); // Return an empty array to prevent the app from breaking in case of an error
+      })
+    );
+  }
+}