+
+ Outdated photos found
+
{photos.length}
{' '}
{photos.length === 1 ? 'photo' : 'photos'}
@@ -87,8 +91,7 @@ export default function AdminOutdatedClient({
{' '}
may have: missing EXIF fields, inaccurate blur data,
{' '}
- undesired privacy settings
- {hasAiTextGeneration && ', missing AI-generated text'}
+ undesired privacy settings, or missing AI-generated text
diff --git a/src/admin/AdminPhotoMenuClient.tsx b/src/admin/AdminPhotoMenuClient.tsx
index e73f0629..2feade73 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 '@/site/paths';
+import { pathForAdminPhotoEdit, pathForPhoto } from '@/app-core/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 073004d1..35015494 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 '@/site/config';
+} from '@/app-core/config';
import AdminPhotosTable from '@/admin/AdminPhotosTable';
import AdminPhotosTableInfinite from '@/admin/AdminPhotosTableInfinite';
import PathLoaderButton from '@/components/primitives/PathLoaderButton';
-import { PATH_ADMIN_OUTDATED } from '@/site/paths';
+import { PATH_ADMIN_OUTDATED } from '@/app-core/paths';
import { Photo } from '@/photo';
import { StorageListResponse } from '@/services/storage';
import { useState } from 'react';
diff --git a/src/admin/AdminPhotosTable.tsx b/src/admin/AdminPhotosTable.tsx
index 357ae9c1..0e8d8ca6 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 '@/site/paths';
+import { pathForAdminPhotoEdit, pathForPhoto } from '@/app-core/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 3dcc7c9d..65376dfe 100644
--- a/src/admin/AdminPhotosTableInfinite.tsx
+++ b/src/admin/AdminPhotosTableInfinite.tsx
@@ -1,6 +1,6 @@
'use client';
-import { PATH_ADMIN_PHOTOS } from '@/site/paths';
+import { PATH_ADMIN_PHOTOS } from '@/app-core/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 a5bdfc5d..cf93cf99 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 '@/site/paths';
+import { pathForAdminTagEdit } from '@/app-core/paths';
import { clsx } from 'clsx/lite';
import AdminTagBadge from './AdminTagBadge';
diff --git a/src/admin/AdminUploadsTable.tsx b/src/admin/AdminUploadsTable.tsx
index edeb0603..027c4a53 100644
--- a/src/admin/AdminUploadsTable.tsx
+++ b/src/admin/AdminUploadsTable.tsx
@@ -5,7 +5,7 @@ import Spinner from '@/components/Spinner';
import { getIdFromStorageUrl } from '@/services/storage';
import { clsx } from 'clsx/lite';
import { FaRegCircleCheck } from 'react-icons/fa6';
-import { pathForAdminUploadUrl } from '@/site/paths';
+import { pathForAdminUploadUrl } from '@/app-core/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 8e30e030..10d483f0 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 '@/site/paths';
+import { PATH_ADMIN_PHOTOS } from '@/app-core/paths';
import { useState } from 'react';
export default function DeleteUploadButton({
diff --git a/src/admin/ExifSyncButton.tsx b/src/admin/ExifSyncButton.tsx
index 517bcbe5..f968e5d2 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 '@/site/IconGrSync';
+import IconGrSync from '@/app-core/IconGrSync';
import { clsx } from 'clsx/lite';
import { ComponentProps, useState } from 'react';
diff --git a/src/admin/PhotoSyncButton.tsx b/src/admin/PhotoSyncButton.tsx
index ea410d82..07e0709d 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 '@/site/IconGrSync';
+import IconGrSync from '@/app-core/IconGrSync';
import { toastSuccess } from '@/toast';
import { ComponentProps, useState } from 'react';
diff --git a/src/admin/actions.ts b/src/admin/actions.ts
index e2ddd1ae..ee366c7a 100644
--- a/src/admin/actions.ts
+++ b/src/admin/actions.ts
@@ -5,7 +5,7 @@ import { testKvConnection } from '@/services/kv';
import { testOpenAiConnection } from '@/services/openai';
import { testDatabaseConnection } from '@/services/postgres';
import { testStorageConnection } from '@/services/storage';
-import { CONFIG_CHECKLIST_STATUS } from '@/site/config';
+import { APP_CONFIGURATION } from '@/app-core/config';
const scanForError = (
shouldCheck: boolean,
@@ -24,7 +24,7 @@ export const testConnectionsAction = async () =>
hasStorageProvider,
hasVercelKv,
isAiTextGenerationEnabled,
- } = CONFIG_CHECKLIST_STATUS;
+ } = APP_CONFIGURATION;
const [
databaseError,
diff --git a/src/admin/github/GitHubForkStatusBadge.tsx b/src/admin/github/GitHubForkStatusBadge.tsx
deleted file mode 100644
index 0af8dbbb..00000000
--- a/src/admin/github/GitHubForkStatusBadge.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Suspense } from 'react';
-import GitHubForkStatusBadgeClient from './GitHubForkStatusBadgeClient';
-import GitHubForkStatusBadgeServer from './GitHubForkStatusBadgeServer';
-import { IS_DEVELOPMENT } from '@/site/config';
-
-export default function GitHubForkStatusBadge() {
- return IS_DEVELOPMENT
- ?
- :
-
- ;
-}
diff --git a/src/admin/github/GitHubForkStatusBadgeClient.tsx b/src/admin/github/GitHubForkStatusBadgeClient.tsx
deleted file mode 100644
index 3bfe8593..00000000
--- a/src/admin/github/GitHubForkStatusBadgeClient.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import Spinner from '@/components/Spinner';
-import Tooltip from '@/components/Tooltip';
-import clsx from 'clsx/lite';
-import { ReactNode } from 'react';
-import { BiLogoGithub } from 'react-icons/bi';
-
-export default function GitHubForkStatusBadgeClient({
- label,
- style = 'mono',
- tooltip,
-}: {
- label?: ReactNode
- style?: 'success' | 'warning' | 'error' | 'mono'
- tooltip?: ReactNode
-}) {
- const classNameForStyle = () => {
- switch (style) {
- case 'success': return clsx(
- 'text-green-700 hover:text-green-700',
- 'dark:text-green-400 dark:hover:text-green-400',
- 'bg-green-100/40 dark:bg-green-900/25',
- 'border-green-300/40 dark:border-green-900/50',
- );
- case 'warning': return clsx(
- 'text-amber-800/90 hover:text-amber-800/90',
- 'dark:text-amber-400 dark:hover:text-amber-400',
- 'bg-amber-100/40 dark:bg-amber-900/25',
- 'border-amber-300/40 dark:border-amber-900/50',
- );
- case 'error': return clsx(
- 'text-red-700/90 hover:text-red-700/90',
- 'dark:text-red-400 dark:hover:text-red-400',
- 'bg-red-100/20 dark:bg-red-900/25',
- 'border-red-300/40 dark:border-red-900/50',
- );
- default: return clsx(
- 'text-main',
- 'bg-white dark:bg-transparent',
- 'border-main',
- );
- }
- };
-
- return (
-
-
- {!label
- ?
- : }
- {label ?? 'Checking'}
-
-
- );
-}
diff --git a/src/admin/github/GitHubForkStatusBadgeServer.tsx b/src/admin/github/GitHubForkStatusBadgeServer.tsx
deleted file mode 100644
index 5b7657fe..00000000
--- a/src/admin/github/GitHubForkStatusBadgeServer.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import GitHubForkStatusBadgeClient from './GitHubForkStatusBadgeClient';
-import {
- VERCEL_GIT_BRANCH,
- VERCEL_GIT_REPO_OWNER,
- VERCEL_GIT_REPO_SLUG,
- VERCEL_GIT_COMMIT_SHA,
-} from '@/site/config';
-import { getGitHubMetaWithFallback, getGitHubRepoUrl } from '.';
-
-export default async function GitHubForkStatusBadgeServer() {
- const owner = VERCEL_GIT_REPO_OWNER;
- const repo = VERCEL_GIT_REPO_SLUG;
- const branch = VERCEL_GIT_BRANCH;
- const commit = VERCEL_GIT_COMMIT_SHA;
-
- const {
- url,
- isForkedFromBase,
- isBaseRepo,
- isBehind,
- label,
- description,
- didError,
- } = await getGitHubMetaWithFallback({ owner, repo, branch, commit });
-
- const repoLink = (text: string) =>
-
- {text}
- ;
-
- const isBehindContent = <>
- {' '}
- {repoLink('Sync on GitHub')} for latest updates.
- ;
-
- const didErrorContent = <>
- {' '}
- Could not connect to {repoLink('GitHub')}.
- ;
-
- return isForkedFromBase || isBaseRepo
- ?
- {description}
- {didError
- ? didErrorContent
- : isBehind
- ? isBehindContent
- : null}
- ,
- style: didError || isBehind === undefined || isBehind
- ? 'warning'
- : 'mono',
- }} />
- : null;
-}
diff --git a/src/admin/github/index.ts b/src/admin/github/index.ts
deleted file mode 100644
index f04491d5..00000000
--- a/src/admin/github/index.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import {
- TEMPLATE_BASE_OWNER,
- TEMPLATE_BASE_REPO,
- TEMPLATE_BASE_BRANCH,
-} from '@/site/config';
-
-const DEFAULT_BRANCH = 'main';
-const FALLBACK_TEXT = 'Unknown';
-const CACHE_GITHUB_REQUESTS = false;
-
-// Cache all results for 2 minutes to avoid rate limiting
-// GitHub API requests limited to 60 requests per hour
-const FETCH_CONFIG: RequestInit | undefined= CACHE_GITHUB_REQUESTS
- ? { next: { revalidate: 120 } } : undefined;
-
-interface RepoParams {
- owner?: string
- repo?: string
- branch?: string
- commit?: string
-};
-
-// Website urls
-
-export const getGitHubRepoUrl = ({
- owner = TEMPLATE_BASE_OWNER,
- repo = TEMPLATE_BASE_REPO,
-}: RepoParams = {}) =>
- `https://github.com/${owner}/${repo}`;
-
-export const getGitHubCompareUrl = ({
- owner,
- repo,
- branch = DEFAULT_BRANCH,
-}: RepoParams = {}) =>
- // eslint-disable-next-line max-len
- `${getGitHubRepoUrl({ owner, repo })}/compare/${branch}...${TEMPLATE_BASE_OWNER}:${TEMPLATE_BASE_REPO}:${TEMPLATE_BASE_BRANCH}`;
-
-// API urls
-
-const getGitHubApiRepoUrl = ({
- owner = TEMPLATE_BASE_OWNER,
- repo = TEMPLATE_BASE_REPO,
-}: RepoParams = {}) =>
- `https://api.github.com/repos/${owner}/${repo}`;
-
-const getGitHubApiCommitsUrl = (params?: RepoParams) =>
- `${getGitHubApiRepoUrl(params)}/commits/${params?.branch || DEFAULT_BRANCH}`;
-
-const getGitHubApiForksUrl = (params?: RepoParams) =>
- `${getGitHubApiRepoUrl(params)}/forks`;
-
-const getGitHubApiCompareToRepoUrl = ({
- owner,
- repo,
- branch = DEFAULT_BRANCH,
-}: RepoParams = {}) =>
- // eslint-disable-next-line max-len
- `${getGitHubApiRepoUrl()}/compare/${TEMPLATE_BASE_BRANCH}...${owner}:${repo}:${branch}`;
-
-const getGitHubApiCompareToCommitUrl = ({ commit }: RepoParams = {}) =>
- `${getGitHubApiRepoUrl()}/compare/${TEMPLATE_BASE_BRANCH}...${commit}`;
-
-// Requests
-
-export const getLatestBaseRepoCommitSha = async () => {
- const response = await fetch(getGitHubApiCommitsUrl(), FETCH_CONFIG);
- const data = await response.json();
- return data.sha ? data.sha.slice(0, 7) as string : undefined;
-};
-
-const getIsRepoForkedFromBase = async (params: RepoParams) => {
- const response = await fetch(getGitHubApiRepoUrl(params), FETCH_CONFIG);
- const data = await response.json();
- return (
- Boolean(data.fork) &&
- data.source?.full_name === `${TEMPLATE_BASE_OWNER}/${TEMPLATE_BASE_REPO}`
- );
-};
-
-const getGitHubCommitsBehindFromRepo = async (params?: RepoParams) => {
- const response = await fetch(
- getGitHubApiCompareToRepoUrl(params),
- FETCH_CONFIG,
- );
- const data = await response.json();
- return data.behind_by as number;
-};
-
-const getGitHubCommitsBehindFromCommit = async (params?: RepoParams) => {
- const response = await fetch(
- getGitHubApiCompareToCommitUrl(params),
- FETCH_CONFIG,
- );
- const data = await response.json();
- return data.behind_by as number;
-};
-
-const isRepoBaseRepo = ({ owner, repo }: RepoParams) =>
- owner?.toLowerCase() === TEMPLATE_BASE_OWNER &&
- repo?.toLowerCase() === TEMPLATE_BASE_REPO;
-
-export const getGitHubPublicFork = async (
- params?: RepoParams,
-): Promise => {
- const response = await fetch(getGitHubApiForksUrl(params), FETCH_CONFIG);
- const fork = (await response.json())[0];
- return {
- owner: fork.owner.login,
- repo: fork.name,
- };
-};
-
-const getGitHubMeta = async (params: RepoParams) => {
- const url = getGitHubRepoUrl(params);
- const isBaseRepo = isRepoBaseRepo(params);
-
- const [
- isForkedFromBase,
- behindBy,
- ] = await Promise.all([
- getIsRepoForkedFromBase(params),
- isBaseRepo && params.commit
- ? getGitHubCommitsBehindFromCommit(params)
- : getGitHubCommitsBehindFromRepo(params),
- ]);
-
- const isBehind = behindBy === undefined
- ? undefined
- : behindBy > 0;
-
- const label = isBehind === undefined
- ? FALLBACK_TEXT
- : isBehind
- ? `${behindBy} Behind`
- : 'Synced';
-
- const description = isBehind === undefined
- ? FALLBACK_TEXT
- : isBehind
- ? `This fork is ${behindBy} commit${behindBy === 1 ? '' : 's'} behind.`
- : isBaseRepo
- ? 'This build is up to date.'
- : 'This fork is up to date.';
-
- return {
- url,
- isForkedFromBase,
- isBaseRepo,
- behindBy,
- isBehind,
- label,
- description,
- didError: false,
- };
-};
-
-export const getGitHubMetaWithFallback = (params: RepoParams) =>
- getGitHubMeta(params)
- .catch(e => {
- console.error('Error retrieving GitHub meta', { params, error: e });
- return {
- url: undefined,
- isForkedFromBase: false,
- isBaseRepo: undefined,
- behindBy: undefined,
- isBehind: undefined,
- label: FALLBACK_TEXT,
- description: 'Could not connect to GitHub.',
- didError: true,
- };
- });
diff --git a/src/admin/insights/AdminAppInsights.tsx b/src/admin/insights/AdminAppInsights.tsx
new file mode 100644
index 00000000..a5cbb379
--- /dev/null
+++ b/src/admin/insights/AdminAppInsights.tsx
@@ -0,0 +1,96 @@
+import {
+ getPhotosMeta,
+ getUniqueCameras,
+ getUniqueFilmSimulations,
+ getUniqueLenses,
+ getUniqueTags,
+} from '@/photo/db/query';
+import AdminAppInsightsClient from './AdminAppInsightsClient';
+import {
+ APP_CONFIGURATION,
+ GRID_HOMEPAGE_ENABLED,
+ HAS_STATIC_OPTIMIZATION,
+ IS_DEVELOPMENT,
+ IS_PRODUCTION,
+ IS_VERCEL_GIT_PROVIDER_GITHUB,
+ MATTE_PHOTOS,
+ VERCEL_GIT_BRANCH,
+ VERCEL_GIT_COMMIT_SHA,
+ VERCEL_GIT_REPO_OWNER,
+ VERCEL_GIT_REPO_SLUG,
+} from '@/app-core/config';
+import { getGitHubMeta } from '../../platforms/github';
+import { OUTDATED_THRESHOLD } from '@/photo';
+
+const BASIC_PHOTO_INSTALLATION_COUNT = 32;
+
+const owner = VERCEL_GIT_REPO_OWNER;
+const repo = VERCEL_GIT_REPO_SLUG;
+const branch = VERCEL_GIT_BRANCH;
+const commit = VERCEL_GIT_COMMIT_SHA;
+
+export default async function AdminAppInsights() {
+ const [
+ { count: photosCount, dateRange },
+ { count: photosCountHidden },
+ { count: photosCountOutdated },
+ { count: photosCountPortrait },
+ tags,
+ cameras,
+ filmSimulations,
+ lenses,
+ codeMeta,
+ ] = await Promise.all([
+ getPhotosMeta({ hidden: 'include' }),
+ getPhotosMeta({ hidden: 'only' }),
+ getPhotosMeta({ hidden: 'include', updatedBefore: OUTDATED_THRESHOLD }),
+ getPhotosMeta({ maximumAspectRatio: 0.9 }),
+ getUniqueTags(),
+ getUniqueCameras(),
+ getUniqueFilmSimulations(),
+ getUniqueLenses(),
+ IS_VERCEL_GIT_PROVIDER_GITHUB || IS_DEVELOPMENT
+ ? getGitHubMeta({
+ owner,
+ repo,
+ branch,
+ commit,
+ })
+ : undefined,
+ ]);
+
+ const {
+ isAiTextGenerationEnabled,
+ hasVercelBlobStorage,
+ } = APP_CONFIGURATION;
+
+ return (
+ 0 && !MATTE_PHOTOS,
+ gridFirst: (
+ photosCount >= BASIC_PHOTO_INSTALLATION_COUNT &&
+ !GRID_HOMEPAGE_ENABLED
+ ),
+ noStaticOptimization: !HAS_STATIC_OPTIMIZATION,
+ }}
+ photoStats={{
+ photosCount,
+ photosCountHidden,
+ photosCountOutdated,
+ tagsCount: tags.length,
+ camerasCount: cameras.length,
+ filmSimulationsCount: filmSimulations.length,
+ lensesCount: lenses.length,
+ dateRange,
+ }}
+ debug={!IS_PRODUCTION}
+ />
+ );
+}
diff --git a/src/admin/insights/AdminAppInsightsClient.tsx b/src/admin/insights/AdminAppInsightsClient.tsx
new file mode 100644
index 00000000..7d49248f
--- /dev/null
+++ b/src/admin/insights/AdminAppInsightsClient.tsx
@@ -0,0 +1,349 @@
+'use client';
+
+import ScoreCard from '@/components/ScoreCard';
+import ScoreCardRow from '@/components/ScoreCardRow';
+import { dateRangeForPhotos } from '@/photo';
+import PhotoFilmSimulationIcon from '@/simulation/PhotoFilmSimulationIcon';
+import { FaCamera } from 'react-icons/fa';
+import { FaTag } from 'react-icons/fa';
+import { FaCircleInfo, FaRegCalendar } from 'react-icons/fa6';
+import { HiOutlinePhotograph } from 'react-icons/hi';
+import { MdAspectRatio } from 'react-icons/md';
+import { PiWarningBold } from 'react-icons/pi';
+import { TbCone, TbSparkles } from 'react-icons/tb';
+import { getGitHubMeta } from '../../platforms/github';
+import { BiGitBranch, BiGitCommit, BiLogoGithub } from 'react-icons/bi';
+import {
+ TEMPLATE_REPO_BRANCH,
+ TEMPLATE_REPO_OWNER,
+ TEMPLATE_REPO_NAME,
+ VERCEL_GIT_COMMIT_SHA_SHORT,
+ VERCEL_GIT_COMMIT_MESSAGE,
+ TEMPLATE_REPO_URL_FORK,
+ TEMPLATE_REPO_URL_README,
+} from '@/app-core/config';
+import { AdminAppInsights, hasTemplateRecommendations, PhotoStats } from '.';
+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 { LiaBroomSolid } from 'react-icons/lia';
+import { IoMdGrid } from 'react-icons/io';
+import { RiSpeedMiniLine } from 'react-icons/ri';
+import AdminLink from '../AdminLink';
+import AdminEmptyState from '../AdminEmptyState';
+
+const DEBUG_COMMIT_SHA = '4cd29ed';
+const DEBUG_COMMIT_MESSAGE = 'Long commit message for debugging purposes';
+const DEBUG_BEHIND_BY = 9;
+const DEBUG_PHOTOS_COUNT_OUTDATED = 7;
+
+const readmeAnchor = (anchor: string) =>
+
+ README/{anchor}
+ ;
+
+const renderLabeledEnvVar = (label: string, envVar: string, value = '1') =>
+
+
+ {label}
+
+
+
;
+
+export default function AdminAppInsightsClient({
+ codeMeta,
+ insights,
+ photoStats: {
+ photosCount,
+ photosCountHidden,
+ photosCountOutdated,
+ tagsCount,
+ camerasCount,
+ filmSimulationsCount,
+ lensesCount,
+ dateRange,
+ },
+ debug,
+}: {
+ codeMeta?: Awaited>
+ insights: AdminAppInsights
+ photoStats: PhotoStats
+ debug?: boolean
+}) {
+ const {
+ noFork,
+ forkBehind,
+ noAi,
+ noAiRateLimiting,
+ outdatedPhotos,
+ photoMatting,
+ gridFirst,
+ noStaticOptimization,
+ } = insights;
+
+ const { descriptionWithSpaces } = dateRangeForPhotos(undefined, dateRange);
+
+ const branchLink =
+ {codeMeta?.branch ?? TEMPLATE_REPO_BRANCH}
+ ;
+
+ return (
+
+ {(codeMeta || debug) && <>
+
+ {(noFork || debug) &&
+ }
+ content="This template is not forked"
+ expandContent={<>
+
+ Fork original template
+
+ {' '}
+ to receive the latest fixes and features.
+ {' '}
+ Additional instructions in
+ {' '}
+ {readmeAnchor('receiving-updates')}.
+ }
+ />}
+ {(forkBehind || debug) && }
+ content={<>
+ This fork is
+ {' '}
+
+ {codeMeta?.behindBy ?? DEBUG_BEHIND_BY}
+ {' '}
+ {(codeMeta?.behindBy ?? DEBUG_BEHIND_BY) === 1
+ ? 'commit'
+ : 'commits'}
+
+ {' '}
+ behind
+ }
+ expandContent={<>
+
+ Sync your fork
+
+ {' '}
+ to receive the latest fixes and features.
+ }
+ />}
+ }
+ content={}
+ />
+ }
+ content={branchLink}
+ />
+ }
+ content={
+
+ {VERCEL_GIT_COMMIT_SHA_SHORT ?? DEBUG_COMMIT_SHA}
+
+
+ {VERCEL_GIT_COMMIT_MESSAGE ?? DEBUG_COMMIT_MESSAGE}
+
+ }
+ />
+
+ }
+
+ {(hasTemplateRecommendations(insights) || debug)
+ ? <>
+ {(noAiRateLimiting || debug) && }
+ content="AI enabled without rate limiting"
+ expandContent={<>
+ Create Vercel KV store and link to this project
+ in order prevent abuse by to enabling rate limiting.
+ }
+ />}
+ {(noStaticOptimization || debug) && }
+ content="Speed up page load times"
+ expandContent={<>
+ Improve load times by enabling static optimization
+ {' '}
+ on:
+
+ {renderLabeledEnvVar(
+ 'Photo pages',
+ 'NEXT_PUBLIC_STATICALLY_OPTIMIZE_PHOTOS',
+ )}
+ {renderLabeledEnvVar(
+ 'Photo OG images',
+ 'NEXT_PUBLIC_STATICALLY_OPTIMIZE_PHOTO_OG_IMAGES',
+ )}
+ {renderLabeledEnvVar(
+ 'Category pages (tags, cameras, etc.)',
+ 'NEXT_PUBLIC_STATICALLY_OPTIMIZE_PHOTO_CATEGORIES',
+ )}
+ {renderLabeledEnvVar(
+ 'Category OG images',
+ 'NEXT_PUBLIC_STATICALLY_OPTIMIZE_PHOTO_CATEGORY_OG_IMAGES',
+ )}
+
+ See {readmeAnchor('performance')} for cost implications.
+
+
+ }
+ />}
+ {(noAi || debug) && }
+ content="Improve SEO + accessibility with AI"
+ expandContent={<>
+ Enable automatic AI text generation
+ {' '}
+ by setting .
+ {' '}
+ Further instruction and cost considerations in
+ {' '}
+ {readmeAnchor('ai-text-generation')}.
+ }
+ />}
+ {(photoMatting || debug) && }
+ content="Vertical photos may benefit from matting"
+ expandContent={<>
+ Enable photo matting to make
+ {' '}
+ portrait and landscape photos appear more consistent
+ {' '}
+ .
+ }
+ />}
+ {(gridFirst || debug) && }
+ content="Grid homepage"
+ expandContent={<>
+ Now that you have enough photos, consider switching your
+ {' '}
+ default view to grid by setting
+ {' '}
+ {/* eslint-disable-next-line max-len */}
+ .
+ }
+ />}
+
+ :
+ Nothing to report!
+ }
+
+
+ {(outdatedPhotos || debug) && }
+ // eslint-disable-next-line max-len
+ content={`${photosCountOutdated || DEBUG_PHOTOS_COUNT_OUTDATED} outdated ${(photosCountOutdated || DEBUG_PHOTOS_COUNT_OUTDATED) === 1 ? 'photo' : 'photos'}`}
+ expandPath={PATH_ADMIN_OUTDATED}
+ />}
+ }
+ content={<>
+ {photosCount} photos
+ {photosCountHidden > 0 &&
+ ` (${photosCountHidden} hidden)`}
+ }
+ />
+ }
+ content={`${tagsCount} tags`}
+ />
+ }
+ content={`${camerasCount} cameras`}
+ />
+ {filmSimulationsCount &&
+
+
+ }
+ content={`${filmSimulationsCount} film simulations`}
+ />}
+ }
+ content={`${lensesCount} lenses`}
+ />
+ }
+ content={descriptionWithSpaces}
+ />
+
+
-
- App Configuration
-
- {(IS_VERCEL_GIT_PROVIDER_GITHUB || IS_DEVELOPMENT) &&
-
}
-
-
}
- />
+
}
+ >
+
+
);
}
diff --git a/src/app/admin/insights/page.tsx b/src/app/admin/insights/page.tsx
new file mode 100644
index 00000000..0bf5efa4
--- /dev/null
+++ b/src/app/admin/insights/page.tsx
@@ -0,0 +1,8 @@
+import AdminAppInsights from '@/admin/insights/AdminAppInsights';
+import AdminInfoPage from '@/admin/AdminInfoPage';
+
+export default async function AdminInsightsPage() {
+ return
+
+ ;
+}
diff --git a/src/app/admin/outdated/page.tsx b/src/app/admin/outdated/page.tsx
index adb47cfe..ef945ffc 100644
--- a/src/app/admin/outdated/page.tsx
+++ b/src/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 '@/site/config';
+import { AI_TEXT_GENERATION_ENABLED } from '@/app-core/config';
export const maxDuration = 60;
diff --git a/src/app/admin/photos/[photoId]/edit/page.tsx b/src/app/admin/photos/[photoId]/edit/page.tsx
index 863695cb..25076704 100644
--- a/src/app/admin/photos/[photoId]/edit/page.tsx
+++ b/src/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 '@/site/paths';
+import { PATH_ADMIN } from '@/app-core/paths';
import PhotoEditPageClient from '@/photo/PhotoEditPageClient';
import {
AI_TEXT_GENERATION_ENABLED,
BLUR_ENABLED,
IS_PREVIEW,
-} from '@/site/config';
+} from '@/app-core/config';
import { blurImageFromUrl, resizeImageFromUrl } from '@/photo/server';
import { getNextImageUrlForManipulation } from '@/services/next-image';
diff --git a/src/app/admin/tags/[tag]/edit/page.tsx b/src/app/admin/tags/[tag]/edit/page.tsx
index e8458867..48c71ab4 100644
--- a/src/app/admin/tags/[tag]/edit/page.tsx
+++ b/src/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 '@/site/paths';
+import { PATH_ADMIN, PATH_ADMIN_TAGS, pathForTag } from '@/app-core/paths';
import PhotoLightbox from '@/photo/PhotoLightbox';
import { getPhotosMeta } from '@/photo/db/query';
import AdminTagBadge from '@/admin/AdminTagBadge';
diff --git a/src/app/admin/uploads/[uploadPath]/page.tsx b/src/app/admin/uploads/[uploadPath]/page.tsx
index 2481ddbb..595d332a 100644
--- a/src/app/admin/uploads/[uploadPath]/page.tsx
+++ b/src/app/admin/uploads/[uploadPath]/page.tsx
@@ -1,4 +1,4 @@
-import { PATH_ADMIN } from '@/site/paths';
+import { PATH_ADMIN } from '@/app-core/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 '@/site/config';
+} from '@/app-core/config';
import ErrorNote from '@/components/ErrorNote';
export const maxDuration = 60;
diff --git a/src/app/api/route.ts b/src/app/api/route.ts
index a3c74dc5..e1a61c62 100644
--- a/src/app/api/route.ts
+++ b/src/app/api/route.ts
@@ -1,10 +1,10 @@
import { getPhotosCached } from '@/photo/cache';
-import { API_PHOTO_REQUEST_LIMIT, formatPhotoForApi } from '@/site/api';
+import { API_PHOTO_REQUEST_LIMIT, formatPhotoForApi } from '@/app-core/api';
import {
BASE_URL,
PUBLIC_API_ENABLED,
SITE_TITLE,
-} from '@/site/config';
+} from '@/app-core/config';
export const dynamic = 'force-dynamic';
diff --git a/src/app/api/storage/presigned-url/[key]/route.ts b/src/app/api/storage/presigned-url/[key]/route.ts
index 9eb0db38..0406b95c 100644
--- a/src/app/api/storage/presigned-url/[key]/route.ts
+++ b/src/app/api/storage/presigned-url/[key]/route.ts
@@ -7,7 +7,7 @@ import {
cloudflareR2Client,
cloudflareR2PutObjectCommandForKey,
} from '@/services/storage/cloudflare-r2';
-import { CURRENT_STORAGE } from '@/site/config';
+import { CURRENT_STORAGE } from '@/app-core/config';
import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
export async function GET(
diff --git a/src/app/film-demo/animate/page.tsx b/src/app/film-demo/animate/page.tsx
index 92cb1f8a..11612df7 100644
--- a/src/app/film-demo/animate/page.tsx
+++ b/src/app/film-demo/animate/page.tsx
@@ -2,7 +2,7 @@
import SiteGrid from '@/components/SiteGrid';
import { clsx } from 'clsx/lite';
-import { FILM_SIMULATION_FORM_INPUT_OPTIONS } from '@/vendors/fujifilm';
+import { FILM_SIMULATION_FORM_INPUT_OPTIONS } from '@/platforms/fujifilm';
import PhotoFilmSimulation from
'@/simulation/PhotoFilmSimulation';
import { useEffect, useState } from 'react';
diff --git a/src/app/film-demo/page.tsx b/src/app/film-demo/page.tsx
index cd6a94be..a5e7467c 100644
--- a/src/app/film-demo/page.tsx
+++ b/src/app/film-demo/page.tsx
@@ -1,4 +1,4 @@
-import { FILM_SIMULATION_FORM_INPUT_OPTIONS } from '@/vendors/fujifilm';
+import { FILM_SIMULATION_FORM_INPUT_OPTIONS } from '@/platforms/fujifilm';
import PhotoFilmSimulation from
'@/simulation/PhotoFilmSimulation';
diff --git a/src/app/film/[simulation]/[photoId]/page.tsx b/src/app/film/[simulation]/[photoId]/page.tsx
index aaee4411..2171b016 100644
--- a/src/app/film/[simulation]/[photoId]/page.tsx
+++ b/src/app/film/[simulation]/[photoId]/page.tsx
@@ -9,7 +9,7 @@ import {
PATH_ROOT,
absolutePathForPhoto,
absolutePathForPhotoImage,
-} from '@/site/paths';
+} from '@/app-core/paths';
import PhotoDetailPage from '@/photo/PhotoDetailPage';
import { FilmSimulation } from '@/simulation';
import {
diff --git a/src/app/film/[simulation]/image/route.tsx b/src/app/film/[simulation]/image/route.tsx
index 62cb4996..b71f1569 100644
--- a/src/app/film/[simulation]/image/route.tsx
+++ b/src/app/film/[simulation]/image/route.tsx
@@ -6,7 +6,7 @@ import {
import FilmSimulationImageResponse from
'@/image-response/FilmSimulationImageResponse';
import { FilmSimulation } from '@/simulation';
-import { getIBMPlexMonoMedium } from '@/site/font';
+import { getIBMPlexMonoMedium } from '@/app-core/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 '@/site/config';
+} from '@/app-core/config';
export let generateStaticParams:
(() => Promise<{ simulation: FilmSimulation }[]>) | undefined = undefined;
diff --git a/src/app/film/[simulation]/page.tsx b/src/app/film/[simulation]/page.tsx
index 0199457c..262d78fd 100644
--- a/src/app/film/[simulation]/page.tsx
+++ b/src/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 '@/site/config';
+import { IS_PRODUCTION } from '@/app-core/config';
import { getPhotosFilmSimulationDataCached } from '@/simulation/data';
-import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/site/config';
+import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/app-core/config';
import { Metadata } from 'next/types';
import { cache } from 'react';
diff --git a/src/app/focal/[focal]/[photoId]/page.tsx b/src/app/focal/[focal]/[photoId]/page.tsx
index 1ca40aa1..85c4dc06 100644
--- a/src/app/focal/[focal]/[photoId]/page.tsx
+++ b/src/app/focal/[focal]/[photoId]/page.tsx
@@ -9,7 +9,7 @@ import {
PATH_ROOT,
absolutePathForPhoto,
absolutePathForPhotoImage,
-} from '@/site/paths';
+} from '@/app-core/paths';
import PhotoDetailPage from '@/photo/PhotoDetailPage';
import { getPhotosNearIdCached } from '@/photo/cache';
import { cache } from 'react';
diff --git a/src/app/focal/[focal]/image/route.tsx b/src/app/focal/[focal]/image/route.tsx
index 44cc1558..79682cb0 100644
--- a/src/app/focal/[focal]/image/route.tsx
+++ b/src/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 '@/site/font';
+import { getIBMPlexMonoMedium } from '@/app-core/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 '@/site/config';
+} from '@/app-core/config';
export let generateStaticParams:
(() => Promise<{ focal: string }[]>) | undefined = undefined;
diff --git a/src/app/focal/[focal]/page.tsx b/src/app/focal/[focal]/page.tsx
index ed8d78a6..2d01680a 100644
--- a/src/app/focal/[focal]/page.tsx
+++ b/src/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 '@/site/config';
+import { IS_PRODUCTION } from '@/app-core/config';
import { getUniqueFocalLengths } from '@/photo/db/query';
-import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/site/config';
-import { PATH_ROOT } from '@/site/paths';
+import { STATICALLY_OPTIMIZED_PHOTO_CATEGORIES } from '@/app-core/config';
+import { PATH_ROOT } from '@/app-core/paths';
import type { Metadata } from 'next';
import { redirect } from 'next/navigation';
import { cache } from 'react';
diff --git a/src/app/home-image/route.tsx b/src/app/home-image/route.tsx
index 7cb7acf7..fa820f94 100644
--- a/src/app/home-image/route.tsx
+++ b/src/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 '@/site/font';
+import { getIBMPlexMonoMedium } from '@/app-core/font';
import { ImageResponse } from 'next/og';
import { getImageResponseCacheControlHeaders } from '@/image-response/cache';
import { isNextImageReadyBasedOnPhotos } from '@/photo';
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index fbebb074..26171370 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,15 +7,15 @@ import {
SITE_DESCRIPTION,
SITE_DOMAIN_OR_TITLE,
SITE_TITLE,
-} from '@/site/config';
+} from '@/app-core/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 '@/site/Nav';
-import Footer from '@/site/Footer';
-import CommandK from '@/site/CommandK';
+import Nav from '@/app-core/Nav';
+import Footer from '@/app-core/Footer';
+import CommandK from '@/app-core/CommandK';
import SwrConfigClient from '../state/SwrConfigClient';
import AdminBatchEditPanel from '@/admin/AdminBatchEditPanel';
import ShareModals from '@/share/ShareModals';
@@ -72,11 +72,8 @@ export default function RootLayout({
>
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+