Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
<app-home></app-home>
<app-navbar></app-navbar>
<router-outlet></router-outlet>

<!-- <app-home></app-home> -->



4 changes: 3 additions & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { Component } from '@angular/core';
import { HomeComponent } from './pages/home/home.component';
import { RouterOutlet } from '@angular/router';
import { NavbarComponent } from "./components/navbar/navbar.component";

@Component({
selector: 'app-root',
standalone: true,
imports: [HomeComponent],
imports: [HomeComponent, RouterOutlet, NavbarComponent],
templateUrl: './app.component.html',
styleUrl: './app.component.css'
})
Expand Down
25 changes: 24 additions & 1 deletion src/app/app.routes.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
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/:slug',
loadComponent: () =>
import('./pages/trip/trip.component').then(m => m.TripComponent)
},

{
path: '**',
redirectTo: '',
}

];
4 changes: 2 additions & 2 deletions src/app/components/navbar/navbar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -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="/">Home</a>
</li>
<li class="navbar-item">
<a href="#" class="navbar-link">Trips</a>
<a routerLink="/trips" >Trips</a>
</li>
</ul>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/app/components/navbar/navbar.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Component } from '@angular/core';
import { RouterLink } from '@angular/router';

@Component({
selector: 'app-navbar',
standalone: true,
imports: [],
imports: [RouterLink],
templateUrl: './navbar.component.html',
styleUrl: './navbar.component.css'
})
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/trip-card/trip-card.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="trip-card-wrapper">
<div class="trip-card-wrapper" [routerLink]="['/trips', trip.slug]">
<div class="trip-card">
<div class="trip-card-overlay">
<div class="trip-card-icon">
Expand Down
5 changes: 3 additions & 2 deletions src/app/components/trip-card/trip-card.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Component, Input } from '@angular/core';
import { Trip } from '../../../data/trips';
import { Trip, trips } from '../../../data/trips';
import { Router, RouterLink, RouterModule } from '@angular/router';

@Component({
selector: 'app-trip-card',
standalone: true,
imports: [],
imports: [RouterModule],
templateUrl: './trip-card.component.html',
styleUrl: './trip-card.component.css',
})
Expand Down
25 changes: 2 additions & 23 deletions src/app/pages/home/home.component.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,4 @@
<app-navbar></app-navbar>

<app-banner
<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>
}
></app-banner>
44 changes: 7 additions & 37 deletions src/app/pages/home/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,46 +10,16 @@ import { NavbarComponent } from '../../components/navbar/navbar.component';
@Component({
selector: 'app-home',
standalone: true,
imports: [
BannerComponent,
SearchFilterComponent,
DividerComponent,
TripsGridComponent,
TripDetailsComponent,
NavbarComponent,
],
imports: [BannerComponent]
// SearchFilterComponent,
// DividerComponent,
// TripsGridComponent,
// TripDetailsComponent,
// NavbarComponent,
,
templateUrl: './home.component.html',
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;
});
}
}
Empty file.
7 changes: 7 additions & 0 deletions src/app/pages/trip/trip.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

@if (trip) {
<app-trip-details [trip]= "trip"></app-trip-details>
}



23 changes: 23 additions & 0 deletions src/app/pages/trip/trip.component.spec.ts
Original file line number Diff line number Diff line change
@@ -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();
});
});
29 changes: 29 additions & 0 deletions src/app/pages/trip/trip.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { Component, NgModule } from '@angular/core';
import { ActivatedRoute, RouterLink, RouterModule , Router} from '@angular/router';
import { DifficultyLevel, Trip, trips } from '../../../data/trips';
import { TripDetailsComponent } from "../../components/trip-details/trip-details.component";
import { NgIf } from '@angular/common';

@Component({
selector: 'app-trip',
standalone: true,
imports: [RouterModule, TripDetailsComponent, NgIf],
templateUrl: './trip.component.html',
styleUrl: './trip.component.css'
})
export class TripComponent {
trip!: Trip | undefined;

constructor(private route: ActivatedRoute, private router: Router) {
const slug = this.route.snapshot.paramMap.get('slug');
const foundTrip = trips.find(t => t.slug === slug);

if (foundTrip) {
this.trip = foundTrip;
} else {
this.router.navigate(['/trips']);
}
}

}

Empty file.
16 changes: 16 additions & 0 deletions src/app/pages/trips-list/trips-list.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

<!-- Move this to trips-list.component.html -->
<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>
23 changes: 23 additions & 0 deletions src/app/pages/trips-list/trips-list.component.spec.ts
Original file line number Diff line number Diff line change
@@ -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();
});
});
52 changes: 52 additions & 0 deletions src/app/pages/trips-list/trips-list.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { Component} from '@angular/core';
import { BannerComponent } from '../../components/banner/banner.component';
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 { TripDetailsComponent } from '../../components/trip-details/trip-details.component';
import { NavbarComponent } from '../../components/navbar/navbar.component';
import { DifficultyLevel, Trip, trips } from '../../../data/trips';


@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];
trip: 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;
});
}

}