mirror of
https://github.com/pacnpal/thrillwiki_django_no_react.git
synced 2025-12-29 01:47:00 -05:00
Add park detail API and detail page implementation with loading states and error handling
This commit is contained in:
99
frontend/src/app/parks/[slug]/loading.tsx
Normal file
99
frontend/src/app/parks/[slug]/loading.tsx
Normal file
@@ -0,0 +1,99 @@
|
||||
export default function ParkDetailLoading() {
|
||||
return (
|
||||
<main className="container mx-auto px-4 py-8 animate-pulse">
|
||||
<article className="bg-white rounded-lg shadow-lg p-6">
|
||||
{/* Header skeleton */}
|
||||
<header className="mb-8">
|
||||
<div className="h-10 w-3/4 bg-gray-200 rounded mb-4"></div>
|
||||
<div className="flex items-center gap-4">
|
||||
<div className="h-6 w-24 bg-gray-200 rounded-full"></div>
|
||||
<div className="h-6 w-32 bg-gray-200 rounded"></div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{/* Description skeleton */}
|
||||
<section className="mb-8">
|
||||
<div className="space-y-2">
|
||||
<div className="h-4 bg-gray-200 rounded w-full"></div>
|
||||
<div className="h-4 bg-gray-200 rounded w-5/6"></div>
|
||||
<div className="h-4 bg-gray-200 rounded w-4/6"></div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Details skeleton */}
|
||||
<section className="grid grid-cols-1 md:grid-cols-2 gap-8 mb-8">
|
||||
<div>
|
||||
<div className="h-8 w-32 bg-gray-200 rounded mb-4"></div>
|
||||
<div className="space-y-4">
|
||||
{[...Array(4)].map((_, i) => (
|
||||
<div key={i} className="grid grid-cols-2 gap-4">
|
||||
<div className="h-6 bg-gray-200 rounded"></div>
|
||||
<div className="h-6 bg-gray-200 rounded"></div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div className="h-8 w-32 bg-gray-200 rounded mb-4"></div>
|
||||
<div className="bg-gray-100 p-4 rounded-lg">
|
||||
<div className="space-y-2">
|
||||
<div className="h-6 bg-gray-200 rounded"></div>
|
||||
<div className="h-6 bg-gray-200 rounded"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Areas skeleton */}
|
||||
<section className="mb-8">
|
||||
<div className="h-8 w-32 bg-gray-200 rounded mb-4"></div>
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
||||
{[...Array(3)].map((_, i) => (
|
||||
<div key={i} className="bg-gray-50 p-4 rounded-lg">
|
||||
<div className="h-6 bg-gray-200 rounded mb-2"></div>
|
||||
<div className="h-4 bg-gray-200 rounded w-3/4"></div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Reviews skeleton */}
|
||||
<section className="mb-8">
|
||||
<div className="h-8 w-32 bg-gray-200 rounded mb-4"></div>
|
||||
<div className="space-y-4">
|
||||
{[...Array(2)].map((_, i) => (
|
||||
<div key={i} className="bg-gray-50 p-4 rounded-lg">
|
||||
<div className="flex justify-between items-start mb-2">
|
||||
<div className="space-y-2">
|
||||
<div className="h-6 bg-gray-200 rounded w-32"></div>
|
||||
<div className="h-4 bg-gray-200 rounded w-24"></div>
|
||||
</div>
|
||||
<div className="h-6 w-24 bg-gray-200 rounded"></div>
|
||||
</div>
|
||||
<div className="space-y-2 mt-4">
|
||||
<div className="h-4 bg-gray-200 rounded w-full"></div>
|
||||
<div className="h-4 bg-gray-200 rounded w-5/6"></div>
|
||||
</div>
|
||||
<div className="mt-2 flex gap-2">
|
||||
{[...Array(2)].map((_, j) => (
|
||||
<div key={j} className="w-24 h-24 bg-gray-200 rounded"></div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Photos skeleton */}
|
||||
<section>
|
||||
<div className="h-8 w-32 bg-gray-200 rounded mb-4"></div>
|
||||
<div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
|
||||
{[...Array(8)].map((_, i) => (
|
||||
<div key={i} className="aspect-square bg-gray-200 rounded-lg"></div>
|
||||
))}
|
||||
</div>
|
||||
</section>
|
||||
</article>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
194
frontend/src/app/parks/[slug]/page.tsx
Normal file
194
frontend/src/app/parks/[slug]/page.tsx
Normal file
@@ -0,0 +1,194 @@
|
||||
import { Metadata } from 'next';
|
||||
import { notFound } from 'next/navigation';
|
||||
import { Park, ParkDetailResponse } from '@/types/api';
|
||||
|
||||
// Dynamically generate metadata for park pages
|
||||
export async function generateMetadata({ params }: { params: { slug: string } }): Promise<Metadata> {
|
||||
try {
|
||||
const park = await fetchParkData(params.slug);
|
||||
return {
|
||||
title: `${park.name} | ThrillWiki`,
|
||||
description: park.description || `Details about ${park.name}`,
|
||||
};
|
||||
} catch (error) {
|
||||
return {
|
||||
title: 'Park Not Found | ThrillWiki',
|
||||
description: 'The requested park could not be found.',
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// Fetch park data from API
|
||||
async function fetchParkData(slug: string): Promise<Park> {
|
||||
const response = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/api/parks/${slug}`, {
|
||||
next: { revalidate: 60 }, // Cache for 1 minute
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
if (response.status === 404) {
|
||||
notFound();
|
||||
}
|
||||
throw new Error('Failed to fetch park data');
|
||||
}
|
||||
|
||||
const { data }: ParkDetailResponse = await response.json();
|
||||
return data;
|
||||
}
|
||||
|
||||
// Park detail page component
|
||||
export default async function ParkDetailPage({ params }: { params: { slug: string } }) {
|
||||
const park = await fetchParkData(params.slug);
|
||||
|
||||
return (
|
||||
<main className="container mx-auto px-4 py-8">
|
||||
<article className="bg-white rounded-lg shadow-lg p-6">
|
||||
{/* Park header */}
|
||||
<header className="mb-8">
|
||||
<h1 className="text-4xl font-bold mb-4">{park.name}</h1>
|
||||
<div className="flex items-center gap-4 text-gray-600">
|
||||
<span className={`px-3 py-1 rounded-full text-sm ${
|
||||
park.status === 'OPERATING' ? 'bg-green-100 text-green-800' :
|
||||
park.status === 'CLOSED_TEMP' ? 'bg-yellow-100 text-yellow-800' :
|
||||
park.status === 'UNDER_CONSTRUCTION' ? 'bg-blue-100 text-blue-800' :
|
||||
'bg-red-100 text-red-800'
|
||||
}`}>
|
||||
{park.status.replace('_', ' ')}
|
||||
</span>
|
||||
{park.opening_date && (
|
||||
<span>Opened: {park.opening_date}</span>
|
||||
)}
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{/* Park description */}
|
||||
{park.description && (
|
||||
<section className="mb-8">
|
||||
<p className="text-gray-700 leading-relaxed">{park.description}</p>
|
||||
</section>
|
||||
)}
|
||||
|
||||
{/* Park details */}
|
||||
<section className="grid grid-cols-1 md:grid-cols-2 gap-8 mb-8">
|
||||
<div>
|
||||
<h2 className="text-2xl font-semibold mb-4">Details</h2>
|
||||
<dl className="grid grid-cols-2 gap-4">
|
||||
{park.size_acres && (
|
||||
<>
|
||||
<dt className="font-medium text-gray-600">Size</dt>
|
||||
<dd>{park.size_acres} acres</dd>
|
||||
</>
|
||||
)}
|
||||
{park.operating_season && (
|
||||
<>
|
||||
<dt className="font-medium text-gray-600">Season</dt>
|
||||
<dd>{park.operating_season}</dd>
|
||||
</>
|
||||
)}
|
||||
{park.ride_count && (
|
||||
<>
|
||||
<dt className="font-medium text-gray-600">Total Rides</dt>
|
||||
<dd>{park.ride_count}</dd>
|
||||
</>
|
||||
)}
|
||||
{park.coaster_count && (
|
||||
<>
|
||||
<dt className="font-medium text-gray-600">Roller Coasters</dt>
|
||||
<dd>{park.coaster_count}</dd>
|
||||
</>
|
||||
)}
|
||||
{park.average_rating && (
|
||||
<>
|
||||
<dt className="font-medium text-gray-600">Average Rating</dt>
|
||||
<dd>{park.average_rating.toFixed(1)} / 5.0</dd>
|
||||
</>
|
||||
)}
|
||||
</dl>
|
||||
</div>
|
||||
|
||||
{/* Location */}
|
||||
{park.location && (
|
||||
<div>
|
||||
<h2 className="text-2xl font-semibold mb-4">Location</h2>
|
||||
<div className="bg-gray-100 p-4 rounded-lg">
|
||||
<p>Latitude: {park.location.latitude}</p>
|
||||
<p>Longitude: {park.location.longitude}</p>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
|
||||
{/* Areas */}
|
||||
{park.areas.length > 0 && (
|
||||
<section className="mb-8">
|
||||
<h2 className="text-2xl font-semibold mb-4">Areas</h2>
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
||||
{park.areas.map(area => (
|
||||
<div key={area.id} className="bg-gray-50 p-4 rounded-lg">
|
||||
<h3 className="font-semibold mb-2">{area.name}</h3>
|
||||
{area.description && (
|
||||
<p className="text-sm text-gray-600">{area.description}</p>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</section>
|
||||
)}
|
||||
|
||||
{/* Reviews */}
|
||||
{park.reviews.length > 0 && (
|
||||
<section className="mb-8">
|
||||
<h2 className="text-2xl font-semibold mb-4">Reviews</h2>
|
||||
<div className="space-y-4">
|
||||
{park.reviews.map(review => (
|
||||
<div key={review.id} className="bg-gray-50 p-4 rounded-lg">
|
||||
<div className="flex justify-between items-start mb-2">
|
||||
<div>
|
||||
<span className="font-medium">{review.user.username}</span>
|
||||
<span className="text-gray-600 text-sm ml-2">
|
||||
{new Date(review.created_at).toLocaleDateString()}
|
||||
</span>
|
||||
</div>
|
||||
<div className="text-yellow-500">{
|
||||
'★'.repeat(review.rating) + '☆'.repeat(5 - review.rating)
|
||||
}</div>
|
||||
</div>
|
||||
<p className="text-gray-700">{review.content}</p>
|
||||
{review.photos.length > 0 && (
|
||||
<div className="mt-2 flex gap-2 flex-wrap">
|
||||
{review.photos.map(photo => (
|
||||
<img
|
||||
key={photo.id}
|
||||
src={photo.url}
|
||||
alt={photo.caption || `Photo by ${photo.user.username}`}
|
||||
className="w-24 h-24 object-cover rounded"
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</section>
|
||||
)}
|
||||
|
||||
{/* Photos */}
|
||||
{park.photos.length > 0 && (
|
||||
<section>
|
||||
<h2 className="text-2xl font-semibold mb-4">Photos</h2>
|
||||
<div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
|
||||
{park.photos.map(photo => (
|
||||
<div key={photo.id} className="aspect-square relative">
|
||||
<img
|
||||
src={photo.url}
|
||||
alt={photo.caption || `Photo of ${park.name}`}
|
||||
className="absolute inset-0 w-full h-full object-cover rounded-lg"
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</section>
|
||||
)}
|
||||
</article>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -1,17 +1,53 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect, useState } from 'react';
|
||||
import type { Park, ParkStatus } from '@/types/api';
|
||||
import type { Park, ParkFilterValues, Company } from '@/types/api';
|
||||
import { ParkSearch } from '@/components/parks/ParkSearch';
|
||||
import { ViewToggle } from '@/components/parks/ViewToggle';
|
||||
import { ParkList } from '@/components/parks/ParkList';
|
||||
import { ParkFilters } from '@/components/parks/ParkFilters';
|
||||
|
||||
export default function ParksPage() {
|
||||
const [parks, setParks] = useState<Park[]>([]);
|
||||
const [companies, setCompanies] = useState<Company[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [viewMode, setViewMode] = useState<'grid' | 'list'>('grid');
|
||||
const [searchQuery, setSearchQuery] = useState('');
|
||||
const [filters, setFilters] = useState<ParkFilterValues>({});
|
||||
|
||||
useEffect(() => {
|
||||
async function fetchCompanies() {
|
||||
try {
|
||||
const response = await fetch('/api/companies');
|
||||
const data = await response.json();
|
||||
if (data.success) {
|
||||
setCompanies(data.data || []);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Failed to fetch companies:', err);
|
||||
}
|
||||
}
|
||||
fetchCompanies();
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
async function fetchParks() {
|
||||
try {
|
||||
const response = await fetch('/api/parks');
|
||||
setLoading(true);
|
||||
const queryParams = new URLSearchParams();
|
||||
|
||||
if (searchQuery) queryParams.set('search', searchQuery);
|
||||
if (filters.status) queryParams.set('status', filters.status);
|
||||
if (filters.ownerId) queryParams.set('ownerId', filters.ownerId);
|
||||
if (filters.hasOwner !== undefined) queryParams.set('hasOwner', filters.hasOwner.toString());
|
||||
if (filters.minRides) queryParams.set('minRides', filters.minRides.toString());
|
||||
if (filters.minCoasters) queryParams.set('minCoasters', filters.minCoasters.toString());
|
||||
if (filters.minSize) queryParams.set('minSize', filters.minSize.toString());
|
||||
if (filters.openingDateStart) queryParams.set('openingDateStart', filters.openingDateStart);
|
||||
if (filters.openingDateEnd) queryParams.set('openingDateEnd', filters.openingDateEnd);
|
||||
|
||||
const response = await fetch(`/api/parks?${queryParams}`);
|
||||
const data = await response.json();
|
||||
|
||||
if (!data.success) {
|
||||
@@ -27,23 +63,14 @@ export default function ParksPage() {
|
||||
}
|
||||
|
||||
fetchParks();
|
||||
}, []);
|
||||
}, [searchQuery, filters]);
|
||||
|
||||
const getStatusColor = (status: ParkStatus): string => {
|
||||
const colors = {
|
||||
OPERATING: 'bg-green-100 text-green-800',
|
||||
CLOSED_TEMP: 'bg-yellow-100 text-yellow-800',
|
||||
CLOSED_PERM: 'bg-red-100 text-red-800',
|
||||
UNDER_CONSTRUCTION: 'bg-blue-100 text-blue-800',
|
||||
DEMOLISHED: 'bg-gray-100 text-gray-800',
|
||||
RELOCATED: 'bg-purple-100 text-purple-800'
|
||||
};
|
||||
return colors[status] || 'bg-gray-100 text-gray-500';
|
||||
const handleSearch = (query: string) => {
|
||||
setSearchQuery(query);
|
||||
};
|
||||
|
||||
const formatRating = (rating: number | null | undefined): string => {
|
||||
if (typeof rating !== 'number') return 'No ratings';
|
||||
return `${rating.toFixed(1)}/5`;
|
||||
const handleFiltersChange = (newFilters: ParkFilterValues) => {
|
||||
setFilters(newFilters);
|
||||
};
|
||||
|
||||
if (loading) {
|
||||
@@ -59,10 +86,12 @@ export default function ParksPage() {
|
||||
|
||||
if (error) {
|
||||
return (
|
||||
<div className="min-h-screen p-8">
|
||||
<div className="rounded-lg bg-red-50 p-4 border border-red-200">
|
||||
<h2 className="text-red-800 font-semibold">Error</h2>
|
||||
<p className="text-red-600 mt-2">{error}</p>
|
||||
<div className="p-4" data-testid="park-list-error">
|
||||
<div className="inline-flex items-center px-4 py-2 rounded-md bg-red-50 text-red-700">
|
||||
<svg className="w-5 h-5 mr-2" fill="currentColor" viewBox="0 0 20 20">
|
||||
<path fillRule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clipRule="evenodd"/>
|
||||
</svg>
|
||||
{error}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@@ -71,75 +100,31 @@ export default function ParksPage() {
|
||||
return (
|
||||
<div className="min-h-screen p-8">
|
||||
<div className="max-w-7xl mx-auto">
|
||||
<h1 className="text-3xl font-bold mb-8">Theme Parks</h1>
|
||||
|
||||
{parks.length === 0 ? (
|
||||
<p className="text-gray-600">No parks found</p>
|
||||
) : (
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
|
||||
{parks.map((park) => (
|
||||
<div
|
||||
key={park.id}
|
||||
className="rounded-lg border border-gray-200 p-6 hover:shadow-lg transition-shadow"
|
||||
>
|
||||
<div className="flex justify-between items-start mb-4">
|
||||
<h2 className="text-xl font-semibold">
|
||||
<a
|
||||
href={`/parks/${park.slug}`}
|
||||
className="hover:text-indigo-600 transition-colors"
|
||||
>
|
||||
{park.name}
|
||||
</a>
|
||||
</h2>
|
||||
<span className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${getStatusColor(park.status)}`}>
|
||||
{park.status.replace('_', ' ')}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{park.description && (
|
||||
<p className="text-gray-600 mb-4">
|
||||
{park.description.length > 150
|
||||
? `${park.description.slice(0, 150)}...`
|
||||
: park.description}
|
||||
</p>
|
||||
)}
|
||||
|
||||
<div className="space-y-2 text-sm text-gray-500">
|
||||
{park.location && (
|
||||
<p>
|
||||
📍 {park.location.latitude}, {park.location.longitude}
|
||||
</p>
|
||||
)}
|
||||
{park.opening_date && (
|
||||
<p>🗓 Opened: {new Date(park.opening_date).toLocaleDateString()}</p>
|
||||
)}
|
||||
{park.operating_season && (
|
||||
<p>⏰ Season: {park.operating_season}</p>
|
||||
)}
|
||||
{park.website && (
|
||||
<p>
|
||||
<a
|
||||
href={park.website}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-indigo-600 hover:text-indigo-800"
|
||||
>
|
||||
Visit Website →
|
||||
</a>
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="mt-4 pt-4 border-t border-gray-100">
|
||||
<div className="flex justify-between text-sm text-gray-500">
|
||||
<span>🎢 {park.ride_count || 0} rides</span>
|
||||
<span>⭐ {formatRating(park.average_rating)}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
<div className="flex justify-between items-center mb-6">
|
||||
<div className="flex items-center space-x-4">
|
||||
<h1 className="text-2xl font-bold text-gray-900">Parks</h1>
|
||||
<ViewToggle currentView={viewMode} onViewChange={setViewMode} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="mb-6">
|
||||
<ParkSearch onSearch={handleSearch} />
|
||||
<ParkFilters onFiltersChange={handleFiltersChange} companies={companies} />
|
||||
</div>
|
||||
|
||||
<div
|
||||
id="park-results"
|
||||
className="bg-white rounded-lg shadow overflow-hidden"
|
||||
data-view-mode={viewMode}
|
||||
>
|
||||
<div className="transition-all duration-300 ease-in-out">
|
||||
<ParkList
|
||||
parks={parks}
|
||||
viewMode={viewMode}
|
||||
searchQuery={searchQuery}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user