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
4 changes: 3 additions & 1 deletion src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<app-home></app-home>
<app-navbar></app-navbar>
<!-- <app-home></app-home> -->
<router-outlet></router-outlet>
7 changes: 4 additions & 3 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
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'
styleUrl: './app.component.css',
})
export class AppComponent {
title = 'TASK-NG-Routing';
Expand Down
22 changes: 20 additions & 2 deletions src/app/app.routes.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
import { Routes } from '@angular/router';
import { RouterModule, Routes } from '@angular/router';

export const routes: Routes = [];
export const routes: Routes = [
{
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: '',
loadComponent: () =>
import('./pages/home/home.component').then((m) => m.HomeComponent),
},
];
5 changes: 3 additions & 2 deletions src/app/components/navbar/navbar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
<div class="navbar-links" id="navbarResponsive">
<ul class="navbar-list">
<li class="navbar-item">
<a href="#" class="navbar-link">Home</a>
<a routerLink="" 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>
</div>
</div>
</nav>
<router-outlet></router-outlet>
11 changes: 5 additions & 6 deletions src/app/components/navbar/navbar.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { Component } from '@angular/core';

import { RouterLink, RouterOutlet } from '@angular/router';
import { RouterModule } from '@angular/router';
@Component({
selector: 'app-navbar',
standalone: true,
imports: [],
imports: [RouterModule],
templateUrl: './navbar.component.html',
styleUrl: './navbar.component.css'
styleUrl: './navbar.component.css',
})
export class NavbarComponent {

}
export class NavbarComponent {}
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,5 +1,5 @@
<div class="trip-card-wrapper">
<div class="trip-card">
<div class="trip-card" routerLink="{{ trip.id }}">
<div class="trip-card-overlay">
<div class="trip-card-icon">
<i class="fas fa-plus"></i>
Expand Down
6 changes: 5 additions & 1 deletion src/app/components/trip-card/trip-card.component.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import { Component, Input } from '@angular/core';
import { Trip } from '../../../data/trips';
import { RouterModule } from '@angular/router';

@Component({
selector: 'app-trip-card',
standalone: true,
imports: [],
imports: [RouterModule],
templateUrl: './trip-card.component.html',
styleUrl: './trip-card.component.css',
})
export class TripCardComponent {
@Input() trip!: Trip;
test() {
console.log(this.trip);
}
}
10 changes: 5 additions & 5 deletions src/app/pages/home/home.component.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<app-navbar></app-navbar>
<!-- <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">
<!-- <section class="explore-section" id="portfolio">
<div class="explore-container">
<h2 class="explore-title">Explore Trips</h2>
<br />
Expand All @@ -18,8 +18,8 @@ <h2 class="explore-title">Explore Trips</h2>
[trips]="filteredTrips"
></app-trips-grid>
</div>
</section>
</section> -->

@if (selectedTrip) {
<!-- @if (selectedTrip) {
<app-trip-details [trip]="selectedTrip"></app-trip-details>
}
} -->
Empty file.
4 changes: 4 additions & 0 deletions src/app/pages/trip/trip.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@if (selectedTrip) {
<app-trip-details [trip]="selectedTrip"></app-trip-details>
}
<!-- <router-outlet></router-outlet> -->
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();
});
});
28 changes: 28 additions & 0 deletions src/app/pages/trip/trip.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { Component, Input } from '@angular/core';
import { Trip, trips } from '../../../data/trips';
import { TripDetailsComponent } from '../../components/trip-details/trip-details.component';
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
@Component({
selector: 'app-trip',
standalone: true,
imports: [TripDetailsComponent, RouterModule],
templateUrl: './trip.component.html',
styleUrl: './trip.component.css',
})
export class TripComponent {
// selectedTrip: Trip = trips[0];
selectedTrip?: Trip;

constructor(private route: ActivatedRoute, private router: Router) {
const id = +this.route.snapshot.paramMap.get('slug')!;
this.selectedTrip = trips.find((trip) => trip.id === id); // Find the fruit by ID
// console.log('PLEASE WORK!!!');
// console.log(this.selectedTrip);

if (!this.selectedTrip) {
// this.router.navigate(['/trips-list']);
this.router.navigate(['/trips-list']);
console.log('trip selected: ', this.selectedTrip);
}
}
}
Empty file.
20 changes: 20 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,20 @@
<!-- 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"
(tripSelected)="selectedTrip = $event"
></app-trips-grid> -->
<app-trips-grid
[trips]="filteredTrips"
(tripSelected)="(selectedTrip)"
></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();
});
});
44 changes: 44 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,44 @@
import { Component } from '@angular/core';
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 { 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];
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;
});
}
}