Skip to content

Commit 00bc764

Browse files
authored
Replace unmaintained color-thief-react with use-color-thief (#700)
* Replace color-thief-react with use-color-thief * chore(View > Album): Change id to filename; remove stale attr id, priority * feat(View > Today): Display year in keyword dropdown * chore(package): Update react-image-gallery to v2
2 parents c22573c + 0752fbe commit 00bc764

File tree

15 files changed

+2169
-1622
lines changed

15 files changed

+2169
-1622
lines changed

app/[gallery]/today/page.tsx

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import type { Metadata } from 'next'
12
import { Suspense } from 'react'
23

3-
import type { Metadata } from 'next'
44
import AlbumPageComponent from '../../../src/components/Album/AlbumClient'
55
import getAlbum from '../../../src/lib/album'
66
import getAlbums from '../../../src/lib/albums'
77
import getGalleries from '../../../src/lib/galleries'
88
import { generateClusters } from '../../../src/lib/generate-clusters'
9-
import indexKeywords, { addGeographyToSearch } from '../../../src/lib/search'
9+
import indexKeywords, { addGeographyToSearch, addYearToSearch, getItemYearFromFilename } from '../../../src/lib/search'
1010
import config from '../../../src/models/config'
1111
import type { AlbumMeta, Gallery, Item } from '../../../src/types/common'
1212

@@ -35,13 +35,19 @@ async function getTodayItems(gallery: Gallery) {
3535
albumCoordinateAccuracy: NonNullable<AlbumMeta['geo']>['zoom'],
3636
items: Item[],
3737
},
38-
) => items.map((item) => ({
39-
...item,
40-
album: albumName,
41-
corpus: [item.description, item.caption, item.location, item.city, item.search].join(' '),
42-
coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
43-
search: addGeographyToSearch(item),
44-
}))
38+
) => items.map((item) => {
39+
const year = getItemYearFromFilename(item)
40+
const search = addYearToSearch(addGeographyToSearch(item), item)
41+
return {
42+
...item,
43+
album: albumName,
44+
corpus: [item.description, item.caption, item.location, item.city, search, year]
45+
.join(' ')
46+
.trim(),
47+
coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
48+
search,
49+
}
50+
})
4551

4652
const MMDD = new Date().toLocaleString('en-CA').substring(5, 10)
4753

0 commit comments

Comments
 (0)