Heba Mahmoud

src/app/app.component.html

@@ -1 +1,2 @@
-<app-home></app-home>
+<app-navbar></app-navbar>
+<router-outlet></router-outlet>

src/app/app.component.ts

@@ -1,10 +1,12 @@
 import { Component } from '@angular/core';
 import { HomeComponent } from './pages/home/home.component';
+import { NavbarComponent } from "./components/navbar/navbar.component";
+import { RouterModule } from '@angular/router';
 
 @Component({
   selector: 'app-root',
   standalone: true,
-  imports: [HomeComponent],
+  imports: [HomeComponent, NavbarComponent, RouterModule],
   templateUrl: './app.component.html',
   styleUrl: './app.component.css'
 })

src/app/app.routes.ts

@@ -1,3 +1,24 @@
 import { Routes } from '@angular/router';
 
-export const routes: Routes = [];
+export const routes: Routes = [
+    {
+        path: '',
+        loadComponent: () =>
+          import('./pages/home/home.component').then(m => m.HomeComponent)
+      },{
+    path: 'trips',
+    loadComponent: () =>
+      import('./pages/trips-list/trips-list.component').then(m => m.TripsListComponent)
+    },{
+        path: 'trips/:id',
+        loadComponent: () =>
+          import('./pages/trip/trip.component').then(m => m.TripComponent)
+      },
+      {
+        path: '**',
+        redirectTo: '',
+      },{
+        path: '**',
+        redirectTo: '',
+      }
+];

src/app/components/navbar/navbar.component.html

@@ -6,10 +6,10 @@
       <div class="navbar-links" id="navbarResponsive">
         <ul class="navbar-list">
           <li class="navbar-item">
-            <a href="#" class="navbar-link">Home</a>
+            <a [routerLink]="['']" routerLinkActive="router-link-active"  class="navbar-link">Home</a>
           </li>
           <li class="navbar-item">
-            <a href="#" class="navbar-link">Trips</a>
+            <a [routerLink]="['/trips']" class="navbar-link">Trips</a>
           </li>
         </ul>
       </div>

src/app/components/navbar/navbar.component.ts

@@ -1,9 +1,10 @@
 import { Component } from '@angular/core';
+import { RouterModule } from '@angular/router';
 
 @Component({
   selector: 'app-navbar',
   standalone: true,
-  imports: [],
+  imports: [RouterModule],
   templateUrl: './navbar.component.html',
   styleUrl: './navbar.component.css'
 })

src/app/components/search-filter/search-filter.component.html

@@ -3,7 +3,9 @@
     type="search"
     class="search-input"
     placeholder="Search"
-    (input)="onSearch($event)"
+    #search
+    [value]="searchString"
+    (input)="onSearch(search.value)"
   />
   <div class="filter-buttons">
     @for (level of difficultyLevels; track $index) {

src/app/components/search-filter/search-filter.component.ts

@@ -1,5 +1,6 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { DifficultyLevel } from '../../../data/trips';
+import { ActivatedRoute, Router } from '@angular/router';
 
 @Component({
   selector: 'app-search-filter',
@@ -14,10 +15,28 @@ export class SearchFilterComponent {
 
   difficultyLevels: DifficultyLevel[] = ['All','Easy', 'Moderate', 'Hard'];
   activeFilter: DifficultyLevel = 'All';
+  searchString: string = '';
 
-  onSearch(event: Event) {
-    const inputElement = event.target as HTMLInputElement;
-    this.searchChange.emit(inputElement.value);
+  constructor(private route: ActivatedRoute, private router: Router) {
+    this.route.queryParams.subscribe((params) => {
+      const difficulty = params['difficulty'] as DifficultyLevel;
+      const search = params['search'] as string;
+
+      if (difficulty && ['Easy', 'Medium', 'Hard'].includes(difficulty)) {
+        this.filterByDifficulty(difficulty);
+      }
+
+      if(search != '' && search != undefined)
+      {
+        this.searchString = search
+        this.onSearch(search)
+      }
+    });
+  }
+
+  onSearch(srch: string){//event: Event) {
+    // const inputElement = event.target as HTMLInputElement;
+    this.searchChange.emit(srch);//inputElement.value);
   }
 
   filterByDifficulty(level: DifficultyLevel) {

src/app/components/trips-grid/trips-grid.component.html

@@ -1,5 +1,5 @@
 <div class="trips-grid">
   @for (trip of trips; track trip.id) {
-  <app-trip-card [trip]="trip"></app-trip-card>
+  <app-trip-card [trip]="trip" [routerLink]="['/trips', trip.id]"></app-trip-card>
   }
 </div>

src/app/components/trips-grid/trips-grid.component.ts

@@ -1,11 +1,12 @@
 import { Component, Input } from '@angular/core';
 import { Trip } from '../../../data/trips';
 import { TripCardComponent } from '../trip-card/trip-card.component';
+import { RouterModule } from '@angular/router';
 
 @Component({
   selector: 'app-trips-grid',
   standalone: true,
-  imports: [TripCardComponent],
+  imports: [TripCardComponent, RouterModule],
   templateUrl: './trips-grid.component.html',
   styleUrl: './trips-grid.component.css'
 })

src/app/pages/home/home.component.html

@@ -1,25 +1,4 @@
-<app-navbar></app-navbar>
-
 <app-banner
   title="Welcome To Hike"
   subtitle="a delightful way to explore nature with friends and family"
 ></app-banner>
-
-<section class="explore-section" id="portfolio">
-  <div class="explore-container">
-    <h2 class="explore-title">Explore Trips</h2>
-    <br />
-    <app-search-filter
-      (searchChange)="handleSearch($event)"
-      (filterChange)="handleFilter($event)"
-    ></app-search-filter>
-    <app-divider></app-divider>
-    <app-trips-grid
-      [trips]="filteredTrips"
-    ></app-trips-grid>
-  </div>
-</section>
-
-@if (selectedTrip) {
-<app-trip-details [trip]="selectedTrip"></app-trip-details>
-}

src/app/pages/home/home.component.ts

@@ -22,34 +22,5 @@ import { NavbarComponent } from '../../components/navbar/navbar.component';
   styleUrl: './home.component.css',
 })
 export class HomeComponent {
-  trips: Trip[] = trips;
-  filteredTrips: Trip[] = [...trips];
-  selectedTrip: Trip = trips[0];
-  searchQuery: string = '';
-  activeDifficultyFilter: DifficultyLevel = 'All';
 
-  handleSearch(searchTerm: string) {
-    this.searchQuery = searchTerm.toLowerCase();
-    this.applyFilters();
-  }
-
-  handleFilter(difficulty: DifficultyLevel) {
-    this.activeDifficultyFilter = difficulty;
-    this.applyFilters();
-  }
-
-  private applyFilters() {
-    this.filteredTrips = this.trips.filter((trip) => {
-      const matchesSearch =
-        !this.searchQuery ||
-        trip.name.toLowerCase().includes(this.searchQuery.toLowerCase()) ||
-        trip.city.toLowerCase().includes(this.searchQuery.toLowerCase()) 
-
-      const matchesDifficulty =
-        this.activeDifficultyFilter === 'All' ||
-        trip.difficulty === this.activeDifficultyFilter;
-
-      return matchesSearch && matchesDifficulty;
-    });
-  }
 }

src/app/pages/trip/trip.component.html

@@ -0,0 +1,3 @@
+@if (selectedTrip) {
+    <app-trip-details [trip]="selectedTrip"></app-trip-details>
+    }

src/app/pages/trip/trip.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TripComponent } from './trip.component';
+
+describe('TripComponent', () => {
+  let component: TripComponent;
+  let fixture: ComponentFixture<TripComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TripComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(TripComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/trip/trip.component.ts

@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { TripDetailsComponent } from "../../components/trip-details/trip-details.component";
+import { Trip, trips } from '../../../data/trips';
+import { ActivatedRoute, Router } from '@angular/router';
+
+@Component({
+  selector: 'app-trip',
+  standalone: true,
+  imports: [TripDetailsComponent],
+  templateUrl: './trip.component.html',
+  styleUrl: './trip.component.css'
+})
+export class TripComponent {
+  selectedTrip: Trip | undefined;
+
+  constructor(private route: ActivatedRoute, private router: Router) {
+    const id = +this.route.snapshot.paramMap.get('id')!;
+    this.selectedTrip = trips.find((trip) => trip.id === id);
+    if (!this.selectedTrip) {
+      this.router.navigate(['/trips']);
+    }
+  }
+}

src/app/pages/trips-list/trips-list.component.html

@@ -0,0 +1,19 @@
+<section class="explore-section" id="portfolio">
+    <div class="explore-container">
+      <h2 class="explore-title">Explore Trips</h2>
+      <br />
+      <app-search-filter
+        (searchChange)="handleSearch($event)"
+        (filterChange)="handleFilter($event)"
+      ></app-search-filter>
+      <app-divider></app-divider>
+      @if(filteredTrips.length > 0){
+        <app-trips-grid 
+        [trips]="filteredTrips"
+      ></app-trips-grid>
+      }
+      @else {
+        <h3>No trips found!</h3>
+    }
+    </div>
+  </section>

src/app/pages/trips-list/trips-list.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TripsListComponent } from './trips-list.component';
+
+describe('TripsListComponent', () => {
+  let component: TripsListComponent;
+  let fixture: ComponentFixture<TripsListComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TripsListComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(TripsListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/trips-list/trips-list.component.ts

@@ -0,0 +1,75 @@
+import { Component } from '@angular/core';
+import { Trip, trips, DifficultyLevel } from '../../../data/trips';
+import { SearchFilterComponent } from "../../components/search-filter/search-filter.component";
+import { DividerComponent } from "../../components/divider/divider.component";
+import { TripsGridComponent } from "../../components/trips-grid/trips-grid.component";
+import { ActivatedRoute, Router } from '@angular/router';
+
+@Component({
+  selector: 'app-trips-list',
+  standalone: true,
+  imports: [SearchFilterComponent, DividerComponent, TripsGridComponent],
+  templateUrl: './trips-list.component.html',
+  styleUrl: './trips-list.component.css'
+})
+export class TripsListComponent {
+  trips: Trip[] = trips;
+  filteredTrips: Trip[] = [...trips];
+  searchQuery: string = '';
+  activeDifficultyFilter: DifficultyLevel = 'All';
+
+  constructor(private route: ActivatedRoute, private router: Router) {
+    this.route.queryParams.subscribe((params) => {
+      const difficulty = params['difficulty'] as DifficultyLevel;
+      const search = params['search'] as string;
+
+      if (difficulty && ['Easy', 'Medium', 'Hard'].includes(difficulty)) {
+        this.activeDifficultyFilter = difficulty;
+        this.applyFilters();
+      }
+
+      if(search != '')
+      {
+        this.searchQuery = search;
+        this.applyFilters();
+      }
+    });
+  }
+
+  handleSearch(searchTerm: string) {
+    this.searchQuery = searchTerm.toLowerCase();
+
+    this.router.navigate([], {
+      queryParams: { search: this.searchQuery !== '' ? this.searchQuery : null },
+      queryParamsHandling: 'merge',
+    });
+
+    this.applyFilters();
+  }
+
+  handleFilter(difficulty: DifficultyLevel) {
+    this.activeDifficultyFilter = difficulty;
+
+    this.router.navigate([], {
+      queryParams: { difficulty: difficulty !== 'All' ? difficulty : null },
+      queryParamsHandling: 'merge',
+    });
+
+    this.applyFilters();
+  }
+
+  private applyFilters() {
+    this.filteredTrips = this.trips.filter((trip) => {
+      const matchesSearch =
+        !this.searchQuery ||
+        trip.name.toLowerCase().includes(this.searchQuery.toLowerCase()) ||
+        trip.city.toLowerCase().includes(this.searchQuery.toLowerCase()) 
+
+      const matchesDifficulty =
+        this.activeDifficultyFilter === 'All' ||
+        trip.difficulty === this.activeDifficultyFilter;
+
+      return matchesSearch && matchesDifficulty;
+    });
+  }
+}