Refactor photo set type names

src/camera/CameraShareModal.tsx

@@ -1,5 +1,5 @@
 import { absolutePathForCamera, pathForCamera } from '@/site/paths';
-import { Photo, PhotoDateRange } from '../photo';
+import { PhotoSetAttributes } from '../photo';
 import ShareModal from '@/components/ShareModal';
 import CameraOGTile from './CameraOGTile';
 import { Camera } from '.';
@@ -12,10 +12,7 @@ export default function CameraShareModal({
   dateRange,
 }: {
   camera: Camera
-  photos: Photo[]
-  count: number
-  dateRange?: PhotoDateRange,
-}) {
+} & PhotoSetAttributes) {
   return (
     <ShareModal
       pathShare={absolutePathForCamera(camera)}

src/focal/FocalLengthShareModal.tsx

@@ -1,5 +1,5 @@
 import { absolutePathForFocalLength, pathForFocalLength } from '@/site/paths';
-import { Photo, PhotoDateRange } from '../photo';
+import { PhotoSetAttributes } from '../photo';
 import ShareModal from '@/components/ShareModal';
 import FocalLengthOGTile from './FocalLengthOGTile';
 import { shareTextFocalLength } from '.';
@@ -11,10 +11,7 @@ export default function FocalLengthShareModal({
   dateRange,
 }: {
   focal: number
-  photos: Photo[]
-  count?: number
-  dateRange?: PhotoDateRange
-}) {
+} & PhotoSetAttributes) {
   return (
     <ShareModal
       pathShare={absolutePathForFocalLength(focal)}

src/photo/InfinitePhotoScroll.tsx

@@ -10,7 +10,7 @@ import {
 import SiteGrid from '@/components/SiteGrid';
 import Spinner from '@/components/Spinner';
 import { getPhotosCachedAction, getPhotosAction } from '@/photo/actions';
-import { Photo, PhotoSetAttributes } from '.';
+import { Photo, PhotoSetCategory } from '.';
 import { clsx } from 'clsx/lite';
 import { useAppState } from '@/state/AppState';
 import { GetPhotosOptions } from './db';
@@ -45,7 +45,7 @@ export default function InfinitePhotoScroll({
     onLastPhotoVisible: () => void
     revalidatePhoto?: RevalidatePhoto
   }) => ReactNode
-} & PhotoSetAttributes) {
+} & PhotoSetCategory) {
   const { swrTimestamp, isUserSignedIn } = useAppState();
 
   const key = `${swrTimestamp}-${cacheKey}`;

src/photo/PhotoDetailPage.tsx

@@ -1,5 +1,5 @@
 import AnimateItems from '@/components/AnimateItems';
-import { Photo, PhotoDateRange, PhotoSetAttributes } from '.';
+import { Photo, PhotoDateRange, PhotoSetCategory } from '.';
 import PhotoLarge from './PhotoLarge';
 import SiteGrid from '@/components/SiteGrid';
 import PhotoGrid from './PhotoGrid';
@@ -34,7 +34,7 @@ export default function PhotoDetailPage({
   dateRange?: PhotoDateRange
   shouldShare?: boolean
   includeFavoriteInAdminMenu?: boolean
-} & PhotoSetAttributes) {
+} & PhotoSetCategory) {
   let customHeader: JSX.Element | undefined;
 
   if (tag) {

src/photo/PhotoGrid.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { Photo, PhotoSetAttributes } from '.';
+import { Photo, PhotoSetCategory } from '.';
 import PhotoMedium from './PhotoMedium';
 import { clsx } from 'clsx/lite';
 import AnimateItems from '@/components/AnimateItems';
@@ -41,7 +41,7 @@ export default function PhotoGrid({
   canSelect?: boolean
   onLastPhotoVisible?: () => void
   onAnimationComplete?: () => void
-} & PhotoSetAttributes) {
+} & PhotoSetCategory) {
   const {
     isUserSignedIn,
     selectedPhotoIds,

src/photo/PhotoHeader.tsx

@@ -4,7 +4,7 @@ import { clsx } from 'clsx/lite';
 import {
   Photo,
   PhotoDateRange,
-  PhotoSetAttributes,
+  PhotoSetCategory,
   dateRangeForPhotos,
   titleForPhoto,
 } from '.';
@@ -41,7 +41,7 @@ export default function PhotoHeader({
   indexNumber?: number
   count?: number
   dateRange?: PhotoDateRange
-} & PhotoSetAttributes) {
+} & PhotoSetCategory) {
   const { isGridHighDensity } = useAppState();
 
   const { start, end } = dateRangeForPhotos(photos, dateRange);

src/photo/PhotoLink.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { ReactNode } from 'react';
-import { Photo, PhotoSetAttributes, titleForPhoto } from '@/photo';
+import { Photo, PhotoSetCategory, titleForPhoto } from '@/photo';
 import Link from 'next/link';
 import { AnimationConfig } from '../components/AnimateItems';
 import { useAppState } from '@/state/AppState';
@@ -26,7 +26,7 @@ export default function PhotoLink({
   nextPhotoAnimation?: AnimationConfig
   className?: string
   children?: ReactNode
-} & PhotoSetAttributes) {
+} & PhotoSetCategory) {
   const { setNextPhotoAnimation } = useAppState();
   
   return (

src/photo/PhotoMedium.tsx

@@ -2,7 +2,7 @@
 
 import {
   Photo,
-  PhotoSetAttributes,
+  PhotoSetCategory,
   altTextForPhoto,
   doesPhotoNeedBlurCompatibility,
 } from '.';
@@ -32,7 +32,7 @@ export default function PhotoMedium({
   prefetch?: boolean
   className?: string
   onVisible?: () => void
-} & PhotoSetAttributes) {
+} & PhotoSetCategory) {
   const ref = useRef<HTMLAnchorElement>(null);
 
   useOnVisible(ref, onVisible);

src/photo/PhotoPrevNext.tsx

@@ -3,7 +3,7 @@
 import { useEffect } from 'react';
 import {
   Photo,
-  PhotoSetAttributes,
+  PhotoSetCategory,
   getNextPhoto,
   getPreviousPhoto,
 } from '@/photo';
@@ -32,7 +32,7 @@ export default function PhotoPrevNext({
   photo?: Photo
   photos?: Photo[]
   className?: string
-} & PhotoSetAttributes) {
+} & PhotoSetCategory) {
   const router = useRouter();
 
   const {

src/photo/PhotoShareModal.tsx

@@ -1,11 +1,11 @@
 import PhotoOGTile from '@/photo/PhotoOGTile';
 import { absolutePathForPhoto, pathForPhoto } from '@/site/paths';
-import { Photo, PhotoSetAttributes } from '.';
+import { Photo, PhotoSetCategory } from '.';
 import ShareModal from '@/components/ShareModal';
 
 export default function PhotoShareModal(props: {
   photo: Photo
-} & PhotoSetAttributes) {
+} & PhotoSetCategory) {
   return (
     <ShareModal
       pathShare={absolutePathForPhoto(props)}

src/photo/PhotoSmall.tsx

@@ -1,6 +1,6 @@
 import {
   Photo,
-  PhotoSetAttributes,
+  PhotoSetCategory,
   altTextForPhoto,
   doesPhotoNeedBlurCompatibility,
 } from '.';
@@ -28,7 +28,7 @@ export default function PhotoSmall({
   className?: string
   prefetch?: boolean
   onVisible?: () => void
-} & PhotoSetAttributes) {
+} & PhotoSetCategory) {
   const ref = useRef<HTMLAnchorElement>(null);
 
   useOnVisible(ref, onVisible);

src/photo/db/index.ts

@@ -1,6 +1,6 @@
 import { PRIORITY_ORDER_ENABLED } from '@/site/config';
 import { parameterize } from '@/utility/string';
-import { PhotoSetAttributes } from '..';
+import { PhotoSetCategory } from '..';
 
 export const GENERATE_STATIC_PARAMS_LIMIT = 1000;
 export const PHOTO_DEFAULT_LIMIT = 100;
@@ -14,7 +14,7 @@ export type GetPhotosOptions = {
   takenAfterInclusive?: Date
   updatedBefore?: Date
   hidden?: 'exclude' | 'include' | 'only'
-} & PhotoSetAttributes;
+} & PhotoSetCategory;
 
 export const areOptionsSensitive = (options: GetPhotosOptions) =>
   options.hidden === 'include' || options.hidden === 'only';

src/photo/index.ts

@@ -102,7 +102,7 @@ export interface Photo extends PhotoDb {
   takenAtNaiveFormatted: string
 }
 
-export interface PhotoSetAttributes {
+export interface PhotoSetCategory {
   tag?: string
   camera?: Camera
   simulation?: FilmSimulation
@@ -110,6 +110,12 @@ export interface PhotoSetAttributes {
   lens?: Lens // Unimplemented as a set
 }
 
+export interface PhotoSetAttributes {
+  photos: Photo[]
+  count?: number
+  dateRange?: PhotoDateRange
+}
+
 export const parsePhotoFromDb = (photoDbRaw: PhotoDb): Photo => {
   const photoDb = camelcaseKeys(
     photoDbRaw as unknown as Record<string, unknown>,

src/simulation/FilmSimulationShareModal.tsx

@@ -2,7 +2,7 @@ import {
   absolutePathForFilmSimulation,
   pathForFilmSimulation,
 } from '@/site/paths';
-import { Photo, PhotoDateRange } from '../photo';
+import { PhotoSetAttributes } from '../photo';
 import ShareModal from '@/components/ShareModal';
 import FilmSimulationOGTile from './FilmSimulationOGTile';
 import { FilmSimulation, shareTextForFilmSimulation } from '.';
@@ -14,10 +14,7 @@ export default function FilmSimulationShareModal({
   dateRange,
 }: {
   simulation: FilmSimulation
-  photos: Photo[]
-  count?: number
-  dateRange?: PhotoDateRange
-}) {
+} & PhotoSetAttributes) {
   return (
     <ShareModal
       pathShare={absolutePathForFilmSimulation(simulation)}

src/site/paths.ts

@@ -1,4 +1,4 @@
-import { Photo, PhotoSetAttributes } from '@/photo';
+import { Photo, PhotoSetCategory } from '@/photo';
 import { BASE_URL, GRID_HOMEPAGE_ENABLED } from './config';
 import { Camera } from '@/camera';
 import { FilmSimulation } from '@/simulation';
@@ -75,7 +75,7 @@ export const PATHS_TO_CACHE = [
   ...PATHS_ADMIN,
 ];
 
-type PhotoPathParams  = { photo: PhotoOrPhotoId } & PhotoSetAttributes;
+type PhotoPathParams  = { photo: PhotoOrPhotoId } & PhotoSetCategory;
 
 // Absolute paths
 export const ABSOLUTE_PATH_FOR_HOME_IMAGE = `${BASE_URL}/home-image`;
@@ -274,7 +274,7 @@ export const isPathProtected = (pathname?: string) =>
 
 export const getPathComponents = (pathname = ''): {
   photoId?: string
-} & PhotoSetAttributes => {
+} & PhotoSetCategory => {
   const photoIdFromPhoto = pathname.match(
     new RegExp(`^${PREFIX_PHOTO}/([^/]+)`))?.[1];
   const photoIdFromTag = pathname.match(

src/state/AppState.ts

@@ -2,7 +2,7 @@ import { Dispatch, SetStateAction, createContext, useContext } from 'react';
 import { AnimationConfig } from '@/components/AnimateItems';
 
 export interface AppStateContext {
-  // CORE
+  // GLOBAL
   previousPathname?: string
   hasLoaded?: boolean
   setHasLoaded?: Dispatch<SetStateAction<boolean>>
@@ -13,9 +13,10 @@ export interface AppStateContext {
   clearNextPhotoAnimation?: () => void
   shouldRespondToKeyboardCommands?: boolean
   setShouldRespondToKeyboardCommands?: Dispatch<SetStateAction<boolean>>
+  // MODAL
   isCommandKOpen?: boolean
   setIsCommandKOpen?: Dispatch<SetStateAction<boolean>>
-  //  ADMIN
+  // ADMIN
   userEmail?: string
   setUserEmail?: Dispatch<SetStateAction<string | undefined>>
   isUserSignedIn?: boolean

src/tag/TagShareModal.tsx

@@ -1,5 +1,5 @@
 import { absolutePathForTag, pathForTag } from '@/site/paths';
-import { Photo, PhotoDateRange } from '../photo';
+import { PhotoSetAttributes } from '../photo';
 import ShareModal from '@/components/ShareModal';
 import TagOGTile from './TagOGTile';
 import { shareTextForTag } from '.';
@@ -11,10 +11,7 @@ export default function TagShareModal({
   dateRange,
 }: {
   tag: string
-  photos: Photo[]
-  count?: number
-  dateRange?: PhotoDateRange
-}) {
+} & PhotoSetAttributes) {
   return (
     <ShareModal
       pathShare={absolutePathForTag(tag)}