strtus/Vercel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine [photoId] static requests

Browse Source
This commit is contained in:
Sam Becker 2024-01-22 20:27:54 -06:00
parent e0daabe678
commit d97c3fcc36
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/p/[photoId]/layout.tsx
View File

@ -1,5 +1,6 @@
import {
GENERATE_STATIC_PARAMS_LIMIT,
GRID_THUMBNAILS_TO_SHOW_MAX,
descriptionForPhoto,
titleForPhoto,
} from '@/photo';
@ -11,10 +12,7 @@ import {
absolutePathForPhotoImage,
} from '@/site/paths';
import PhotoDetailPage from '@/photo/PhotoDetailPage';
import {
getPhotoCached,
// getPhotosNearIdCached,
} from '@/cache';
import { getPhotosNearIdCached } from '@/cache';
import { getPhotoIds } from '@/services/vercel-postgres';
export async function generateStaticParams() {
@ -29,7 +27,12 @@ interface PhotoProps {
export async function generateMetadata({
params: { photoId },
}:PhotoProps): Promise<Metadata> {
const photo = await getPhotoCached(photoId);
const photos = await getPhotosNearIdCached(
photoId,
GRID_THUMBNAILS_TO_SHOW_MAX + 2,
);
const photo = photos.find(p => p.id === photoId);
if (!photo) { return {}; }
@ -60,31 +63,28 @@ export default async function PhotoPage({
params: { photoId },
children,
}: PhotoProps & { children: React.ReactNode }) {
// const photos = await getPhotosNearIdCached(
// photoId,
// GRID_THUMBNAILS_TO_SHOW_MAX + 2,
// );
const photos = await getPhotosNearIdCached(
photoId,
GRID_THUMBNAILS_TO_SHOW_MAX + 2,
);
const photo = await getPhotoCached(photoId);
// const photo = photos.find(p => p.id === photoId);
const photo = photos.find(p => p.id === photoId);
if (!photo) { redirect(PATH_ROOT); }
// const isPhotoFirst = photos.findIndex(p => p.id === photoId) === 0;
const isPhotoFirst = photos.findIndex(p => p.id === photoId) === 0;
return <>
{children}
<PhotoDetailPage
photo={photo}
// photos={photos}
photos={[]}
// photosGrid={photos.slice(
// isPhotoFirst ? 1 : 2,
// isPhotoFirst
// ? GRID_THUMBNAILS_TO_SHOW_MAX + 1
// : GRID_THUMBNAILS_TO_SHOW_MAX + 2,
// )}
photos={photos}
photosGrid={photos.slice(
isPhotoFirst ? 1 : 2,
isPhotoFirst
? GRID_THUMBNAILS_TO_SHOW_MAX + 1
: GRID_THUMBNAILS_TO_SHOW_MAX + 2,
)}
/>
</>;
}