From 38b831243e795d477202e438dc2af8df8ffe5453 Mon Sep 17 00:00:00 2001 From: ngn Date: Tue, 21 Jan 2025 12:26:15 +0300 Subject: [PATCH] im fucking losing it Signed-off-by: ngn --- .env | 3 +-- Dockerfile | 1 - docker/init.sh | 5 +---- env.d.ts | 7 +++---- src/components/SearchBar.vue | 3 +-- src/settingsManager.ts | 4 ++-- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.env b/.env index f41865f..0340275 100644 --- a/.env +++ b/.env @@ -2,5 +2,4 @@ SAFETWITCH_BACKEND_DOMAIN=localhost:7000 SAFETWITCH_INSTANCE_DOMAIN=localhost:5173 SAFETWITCH_HTTPS=false SAFETWITCH_DEFAULT_LOCALE=en-US -SAFETWITCH_DEFAULT_THEME=dark -SAFETWITCH_FALLBACK_LOCALE=en-US \ No newline at end of file +SAFETWITCH_FALLBACK_LOCALE=en-US diff --git a/Dockerfile b/Dockerfile index 1d26934..3c7c70f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,6 @@ ENV SAFETWITCH_INSTANCE_DOMAIN SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER ENV SAFETWITCH_HTTPS SAFETWITCH_HTTPS_PLACEHOLDER ENV SAFETWITCH_DEFAULT_LOCALE SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER ENV SAFETWITCH_FALLBACK_LOCALE SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER -ENV SAFETWITCH_DEFAULT_THEME SAFETWITCH_DEFAULT_THEME_PLACEHOLDER WORKDIR /app diff --git a/docker/init.sh b/docker/init.sh index e545fb8..bf3a32a 100644 --- a/docker/init.sh +++ b/docker/init.sh @@ -10,7 +10,6 @@ else export SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER=SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER export SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER=SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER export SAFETWITCH_HTTPS_PLACEHOLDER=SAFETWITCH_HTTPS_PLACEHOLDER - export SAFETWITCH_DEFAULT_THEME_PLACEHOLDER=SAFETWITCH_DEFAULT_THEME_PLACEHOLDER export SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER=SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER export SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER=SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER fi @@ -21,7 +20,6 @@ do sed -i 's|'${SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER}'|'${SAFETWITCH_BACKEND_DOMAIN}'|g' $file sed -i 's|'${SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER}'|'${SAFETWITCH_INSTANCE_DOMAIN}'|g' $file sed -i 's|'${SAFETWITCH_HTTPS_PLACEHOLDER}'|'${SAFETWITCH_HTTPS}'|g' $file - sed -i 's|'${SAFETWITCH_DEFAULT_THEME_PLACEHOLDER}'|'${SAFETWITCH_DEFAULT_THEME}'|g' $file sed -i 's|'${SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER}'|'${SAFETWITCH_DEFAULT_LOCALE}'|g' $file sed -i 's|'${SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER}'|'${SAFETWITCH_FALLBACK_LOCALE}'|g' $file # Your other variables here... @@ -31,9 +29,8 @@ done echo -e "SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER=${SAFETWITCH_BACKEND_DOMAIN}" > .env.old echo -e "SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER=${SAFETWITCH_INSTANCE_DOMAIN}" >> .env.old echo -e "SAFETWITCH_HTTPS_PLACEHOLDER=${SAFETWITCH_HTTPS}" >> .env.old -echo -e "SAFETWITCH_DEFAULT_THEME_PLACEHOLDER=${SAFETWITCH_DEFAULT_THEME}" >> .env.old echo -e "SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER=${SAFETWITCH_DEFAULT_LOCALE}" >> .env.old echo -e "SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER=${SAFETWITCH_FALLBACK_LOCALE}" >> .env.old # Starting NGINX -nginx -g 'daemon off;' \ No newline at end of file +nginx -g 'daemon off;' diff --git a/env.d.ts b/env.d.ts index 5c06b76..58b5c80 100644 --- a/env.d.ts +++ b/env.d.ts @@ -1,7 +1,7 @@ /// // https://github.com/intlify/vue-i18n-next/issues/1403 -/// +/// /// declare module 'vue-i18n' @@ -13,10 +13,9 @@ interface ImportMetaEnv { readonly SAFETWITCH_FALLBACK_LOCALE: string readonly SAFETWITCH_COMMIT_HASH: string readonly SAFETWITCH_TAG: string - readonly SAFETWITCH_DEFAULT_THEME: string // more env variables... } - + interface ImportMeta { readonly env: ImportMetaEnv - } \ No newline at end of file + } diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue index db9337c..6ac8aac 100644 --- a/src/components/SearchBar.vue +++ b/src/components/SearchBar.vue @@ -24,8 +24,7 @@ export default { :placeholder="$t('main.search')" v-model="searchInput" @keyup.enter="redirectToSearch" - class="rounded-md text-white bg-none placeholder:text-black w-full outline-none" - style="border-bottom: solid 1px white" + class="rounded-md text-white bg-black placeholder:text-black w-full outline-none" /> diff --git a/src/settingsManager.ts b/src/settingsManager.ts index 16d7fb7..93c97ce 100644 --- a/src/settingsManager.ts +++ b/src/settingsManager.ts @@ -215,7 +215,7 @@ export function getFollows(): string[] { * @default string light */ export function getTheme(): string { - const selectedTheme = localStorage.getItem('theme') || import.meta.env.SAFETWITCH_DEFAULT_THEME + const selectedTheme = localStorage.getItem('theme') || "dark" if (selectedTheme === '') { return 'light' @@ -226,7 +226,7 @@ export function getTheme(): string { if (t.length === 0) { console.error(`Theme ${selectedTheme} does not exist... Perhaps improperly setup instance defaults or improper config? Stored Theme: ${localStorage.getItem('theme')} - Default Theme: ${import.meta.env.SAFETWITCH_DEFAULT_THEME} + Default Theme: black `) return 'light' }