Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

refactor(config): update config structure and references in components

HoshinoSuzumi4b546a4256c1
diff --git a/app/app.vue b/app/app.vue
index 1d297ca8..b0bc23d2 100644
--- a/app/app.vue
+++ b/app/app.vue
@@ -8,7 +8,7 @@ const dayjs = useDayjs()
useHead({
titleTemplate: (title) =>
- `${title ? title + ' | ' : ''}${config.public.APP_TITLE}`,
+ `${title ? title + ' | ' : ''}${config.public.app.title}`,
})
const { data, refresh, status } = useFetch('/api/photos')
diff --git a/app/components/loader/Avatar.vue b/app/components/loader/Avatar.vue
index d2aed224..153e1f7e 100644
--- a/app/components/loader/Avatar.vue
+++ b/app/components/loader/Avatar.vue
@@ -10,9 +10,9 @@ const config = useRuntimeConfig()
<div class="absolute inset-1 rounded-full overflow-hidden">
<img
- v-if="config.public.APP_AVATAR_URL"
+ v-if="config.public.app.avatarUrl"
class="w-full h-full object-cover"
- :src="config.public.APP_AVATAR_URL"
+ :src="config.public.app.avatarUrl"
alt="Loading..."
/>
<img
diff --git a/app/components/masonry/item/Header.vue b/app/components/masonry/item/Header.vue
index 889ac613..2bd5a7f1 100644
--- a/app/components/masonry/item/Header.vue
+++ b/app/components/masonry/item/Header.vue
@@ -55,7 +55,7 @@ const isRepoLinkHovering = ref(false)
<div
class="absolute inset-0 -z-10 blur-3xl scale-110 bg-cover bg-center opacity-35"
:style="{
- backgroundImage: `url(${config.public.APP_AVATAR_URL || avatarImage})`,
+ backgroundImage: `url(${config.public.app.avatarUrl || avatarImage})`,
}"
></div>
<div
@@ -73,7 +73,7 @@ const isRepoLinkHovering = ref(false)
<Icon name="tabler:star-filled" />
</div>
<img
- :src="config.public.APP_AVATAR_URL || avatarImage"
+ :src="config.public.app.avatarUrl || avatarImage"
class="size-12 rounded-full object-cover"
:class="!loggedIn && 'cursor-pointer'"
alt="Author's avatar"
@@ -83,7 +83,7 @@ const isRepoLinkHovering = ref(false)
<h1
class="text-2xl font-bold text-neutral-900 dark:text-white/90 mb-2"
>
- {{ config.public.APP_TITLE }}
+ {{ config.public.app.title }}
</h1>
</div>
<div
@@ -107,10 +107,10 @@ const isRepoLinkHovering = ref(false)
{{ $t('ui.stats.noPhotosTip') }}
</p>
<p
- v-if="config.public.APP_SLOGAN"
+ v-if="config.public.app.slogan"
class="font-[Pacifico]"
>
- {{ config.public.APP_SLOGAN }}
+ {{ config.public.app.slogan }}
</p>
</div>
<div
@@ -240,11 +240,11 @@ const isRepoLinkHovering = ref(false)
class="w-full px-2 pb-1 pt-1.5 bg-neutral-200/50 dark:bg-neutral-900/50 flex justify-between items-center gap-2"
>
<div
- v-if="$config.public.APP_AUTHOR || $config.public.APP_TITLE"
+ v-if="$config.public.app.author || $config.public.app.title"
class="text-xs text-neutral-500/80 dark:text-neutral-500 font-medium truncate"
>
© {{ $dayjs().format('YYYY') }}
- {{ $config.public.APP_AUTHOR || $config.public.APP_TITLE }}
+ {{ $config.public.app.author || $config.public.app.title }}
</div>
<div
class="text-xs text-neutral-500/60 dark:text-neutral-500/80 font-medium inline-flex justify-center items-center gap-0.5"
diff --git a/app/layouts/dashboard.vue b/app/layouts/dashboard.vue
index 5b104120..93a52a82 100644
--- a/app/layouts/dashboard.vue
+++ b/app/layouts/dashboard.vue
@@ -38,7 +38,7 @@ const { loggedIn, user } = useUserSession()
useHead({
title: $t('title.dashboard'),
titleTemplate: (title) =>
- `${title ? title + ' | ' : ''}${config.public.APP_TITLE}`,
+ `${title ? title + ' | ' : ''}${config.public.app.title}`,
})
const isMobileMenuOpen = ref(false)
@@ -83,7 +83,7 @@ const closeMobileMenu = () => {
to="/"
class="text-lg font-medium text-nowrap"
>
- {{ config.public.APP_TITLE || $t('title.dashboard') }}
+ {{ config.public.app.title || $t('title.dashboard') }}
</NuxtLink>
</div>
<UNavigationMenu
@@ -109,7 +109,7 @@ const closeMobileMenu = () => {
to="/"
class="text-lg font-medium"
>
- {{ config.public.APP_TITLE || $t('title.dashboard') }}
+ {{ config.public.app.title || $t('title.dashboard') }}
</NuxtLink>
</div>
<UButton
diff --git a/app/pages/[...slug].vue b/app/pages/[...slug].vue
index e9916389..57a6f56d 100644
--- a/app/pages/[...slug].vue
+++ b/app/pages/[...slug].vue
@@ -22,10 +22,10 @@ const currentPhoto = computed(() =>
defineOgImageComponent('Photo', {
headline: currentPhoto.value ? 'PHOTO' : 'ChronoFrame',
- title: currentPhoto.value?.title || config.public.APP_TITLE,
+ title: currentPhoto.value?.title || config.public.app.title,
description: currentPhoto.value
? currentPhoto.value.description
- : config.public.APP_SLOGAN,
+ : config.public.app.slogan,
thumbnailJpegUrl:
currentPhoto.value && currentPhoto.value.thumbnailKey
? `/thumb/${currentPhoto.value.thumbnailKey}`
diff --git a/app/pages/signin.vue b/app/pages/signin.vue
index e6616d0e..20ec7e24 100644
--- a/app/pages/signin.vue
+++ b/app/pages/signin.vue
@@ -47,7 +47,7 @@ const onAuthSubmit = async (event: any) => {
:subtitle="$t('auth.form.signin.subtitle')"
:loading="isLoading"
:providers="[
- config.public.OAUTH_GITHUB_ENABLED && {
+ config.public.oauth.github.enabled && {
icon: 'tabler:brand-github',
size: 'lg',
color: 'neutral',
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 6a027f83..cb3d77d7 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -35,21 +35,33 @@ export default defineNuxtConfig({
mapbox: {
accessToken: '',
},
- APP_TITLE: 'ChronoFrame',
- APP_SLOGAN: '',
- APP_AUTHOR: '',
- APP_AVATAR_URL: '/avatar.webp',
- OAUTH_GITHUB_ENABLED: false,
+ app: {
+ title: 'ChronoFrame',
+ slogan: '',
+ author: '',
+ avatarUrl: '',
+ },
+ oauth: {
+ github: {
+ enabled: false,
+ }
+ },
+ },
+ mapbox: {
+ accessToken: '',
},
- MAPBOX_ACCESS_TOKEN: '',
STORAGE_PROVIDER: 's3',
- PROVIDER_S3_ENDPOINT: '',
- PROVIDER_S3_BUCKET: '',
- PROVIDER_S3_REGION: '',
- PROVIDER_S3_ACCESS_KEY_ID: '',
- PROVIDER_S3_SECRET_ACCESS_KEY: '',
- PROVIDER_S3_PREFIX: '',
- PROVIDER_S3_CDN_URL: '',
+ provider: {
+ s3: {
+ endpoint: '',
+ bucket: '',
+ region: '',
+ accessKeyId: '',
+ secretAccessKey: '',
+ prefix: '',
+ cdnUrl: '',
+ }
+ },
ALLOW_INSECURE_COOKIE: false,
},
diff --git a/server/plugins/storage.ts b/server/plugins/storage.ts
index abf5e809..89962706 100644
--- a/server/plugins/storage.ts
+++ b/server/plugins/storage.ts
@@ -17,13 +17,13 @@ export default nitroPlugin(async (nitroApp) => {
const devConfigs: Record<'s3' | 'r2', StorageConfig> = {
s3: {
provider: (config.STORAGE_PROVIDER as StorageConfig['provider']) || 's3',
- bucket: config.PROVIDER_S3_BUCKET,
- region: config.PROVIDER_S3_REGION,
- endpoint: config.PROVIDER_S3_ENDPOINT,
- prefix: config.PROVIDER_S3_PREFIX,
- cdnUrl: config.PROVIDER_S3_CDN_URL,
- accessKeyId: config.PROVIDER_S3_ACCESS_KEY_ID,
- secretAccessKey: config.PROVIDER_S3_SECRET_ACCESS_KEY,
+ bucket: config.provider.s3.bucket,
+ region: config.provider.s3.region,
+ endpoint: config.provider.s3.endpoint,
+ prefix: config.provider.s3.prefix,
+ cdnUrl: config.provider.s3.cdnUrl,
+ accessKeyId: config.provider.s3.accessKeyId,
+ secretAccessKey: config.provider.s3.secretAccessKey,
},
r2: {
provider: 'hub-r2',