diff --git a/src/components/people/PersonItem.tsx b/src/components/people/PersonItem.tsx index 0523124..96cea2f 100644 --- a/src/components/people/PersonItem.tsx +++ b/src/components/people/PersonItem.tsx @@ -4,11 +4,9 @@ import { Avatar } from "../ui/avatar"; import { updatePerson } from "@/handlers/api/people.handler"; import { PersonMergeDropdown } from "./PersonMergeDropdown"; import PersonBirthdayCell from "./PersonBirthdayCell"; -import PersonHideCell from "./PersonHideCell"; import clsx from "clsx"; import Link from "next/link"; -import { ENV } from "@/config/environment"; -import { ArrowUpRight, Search } from "lucide-react"; +import { ArrowUpRight, Info, Search } from "lucide-react"; import { useConfig } from "@/contexts/ConfigContext"; import { useToast } from "../ui/use-toast"; import { Badge } from "../ui/badge"; @@ -107,7 +105,7 @@ export default function PersonItem({ person, onRemove }: IProps) { className="bg-gray-300 block rounded-lg px-2 py-1 text-sm dark:text-gray-900" href={`/people/${person.id}`} > - +
diff --git a/src/components/people/info/PersonAlbumList.tsx b/src/components/people/info/PersonAlbumList.tsx new file mode 100644 index 0000000..5d4447e --- /dev/null +++ b/src/components/people/info/PersonAlbumList.tsx @@ -0,0 +1,71 @@ +import { ASSET_THUMBNAIL_PATH } from '@/config/routes'; +import { useConfig } from '@/contexts/ConfigContext'; +import { ExternalLink } from 'lucide-react'; +import Image from 'next/image'; +import Link from 'next/link'; +import React, { useMemo } from 'react' + +interface PersonAlbumListProps { + albums: { + id: string; + name: string; + thumbnail: string; + assetCount: number; + lastAssetYear: number; + }[] + personId: string; +} + +export const PersonAlbum = ({ album, personId }: { album: PersonAlbumListProps['albums'][number], personId: string }) => { + const { exImmichUrl } = useConfig(); + return ( +
+
+ {album.name} +
+ {album.name} + {album.assetCount} Occurences +
+ ) +} +export default function PersonAlbumList({ albums, personId }: PersonAlbumListProps) { + + const groupedAlbums = useMemo(() => { + const years: { + label: number; + albums: { + id: string; + name: string; + thumbnail: string; + assetCount: number; + lastAssetYear: number; + }[]; + }[] = []; + const uniqueYears = albums.map((album) => album.lastAssetYear).filter((year, index, self) => self.indexOf(year) === index); + uniqueYears.forEach((year) => { + years.push({ label: year, albums: albums.filter((album) => album.lastAssetYear === year) }); + }); + return years.sort((a, b) => b.label - a.label); + }, [albums]); + + return ( +
+ {groupedAlbums.map((year) => ( +
+ {/* Country */} + {year.label} + {/* Cities */} +
+ {year.albums.map((album) => ( + + ))} +
+
+ ))} +
+ ) +} diff --git a/src/pages/api/people/[id]/info.ts b/src/pages/api/people/[id]/info.ts index 31c07d2..1961149 100644 --- a/src/pages/api/people/[id]/info.ts +++ b/src/pages/api/people/[id]/info.ts @@ -30,10 +30,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) name: albums.albumName, thumbnail: albums.albumThumbnailAssetId, assetCount: sql`count(${assets.id})`, + lastAssetDate: sql`max(${exif.dateTimeOriginal})`, }) .from(albums) .leftJoin(assetFaces, eq(assetFaces.personId, personRecord.id)) .leftJoin(assets, eq(assets.id, assetFaces.assetId)) + .leftJoin(exif, eq(exif.assetId, assets.id)) .leftJoin(albumsAssetsAssets, eq(albumsAssetsAssets.assetsId, assets.id)) .where(eq(albumsAssetsAssets.albumsId, albums.id)) .groupBy(albums.id); @@ -57,7 +59,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) return res.status(200).json({ ...personRecord, - albums: dbPersonAlbums.sort((a, b) => b.assetCount - a.assetCount), + albums: dbPersonAlbums.sort((a, b) => b.assetCount - a.assetCount).map((album) => ({ + ...album, + lastAssetYear: album.lastAssetDate ? new Date(album.lastAssetDate).getFullYear() : null, + })), cities: dbPersonCities, + citiesCount: dbPersonCities.length, + countriesCount: dbPersonCities.map((city) => city.country).filter((country, index, self) => self.indexOf(country) === index).length, }); } diff --git a/src/pages/people/[personId].tsx b/src/pages/people/[personId].tsx index 9811e25..d206988 100644 --- a/src/pages/people/[personId].tsx +++ b/src/pages/people/[personId].tsx @@ -1,4 +1,5 @@ import PageLayout from '@/components/layouts/PageLayout'; +import PersonAlbumList from '@/components/people/info/PersonAlbumList'; import PersonCityList from '@/components/people/info/PersonCityList'; import Header from '@/components/shared/Header'; import { Button } from '@/components/ui/button'; @@ -20,7 +21,10 @@ interface IPersonFullInfo extends IPerson { name: string; assetCount: number; thumbnail: string; + lastAssetYear: number; }[]; + citiesCount: number; + countriesCount: number; cities: { city: string; country: string; @@ -29,7 +33,6 @@ interface IPersonFullInfo extends IPerson { } export default function PersonPage() { - const { exImmichUrl } = useConfig(); const router = useRouter(); const { pathname, query } = router; const { personId } = router.query as { personId: string }; @@ -56,8 +59,9 @@ export default function PersonPage() { if (query.tab === "cities") { return (
-
+
Cities + {person?.citiesCount} Cities, {person?.countriesCount} Countries
@@ -66,24 +70,12 @@ export default function PersonPage() { return (
-
- Albums {person?.albums.length} -
-
- {person?.albums.map((album) => ( -
-
- {album.name} -
- {album.name} - {album.assetCount} Occurences -
- ))} +
+ Albums + {person?.albums.length} Albums
+ +
) }