From 1508a9718c73f2255ea789a258317f828be1ca6c Mon Sep 17 00:00:00 2001 From: Sam Becker Date: Mon, 17 Feb 2025 17:54:00 -0600 Subject: [PATCH] Rename src/app-core to src/app --- __tests__/github.test.ts | 2 +- __tests__/path.test.ts | 2 +- app/admin/outdated/page.tsx | 2 +- app/admin/photos/[photoId]/edit/page.tsx | 4 ++-- app/admin/tags/[tag]/edit/page.tsx | 2 +- app/admin/uploads/[uploadPath]/page.tsx | 4 ++-- app/api/route.ts | 4 ++-- app/api/storage/presigned-url/[key]/route.ts | 2 +- app/film/[simulation]/[photoId]/page.tsx | 2 +- app/film/[simulation]/image/route.tsx | 4 ++-- app/film/[simulation]/page.tsx | 4 ++-- app/focal/[focal]/[photoId]/page.tsx | 2 +- app/focal/[focal]/image/route.tsx | 4 ++-- app/focal/[focal]/page.tsx | 6 +++--- app/home-image/route.tsx | 2 +- app/layout.tsx | 8 ++++---- app/p/[photoId]/image/route.tsx | 4 ++-- app/p/[photoId]/page.tsx | 4 ++-- app/page.tsx | 2 +- app/shot-on/[make]/[model]/[photoId]/page.tsx | 2 +- app/shot-on/[make]/[model]/image/route.tsx | 4 ++-- app/shot-on/[make]/[model]/page.tsx | 4 ++-- app/sign-in/page.tsx | 2 +- app/tag/[tag]/[photoId]/page.tsx | 2 +- app/tag/[tag]/image/route.tsx | 4 ++-- app/tag/[tag]/page.tsx | 6 +++--- app/tag/hidden/[photoId]/page.tsx | 2 +- app/tag/hidden/page.tsx | 2 +- app/template-image-tight/route.tsx | 2 +- app/template-image/route.tsx | 2 +- app/template-url/route.tsx | 2 +- src/admin/AdminAddAllUploads.tsx | 2 +- src/admin/AdminAppConfiguration.tsx | 2 +- src/admin/AdminAppConfigurationClient.tsx | 4 ++-- src/admin/AdminAppConfigurationServer.tsx | 2 +- src/admin/AdminAppMenu.tsx | 2 +- src/admin/AdminBatchEditPanelClient.tsx | 2 +- src/admin/AdminCTA.tsx | 2 +- src/admin/AdminNav.tsx | 2 +- src/admin/AdminNavClient.tsx | 2 +- src/admin/AdminOutdatedClient.tsx | 4 ++-- src/admin/AdminPhotoMenuClient.tsx | 2 +- src/admin/AdminPhotosClient.tsx | 4 ++-- src/admin/AdminPhotosTable.tsx | 2 +- src/admin/AdminPhotosTableInfinite.tsx | 2 +- src/admin/AdminTagTable.tsx | 2 +- src/admin/AdminUploadsTable.tsx | 2 +- src/admin/DeleteBlobButton.tsx | 2 +- src/admin/ExifSyncButton.tsx | 2 +- src/admin/PhotoSyncButton.tsx | 2 +- src/admin/actions.ts | 2 +- src/admin/insights/AdminAppInsights.tsx | 2 +- src/admin/insights/AdminAppInsightsClient.tsx | 4 ++-- src/admin/insights/index.ts | 2 +- src/{app-core => app}/CommandK.tsx | 0 src/{app-core => app}/Footer.tsx | 4 ++-- src/{app-core => app}/IconFeed.tsx | 0 src/{app-core => app}/IconGrSync.tsx | 0 src/{app-core => app}/IconGrid.tsx | 0 src/{app-core => app}/IconSearch.tsx | 0 src/{app-core => app}/Nav.tsx | 4 ++-- src/{app-core => app}/SecretGenerator.tsx | 0 src/{app-core => app}/ThemeSwitcher.tsx | 0 src/{app-core => app}/ViewSwitcher.tsx | 6 +++--- src/{app-core => app}/api.ts | 0 src/{app-core => app}/config.ts | 0 src/{app-core => app}/font.ts | 0 src/{app-core => app}/paths.ts | 0 src/auth/actions.ts | 2 +- src/auth/index.ts | 2 +- src/camera/CameraOGTile.tsx | 2 +- src/camera/CameraShareModal.tsx | 2 +- src/camera/PhotoCamera.tsx | 2 +- src/camera/meta.ts | 2 +- src/components/HttpStatusPage.tsx | 2 +- src/components/Modal.tsx | 2 +- src/components/RepoLink.tsx | 2 +- src/components/SwitcherItem.tsx | 2 +- src/components/cmdk/CommandKClient.tsx | 4 ++-- src/components/image/ImageLarge.tsx | 2 +- src/components/image/ImageWithFallback.tsx | 2 +- src/focal/FocalLengthOGTile.tsx | 2 +- src/focal/FocalLengthShareModal.tsx | 2 +- src/focal/PhotoFocalLength.tsx | 2 +- src/focal/index.ts | 2 +- src/image-response/HomeImageResponse.tsx | 2 +- src/image-response/PhotoImageResponse.tsx | 2 +- src/image-response/TemplateImageResponse.tsx | 4 ++-- src/image-response/components/ImageCaption.tsx | 2 +- src/image-response/components/ImagePhotoGrid.tsx | 2 +- src/middleware.ts | 2 +- src/photo/InfinitePhotoScroll.tsx | 2 +- src/photo/PhotoEditPageClient.tsx | 2 +- src/photo/PhotoEscapeHandler.tsx | 2 +- src/photo/PhotoGrid.tsx | 2 +- src/photo/PhotoGridPage.tsx | 2 +- src/photo/PhotoGridSidebar.tsx | 2 +- src/photo/PhotoLarge.tsx | 4 ++-- src/photo/PhotoLink.tsx | 2 +- src/photo/PhotoMedium.tsx | 4 ++-- src/photo/PhotoOGTile.tsx | 2 +- src/photo/PhotoPrevNext.tsx | 2 +- src/photo/PhotoShareModal.tsx | 2 +- src/photo/PhotoSmall.tsx | 4 ++-- src/photo/PhotoUpload.tsx | 2 +- src/photo/PhotosEmptyState.tsx | 4 ++-- src/photo/PhotosLargeInfinite.tsx | 2 +- src/photo/StaggeredOgPhotosInfinite.tsx | 2 +- src/photo/UploadPageClient.tsx | 2 +- src/photo/actions.ts | 4 ++-- src/photo/cache.ts | 2 +- src/photo/data.ts | 2 +- src/photo/db/index.ts | 2 +- src/photo/db/query.ts | 2 +- src/photo/form/PhotoForm.tsx | 4 ++-- src/photo/form/index.ts | 2 +- src/photo/index.ts | 4 ++-- src/photo/server.ts | 2 +- src/platforms/github.ts | 2 +- src/platforms/next-image.ts | 2 +- src/platforms/openai.ts | 2 +- src/platforms/postgres.ts | 2 +- src/platforms/storage/index.ts | 4 ++-- src/platforms/storage/vercel-blob.ts | 2 +- src/platforms/vercel.ts | 2 +- src/share/ShareModal.tsx | 2 +- src/share/index.ts | 2 +- src/simulation/FilmSimulationOGTile.tsx | 2 +- src/simulation/FilmSimulationShareModal.tsx | 2 +- src/simulation/PhotoFilmSimulation.tsx | 2 +- src/simulation/index.ts | 2 +- src/state/AppStateProvider.tsx | 2 +- src/tag/FavsTag.tsx | 2 +- src/tag/HiddenTag.tsx | 2 +- src/tag/PhotoTag.tsx | 2 +- src/tag/TagForm.tsx | 2 +- src/tag/TagOGTile.tsx | 2 +- src/tag/TagShareModal.tsx | 2 +- src/tag/index.ts | 2 +- 139 files changed, 164 insertions(+), 164 deletions(-) rename src/{app-core => app}/CommandK.tsx (100%) rename src/{app-core => app}/Footer.tsx (95%) rename src/{app-core => app}/IconFeed.tsx (100%) rename src/{app-core => app}/IconGrSync.tsx (100%) rename src/{app-core => app}/IconGrid.tsx (100%) rename src/{app-core => app}/IconSearch.tsx (100%) rename src/{app-core => app}/Nav.tsx (96%) rename src/{app-core => app}/SecretGenerator.tsx (100%) rename src/{app-core => app}/ThemeSwitcher.tsx (100%) rename src/{app-core => app}/ViewSwitcher.tsx (93%) rename src/{app-core => app}/api.ts (100%) rename src/{app-core => app}/config.ts (100%) rename src/{app-core => app}/font.ts (100%) rename src/{app-core => app}/paths.ts (100%) diff --git a/__tests__/github.test.ts b/__tests__/github.test.ts index 6aa8a2a0..a3b9cc1e 100644 --- a/__tests__/github.test.ts +++ b/__tests__/github.test.ts @@ -2,7 +2,7 @@ import { getGitHubMeta, getGitHubPublicFork, } from '@/platforms/github'; -import { TEMPLATE_REPO_OWNER, TEMPLATE_REPO_NAME } from '@/app-core/config'; +import { TEMPLATE_REPO_OWNER, TEMPLATE_REPO_NAME } from '@/app/config'; describe('GitHub', () => { it('fetches base repo meta', async () => { diff --git a/__tests__/path.test.ts b/__tests__/path.test.ts index 77f2c737..356e478e 100644 --- a/__tests__/path.test.ts +++ b/__tests__/path.test.ts @@ -12,7 +12,7 @@ import { isPathProtected, isPathTag, isPathTagPhoto, -} from '@/app-core/paths'; +} from '@/app/paths'; import { TAG_HIDDEN } from '@/tag'; const PHOTO_ID = 'UsKSGcbt'; diff --git a/app/admin/outdated/page.tsx b/app/admin/outdated/page.tsx index ef945ffc..ee30bc28 100644 --- a/app/admin/outdated/page.tsx +++ b/app/admin/outdated/page.tsx @@ -1,7 +1,7 @@ import { getPhotos } from '@/photo/db/query'; import { OUTDATED_THRESHOLD } from '@/photo'; import AdminOutdatedClient from '@/admin/AdminOutdatedClient'; -import { AI_TEXT_GENERATION_ENABLED } from '@/app-core/config'; +import { AI_TEXT_GENERATION_ENABLED } from '@/app/config'; export const maxDuration = 60; diff --git a/app/admin/photos/[photoId]/edit/page.tsx b/app/admin/photos/[photoId]/edit/page.tsx index c83c11a3..a0b1419a 100644 --- a/app/admin/photos/[photoId]/edit/page.tsx +++ b/app/admin/photos/[photoId]/edit/page.tsx @@ -1,12 +1,12 @@ import { redirect } from 'next/navigation'; import { getPhotoNoStore, getUniqueTagsCached } from '@/photo/cache'; -import { PATH_ADMIN } from '@/app-core/paths'; +import { PATH_ADMIN } from '@/app/paths'; import PhotoEditPageClient from '@/photo/PhotoEditPageClient'; import { AI_TEXT_GENERATION_ENABLED, BLUR_ENABLED, IS_PREVIEW, -} from '@/app-core/config'; +} from '@/app/config'; import { blurImageFromUrl, resizeImageFromUrl } from '@/photo/server'; import { getNextImageUrlForManipulation } from '@/platforms/next-image'; diff --git a/app/admin/tags/[tag]/edit/page.tsx b/app/admin/tags/[tag]/edit/page.tsx index 48c71ab4..5cdfc425 100644 --- a/app/admin/tags/[tag]/edit/page.tsx +++ b/app/admin/tags/[tag]/edit/page.tsx @@ -2,7 +2,7 @@ import AdminChildPage from '@/components/AdminChildPage'; import { redirect } from 'next/navigation'; import { getPhotosCached } from '@/photo/cache'; import TagForm from '@/tag/TagForm'; -import { PATH_ADMIN, PATH_ADMIN_TAGS, pathForTag } from '@/app-core/paths'; +import { PATH_ADMIN, PATH_ADMIN_TAGS, pathForTag } from '@/app/paths'; import PhotoLightbox from '@/photo/PhotoLightbox'; import { getPhotosMeta } from '@/photo/db/query'; import AdminTagBadge from '@/admin/AdminTagBadge'; diff --git a/app/admin/uploads/[uploadPath]/page.tsx b/app/admin/uploads/[uploadPath]/page.tsx index 595d332a..100913af 100644 --- a/app/admin/uploads/[uploadPath]/page.tsx +++ b/app/admin/uploads/[uploadPath]/page.tsx @@ -1,4 +1,4 @@ -import { PATH_ADMIN } from '@/app-core/paths'; +import { PATH_ADMIN } from '@/app/paths'; import { extractImageDataFromBlobPath } from '@/photo/server'; import { redirect } from 'next/navigation'; import { getUniqueTagsCached } from '@/photo/cache'; @@ -7,7 +7,7 @@ import { AI_TEXT_AUTO_GENERATED_FIELDS, AI_TEXT_GENERATION_ENABLED, BLUR_ENABLED, -} from '@/app-core/config'; +} from '@/app/config'; import ErrorNote from '@/components/ErrorNote'; export const maxDuration = 60; diff --git a/app/api/route.ts b/app/api/route.ts index e1a61c62..9d46cd8a 100644 --- a/app/api/route.ts +++ b/app/api/route.ts @@ -1,10 +1,10 @@ import { getPhotosCached } from '@/photo/cache'; -import { API_PHOTO_REQUEST_LIMIT, formatPhotoForApi } from '@/app-core/api'; +import { API_PHOTO_REQUEST_LIMIT, formatPhotoForApi } from '@/app/api'; import { BASE_URL, PUBLIC_API_ENABLED, SITE_TITLE, -} from '@/app-core/config'; +} from '@/app/config'; export const dynamic = 'force-dynamic'; diff --git a/app/api/storage/presigned-url/[key]/route.ts b/app/api/storage/presigned-url/[key]/route.ts index 99d078f5..0856e35c 100644 --- a/app/api/storage/presigned-url/[key]/route.ts +++ b/app/api/storage/presigned-url/[key]/route.ts @@ -7,7 +7,7 @@ import { cloudflareR2Client, cloudflareR2PutObjectCommandForKey, } from '@/platforms/storage/cloudflare-r2'; -import { CURRENT_STORAGE } from '@/app-core/config'; +import { CURRENT_STORAGE } from '@/app/config'; import { getSignedUrl } from '@aws-sdk/s3-request-presigner'; export async function GET( diff --git a/app/film/[simulation]/[photoId]/page.tsx b/app/film/[simulation]/[photoId]/page.tsx index 2171b016..0566cd4f 100644 --- a/app/film/[simulation]/[photoId]/page.tsx +++ b/app/film/[simulation]/[photoId]/page.tsx @@ -9,7 +9,7 @@ import { PATH_ROOT, absolutePathForPhoto, absolutePathForPhotoImage, -} from '@/app-core/paths'; +} from '@/app/paths'; import PhotoDetailPage from '@/photo/PhotoDetailPage'; import { FilmSimulation } from '@/simulation'; import { diff --git a/app/film/[simulation]/image/route.tsx b/app/film/[simulation]/image/route.tsx index b71f1569..386c5fc0 100644 --- a/app/film/[simulation]/image/route.tsx +++ b/app/film/[simulation]/image/route.tsx @@ -6,7 +6,7 @@ import { import FilmSimulationImageResponse from '@/image-response/FilmSimulationImageResponse'; import { FilmSimulation } from '@/simulation'; -import { getIBMPlexMonoMedium } from '@/app-core/font'; +import { getIBMPlexMonoMedium } from '@/app/font'; import { ImageResponse } from 'next/og'; import { getImageResponseCacheControlHeaders } from '@/image-response/cache'; import { GENERATE_STATIC_PARAMS_LIMIT } from '@/photo/db'; @@ -14,7 +14,7 @@ import { getUniqueFilmSimulations } from '@/photo/db/query'; import { STATICALLY_OPTIMIZED_PHOTO_CATEGORY_OG_IMAGES, IS_PRODUCTION, -} from '@/app-core/config'; +} from '@/app/config'; export let generateStaticParams: (() => Promise<{ simulation: FilmSimulation }[]>) | undefined = undefined; diff --git a/app/film/[simulation]/page.tsx b/app/film/[simulation]/page.tsx index 262d78fd..a941adb7 100644 --- a/app/film/[simulation]/page.tsx +++ b/app/film/[simulation]/page.tsx @@ -2,9 +2,9 @@ import { INFINITE_SCROLL_GRID_INITIAL } from '@/photo'; import { getUniqueFilmSimulations } from '@/photo/db/query'; import { FilmSimulation, generateMetaForFilmSimulation } from '@/simulation'; import FilmSimulationOverview from '@/simulation/FilmSimulationOverview'; -import { IS_PRODUCTION } from '@/app-core/config'; +import { IS_PRODUCTION } from '@/app/config'; import { getPhotosFilmSimulationDataCached } from '@/simulation/data'; -import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/app-core/config'; +import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/app/config'; import { Metadata } from 'next/types'; import { cache } from 'react'; diff --git a/app/focal/[focal]/[photoId]/page.tsx b/app/focal/[focal]/[photoId]/page.tsx index 85c4dc06..8c972a8c 100644 --- a/app/focal/[focal]/[photoId]/page.tsx +++ b/app/focal/[focal]/[photoId]/page.tsx @@ -9,7 +9,7 @@ import { PATH_ROOT, absolutePathForPhoto, absolutePathForPhotoImage, -} from '@/app-core/paths'; +} from '@/app/paths'; import PhotoDetailPage from '@/photo/PhotoDetailPage'; import { getPhotosNearIdCached } from '@/photo/cache'; import { cache } from 'react'; diff --git a/app/focal/[focal]/image/route.tsx b/app/focal/[focal]/image/route.tsx index 79682cb0..734e5a9a 100644 --- a/app/focal/[focal]/image/route.tsx +++ b/app/focal/[focal]/image/route.tsx @@ -3,7 +3,7 @@ import { IMAGE_OG_DIMENSION_SMALL, MAX_PHOTOS_TO_SHOW_PER_TAG, } from '@/image-response'; -import { getIBMPlexMonoMedium } from '@/app-core/font'; +import { getIBMPlexMonoMedium } from '@/app/font'; import { ImageResponse } from 'next/og'; import { getImageResponseCacheControlHeaders } from '@/image-response/cache'; import FocalLengthImageResponse from @@ -14,7 +14,7 @@ import { getUniqueFocalLengths } from '@/photo/db/query'; import { STATICALLY_OPTIMIZED_PHOTO_CATEGORY_OG_IMAGES, IS_PRODUCTION, -} from '@/app-core/config'; +} from '@/app/config'; export let generateStaticParams: (() => Promise<{ focal: string }[]>) | undefined = undefined; diff --git a/app/focal/[focal]/page.tsx b/app/focal/[focal]/page.tsx index 2d01680a..42634217 100644 --- a/app/focal/[focal]/page.tsx +++ b/app/focal/[focal]/page.tsx @@ -2,10 +2,10 @@ import { generateMetaForFocalLength, getFocalLengthFromString } from '@/focal'; import FocalLengthOverview from '@/focal/FocalLengthOverview'; import { getPhotosFocalLengthDataCached } from '@/focal/data'; import { INFINITE_SCROLL_GRID_INITIAL } from '@/photo'; -import { IS_PRODUCTION } from '@/app-core/config'; +import { IS_PRODUCTION } from '@/app/config'; import { getUniqueFocalLengths } from '@/photo/db/query'; -import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/app-core/config'; -import { PATH_ROOT } from '@/app-core/paths'; +import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/app/config'; +import { PATH_ROOT } from '@/app/paths'; import type { Metadata } from 'next'; import { redirect } from 'next/navigation'; import { cache } from 'react'; diff --git a/app/home-image/route.tsx b/app/home-image/route.tsx index fa820f94..7223cec0 100644 --- a/app/home-image/route.tsx +++ b/app/home-image/route.tsx @@ -4,7 +4,7 @@ import { MAX_PHOTOS_TO_SHOW_OG, } from '@/image-response'; import HomeImageResponse from '@/image-response/HomeImageResponse'; -import { getIBMPlexMonoMedium } from '@/app-core/font'; +import { getIBMPlexMonoMedium } from '@/app/font'; import { ImageResponse } from 'next/og'; import { getImageResponseCacheControlHeaders } from '@/image-response/cache'; import { isNextImageReadyBasedOnPhotos } from '@/photo'; diff --git a/app/layout.tsx b/app/layout.tsx index 1b2292cd..ae26b1c7 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -7,15 +7,15 @@ import { SITE_DESCRIPTION, SITE_DOMAIN_OR_TITLE, SITE_TITLE, -} from '@/app-core/config'; +} from '@/app/config'; import AppStateProvider from '@/state/AppStateProvider'; import ToasterWithThemes from '@/toast/ToasterWithThemes'; import PhotoEscapeHandler from '@/photo/PhotoEscapeHandler'; import { Metadata } from 'next/types'; import { ThemeProvider } from 'next-themes'; -import Nav from '@/app-core/Nav'; -import Footer from '@/app-core/Footer'; -import CommandK from '@/app-core/CommandK'; +import Nav from '@/app/Nav'; +import Footer from '@/app/Footer'; +import CommandK from '@/app/CommandK'; import SwrConfigClient from '@/state/SwrConfigClient'; import AdminBatchEditPanel from '@/admin/AdminBatchEditPanel'; import ShareModals from '@/share/ShareModals'; diff --git a/app/p/[photoId]/image/route.tsx b/app/p/[photoId]/image/route.tsx index 07be4e8f..55f48f34 100644 --- a/app/p/[photoId]/image/route.tsx +++ b/app/p/[photoId]/image/route.tsx @@ -1,13 +1,13 @@ import { getPhotoCached } from '@/photo/cache'; import { IMAGE_OG_DIMENSION } from '@/image-response'; import PhotoImageResponse from '@/image-response/PhotoImageResponse'; -import { getIBMPlexMonoMedium } from '@/app-core/font'; +import { getIBMPlexMonoMedium } from '@/app/font'; import { ImageResponse } from 'next/og'; import { getImageResponseCacheControlHeaders } from '@/image-response/cache'; import { IS_PRODUCTION, STATICALLY_OPTIMIZED_PHOTO_OG_IMAGES, -} from '@/app-core/config'; +} from '@/app/config'; import { getPhotoIds } from '@/photo/db/query'; import { GENERATE_STATIC_PARAMS_LIMIT } from '@/photo/db'; import { isNextImageReadyBasedOnPhotos } from '@/photo'; diff --git a/app/p/[photoId]/page.tsx b/app/p/[photoId]/page.tsx index 6097fbf1..01b77997 100644 --- a/app/p/[photoId]/page.tsx +++ b/app/p/[photoId]/page.tsx @@ -9,10 +9,10 @@ import { PATH_ROOT, absolutePathForPhoto, absolutePathForPhotoImage, -} from '@/app-core/paths'; +} from '@/app/paths'; import PhotoDetailPage from '@/photo/PhotoDetailPage'; import { getPhotosNearIdCached } from '@/photo/cache'; -import { IS_PRODUCTION, STATICALLY_OPTIMIZED_PHOTOS } from '@/app-core/config'; +import { IS_PRODUCTION, STATICALLY_OPTIMIZED_PHOTOS } from '@/app/config'; import { getPhotoIds } from '@/photo/db/query'; import { GENERATE_STATIC_PARAMS_LIMIT } from '@/photo/db'; import { cache } from 'react'; diff --git a/app/page.tsx b/app/page.tsx index e74c5467..6b25252e 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -7,7 +7,7 @@ import PhotosEmptyState from '@/photo/PhotosEmptyState'; import { Metadata } from 'next/types'; import { cache } from 'react'; import { getPhotos, getPhotosMeta } from '@/photo/db/query'; -import { GRID_HOMEPAGE_ENABLED } from '@/app-core/config'; +import { GRID_HOMEPAGE_ENABLED } from '@/app/config'; import { getPhotoSidebarData } from '@/photo/data'; import PhotoGridPage from '@/photo/PhotoGridPage'; import PhotoFeedPage from '@/photo/PhotoFeedPage'; diff --git a/app/shot-on/[make]/[model]/[photoId]/page.tsx b/app/shot-on/[make]/[model]/[photoId]/page.tsx index 169e80f2..73bf914d 100644 --- a/app/shot-on/[make]/[model]/[photoId]/page.tsx +++ b/app/shot-on/[make]/[model]/[photoId]/page.tsx @@ -9,7 +9,7 @@ import { PATH_ROOT, absolutePathForPhoto, absolutePathForPhotoImage, -} from '@/app-core/paths'; +} from '@/app/paths'; import PhotoDetailPage from '@/photo/PhotoDetailPage'; import { getPhotosMetaCached, diff --git a/app/shot-on/[make]/[model]/image/route.tsx b/app/shot-on/[make]/[model]/image/route.tsx index b073b7f9..e30c5e94 100644 --- a/app/shot-on/[make]/[model]/image/route.tsx +++ b/app/shot-on/[make]/[model]/image/route.tsx @@ -5,7 +5,7 @@ import { MAX_PHOTOS_TO_SHOW_PER_TAG, } from '@/image-response'; import CameraImageResponse from '@/image-response/CameraImageResponse'; -import { getIBMPlexMonoMedium } from '@/app-core/font'; +import { getIBMPlexMonoMedium } from '@/app/font'; import { ImageResponse } from 'next/og'; import { getImageResponseCacheControlHeaders } from '@/image-response/cache'; import { GENERATE_STATIC_PARAMS_LIMIT } from '@/photo/db'; @@ -13,7 +13,7 @@ import { getUniqueCameras } from '@/photo/db/query'; import { STATICALLY_OPTIMIZED_PHOTO_CATEGORY_OG_IMAGES, IS_PRODUCTION, -} from '@/app-core/config'; +} from '@/app/config'; export let generateStaticParams: (() => Promise<{ camera: Camera }[]>) | undefined = undefined; diff --git a/app/shot-on/[make]/[model]/page.tsx b/app/shot-on/[make]/[model]/page.tsx index 40ba15df..0a6cccb6 100644 --- a/app/shot-on/[make]/[model]/page.tsx +++ b/app/shot-on/[make]/[model]/page.tsx @@ -5,8 +5,8 @@ import { INFINITE_SCROLL_GRID_INITIAL } from '@/photo'; import { getPhotosCameraDataCached } from '@/camera/data'; import CameraOverview from '@/camera/CameraOverview'; import { cache } from 'react'; -import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/app-core/config'; -import { IS_PRODUCTION } from '@/app-core/config'; +import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/app/config'; +import { IS_PRODUCTION } from '@/app/config'; import { getUniqueCameras } from '@/photo/db/query'; const getPhotosCameraDataCachedCached = cache(( diff --git a/app/sign-in/page.tsx b/app/sign-in/page.tsx index f4a93638..7c3ee0a1 100644 --- a/app/sign-in/page.tsx +++ b/app/sign-in/page.tsx @@ -1,6 +1,6 @@ import { auth } from '@/auth'; import SignInForm from '@/auth/SignInForm'; -import { PATH_ADMIN } from '@/app-core/paths'; +import { PATH_ADMIN } from '@/app/paths'; import { clsx } from 'clsx/lite'; import { redirect } from 'next/navigation'; diff --git a/app/tag/[tag]/[photoId]/page.tsx b/app/tag/[tag]/[photoId]/page.tsx index 9120e9b8..9e1599ef 100644 --- a/app/tag/[tag]/[photoId]/page.tsx +++ b/app/tag/[tag]/[photoId]/page.tsx @@ -9,7 +9,7 @@ import { PATH_ROOT, absolutePathForPhoto, absolutePathForPhotoImage, -} from '@/app-core/paths'; +} from '@/app/paths'; import PhotoDetailPage from '@/photo/PhotoDetailPage'; import { getPhotosNearIdCached } from '@/photo/cache'; import { cache } from 'react'; diff --git a/app/tag/[tag]/image/route.tsx b/app/tag/[tag]/image/route.tsx index a2dcb221..6bb84066 100644 --- a/app/tag/[tag]/image/route.tsx +++ b/app/tag/[tag]/image/route.tsx @@ -4,7 +4,7 @@ import { MAX_PHOTOS_TO_SHOW_PER_TAG, } from '@/image-response'; import TagImageResponse from '@/image-response/TagImageResponse'; -import { getIBMPlexMonoMedium } from '@/app-core/font'; +import { getIBMPlexMonoMedium } from '@/app/font'; import { ImageResponse } from 'next/og'; import { getImageResponseCacheControlHeaders } from '@/image-response/cache'; import { GENERATE_STATIC_PARAMS_LIMIT } from '@/photo/db'; @@ -12,7 +12,7 @@ import { getUniqueTags } from '@/photo/db/query'; import { STATICALLY_OPTIMIZED_PHOTO_CATEGORY_OG_IMAGES, IS_PRODUCTION, -} from '@/app-core/config'; +} from '@/app/config'; export let generateStaticParams: (() => Promise<{ tag: string }[]>) | undefined = undefined; diff --git a/app/tag/[tag]/page.tsx b/app/tag/[tag]/page.tsx index 732e7b04..f5db21ea 100644 --- a/app/tag/[tag]/page.tsx +++ b/app/tag/[tag]/page.tsx @@ -1,8 +1,8 @@ import { INFINITE_SCROLL_GRID_INITIAL } from '@/photo'; import { getUniqueTags } from '@/photo/db/query'; -import { IS_PRODUCTION } from '@/app-core/config'; -import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/app-core/config'; -import { PATH_ROOT } from '@/app-core/paths'; +import { IS_PRODUCTION } from '@/app/config'; +import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/app/config'; +import { PATH_ROOT } from '@/app/paths'; import { generateMetaForTag } from '@/tag'; import TagOverview from '@/tag/TagOverview'; import { getPhotosTagDataCached } from '@/tag/data'; diff --git a/app/tag/hidden/[photoId]/page.tsx b/app/tag/hidden/[photoId]/page.tsx index d890a95b..42d97800 100644 --- a/app/tag/hidden/[photoId]/page.tsx +++ b/app/tag/hidden/[photoId]/page.tsx @@ -8,7 +8,7 @@ import { getPhotosNearIdCached, } from '@/photo/cache'; import { getPhotosMeta } from '@/photo/db/query'; -import { PATH_ROOT, absolutePathForPhoto } from '@/app-core/paths'; +import { PATH_ROOT, absolutePathForPhoto } from '@/app/paths'; import { TAG_HIDDEN } from '@/tag'; import { Metadata } from 'next'; import { redirect } from 'next/navigation'; diff --git a/app/tag/hidden/page.tsx b/app/tag/hidden/page.tsx index cf5a353d..3e4c87b1 100644 --- a/app/tag/hidden/page.tsx +++ b/app/tag/hidden/page.tsx @@ -4,7 +4,7 @@ import SiteGrid from '@/components/SiteGrid'; import PhotoGrid from '@/photo/PhotoGrid'; import { getPhotosNoStore } from '@/photo/cache'; import { getPhotosMeta } from '@/photo/db/query'; -import { absolutePathForTag } from '@/app-core/paths'; +import { absolutePathForTag } from '@/app/paths'; import { TAG_HIDDEN, descriptionForTaggedPhotos, titleForTag } from '@/tag'; import HiddenHeader from '@/tag/HiddenHeader'; import { Metadata } from 'next'; diff --git a/app/template-image-tight/route.tsx b/app/template-image-tight/route.tsx index 8fb805a4..177beaba 100644 --- a/app/template-image-tight/route.tsx +++ b/app/template-image-tight/route.tsx @@ -5,7 +5,7 @@ import { } from '@/image-response'; import TemplateImageResponse from '@/image-response/TemplateImageResponse'; -import { getIBMPlexMonoMedium } from '@/app-core/font'; +import { getIBMPlexMonoMedium } from '@/app/font'; import { ImageResponse } from 'next/og'; import { getImageResponseCacheControlHeaders } from '@/image-response/cache'; import { isNextImageReadyBasedOnPhotos } from '@/photo'; diff --git a/app/template-image/route.tsx b/app/template-image/route.tsx index 181defdb..1d54f99c 100644 --- a/app/template-image/route.tsx +++ b/app/template-image/route.tsx @@ -5,7 +5,7 @@ import { } from '@/image-response'; import TemplateImageResponse from '@/image-response/TemplateImageResponse'; -import { getIBMPlexMonoMedium } from '@/app-core/font'; +import { getIBMPlexMonoMedium } from '@/app/font'; import { ImageResponse } from 'next/og'; import { getImageResponseCacheControlHeaders } from '@/image-response/cache'; import { isNextImageReadyBasedOnPhotos } from '@/photo'; diff --git a/app/template-url/route.tsx b/app/template-url/route.tsx index 79599351..89e67847 100644 --- a/app/template-url/route.tsx +++ b/app/template-url/route.tsx @@ -4,7 +4,7 @@ import { TEMPLATE_REPO_NAME, TEMPLATE_DESCRIPTION, TEMPLATE_TITLE, -} from '@/app-core/config'; +} from '@/app/config'; import { NextResponse } from 'next/server'; const REQUIRE_ENV_VARS = false; diff --git a/src/admin/AdminAddAllUploads.tsx b/src/admin/AdminAddAllUploads.tsx index 71b31d56..2184b93a 100644 --- a/src/admin/AdminAddAllUploads.tsx +++ b/src/admin/AdminAddAllUploads.tsx @@ -4,7 +4,7 @@ import ErrorNote from '@/components/ErrorNote'; import FieldSetWithStatus from '@/components/FieldSetWithStatus'; import Container from '@/components/Container'; import { addAllUploadsAction } from '@/photo/actions'; -import { PATH_ADMIN_PHOTOS } from '@/app-core/paths'; +import { PATH_ADMIN_PHOTOS } from '@/app/paths'; import { Tags } from '@/tag'; import { generateLocalNaivePostgresString, diff --git a/src/admin/AdminAppConfiguration.tsx b/src/admin/AdminAppConfiguration.tsx index bc4dbc69..b241a2f1 100644 --- a/src/admin/AdminAppConfiguration.tsx +++ b/src/admin/AdminAppConfiguration.tsx @@ -1,5 +1,5 @@ import { Suspense } from 'react'; -import { APP_CONFIGURATION } from '@/app-core/config'; +import { APP_CONFIGURATION } from '@/app/config'; import AdminAppConfigurationServer from './AdminAppConfigurationServer'; import AdminAppConfigurationClient from './AdminAppConfigurationClient'; diff --git a/src/admin/AdminAppConfigurationClient.tsx b/src/admin/AdminAppConfigurationClient.tsx index 25b3d6ec..0982188e 100644 --- a/src/admin/AdminAppConfigurationClient.tsx +++ b/src/admin/AdminAppConfigurationClient.tsx @@ -13,7 +13,7 @@ import { } from 'react-icons/bi'; import { HiOutlineCog } from 'react-icons/hi'; import ChecklistGroup from '@/components/ChecklistGroup'; -import { ConfigChecklistStatus } from '../app-core/config'; +import { ConfigChecklistStatus } from '../app/config'; import StatusIcon from '@/components/StatusIcon'; import { labelForStorage } from '@/platforms/storage'; import { HiSparkles } from 'react-icons/hi'; @@ -21,7 +21,7 @@ import { testConnectionsAction } from '@/admin/actions'; import ErrorNote from '@/components/ErrorNote'; import WarningNote from '@/components/WarningNote'; import { RiSpeedMiniLine } from 'react-icons/ri'; -import SecretGenerator from '../app-core/SecretGenerator'; +import SecretGenerator from '../app/SecretGenerator'; import { PiPaintBrushHousehold } from 'react-icons/pi'; import { IoMdGrid } from 'react-icons/io'; import { CgDebug } from 'react-icons/cg'; diff --git a/src/admin/AdminAppConfigurationServer.tsx b/src/admin/AdminAppConfigurationServer.tsx index 0f19eb2c..0e817be1 100644 --- a/src/admin/AdminAppConfigurationServer.tsx +++ b/src/admin/AdminAppConfigurationServer.tsx @@ -1,5 +1,5 @@ import AdminAppConfigurationClient from './AdminAppConfigurationClient'; -import { APP_CONFIGURATION } from '@/app-core/config'; +import { APP_CONFIGURATION } from '@/app/config'; import { testConnectionsAction } from '@/admin/actions'; export default async function AdminAppConfigurationServer({ diff --git a/src/admin/AdminAppMenu.tsx b/src/admin/AdminAppMenu.tsx index de7e9f4d..d7c1cf3c 100644 --- a/src/admin/AdminAppMenu.tsx +++ b/src/admin/AdminAppMenu.tsx @@ -5,7 +5,7 @@ import { PATH_ADMIN_CONFIGURATION, PATH_ADMIN_INSIGHTS, PATH_GRID_INFERRED, -} from '@/app-core/paths'; +} from '@/app/paths'; import { useAppState } from '@/state/AppState'; import { ImCheckboxUnchecked } from 'react-icons/im'; import { IoCloseSharp } from 'react-icons/io5'; diff --git a/src/admin/AdminBatchEditPanelClient.tsx b/src/admin/AdminBatchEditPanelClient.tsx index e108c6cd..6a20b791 100644 --- a/src/admin/AdminBatchEditPanelClient.tsx +++ b/src/admin/AdminBatchEditPanelClient.tsx @@ -9,7 +9,7 @@ import { IoCloseSharp } from 'react-icons/io5'; import { useState } from 'react'; import { TAG_FAVS, Tags } from '@/tag'; import { usePathname } from 'next/navigation'; -import { PATH_GRID_INFERRED } from '@/app-core/paths'; +import { PATH_GRID_INFERRED } from '@/app/paths'; import PhotoTagFieldset from './PhotoTagFieldset'; import { tagMultiplePhotosAction } from '@/photo/actions'; import { toastSuccess } from '@/toast'; diff --git a/src/admin/AdminCTA.tsx b/src/admin/AdminCTA.tsx index 74ea1015..0f5ea73f 100644 --- a/src/admin/AdminCTA.tsx +++ b/src/admin/AdminCTA.tsx @@ -1,7 +1,7 @@ 'use client'; import PhotoUpload from '@/photo/PhotoUpload'; -import { PATH_ADMIN_PHOTOS } from '@/app-core/paths'; +import { PATH_ADMIN_PHOTOS } from '@/app/paths'; import { useAppState } from '@/state/AppState'; import Link from 'next/link'; import { useState } from 'react'; diff --git a/src/admin/AdminNav.tsx b/src/admin/AdminNav.tsx index 18c330f6..e6f10e30 100644 --- a/src/admin/AdminNav.tsx +++ b/src/admin/AdminNav.tsx @@ -8,7 +8,7 @@ import { PATH_ADMIN_PHOTOS, PATH_ADMIN_TAGS, PATH_ADMIN_UPLOADS, -} from '@/app-core/paths'; +} from '@/app/paths'; import AdminNavClient from './AdminNavClient'; export default async function AdminNav() { diff --git a/src/admin/AdminNavClient.tsx b/src/admin/AdminNavClient.tsx index b112dc3e..c7aea84a 100644 --- a/src/admin/AdminNavClient.tsx +++ b/src/admin/AdminNavClient.tsx @@ -12,7 +12,7 @@ import { isPathAdminConfiguration, isPathAdminInsights, isPathTopLevelAdmin, -} from '@/app-core/paths'; +} from '@/app/paths'; import { useAppState } from '@/state/AppState'; import { clsx } from 'clsx/lite'; import { differenceInMinutes } from 'date-fns'; diff --git a/src/admin/AdminOutdatedClient.tsx b/src/admin/AdminOutdatedClient.tsx index 734471b7..ad3f7f6b 100644 --- a/src/admin/AdminOutdatedClient.tsx +++ b/src/admin/AdminOutdatedClient.tsx @@ -3,10 +3,10 @@ import { OUTDATED_THRESHOLD, Photo } from '@/photo'; import AdminPhotosTable from '@/admin/AdminPhotosTable'; import LoaderButton from '@/components/primitives/LoaderButton'; -import IconGrSync from '@/app-core/IconGrSync'; +import IconGrSync from '@/app/IconGrSync'; import Note from '@/components/Note'; import AdminChildPage from '@/components/AdminChildPage'; -import { PATH_ADMIN_PHOTOS } from '@/app-core/paths'; +import { PATH_ADMIN_PHOTOS } from '@/app/paths'; import { useState } from 'react'; import { syncPhotosAction } from '@/photo/actions'; import { useRouter } from 'next/navigation'; diff --git a/src/admin/AdminPhotoMenuClient.tsx b/src/admin/AdminPhotoMenuClient.tsx index 2feade73..7e86c7e5 100644 --- a/src/admin/AdminPhotoMenuClient.tsx +++ b/src/admin/AdminPhotoMenuClient.tsx @@ -1,7 +1,7 @@ 'use client'; import { ComponentProps, useMemo } from 'react'; -import { pathForAdminPhotoEdit, pathForPhoto } from '@/app-core/paths'; +import { pathForAdminPhotoEdit, pathForPhoto } from '@/app/paths'; import { deletePhotoAction, toggleFavoritePhotoAction } from '@/photo/actions'; import { FaRegEdit, FaRegStar, FaStar } from 'react-icons/fa'; import { diff --git a/src/admin/AdminPhotosClient.tsx b/src/admin/AdminPhotosClient.tsx index 1199ca0c..d087a440 100644 --- a/src/admin/AdminPhotosClient.tsx +++ b/src/admin/AdminPhotosClient.tsx @@ -6,11 +6,11 @@ import SiteGrid from '@/components/SiteGrid'; import { AI_TEXT_GENERATION_ENABLED, PRESERVE_ORIGINAL_UPLOADS, -} from '@/app-core/config'; +} from '@/app/config'; import AdminPhotosTable from '@/admin/AdminPhotosTable'; import AdminPhotosTableInfinite from '@/admin/AdminPhotosTableInfinite'; import PathLoaderButton from '@/components/primitives/PathLoaderButton'; -import { PATH_ADMIN_OUTDATED } from '@/app-core/paths'; +import { PATH_ADMIN_OUTDATED } from '@/app/paths'; import { Photo } from '@/photo'; import { StorageListResponse } from '@/platforms/storage'; import { useState } from 'react'; diff --git a/src/admin/AdminPhotosTable.tsx b/src/admin/AdminPhotosTable.tsx index 0e8d8ca6..3d580674 100644 --- a/src/admin/AdminPhotosTable.tsx +++ b/src/admin/AdminPhotosTable.tsx @@ -5,7 +5,7 @@ import AdminTable from './AdminTable'; import { Fragment } from 'react'; import PhotoSmall from '@/photo/PhotoSmall'; import { clsx } from 'clsx/lite'; -import { pathForAdminPhotoEdit, pathForPhoto } from '@/app-core/paths'; +import { pathForAdminPhotoEdit, pathForPhoto } from '@/app/paths'; import Link from 'next/link'; import { AiOutlineEyeInvisible } from 'react-icons/ai'; import PhotoDate from '@/photo/PhotoDate'; diff --git a/src/admin/AdminPhotosTableInfinite.tsx b/src/admin/AdminPhotosTableInfinite.tsx index 65376dfe..c4ae655c 100644 --- a/src/admin/AdminPhotosTableInfinite.tsx +++ b/src/admin/AdminPhotosTableInfinite.tsx @@ -1,6 +1,6 @@ 'use client'; -import { PATH_ADMIN_PHOTOS } from '@/app-core/paths'; +import { PATH_ADMIN_PHOTOS } from '@/app/paths'; import InfinitePhotoScroll from '../photo/InfinitePhotoScroll'; import AdminPhotosTable from './AdminPhotosTable'; import { ComponentProps } from 'react'; diff --git a/src/admin/AdminTagTable.tsx b/src/admin/AdminTagTable.tsx index cf93cf99..8f961344 100644 --- a/src/admin/AdminTagTable.tsx +++ b/src/admin/AdminTagTable.tsx @@ -6,7 +6,7 @@ import DeleteFormButton from '@/admin/DeleteFormButton'; import { photoQuantityText } from '@/photo'; import { Tags, formatTag, sortTagsObject } from '@/tag'; import EditButton from '@/admin/EditButton'; -import { pathForAdminTagEdit } from '@/app-core/paths'; +import { pathForAdminTagEdit } from '@/app/paths'; import { clsx } from 'clsx/lite'; import AdminTagBadge from './AdminTagBadge'; diff --git a/src/admin/AdminUploadsTable.tsx b/src/admin/AdminUploadsTable.tsx index 6f9967d5..8b5ae2b4 100644 --- a/src/admin/AdminUploadsTable.tsx +++ b/src/admin/AdminUploadsTable.tsx @@ -5,7 +5,7 @@ import Spinner from '@/components/Spinner'; import { getIdFromStorageUrl } from '@/platforms/storage'; import { clsx } from 'clsx/lite'; import { FaRegCircleCheck } from 'react-icons/fa6'; -import { pathForAdminUploadUrl } from '@/app-core/paths'; +import { pathForAdminUploadUrl } from '@/app/paths'; import AddButton from './AddButton'; import { UrlAddStatus } from './AdminUploadsClient'; import ResponsiveDate from '@/components/ResponsiveDate'; diff --git a/src/admin/DeleteBlobButton.tsx b/src/admin/DeleteBlobButton.tsx index 10d483f0..12914ce8 100644 --- a/src/admin/DeleteBlobButton.tsx +++ b/src/admin/DeleteBlobButton.tsx @@ -3,7 +3,7 @@ import { deleteUploadAction } from '@/photo/actions'; import DeleteButton from './DeleteButton'; import { useRouter } from 'next/navigation'; -import { PATH_ADMIN_PHOTOS } from '@/app-core/paths'; +import { PATH_ADMIN_PHOTOS } from '@/app/paths'; import { useState } from 'react'; export default function DeleteUploadButton({ diff --git a/src/admin/ExifSyncButton.tsx b/src/admin/ExifSyncButton.tsx index f968e5d2..a5ddadce 100644 --- a/src/admin/ExifSyncButton.tsx +++ b/src/admin/ExifSyncButton.tsx @@ -4,7 +4,7 @@ import LoaderButton from '@/components/primitives/LoaderButton'; import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus'; import { getExifDataAction } from '@/photo/actions'; import { PhotoFormData } from '@/photo/form'; -import IconGrSync from '@/app-core/IconGrSync'; +import IconGrSync from '@/app/IconGrSync'; import { clsx } from 'clsx/lite'; import { ComponentProps, useState } from 'react'; diff --git a/src/admin/PhotoSyncButton.tsx b/src/admin/PhotoSyncButton.tsx index 07e0709d..e61ae875 100644 --- a/src/admin/PhotoSyncButton.tsx +++ b/src/admin/PhotoSyncButton.tsx @@ -1,6 +1,6 @@ import LoaderButton from '@/components/primitives/LoaderButton'; import { syncPhotoAction } from '@/photo/actions'; -import IconGrSync from '@/app-core/IconGrSync'; +import IconGrSync from '@/app/IconGrSync'; import { toastSuccess } from '@/toast'; import { ComponentProps, useState } from 'react'; diff --git a/src/admin/actions.ts b/src/admin/actions.ts index 57f408f4..de215f9c 100644 --- a/src/admin/actions.ts +++ b/src/admin/actions.ts @@ -5,7 +5,7 @@ import { testRedisConnection } from '@/platforms/redis'; import { testOpenAiConnection } from '@/platforms/openai'; import { testDatabaseConnection } from '@/platforms/postgres'; import { testStorageConnection } from '@/platforms/storage'; -import { APP_CONFIGURATION } from '@/app-core/config'; +import { APP_CONFIGURATION } from '@/app/config'; const scanForError = ( shouldCheck: boolean, diff --git a/src/admin/insights/AdminAppInsights.tsx b/src/admin/insights/AdminAppInsights.tsx index 86c7abf8..db92e2fd 100644 --- a/src/admin/insights/AdminAppInsights.tsx +++ b/src/admin/insights/AdminAppInsights.tsx @@ -12,7 +12,7 @@ import { HAS_STATIC_OPTIMIZATION, IS_PRODUCTION, MATTE_PHOTOS, -} from '@/app-core/config'; +} from '@/app/config'; import { OUTDATED_THRESHOLD } from '@/photo'; import { getGitHubMetaForCurrentApp, getSignificantInsights } from '.'; diff --git a/src/admin/insights/AdminAppInsightsClient.tsx b/src/admin/insights/AdminAppInsightsClient.tsx index 5ced66bc..01d42baf 100644 --- a/src/admin/insights/AdminAppInsightsClient.tsx +++ b/src/admin/insights/AdminAppInsightsClient.tsx @@ -20,7 +20,7 @@ import { VERCEL_GIT_COMMIT_MESSAGE, TEMPLATE_REPO_URL_FORK, TEMPLATE_REPO_URL_README, -} from '@/app-core/config'; +} from '@/app/config'; import { AdminAppInsights, getGitHubMetaForCurrentApp, @@ -30,7 +30,7 @@ import { import EnvVar from '@/components/EnvVar'; import { IoSyncCircle } from 'react-icons/io5'; import clsx from 'clsx/lite'; -import { PATH_ADMIN_OUTDATED } from '@/app-core/paths'; +import { PATH_ADMIN_OUTDATED } from '@/app/paths'; import { LiaBroomSolid } from 'react-icons/lia'; import { IoMdGrid } from 'react-icons/io'; import { RiSpeedMiniLine } from 'react-icons/ri'; diff --git a/src/admin/insights/index.ts b/src/admin/insights/index.ts index 6065ae74..0514fc9c 100644 --- a/src/admin/insights/index.ts +++ b/src/admin/insights/index.ts @@ -6,7 +6,7 @@ import { IS_VERCEL_GIT_PROVIDER_GITHUB, IS_DEVELOPMENT, APP_CONFIGURATION, -} from '@/app-core/config'; +} from '@/app/config'; import { PhotoDateRange } from '@/photo'; import { getGitHubMeta } from '@/platforms/github'; diff --git a/src/app-core/CommandK.tsx b/src/app/CommandK.tsx similarity index 100% rename from src/app-core/CommandK.tsx rename to src/app/CommandK.tsx diff --git a/src/app-core/Footer.tsx b/src/app/Footer.tsx similarity index 95% rename from src/app-core/Footer.tsx rename to src/app/Footer.tsx index 2fab4de5..3579b55c 100644 --- a/src/app-core/Footer.tsx +++ b/src/app/Footer.tsx @@ -2,9 +2,9 @@ import { clsx } from 'clsx/lite'; import SiteGrid from '../components/SiteGrid'; -import ThemeSwitcher from '@/app-core/ThemeSwitcher'; +import ThemeSwitcher from '@/app/ThemeSwitcher'; import Link from 'next/link'; -import { SHOW_REPO_LINK } from '@/app-core/config'; +import { SHOW_REPO_LINK } from '@/app/config'; import RepoLink from '../components/RepoLink'; import { usePathname } from 'next/navigation'; import { PATH_ADMIN_PHOTOS, isPathAdmin, isPathSignIn } from './paths'; diff --git a/src/app-core/IconFeed.tsx b/src/app/IconFeed.tsx similarity index 100% rename from src/app-core/IconFeed.tsx rename to src/app/IconFeed.tsx diff --git a/src/app-core/IconGrSync.tsx b/src/app/IconGrSync.tsx similarity index 100% rename from src/app-core/IconGrSync.tsx rename to src/app/IconGrSync.tsx diff --git a/src/app-core/IconGrid.tsx b/src/app/IconGrid.tsx similarity index 100% rename from src/app-core/IconGrid.tsx rename to src/app/IconGrid.tsx diff --git a/src/app-core/IconSearch.tsx b/src/app/IconSearch.tsx similarity index 100% rename from src/app-core/IconSearch.tsx rename to src/app/IconSearch.tsx diff --git a/src/app-core/Nav.tsx b/src/app/Nav.tsx similarity index 96% rename from src/app-core/Nav.tsx rename to src/app/Nav.tsx index 07715a4c..adfeb2ce 100644 --- a/src/app-core/Nav.tsx +++ b/src/app/Nav.tsx @@ -4,7 +4,7 @@ import { clsx } from 'clsx/lite'; import { usePathname } from 'next/navigation'; import Link from 'next/link'; import SiteGrid from '../components/SiteGrid'; -import ViewSwitcher, { SwitcherSelection } from '@/app-core/ViewSwitcher'; +import ViewSwitcher, { SwitcherSelection } from '@/app/ViewSwitcher'; import { PATH_ROOT, isPathAdmin, @@ -12,7 +12,7 @@ import { isPathGrid, isPathProtected, isPathSignIn, -} from '@/app-core/paths'; +} from '@/app/paths'; import AnimateItems from '../components/AnimateItems'; import { useAppState } from '@/state/AppState'; import { diff --git a/src/app-core/SecretGenerator.tsx b/src/app/SecretGenerator.tsx similarity index 100% rename from src/app-core/SecretGenerator.tsx rename to src/app/SecretGenerator.tsx diff --git a/src/app-core/ThemeSwitcher.tsx b/src/app/ThemeSwitcher.tsx similarity index 100% rename from src/app-core/ThemeSwitcher.tsx rename to src/app/ThemeSwitcher.tsx diff --git a/src/app-core/ViewSwitcher.tsx b/src/app/ViewSwitcher.tsx similarity index 93% rename from src/app-core/ViewSwitcher.tsx rename to src/app/ViewSwitcher.tsx index ab39720e..2ff538ed 100644 --- a/src/app-core/ViewSwitcher.tsx +++ b/src/app/ViewSwitcher.tsx @@ -1,12 +1,12 @@ import Switcher from '@/components/Switcher'; import SwitcherItem from '@/components/SwitcherItem'; -import IconFeed from '@/app-core/IconFeed'; -import IconGrid from '@/app-core/IconGrid'; +import IconFeed from '@/app/IconFeed'; +import IconGrid from '@/app/IconGrid'; import { PATH_ADMIN_PHOTOS, PATH_FEED_INFERRED, PATH_GRID_INFERRED, -} from '@/app-core/paths'; +} from '@/app/paths'; import { BiLockAlt } from 'react-icons/bi'; import IconSearch from './IconSearch'; import { useAppState } from '@/state/AppState'; diff --git a/src/app-core/api.ts b/src/app/api.ts similarity index 100% rename from src/app-core/api.ts rename to src/app/api.ts diff --git a/src/app-core/config.ts b/src/app/config.ts similarity index 100% rename from src/app-core/config.ts rename to src/app/config.ts diff --git a/src/app-core/font.ts b/src/app/font.ts similarity index 100% rename from src/app-core/font.ts rename to src/app/font.ts diff --git a/src/app-core/paths.ts b/src/app/paths.ts similarity index 100% rename from src/app-core/paths.ts rename to src/app/paths.ts diff --git a/src/auth/actions.ts b/src/auth/actions.ts index d3791893..894fb1d6 100644 --- a/src/auth/actions.ts +++ b/src/auth/actions.ts @@ -10,7 +10,7 @@ import { signIn, signOut, } from '@/auth'; -import { PATH_ADMIN_PHOTOS, PATH_ROOT } from '@/app-core/paths'; +import { PATH_ADMIN_PHOTOS, PATH_ROOT } from '@/app/paths'; import type { Session } from 'next-auth'; import { redirect } from 'next/navigation'; diff --git a/src/auth/index.ts b/src/auth/index.ts index 83ec6da7..a207d8cd 100644 --- a/src/auth/index.ts +++ b/src/auth/index.ts @@ -1,4 +1,4 @@ -import { isPathProtected } from '@/app-core/paths'; +import { isPathProtected } from '@/app/paths'; import NextAuth, { User } from 'next-auth'; import Credentials from 'next-auth/providers/credentials'; diff --git a/src/camera/CameraOGTile.tsx b/src/camera/CameraOGTile.tsx index 184b8399..5e74795f 100644 --- a/src/camera/CameraOGTile.tsx +++ b/src/camera/CameraOGTile.tsx @@ -1,5 +1,5 @@ import { Photo, PhotoDateRange } from '@/photo'; -import { absolutePathForCameraImage, pathForCamera } from '@/app-core/paths'; +import { absolutePathForCameraImage, pathForCamera } from '@/app/paths'; import OGTile from '@/components/OGTile'; import { Camera } from '.'; import { descriptionForCameraPhotos, titleForCamera } from './meta'; diff --git a/src/camera/CameraShareModal.tsx b/src/camera/CameraShareModal.tsx index 6e85b7ef..d731e5a5 100644 --- a/src/camera/CameraShareModal.tsx +++ b/src/camera/CameraShareModal.tsx @@ -1,4 +1,4 @@ -import { absolutePathForCamera } from '@/app-core/paths'; +import { absolutePathForCamera } from '@/app/paths'; import { PhotoSetAttributes } from '../photo'; import ShareModal from '@/share/ShareModal'; import CameraOGTile from './CameraOGTile'; diff --git a/src/camera/PhotoCamera.tsx b/src/camera/PhotoCamera.tsx index 845de6d5..1943db11 100644 --- a/src/camera/PhotoCamera.tsx +++ b/src/camera/PhotoCamera.tsx @@ -1,5 +1,5 @@ import { AiFillApple } from 'react-icons/ai'; -import { pathForCamera } from '@/app-core/paths'; +import { pathForCamera } from '@/app/paths'; import { IoMdCamera } from 'react-icons/io'; import { Camera, formatCameraText, isCameraApple } from '.'; import EntityLink, { diff --git a/src/camera/meta.ts b/src/camera/meta.ts index 5c85cd2a..3fd38bc4 100644 --- a/src/camera/meta.ts +++ b/src/camera/meta.ts @@ -8,7 +8,7 @@ import { Camera, cameraFromPhoto, formatCameraText } from '.'; import { absolutePathForCamera, absolutePathForCameraImage, -} from '@/app-core/paths'; +} from '@/app/paths'; // Meta functions moved to separate file to avoid // dependencies (camelcase-keys) found in photo/index.ts diff --git a/src/components/HttpStatusPage.tsx b/src/components/HttpStatusPage.tsx index 4e9dba0d..13dd3d0d 100644 --- a/src/components/HttpStatusPage.tsx +++ b/src/components/HttpStatusPage.tsx @@ -1,7 +1,7 @@ import { ReactNode } from 'react'; import SiteGrid from './SiteGrid'; import { clsx } from 'clsx/lite'; -import { PATH_ROOT } from '@/app-core/paths'; +import { PATH_ROOT } from '@/app/paths'; import Link from 'next/link'; export default function HttpStatusPage({ diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx index f4b9eca2..d1ef5f87 100644 --- a/src/components/Modal.tsx +++ b/src/components/Modal.tsx @@ -6,7 +6,7 @@ import { clsx } from 'clsx/lite'; import useClickInsideOutside from '@/utility/useClickInsideOutside'; import { useRouter } from 'next/navigation'; import AnimateItems from './AnimateItems'; -import { PATH_ROOT } from '@/app-core/paths'; +import { PATH_ROOT } from '@/app/paths'; import usePrefersReducedMotion from '@/utility/usePrefersReducedMotion'; import useMetaThemeColor from '@/utility/useMetaThemeColor'; import useEscapeHandler from '@/utility/useEscapeHandler'; diff --git a/src/components/RepoLink.tsx b/src/components/RepoLink.tsx index 621c6f82..cca83faf 100644 --- a/src/components/RepoLink.tsx +++ b/src/components/RepoLink.tsx @@ -1,4 +1,4 @@ -import { TEMPLATE_REPO_NAME, TEMPLATE_REPO_URL } from '@/app-core/config'; +import { TEMPLATE_REPO_NAME, TEMPLATE_REPO_URL } from '@/app/config'; import { clsx } from 'clsx/lite'; import Link from 'next/link'; import { BiLogoGithub } from 'react-icons/bi'; diff --git a/src/components/SwitcherItem.tsx b/src/components/SwitcherItem.tsx index 3967f9ce..b69b00fc 100644 --- a/src/components/SwitcherItem.tsx +++ b/src/components/SwitcherItem.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx/lite'; -import { SHOULD_PREFETCH_ALL_LINKS } from '@/app-core/config'; +import { SHOULD_PREFETCH_ALL_LINKS } from '@/app/config'; import { JSX } from 'react'; import Spinner from './Spinner'; import LinkWithLoader from './LinkWithLoader'; diff --git a/src/components/cmdk/CommandKClient.tsx b/src/components/cmdk/CommandKClient.tsx index 5e9c1707..17e72d9c 100644 --- a/src/components/cmdk/CommandKClient.tsx +++ b/src/components/cmdk/CommandKClient.tsx @@ -22,7 +22,7 @@ import { PATH_SIGN_IN, pathForPhoto, pathForTag, -} from '../../app-core/paths'; +} from '../../app/paths'; import Modal from '../Modal'; import { clsx } from 'clsx/lite'; import { useDebounce } from 'use-debounce'; @@ -46,7 +46,7 @@ import { Tags, addHiddenToTags, formatTag } from '@/tag'; import { FaTag } from 'react-icons/fa'; import { formatCount, formatCountDescriptive } from '@/utility/string'; import CommandKItem from './CommandKItem'; -import { GRID_HOMEPAGE_ENABLED } from '@/app-core/config'; +import { GRID_HOMEPAGE_ENABLED } from '@/app/config'; import { DialogDescription, DialogTitle } from '@radix-ui/react-dialog'; import * as VisuallyHidden from '@radix-ui/react-visually-hidden'; diff --git a/src/components/image/ImageLarge.tsx b/src/components/image/ImageLarge.tsx index 4a9ee82f..0f56f6b1 100644 --- a/src/components/image/ImageLarge.tsx +++ b/src/components/image/ImageLarge.tsx @@ -1,4 +1,4 @@ -import { IMAGE_QUALITY } from '@/app-core/config'; +import { IMAGE_QUALITY } from '@/app/config'; import { IMAGE_WIDTH_LARGE, ImageProps } from '.'; import ImageWithFallback from './ImageWithFallback'; diff --git a/src/components/image/ImageWithFallback.tsx b/src/components/image/ImageWithFallback.tsx index 91ae5935..c39fdd93 100644 --- a/src/components/image/ImageWithFallback.tsx +++ b/src/components/image/ImageWithFallback.tsx @@ -1,7 +1,7 @@ 'use client'; /* eslint-disable jsx-a11y/alt-text */ -import { BLUR_ENABLED } from '@/app-core/config'; +import { BLUR_ENABLED } from '@/app/config'; import { useAppState } from '@/state/AppState'; import { clsx} from 'clsx/lite'; import Image, { ImageProps } from 'next/image'; diff --git a/src/focal/FocalLengthOGTile.tsx b/src/focal/FocalLengthOGTile.tsx index b7fc7782..6262bd31 100644 --- a/src/focal/FocalLengthOGTile.tsx +++ b/src/focal/FocalLengthOGTile.tsx @@ -2,7 +2,7 @@ import { Photo, PhotoDateRange } from '@/photo'; import { absolutePathForFocalLengthImage, pathForFocalLength, -} from '@/app-core/paths'; +} from '@/app/paths'; import OGTile from '@/components/OGTile'; import { descriptionForFocalLengthPhotos, titleForFocalLength } from '.'; diff --git a/src/focal/FocalLengthShareModal.tsx b/src/focal/FocalLengthShareModal.tsx index 62d89cf2..b770956b 100644 --- a/src/focal/FocalLengthShareModal.tsx +++ b/src/focal/FocalLengthShareModal.tsx @@ -1,4 +1,4 @@ -import { absolutePathForFocalLength } from '@/app-core/paths'; +import { absolutePathForFocalLength } from '@/app/paths'; import { PhotoSetAttributes } from '../photo'; import ShareModal from '@/share/ShareModal'; import FocalLengthOGTile from './FocalLengthOGTile'; diff --git a/src/focal/PhotoFocalLength.tsx b/src/focal/PhotoFocalLength.tsx index c457e291..5b4c9cf4 100644 --- a/src/focal/PhotoFocalLength.tsx +++ b/src/focal/PhotoFocalLength.tsx @@ -1,4 +1,4 @@ -import { pathForFocalLength } from '@/app-core/paths'; +import { pathForFocalLength } from '@/app/paths'; import EntityLink, { EntityLinkExternalProps, } from '@/components/primitives/EntityLink'; diff --git a/src/focal/index.ts b/src/focal/index.ts index 617bf113..4089ff32 100644 --- a/src/focal/index.ts +++ b/src/focal/index.ts @@ -7,7 +7,7 @@ import { import { absolutePathForFocalLength, absolutePathForFocalLengthImage, -} from '@/app-core/paths'; +} from '@/app/paths'; export type FocalLengths = { focal: number diff --git a/src/image-response/HomeImageResponse.tsx b/src/image-response/HomeImageResponse.tsx index e6f3789b..c0aea4c7 100644 --- a/src/image-response/HomeImageResponse.tsx +++ b/src/image-response/HomeImageResponse.tsx @@ -1,4 +1,4 @@ -import { SITE_DOMAIN_OR_TITLE } from '@/app-core/config'; +import { SITE_DOMAIN_OR_TITLE } from '@/app/config'; import { Photo } from '../photo'; import ImageCaption from './components/ImageCaption'; import ImageContainer from './components/ImageContainer'; diff --git a/src/image-response/PhotoImageResponse.tsx b/src/image-response/PhotoImageResponse.tsx index 20eee2b0..99711732 100644 --- a/src/image-response/PhotoImageResponse.tsx +++ b/src/image-response/PhotoImageResponse.tsx @@ -3,7 +3,7 @@ import { AiFillApple } from 'react-icons/ai'; import ImageCaption from './components/ImageCaption'; import ImagePhotoGrid from './components/ImagePhotoGrid'; import ImageContainer from './components/ImageContainer'; -import { OG_TEXT_BOTTOM_ALIGNMENT } from '@/app-core/config'; +import { OG_TEXT_BOTTOM_ALIGNMENT } from '@/app/config'; import { NextImageSize } from '@/platforms/next-image'; import { cameraFromPhoto, formatCameraText } from '@/camera'; diff --git a/src/image-response/TemplateImageResponse.tsx b/src/image-response/TemplateImageResponse.tsx index 7a063b54..7c42402c 100644 --- a/src/image-response/TemplateImageResponse.tsx +++ b/src/image-response/TemplateImageResponse.tsx @@ -1,6 +1,6 @@ import { Photo } from '../photo'; -import IconFeed from '@/app-core/IconFeed'; -import IconGrid from '@/app-core/IconGrid'; +import IconFeed from '@/app/IconFeed'; +import IconGrid from '@/app/IconGrid'; import ImagePhotoGrid from './components/ImagePhotoGrid'; import { NextImageSize } from '@/platforms/next-image'; diff --git a/src/image-response/components/ImageCaption.tsx b/src/image-response/components/ImageCaption.tsx index 8b52f32d..c05bc5c0 100644 --- a/src/image-response/components/ImageCaption.tsx +++ b/src/image-response/components/ImageCaption.tsx @@ -1,4 +1,4 @@ -import { OG_TEXT_BOTTOM_ALIGNMENT } from '@/app-core/config'; +import { OG_TEXT_BOTTOM_ALIGNMENT } from '@/app/config'; import { ReactNode } from 'react'; const GRADIENT_STOPS = 'rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0.7)'; diff --git a/src/image-response/components/ImagePhotoGrid.tsx b/src/image-response/components/ImagePhotoGrid.tsx index 6c253843..fa2c8793 100644 --- a/src/image-response/components/ImagePhotoGrid.tsx +++ b/src/image-response/components/ImagePhotoGrid.tsx @@ -5,7 +5,7 @@ import { NextImageSize, getNextImageUrlForRequest, } from '@/platforms/next-image'; -import { IS_PREVIEW } from '@/app-core/config'; +import { IS_PREVIEW } from '@/app/config'; export default function ImagePhotoGrid({ photos, diff --git a/src/middleware.ts b/src/middleware.ts index a2534203..0fc0d2dd 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -8,7 +8,7 @@ import { PATH_OG_SAMPLE, PREFIX_PHOTO, PREFIX_TAG, -} from './app-core/paths'; +} from './app/paths'; export default function middleware(req: NextRequest, res:NextResponse) { const pathname = req.nextUrl.pathname; diff --git a/src/photo/InfinitePhotoScroll.tsx b/src/photo/InfinitePhotoScroll.tsx index 71ddaedd..77adb2f4 100644 --- a/src/photo/InfinitePhotoScroll.tsx +++ b/src/photo/InfinitePhotoScroll.tsx @@ -16,7 +16,7 @@ import { clsx } from 'clsx/lite'; import { useAppState } from '@/state/AppState'; import { GetPhotosOptions } from './db'; import useVisible from '@/utility/useVisible'; -import { ADMIN_DB_OPTIMIZE_ENABLED } from '@/app-core/config'; +import { ADMIN_DB_OPTIMIZE_ENABLED } from '@/app/config'; export type RevalidatePhoto = ( photoId: string, diff --git a/src/photo/PhotoEditPageClient.tsx b/src/photo/PhotoEditPageClient.tsx index e94af7de..69fc8ede 100644 --- a/src/photo/PhotoEditPageClient.tsx +++ b/src/photo/PhotoEditPageClient.tsx @@ -2,7 +2,7 @@ import AdminChildPage from '@/components/AdminChildPage'; import { Photo } from '.'; -import { PATH_ADMIN_PHOTOS } from '@/app-core/paths'; +import { PATH_ADMIN_PHOTOS } from '@/app/paths'; import { PhotoFormData, convertPhotoToFormData } from './form'; import PhotoForm from './form/PhotoForm'; import { Tags } from '@/tag'; diff --git a/src/photo/PhotoEscapeHandler.tsx b/src/photo/PhotoEscapeHandler.tsx index 86d7809a..c52223af 100644 --- a/src/photo/PhotoEscapeHandler.tsx +++ b/src/photo/PhotoEscapeHandler.tsx @@ -1,6 +1,6 @@ 'use client'; -import { getEscapePath } from '@/app-core/paths'; +import { getEscapePath } from '@/app/paths'; import { useRouter, usePathname } from 'next/navigation'; import { useCallback } from 'react'; import useEscapeHandler from '../utility/useEscapeHandler'; diff --git a/src/photo/PhotoGrid.tsx b/src/photo/PhotoGrid.tsx index b69cd133..fc153f67 100644 --- a/src/photo/PhotoGrid.tsx +++ b/src/photo/PhotoGrid.tsx @@ -4,7 +4,7 @@ import { Photo, PhotoSetCategory } from '.'; import PhotoMedium from './PhotoMedium'; import { clsx } from 'clsx/lite'; import AnimateItems from '@/components/AnimateItems'; -import { GRID_ASPECT_RATIO } from '@/app-core/config'; +import { GRID_ASPECT_RATIO } from '@/app/config'; import { useAppState } from '@/state/AppState'; import SelectTileOverlay from '@/components/SelectTileOverlay'; import { JSX } from 'react'; diff --git a/src/photo/PhotoGridPage.tsx b/src/photo/PhotoGridPage.tsx index 2ec0d14d..aed2312b 100644 --- a/src/photo/PhotoGridPage.tsx +++ b/src/photo/PhotoGridPage.tsx @@ -4,7 +4,7 @@ import { Tags } from '@/tag'; import { Photo } from '.'; import { Cameras } from '@/camera'; import { FilmSimulations } from '@/simulation'; -import { PATH_GRID_INFERRED } from '@/app-core/paths'; +import { PATH_GRID_INFERRED } from '@/app/paths'; import PhotoGridSidebar from './PhotoGridSidebar'; import PhotoGridContainer from './PhotoGridContainer'; import { useEffect } from 'react'; diff --git a/src/photo/PhotoGridSidebar.tsx b/src/photo/PhotoGridSidebar.tsx index 5362c21e..21c53dae 100644 --- a/src/photo/PhotoGridSidebar.tsx +++ b/src/photo/PhotoGridSidebar.tsx @@ -15,7 +15,7 @@ import FavsTag from '../tag/FavsTag'; import { useAppState } from '@/state/AppState'; import { useMemo } from 'react'; import HiddenTag from '@/tag/HiddenTag'; -import { SITE_ABOUT } from '@/app-core/config'; +import { SITE_ABOUT } from '@/app/config'; import { htmlHasBrParagraphBreaks, safelyParseFormattedHtml, diff --git a/src/photo/PhotoLarge.tsx b/src/photo/PhotoLarge.tsx index f45eadd9..7f5beb3a 100644 --- a/src/photo/PhotoLarge.tsx +++ b/src/photo/PhotoLarge.tsx @@ -15,7 +15,7 @@ import Link from 'next/link'; import { pathForFocalLength, pathForPhoto, -} from '@/app-core/paths'; +} from '@/app/paths'; import PhotoTags from '@/tag/PhotoTags'; import ShareButton from '@/share/ShareButton'; import DownloadButton from '@/components/DownloadButton'; @@ -29,7 +29,7 @@ import { SHOULD_PREFETCH_ALL_LINKS, ALLOW_PUBLIC_DOWNLOADS, SHOW_TAKEN_AT_TIME, -} from '@/app-core/config'; +} from '@/app/config'; import AdminPhotoMenuClient from '@/admin/AdminPhotoMenuClient'; import { RevalidatePhoto } from './InfinitePhotoScroll'; import { useRef } from 'react'; diff --git a/src/photo/PhotoLink.tsx b/src/photo/PhotoLink.tsx index d17ff63b..c8f1b7c3 100644 --- a/src/photo/PhotoLink.tsx +++ b/src/photo/PhotoLink.tsx @@ -5,7 +5,7 @@ import { Photo, PhotoSetCategory, titleForPhoto } from '@/photo'; import Link from 'next/link'; import { AnimationConfig } from '../components/AnimateItems'; import { useAppState } from '@/state/AppState'; -import { pathForPhoto } from '@/app-core/paths'; +import { pathForPhoto } from '@/app/paths'; import { clsx } from 'clsx/lite'; export default function PhotoLink({ diff --git a/src/photo/PhotoMedium.tsx b/src/photo/PhotoMedium.tsx index a659213c..634b126d 100644 --- a/src/photo/PhotoMedium.tsx +++ b/src/photo/PhotoMedium.tsx @@ -8,8 +8,8 @@ import { } from '.'; import ImageMedium from '@/components/image/ImageMedium'; import { clsx } from 'clsx/lite'; -import { pathForPhoto } from '@/app-core/paths'; -import { SHOULD_PREFETCH_ALL_LINKS } from '@/app-core/config'; +import { pathForPhoto } from '@/app/paths'; +import { SHOULD_PREFETCH_ALL_LINKS } from '@/app/config'; import { useRef } from 'react'; import useVisible from '@/utility/useVisible'; import LinkWithStatus from '@/components/LinkWithStatus'; diff --git a/src/photo/PhotoOGTile.tsx b/src/photo/PhotoOGTile.tsx index 58498834..eacd838e 100644 --- a/src/photo/PhotoOGTile.tsx +++ b/src/photo/PhotoOGTile.tsx @@ -4,7 +4,7 @@ import { descriptionForPhoto, titleForPhoto, } from '@/photo'; -import { absolutePathForPhotoImage, pathForPhoto } from '@/app-core/paths'; +import { absolutePathForPhotoImage, pathForPhoto } from '@/app/paths'; import OGTile from '@/components/OGTile'; export type OGLoadingState = 'unloaded' | 'loading' | 'loaded' | 'failed'; diff --git a/src/photo/PhotoPrevNext.tsx b/src/photo/PhotoPrevNext.tsx index 0808cf1c..c20ea912 100644 --- a/src/photo/PhotoPrevNext.tsx +++ b/src/photo/PhotoPrevNext.tsx @@ -9,7 +9,7 @@ import { } from '@/photo'; import PhotoLink from './PhotoLink'; import { useRouter } from 'next/navigation'; -import { pathForPhoto } from '@/app-core/paths'; +import { pathForPhoto } from '@/app/paths'; import { useAppState } from '@/state/AppState'; import { AnimationConfig } from '@/components/AnimateItems'; import { clsx } from 'clsx/lite'; diff --git a/src/photo/PhotoShareModal.tsx b/src/photo/PhotoShareModal.tsx index 851dcb4e..31f6a09e 100644 --- a/src/photo/PhotoShareModal.tsx +++ b/src/photo/PhotoShareModal.tsx @@ -1,5 +1,5 @@ import PhotoOGTile from '@/photo/PhotoOGTile'; -import { absolutePathForPhoto } from '@/app-core/paths'; +import { absolutePathForPhoto } from '@/app/paths'; import { Photo, PhotoSetCategory } from '.'; import ShareModal from '@/share/ShareModal'; diff --git a/src/photo/PhotoSmall.tsx b/src/photo/PhotoSmall.tsx index dec8780c..1a4658a0 100644 --- a/src/photo/PhotoSmall.tsx +++ b/src/photo/PhotoSmall.tsx @@ -7,8 +7,8 @@ import { import ImageSmall from '@/components/image/ImageSmall'; import Link from 'next/link'; import { clsx } from 'clsx/lite'; -import { pathForPhoto } from '@/app-core/paths'; -import { SHOULD_PREFETCH_ALL_LINKS } from '@/app-core/config'; +import { pathForPhoto } from '@/app/paths'; +import { SHOULD_PREFETCH_ALL_LINKS } from '@/app/config'; import { useRef } from 'react'; import useVisible from '@/utility/useVisible'; diff --git a/src/photo/PhotoUpload.tsx b/src/photo/PhotoUpload.tsx index e19b43ae..1e1b7717 100644 --- a/src/photo/PhotoUpload.tsx +++ b/src/photo/PhotoUpload.tsx @@ -3,7 +3,7 @@ import { useState } from 'react'; import { uploadPhotoFromClient } from '@/platforms/storage'; import { useRouter } from 'next/navigation'; -import { PATH_ADMIN_UPLOADS, pathForAdminUploadUrl } from '@/app-core/paths'; +import { PATH_ADMIN_UPLOADS, pathForAdminUploadUrl } from '@/app/paths'; import ImageInput from '../components/ImageInput'; import { clsx } from 'clsx/lite'; diff --git a/src/photo/PhotosEmptyState.tsx b/src/photo/PhotosEmptyState.tsx index 7386b2b0..ea7cfa78 100644 --- a/src/photo/PhotosEmptyState.tsx +++ b/src/photo/PhotosEmptyState.tsx @@ -1,8 +1,8 @@ import AdminCTA from '@/admin/AdminCTA'; import Container from '@/components/Container'; import SiteGrid from '@/components/SiteGrid'; -import { IS_SITE_READY } from '@/app-core/config'; -import { PATH_ADMIN_CONFIGURATION } from '@/app-core/paths'; +import { IS_SITE_READY } from '@/app/config'; +import { PATH_ADMIN_CONFIGURATION } from '@/app/paths'; import AdminAppConfiguration from '@/admin/AdminAppConfiguration'; import { clsx } from 'clsx/lite'; import Link from 'next/link'; diff --git a/src/photo/PhotosLargeInfinite.tsx b/src/photo/PhotosLargeInfinite.tsx index 1b2b72b9..40631291 100644 --- a/src/photo/PhotosLargeInfinite.tsx +++ b/src/photo/PhotosLargeInfinite.tsx @@ -1,6 +1,6 @@ 'use client'; -import { PATH_FEED_INFERRED } from '@/app-core/paths'; +import { PATH_FEED_INFERRED } from '@/app/paths'; import InfinitePhotoScroll from './InfinitePhotoScroll'; import PhotosLarge from './PhotosLarge'; diff --git a/src/photo/StaggeredOgPhotosInfinite.tsx b/src/photo/StaggeredOgPhotosInfinite.tsx index 2d9de205..feed5967 100644 --- a/src/photo/StaggeredOgPhotosInfinite.tsx +++ b/src/photo/StaggeredOgPhotosInfinite.tsx @@ -1,6 +1,6 @@ 'use client'; -import { PATH_OG } from '@/app-core/paths'; +import { PATH_OG } from '@/app/paths'; import InfinitePhotoScroll from './InfinitePhotoScroll'; import StaggeredOgPhotos from './StaggeredOgPhotos'; diff --git a/src/photo/UploadPageClient.tsx b/src/photo/UploadPageClient.tsx index e8355af3..2fb34f76 100644 --- a/src/photo/UploadPageClient.tsx +++ b/src/photo/UploadPageClient.tsx @@ -1,7 +1,7 @@ 'use client'; import AdminChildPage from '@/components/AdminChildPage'; -import { PATH_ADMIN_UPLOADS } from '@/app-core/paths'; +import { PATH_ADMIN_UPLOADS } from '@/app/paths'; import { PhotoFormData, generateTakenAtFields } from './form'; import PhotoForm from './form/PhotoForm'; import { Tags } from '@/tag'; diff --git a/src/photo/actions.ts b/src/photo/actions.ts index 6b35c082..dc8099f3 100644 --- a/src/photo/actions.ts +++ b/src/photo/actions.ts @@ -33,7 +33,7 @@ import { PATH_ADMIN_TAGS, PATH_ROOT, pathForPhoto, -} from '@/app-core/paths'; +} from '@/app/paths'; import { blurImageFromUrl, extractImageDataFromBlobPath } from './server'; import { TAG_FAVS, isTagFavs } from '@/tag'; import { convertPhotoToPhotoDbInsert, Photo } from '.'; @@ -44,7 +44,7 @@ import { AI_TEXT_AUTO_GENERATED_FIELDS, AI_TEXT_GENERATION_ENABLED, BLUR_ENABLED, -} from '@/app-core/config'; +} from '@/app/config'; import { generateAiImageQueries } from './ai/server'; import { createStreamableValue } from 'ai/rsc'; import { convertUploadToPhoto } from './storage'; diff --git a/src/photo/cache.ts b/src/photo/cache.ts index 4d3c3fa8..db0348cc 100644 --- a/src/photo/cache.ts +++ b/src/photo/cache.ts @@ -31,7 +31,7 @@ import { PREFIX_FILM_SIMULATION, PREFIX_TAG, pathForPhoto, -} from '@/app-core/paths'; +} from '@/app/paths'; import { createLensKey } from '@/lens'; // Table key diff --git a/src/photo/data.ts b/src/photo/data.ts index 47837a3f..66b884b4 100644 --- a/src/photo/data.ts +++ b/src/photo/data.ts @@ -8,7 +8,7 @@ import { getUniqueFilmSimulations, getUniqueTags, } from '@/photo/db/query'; -import { SHOW_FILM_SIMULATIONS } from '@/app-core/config'; +import { SHOW_FILM_SIMULATIONS } from '@/app/config'; import { sortTagsObject } from '@/tag'; export const getPhotoSidebarData = () => [ diff --git a/src/photo/db/index.ts b/src/photo/db/index.ts index 6b0fe754..544e29b6 100644 --- a/src/photo/db/index.ts +++ b/src/photo/db/index.ts @@ -1,4 +1,4 @@ -import { PRIORITY_ORDER_ENABLED } from '@/app-core/config'; +import { PRIORITY_ORDER_ENABLED } from '@/app/config'; import { parameterize } from '@/utility/string'; import { PhotoSetCategory } from '..'; diff --git a/src/photo/db/query.ts b/src/photo/db/query.ts index 1180eda9..1d783465 100644 --- a/src/photo/db/query.ts +++ b/src/photo/db/query.ts @@ -14,7 +14,7 @@ import { import { Cameras, createCameraKey } from '@/camera'; import { Tags } from '@/tag'; import { FilmSimulation, FilmSimulations } from '@/simulation'; -import { ADMIN_SQL_DEBUG_ENABLED } from '@/app-core/config'; +import { ADMIN_SQL_DEBUG_ENABLED } from '@/app/config'; import { GetPhotosOptions, getLimitAndOffsetFromOptions, diff --git a/src/photo/form/PhotoForm.tsx b/src/photo/form/PhotoForm.tsx index 3d9d4db0..65915b11 100644 --- a/src/photo/form/PhotoForm.tsx +++ b/src/photo/form/PhotoForm.tsx @@ -15,7 +15,7 @@ import { createPhotoAction, updatePhotoAction } from '../actions'; import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus'; import Link from 'next/link'; import { clsx } from 'clsx/lite'; -import { PATH_ADMIN_PHOTOS, PATH_ADMIN_UPLOADS } from '@/app-core/paths'; +import { PATH_ADMIN_PHOTOS, PATH_ADMIN_UPLOADS } from '@/app/paths'; import { toastSuccess, toastWarning } from '@/toast'; import { getDimensionsFromSize } from '@/utility/size'; import ImageWithFallback from '@/components/image/ImageWithFallback'; @@ -27,7 +27,7 @@ import usePreventNavigation from '@/utility/usePreventNavigation'; import { useAppState } from '@/state/AppState'; import UpdateBlurDataButton from '../UpdateBlurDataButton'; import { getNextImageUrlForManipulation } from '@/platforms/next-image'; -import { BLUR_ENABLED, IS_PREVIEW } from '@/app-core/config'; +import { BLUR_ENABLED, IS_PREVIEW } from '@/app/config'; import { PhotoDbInsert } from '..'; import ErrorNote from '@/components/ErrorNote'; diff --git a/src/photo/form/index.ts b/src/photo/form/index.ts index a50f95b0..83991340 100644 --- a/src/photo/form/index.ts +++ b/src/photo/form/index.ts @@ -21,7 +21,7 @@ import { MAKE_FUJIFILM, } from '@/platforms/fujifilm'; import { FilmSimulation } from '@/simulation'; -import { GEO_PRIVACY_ENABLED } from '@/app-core/config'; +import { GEO_PRIVACY_ENABLED } from '@/app/config'; import { TAG_FAVS, getValidationMessageForTags } from '@/tag'; type VirtualFields = 'favorite'; diff --git a/src/photo/index.ts b/src/photo/index.ts index b2fd808e..83597475 100644 --- a/src/photo/index.ts +++ b/src/photo/index.ts @@ -7,8 +7,8 @@ import { HIGH_DENSITY_GRID, IS_PREVIEW, SHOW_EXIF_DATA, -} from '@/app-core/config'; -import { ABSOLUTE_PATH_FOR_HOME_IMAGE } from '@/app-core/paths'; +} from '@/app/config'; +import { ABSOLUTE_PATH_FOR_HOME_IMAGE } from '@/app/paths'; import { formatDate, formatDateFromPostgresString } from '@/utility/date'; import { formatAperture, diff --git a/src/photo/server.ts b/src/photo/server.ts index 9206d95d..5a368db1 100644 --- a/src/photo/server.ts +++ b/src/photo/server.ts @@ -14,7 +14,7 @@ import sharp, { Sharp } from 'sharp'; import { GEO_PRIVACY_ENABLED, PRESERVE_ORIGINAL_UPLOADS, -} from '@/app-core/config'; +} from '@/app/config'; const IMAGE_WIDTH_RESIZE = 200; const IMAGE_WIDTH_BLUR = 200; diff --git a/src/platforms/github.ts b/src/platforms/github.ts index 6778f58f..a7a69b83 100644 --- a/src/platforms/github.ts +++ b/src/platforms/github.ts @@ -2,7 +2,7 @@ import { TEMPLATE_REPO_OWNER, TEMPLATE_REPO_NAME, TEMPLATE_REPO_BRANCH, -} from '@/app-core/config'; +} from '@/app/config'; const DEFAULT_BRANCH = 'main'; const CACHE_GITHUB_REQUESTS = false; diff --git a/src/platforms/next-image.ts b/src/platforms/next-image.ts index 93f8e7a2..73724898 100644 --- a/src/platforms/next-image.ts +++ b/src/platforms/next-image.ts @@ -2,7 +2,7 @@ import { BASE_URL, VERCEL_BYPASS_KEY, VERCEL_BYPASS_SECRET, -} from '@/app-core/config'; +} from '@/app/config'; // Explicity defined next.config.js `imageSizes` type NextCustomSize = 200; diff --git a/src/platforms/openai.ts b/src/platforms/openai.ts index 949b8dd3..856bd4ef 100644 --- a/src/platforms/openai.ts +++ b/src/platforms/openai.ts @@ -6,7 +6,7 @@ import { Ratelimit } from '@upstash/ratelimit'; import { AI_TEXT_GENERATION_ENABLED, HAS_REDIS_STORAGE, -} from '@/app-core/config'; +} from '@/app/config'; import { removeBase64Prefix } from '@/utility/image'; import { cleanUpAiTextResponse } from '@/photo/ai'; diff --git a/src/platforms/postgres.ts b/src/platforms/postgres.ts index 439e56ab..77e17f10 100644 --- a/src/platforms/postgres.ts +++ b/src/platforms/postgres.ts @@ -1,4 +1,4 @@ -import { POSTGRES_SSL_ENABLED } from '@/app-core/config'; +import { POSTGRES_SSL_ENABLED } from '@/app/config'; import { Pool, QueryResult, QueryResultRow } from 'pg'; const pool = new Pool({ diff --git a/src/platforms/storage/index.ts b/src/platforms/storage/index.ts index 364c4ba6..63af85d4 100644 --- a/src/platforms/storage/index.ts +++ b/src/platforms/storage/index.ts @@ -19,7 +19,7 @@ import { HAS_AWS_S3_STORAGE, HAS_VERCEL_BLOB_STORAGE, HAS_CLOUDFLARE_R2_STORAGE, -} from '@/app-core/config'; +} from '@/app/config'; import { generateNanoid } from '@/utility/nanoid'; import { CLOUDFLARE_R2_BASE_URL_PUBLIC, @@ -29,7 +29,7 @@ import { cloudflareR2Put, isUrlFromCloudflareR2, } from './cloudflare-r2'; -import { PATH_API_PRESIGNED_URL } from '@/app-core/paths'; +import { PATH_API_PRESIGNED_URL } from '@/app/paths'; export const generateStorageId = () => generateNanoid(16); diff --git a/src/platforms/storage/vercel-blob.ts b/src/platforms/storage/vercel-blob.ts index 6abfefb5..2fdc49d8 100644 --- a/src/platforms/storage/vercel-blob.ts +++ b/src/platforms/storage/vercel-blob.ts @@ -1,4 +1,4 @@ -import { PATH_API_VERCEL_BLOB_UPLOAD } from '@/app-core/paths'; +import { PATH_API_VERCEL_BLOB_UPLOAD } from '@/app/paths'; import { copy, del, list, put } from '@vercel/blob'; import { upload } from '@vercel/blob/client'; import { fileNameForStorageUrl } from '.'; diff --git a/src/platforms/vercel.ts b/src/platforms/vercel.ts index 0986f6bc..0d6711ef 100644 --- a/src/platforms/vercel.ts +++ b/src/platforms/vercel.ts @@ -2,7 +2,7 @@ import { IS_PREVIEW, VERCEL_BYPASS_KEY, VERCEL_BYPASS_SECRET, -} from '@/app-core/config'; +} from '@/app/config'; export const fetchWithBypass: typeof fetch = (url, options) => IS_PREVIEW && VERCEL_BYPASS_SECRET diff --git a/src/share/ShareModal.tsx b/src/share/ShareModal.tsx index 6301a07a..1b069686 100644 --- a/src/share/ShareModal.tsx +++ b/src/share/ShareModal.tsx @@ -8,7 +8,7 @@ import { JSX, ReactNode, useEffect } from 'react'; import { shortenUrl } from '@/utility/url'; import { toastSuccess } from '@/toast'; import { PiXLogo } from 'react-icons/pi'; -import { SHOW_SOCIAL } from '@/app-core/config'; +import { SHOW_SOCIAL } from '@/app/config'; import { generateXPostText } from '@/utility/social'; import { useAppState } from '@/state/AppState'; import useOnPathChange from '@/utility/useOnPathChange'; diff --git a/src/share/index.ts b/src/share/index.ts index fabc9f01..22cc0f47 100644 --- a/src/share/index.ts +++ b/src/share/index.ts @@ -5,7 +5,7 @@ import { absolutePathForFocalLengthImage, absolutePathForPhotoImage, absolutePathForTagImage, -} from '@/app-core/paths'; +} from '@/app/paths'; export type ShareModalProps = Omit & { photo?: Photo diff --git a/src/simulation/FilmSimulationOGTile.tsx b/src/simulation/FilmSimulationOGTile.tsx index 1f894877..c2faf69b 100644 --- a/src/simulation/FilmSimulationOGTile.tsx +++ b/src/simulation/FilmSimulationOGTile.tsx @@ -2,7 +2,7 @@ import { Photo, PhotoDateRange } from '@/photo'; import { absolutePathForFilmSimulationImage, pathForFilmSimulation, -} from '@/app-core/paths'; +} from '@/app/paths'; import OGTile from '@/components/OGTile'; import { FilmSimulation, diff --git a/src/simulation/FilmSimulationShareModal.tsx b/src/simulation/FilmSimulationShareModal.tsx index e8ca9691..6a5929fa 100644 --- a/src/simulation/FilmSimulationShareModal.tsx +++ b/src/simulation/FilmSimulationShareModal.tsx @@ -1,4 +1,4 @@ -import { absolutePathForFilmSimulation } from '@/app-core/paths'; +import { absolutePathForFilmSimulation } from '@/app/paths'; import { PhotoSetAttributes } from '../photo'; import ShareModal from '@/share/ShareModal'; import FilmSimulationOGTile from './FilmSimulationOGTile'; diff --git a/src/simulation/PhotoFilmSimulation.tsx b/src/simulation/PhotoFilmSimulation.tsx index e12808c1..e6c03f72 100644 --- a/src/simulation/PhotoFilmSimulation.tsx +++ b/src/simulation/PhotoFilmSimulation.tsx @@ -1,6 +1,6 @@ import { labelForFilmSimulation } from '@/platforms/fujifilm'; import PhotoFilmSimulationIcon from './PhotoFilmSimulationIcon'; -import { pathForFilmSimulation } from '@/app-core/paths'; +import { pathForFilmSimulation } from '@/app/paths'; import { FilmSimulation } from '.'; import EntityLink, { EntityLinkExternalProps, diff --git a/src/simulation/index.ts b/src/simulation/index.ts index 81f747f4..499660c0 100644 --- a/src/simulation/index.ts +++ b/src/simulation/index.ts @@ -7,7 +7,7 @@ import { import { absolutePathForFilmSimulation, absolutePathForFilmSimulationImage, -} from '@/app-core/paths'; +} from '@/app/paths'; import { FujifilmSimulation, labelForFilmSimulation, diff --git a/src/state/AppStateProvider.tsx b/src/state/AppStateProvider.tsx index 0a99c95f..626666cb 100644 --- a/src/state/AppStateProvider.tsx +++ b/src/state/AppStateProvider.tsx @@ -10,7 +10,7 @@ import { HIGH_DENSITY_GRID, MATTE_PHOTOS, SHOW_ZOOM_CONTROLS, -} from '@/app-core/config'; +} from '@/app/config'; import { getPhotosHiddenMetaCachedAction } from '@/photo/actions'; import { ShareModalProps } from '@/share'; import { storeTimezoneCookie } from '@/utility/timezone'; diff --git a/src/tag/FavsTag.tsx b/src/tag/FavsTag.tsx index d8df8183..97f3ac7a 100644 --- a/src/tag/FavsTag.tsx +++ b/src/tag/FavsTag.tsx @@ -1,6 +1,6 @@ import { FaStar } from 'react-icons/fa'; import { TAG_FAVS } from '.'; -import { pathForTag } from '@/app-core/paths'; +import { pathForTag } from '@/app/paths'; import { clsx } from 'clsx/lite'; import EntityLink, { EntityLinkExternalProps, diff --git a/src/tag/HiddenTag.tsx b/src/tag/HiddenTag.tsx index c9176bea..635dac93 100644 --- a/src/tag/HiddenTag.tsx +++ b/src/tag/HiddenTag.tsx @@ -1,5 +1,5 @@ import { TAG_HIDDEN } from '.'; -import { pathForTag } from '@/app-core/paths'; +import { pathForTag } from '@/app/paths'; import EntityLink, { EntityLinkExternalProps, } from '@/components/primitives/EntityLink'; diff --git a/src/tag/PhotoTag.tsx b/src/tag/PhotoTag.tsx index 8ffd6657..629c3c71 100644 --- a/src/tag/PhotoTag.tsx +++ b/src/tag/PhotoTag.tsx @@ -1,4 +1,4 @@ -import { pathForTag } from '@/app-core/paths'; +import { pathForTag } from '@/app/paths'; import { FaTag } from 'react-icons/fa'; import { formatTag } from '.'; import EntityLink, { diff --git a/src/tag/TagForm.tsx b/src/tag/TagForm.tsx index bad08222..9be11e8d 100644 --- a/src/tag/TagForm.tsx +++ b/src/tag/TagForm.tsx @@ -2,7 +2,7 @@ import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus'; import Link from 'next/link'; -import { PATH_ADMIN_TAGS } from '@/app-core/paths'; +import { PATH_ADMIN_TAGS } from '@/app/paths'; import FieldSetWithStatus from '@/components/FieldSetWithStatus'; import { ReactNode, useMemo, useState } from 'react'; import { renamePhotoTagGloballyAction } from '@/photo/actions'; diff --git a/src/tag/TagOGTile.tsx b/src/tag/TagOGTile.tsx index 4026fb05..b4ef1842 100644 --- a/src/tag/TagOGTile.tsx +++ b/src/tag/TagOGTile.tsx @@ -1,5 +1,5 @@ import { Photo, PhotoDateRange } from '@/photo'; -import { absolutePathForTagImage, pathForTag } from '@/app-core/paths'; +import { absolutePathForTagImage, pathForTag } from '@/app/paths'; import OGTile from '@/components/OGTile'; import { descriptionForTaggedPhotos, titleForTag } from '.'; diff --git a/src/tag/TagShareModal.tsx b/src/tag/TagShareModal.tsx index b0223bf6..1a861fde 100644 --- a/src/tag/TagShareModal.tsx +++ b/src/tag/TagShareModal.tsx @@ -1,4 +1,4 @@ -import { absolutePathForTag } from '@/app-core/paths'; +import { absolutePathForTag } from '@/app/paths'; import { PhotoSetAttributes } from '../photo'; import ShareModal from '@/share/ShareModal'; import TagOGTile from './TagOGTile'; diff --git a/src/tag/index.ts b/src/tag/index.ts index 447ee702..0bd2fb77 100644 --- a/src/tag/index.ts +++ b/src/tag/index.ts @@ -8,7 +8,7 @@ import { absolutePathForTag, absolutePathForTagImage, getPathComponents, -} from '@/app-core/paths'; +} from '@/app/paths'; import { capitalizeWords, convertStringToArray,