feat(Next > Search): Add country or province to search keyword

danactive · Oct 31, 2023 · 5377101 · 5377101
1 parent 3d3a680
commit 5377101
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 deletions.
diff --git a/next/pages/[gallery].tsx b/next/pages/[gallery].tsx
@@ -17,7 +17,7 @@ interface ServerSideAlbumItem extends GalleryAlbum {
   corpus: string;
 }
 
-type Props = {
+type ComponentProps = {
   gallery: NonNullable<AlbumMeta['gallery']>;
   albums: ServerSideAlbumItem[];
   indexedKeywords: object[];
@@ -27,7 +27,7 @@ interface Params extends ParsedUrlQuery {
   gallery: NonNullable<AlbumMeta['gallery']>
 }
 
-export const getStaticProps: GetStaticProps<Props, Params> = async (context) => {
+export const getStaticProps: GetStaticProps<ComponentProps, Params> = async (context) => {
   const params = context.params!
   const { albums } = await getAlbums(params.gallery)
   const preparedAlbums = albums.map((album): ServerSideAlbumItem => ({
@@ -74,7 +74,7 @@ const AlbumYear = styled.h3`
   color: #8B5A2B;
 `
 
-function AlbumsPage({ gallery, albums, indexedKeywords }: Props) {
+function AlbumsPage({ gallery, albums, indexedKeywords }: ComponentProps) {
   const {
     filtered,
     searchBox,

diff --git a/next/pages/[gallery]/[album].tsx b/next/pages/[gallery]/[album].tsx
@@ -5,7 +5,7 @@ import AlbumPageComponent from '../../src/components/AlbumPage'
 import getAlbum from '../../src/lib/album'
 import getAlbums from '../../src/lib/albums'
 import getGalleries from '../../src/lib/galleries'
-import indexKeywords from '../../src/lib/search'
+import indexKeywords, { addGeographyToSearch } from '../../src/lib/search'
 import type { AlbumMeta, Item } from '../../src/types/common'
 
 async function buildStaticPaths() {
@@ -21,7 +21,7 @@ interface ServerSideAlbumItem extends Item {
   corpus: string;
 }
 
-type Props = {
+type ComponentProps = {
   items?: ServerSideAlbumItem[];
   meta: AlbumMeta;
   indexedKeywords: object[];
@@ -32,16 +32,17 @@ interface Params extends ParsedUrlQuery {
   album: NonNullable<AlbumMeta['albumName']>
 }
 
-export const getStaticProps: GetStaticProps<Props, Params> = async (context) => {
+export const getStaticProps: GetStaticProps<ComponentProps, Params> = async (context) => {
   const params = context.params!
   const { album: { items, meta } } = await getAlbum(params.gallery, params.album)
   const preparedItems = items.map((item) => ({
     ...item,
+    search: addGeographyToSearch(item),
     corpus: [item.description, item.caption, item.location, item.city, item.search].join(' '),
   }))
 
   return {
-    props: { items: preparedItems, meta, ...indexKeywords(items) },
+    props: { items: preparedItems, meta, ...indexKeywords(preparedItems) },
   }
 }
 
@@ -53,7 +54,7 @@ export const getStaticPaths: GetStaticPaths = async () => (
   }
 )
 
-function AlbumPage({ items = [], meta, indexedKeywords }: Props) {
+function AlbumPage({ items = [], meta, indexedKeywords }: ComponentProps) {
   return <AlbumPageComponent items={items} meta={meta} indexedKeywords={indexedKeywords} />
 }
 

diff --git a/next/pages/[gallery]/all.tsx b/next/pages/[gallery]/all.tsx
@@ -9,7 +9,7 @@ import config from '../../../config.json'
 import getAlbum from '../../src/lib/album'
 import getAlbums from '../../src/lib/albums'
 import getGalleries from '../../src/lib/galleries'
-import indexKeywords from '../../src/lib/search'
+import indexKeywords, { addGeographyToSearch } from '../../src/lib/search'
 
 import AlbumContext from '../../src/components/Context'
 import Img from '../../src/components/Img'
@@ -34,7 +34,7 @@ interface ServerSideAllItem extends Item {
   coordinateAccuracy: NonNullable<AlbumMeta['geo']>['zoom'];
 }
 
-type Props = {
+type ComponentProps = {
   items: ServerSideAllItem[];
   indexedKeywords: object[];
 }
@@ -43,7 +43,7 @@ interface Params extends ParsedUrlQuery {
   gallery: NonNullable<AlbumMeta['gallery']>
 }
 
-export const getStaticProps: GetStaticProps<Props, Params> = async (context) => {
+export const getStaticProps: GetStaticProps<ComponentProps, Params> = async (context) => {
   const params = context.params!
   const { albums } = await getAlbums(params.gallery)
 
@@ -60,6 +60,7 @@ export const getStaticProps: GetStaticProps<Props, Params> = async (context) =>
     album: albumName,
     corpus: [item.description, item.caption, item.location, item.city, item.search].join(' '),
     coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
+    search: addGeographyToSearch(item),
   }))
 
   // reverse order for albums in ascending order (oldest on top)
@@ -90,7 +91,7 @@ export const getStaticPaths: GetStaticPaths = async () => {
   }
 }
 
-function AllPage({ items = [], indexedKeywords }: Props) {
+function AllPage({ items = [], indexedKeywords }: ComponentProps) {
   const refImageGallery = useRef<ReactImageGallery>(null)
   const [memoryIndex, setMemoryIndex] = useState(0)
   const {

diff --git a/next/pages/[gallery]/today.tsx b/next/pages/[gallery]/today.tsx
@@ -5,7 +5,7 @@ import config from '../../../config.json'
 import getAlbum from '../../src/lib/album'
 import getAlbums from '../../src/lib/albums'
 import getGalleries from '../../src/lib/galleries'
-import indexKeywords from '../../src/lib/search'
+import indexKeywords, { addGeographyToSearch } from '../../src/lib/search'
 
 import AlbumPageComponent from '../../src/components/AlbumPage'
 import type { AlbumMeta, Item } from '../../src/types/common'
@@ -16,7 +16,7 @@ interface ServerSideTodayItem extends Item {
   coordinateAccuracy: NonNullable<AlbumMeta['geo']>['zoom'];
 }
 
-type Props = {
+type ComponentProps = {
   items: ServerSideTodayItem[];
   indexedKeywords: object[];
 }
@@ -25,7 +25,7 @@ interface Params extends ParsedUrlQuery {
   gallery: NonNullable<AlbumMeta['gallery']>
 }
 
-export const getStaticProps: GetStaticProps<Props, Params> = async (context) => {
+export const getStaticProps: GetStaticProps<ComponentProps, Params> = async (context) => {
   const params = context.params!
   const { albums } = await getAlbums(params.gallery)
 
@@ -41,6 +41,7 @@ export const getStaticProps: GetStaticProps<Props, Params> = async (context) =>
     album: albumName,
     corpus: [item.description, item.caption, item.location, item.city, item.search].join(' '),
     coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
+    search: addGeographyToSearch(item),
   }))
 
   // reverse order for albums in ascending order (oldest on top)
@@ -73,7 +74,7 @@ export const getStaticPaths: GetStaticPaths = async () => {
   }
 }
 
-function Today({ items, indexedKeywords }: Props) {
+function Today({ items, indexedKeywords }: ComponentProps) {
   return <AlbumPageComponent items={items} indexedKeywords={indexedKeywords} />
 }
 

diff --git a/next/pages/index.tsx b/next/pages/index.tsx
@@ -6,11 +6,11 @@ import { Fragment } from 'react'
 import Link from '../src/components/Link'
 import getGalleries, { type Gallery } from '../src/lib/galleries'
 
-type Props = {
+type ComponentProps = {
   galleries: { id: Gallery; gallery: Gallery }[]
 }
 
-export const getStaticProps: GetStaticProps<Props> = async () => {
+export const getStaticProps: GetStaticProps<ComponentProps> = async () => {
   const { galleries } = await getGalleries()
 
   return {
@@ -20,7 +20,7 @@ export const getStaticProps: GetStaticProps<Props> = async () => {
   }
 }
 
-function Home({ galleries }: Props) {
+function Home({ galleries }: ComponentProps) {
   return (
     <>
       <Head>

diff --git a/next/src/lib/search.ts b/next/src/lib/search.ts
@@ -34,3 +34,10 @@ function indexKeywords(items: { search: Item['search'] | GalleryAlbum['search']
 }
 
 export default indexKeywords
+
+export function addGeographyToSearch(item: Item) {
+  const hasComma = item.city.lastIndexOf(',') !== -1
+  const country = hasComma ? item.city.substring(item.city.lastIndexOf(', ') + 1).trim() : item.city.trim()
+
+  return item.search === null ? country : `${item.search}, ${country}`
+}