From 171a4eb6f3e6767f1ae4fd1812bd3195abe01989 Mon Sep 17 00:00:00 2001 From: MoeGrid Date: Sun, 16 Mar 2025 19:56:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86config.ts=E4=B8=AD=E7=9A=84=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=85=8D=E7=BD=AE=E7=A7=BB=E5=8A=A8=E5=88=B0.env?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=96=B9=E4=BE=BF=E7=A7=81=E6=9C=89=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E3=80=82=20=E5=B0=86public=E4=B8=AD=E7=9A=84psd?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=A7=BB=E5=87=BA=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E8=A2=AB=E6=89=93=E5=8C=85=E5=88=B0dist=E3=80=82=20=E5=88=A4?= =?UTF-8?q?=E6=96=ADTURNSTILE=5FSITE=5FKEY=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=BC=80=E5=90=AF=E6=AD=A4=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AquaNet/.env | 9 +++++++++ AquaNet/.gitignore | 5 ++++- .../{public/assets => psd}/icons/AquaDX Cat.psd | Bin AquaNet/{public/assets => psd}/icons/Icon.psd | Bin .../{public/assets => psd}/imgs/All Perfect.psd | Bin .../{public/assets => psd}/imgs/Full Combo.psd | Bin AquaNet/{public/assets => psd}/imgs/no_cover.psd | Bin .../{public/assets => psd}/imgs/no_profile.psd | Bin AquaNet/src/libs/config.ts | 14 +++++++------- AquaNet/src/pages/Welcome.svelte | 4 +++- 10 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 AquaNet/.env rename AquaNet/{public/assets => psd}/icons/AquaDX Cat.psd (100%) rename AquaNet/{public/assets => psd}/icons/Icon.psd (100%) rename AquaNet/{public/assets => psd}/imgs/All Perfect.psd (100%) rename AquaNet/{public/assets => psd}/imgs/Full Combo.psd (100%) rename AquaNet/{public/assets => psd}/imgs/no_cover.psd (100%) rename AquaNet/{public/assets => psd}/imgs/no_profile.psd (100%) diff --git a/AquaNet/.env b/AquaNet/.env new file mode 100644 index 00000000..dbc79813 --- /dev/null +++ b/AquaNet/.env @@ -0,0 +1,9 @@ +VITE_AQUA_HOST=https://aquadx.net/aqua +VITE_DATA_HOST=https://aquadx.net + +VITE_AQUA_CONNECTION=aquadx.hydev.org + +VITE_TURNSTILE_SITE_KEY=0x4AAAAAAASGA2KQEIelo9P9 +VITE_DISCORD_INVITE=https://discord.gg/FNgveqFF7s +VITE_TELEGRAM_INVITE=https://t.me/+zBL4RZdyfvUzZGU1 +VITE_QQ_INVITE=https://qm.qq.com/q/wvNXbXbHbO diff --git a/AquaNet/.gitignore b/AquaNet/.gitignore index 20ffbea5..69166fea 100644 --- a/AquaNet/.gitignore +++ b/AquaNet/.gitignore @@ -32,4 +32,7 @@ dist-ssr !.yarn/sdks !.yarn/versions -public/chu3 \ No newline at end of file +public/chu3 + +# local env file +*.local \ No newline at end of file diff --git a/AquaNet/public/assets/icons/AquaDX Cat.psd b/AquaNet/psd/icons/AquaDX Cat.psd similarity index 100% rename from AquaNet/public/assets/icons/AquaDX Cat.psd rename to AquaNet/psd/icons/AquaDX Cat.psd diff --git a/AquaNet/public/assets/icons/Icon.psd b/AquaNet/psd/icons/Icon.psd similarity index 100% rename from AquaNet/public/assets/icons/Icon.psd rename to AquaNet/psd/icons/Icon.psd diff --git a/AquaNet/public/assets/imgs/All Perfect.psd b/AquaNet/psd/imgs/All Perfect.psd similarity index 100% rename from AquaNet/public/assets/imgs/All Perfect.psd rename to AquaNet/psd/imgs/All Perfect.psd diff --git a/AquaNet/public/assets/imgs/Full Combo.psd b/AquaNet/psd/imgs/Full Combo.psd similarity index 100% rename from AquaNet/public/assets/imgs/Full Combo.psd rename to AquaNet/psd/imgs/Full Combo.psd diff --git a/AquaNet/public/assets/imgs/no_cover.psd b/AquaNet/psd/imgs/no_cover.psd similarity index 100% rename from AquaNet/public/assets/imgs/no_cover.psd rename to AquaNet/psd/imgs/no_cover.psd diff --git a/AquaNet/public/assets/imgs/no_profile.psd b/AquaNet/psd/imgs/no_profile.psd similarity index 100% rename from AquaNet/public/assets/imgs/no_profile.psd rename to AquaNet/psd/imgs/no_profile.psd diff --git a/AquaNet/src/libs/config.ts b/AquaNet/src/libs/config.ts index fb9cbde6..5db05557 100644 --- a/AquaNet/src/libs/config.ts +++ b/AquaNet/src/libs/config.ts @@ -1,15 +1,15 @@ import type { ChusanMatchingOption } from "./generalTypes" -export const AQUA_HOST = 'https://aquadx.net/aqua' -export const DATA_HOST = 'https://aquadx.net' +export const AQUA_HOST = import.meta.env.VITE_AQUA_HOST +export const DATA_HOST = import.meta.env.VITE_DATA_HOST // This will be displayed for users to connect from the client -export const AQUA_CONNECTION = 'aquadx.hydev.org' +export const AQUA_CONNECTION = import.meta.env.VITE_AQUA_CONNECTION -export const TURNSTILE_SITE_KEY = '0x4AAAAAAASGA2KQEIelo9P9' -export const DISCORD_INVITE = 'https://discord.gg/FNgveqFF7s' -export const TELEGRAM_INVITE = 'https://t.me/+zBL4RZdyfvUzZGU1' -export const QQ_INVITE = 'https://qm.qq.com/q/wvNXbXbHbO' +export const TURNSTILE_SITE_KEY = import.meta.env.VITE_TURNSTILE_SITE_KEY +export const DISCORD_INVITE = import.meta.env.VITE_DISCORD_INVITE +export const TELEGRAM_INVITE = import.meta.env.VITE_TELEGRAM_INVITE +export const QQ_INVITE = import.meta.env.VITE_QQ_INVITE // UI export const FADE_OUT = { duration: 200 } diff --git a/AquaNet/src/pages/Welcome.svelte b/AquaNet/src/pages/Welcome.svelte index 1af1ae4c..669c56eb 100644 --- a/AquaNet/src/pages/Welcome.svelte +++ b/AquaNet/src/pages/Welcome.svelte @@ -51,7 +51,7 @@ return submitting = false } - if (turnstile === "") { + if (TURNSTILE_SITE_KEY && turnstile === "") { // Sleep for 100ms to allow Turnstile to finish error = t("welcome.waiting-turnstile") return setTimeout(submit, 100) @@ -137,11 +137,13 @@ {isSignup ? t('welcome.btn-signup') : t('welcome.btn-login')} {/if} + {#if TURNSTILE_SITE_KEY} console.log(turnstile = e.detail.token)} on:turnstile-error={_ => console.log(error = t("welcome.turnstile-error"))} on:turnstile-expired={_ => window.location.reload()} on:turnstile-timeout={_ => console.log(error = t('welcome.turnstile-timeout'))} /> + {/if} {:else if state === "verify"}