Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

View by age #637

Merged
merged 8 commits into from
Nov 30, 2024
Merged

View by age #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9267e27
Move types to pages
danactive Nov 19, 2024
01000d6
Move types to pages
danactive Nov 22, 2024
5be4000
Person: GenAi lists all years when selected shows persons of that age
danactive Nov 29, 2024
2e403f3
Person: GenAi lists all years and allows to filter by person of that age
danactive Nov 29, 2024
6839723
Person: GenAi lists all years and allows to filter by person of that …
danactive Nov 29, 2024
ae0fbc8
feat(View All > Person): Filter by keyword then age then person
danactive Nov 30, 2024
a5b039b
lint
danactive Nov 30, 2024
a3987b4
lint
danactive Nov 30, 2024
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"test": "jest --watch",
"test:ci": "jest --ci",
"test:e2e": "npx playwright test",
"typecheck": "tsc",
"typecheck": "echo 'Typecheck...' && tsc",
"release": "standard-version"
},
"dependencies": {
Expand Down
43 changes: 7 additions & 36 deletions pages/[gallery].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,13 @@
import type { GetStaticPaths, GetStaticProps } from 'next'
import Head from 'next/head'
import { type ParsedUrlQuery } from 'node:querystring'

import GalleryPageComponent from '../src/components/GalleryPage'
import getAlbums from '../src/lib/albums'
import getGalleries from '../src/lib/galleries'
import indexKeywords from '../src/lib/search'
import type { ServerSideAlbumItem } from '../src/types/common'
import { Gallery } from '../src/types/pages'

import Galleries from '../src/components/Albums'
import Link from '../src/components/Link'
import useSearch from '../src/hooks/useSearch'
import type { AlbumMeta, IndexedKeywords, ServerSideAlbumItem } from '../src/types/common'

type ComponentProps = {
gallery: NonNullable<AlbumMeta['gallery']>;
albums: ServerSideAlbumItem[];
indexedKeywords: IndexedKeywords[];
}

interface Params extends ParsedUrlQuery {
gallery: NonNullable<AlbumMeta['gallery']>
}

export const getStaticProps: GetStaticProps<ComponentProps, Params> = async (context) => {
export const getStaticProps: GetStaticProps<Gallery.ComponentProps, Gallery.Params> = async (context) => {
const params = context.params!
const { albums } = await getAlbums(params.gallery)
const preparedAlbums = albums.map((album): ServerSideAlbumItem => ({
Expand All @@ -43,25 +29,10 @@ export const getStaticPaths: GetStaticPaths = async () => {
}
}

function AlbumsPage({ gallery, albums, indexedKeywords }: ComponentProps) {
const {
filtered,
searchBox,
} = useSearch({ items: albums, indexedKeywords })

function GalleryPage({ gallery, albums, indexedKeywords }: Gallery.ComponentProps) {
return (
<div>
<Head>
<title>History App - List Albums</title>
<link rel="icon" href="/favicon.ico" />
</Head>
<div>{searchBox}</div>
<h1>Links</h1>
<ul><li><Link href={`/${gallery}/all`}>All</Link></li></ul>
<ul><li><Link href={`/${gallery}/today`}>Today</Link></li></ul>
<Galleries items={filtered} gallery={gallery} />
</div>
<GalleryPageComponent albums={albums} gallery={gallery} indexedKeywords={indexedKeywords} />
)
}

export default AlbumsPage
export default GalleryPage
21 changes: 3 additions & 18 deletions pages/[gallery]/[album].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import getAlbum from '../../src/lib/album'
import getAlbums from '../../src/lib/albums'
import getGalleries from '../../src/lib/galleries'
import indexKeywords, { addGeographyToSearch } from '../../src/lib/search'
import type { AlbumMeta, IndexedKeywords, Item } from '../../src/types/common'
import type { Album } from '../../src/types/pages'

async function buildStaticPaths() {
const { galleries } = await getGalleries()
Expand All @@ -17,22 +17,7 @@ async function buildStaticPaths() {
return groups.flat()
}

interface ServerSideAlbumItem extends Item {
corpus: string;
}

type ComponentProps = {
items?: ServerSideAlbumItem[];
meta: AlbumMeta;
indexedKeywords: IndexedKeywords[];
}

interface Params extends ParsedUrlQuery {
gallery: NonNullable<AlbumMeta['gallery']>
album: NonNullable<AlbumMeta['albumName']>
}

export const getStaticProps: GetStaticProps<ComponentProps, Params> = async (context) => {
export const getStaticProps: GetStaticProps<Album.ComponentProps, Album.Params> = async (context) => {
const params = context.params!
const { album: { items, meta } } = await getAlbum(params.gallery, params.album)
const preparedItems = items.map((item) => ({
Expand All @@ -54,7 +39,7 @@ export const getStaticPaths: GetStaticPaths = async () => (
}
)

function AlbumPage({ items = [], meta, indexedKeywords }: ComponentProps) {
function AlbumPage({ items = [], meta, indexedKeywords }: Album.ComponentProps) {
return <AlbumPageComponent items={items} meta={meta} indexedKeywords={indexedKeywords} />
}

Expand Down
15 changes: 0 additions & 15 deletions pages/[gallery]/[album]/nearby.tsx
View file
Open in desktop

This file was deleted.

Loading