Merge branch 'v1-dev' into broker

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

AquaNet/.gitignore

@@ -32,4 +32,7 @@ dist-ssr
 !.yarn/sdks
 !.yarn/versions
 
-public/chu3
+public/chu3
+
+# local env file
+*.local

AquaNet/src/components/settings/ChuniSettings.svelte

@@ -34,7 +34,7 @@
   // Available (unlocked) options for each kind of item
   // In allItems: 'namePlate', 'frame', 'trophy', 'mapIcon', 'systemVoice', 'avatarAccessory'
   let allItems: Record<string, Record<string, { name: string }>> = {}
-  let iKinds = { namePlate: 1, frame: 2, trophy: 3, mapIcon: 8, systemVoice: 9, avatarAccessory: 11 }
+  let iKinds = { namePlate: 1, frame: 2, trophy: 3, trophySub1: 4, trophySub2: 5, mapIcon: 8, systemVoice: 9, avatarAccessory: 11 }
   // In userbox: 'nameplateId', 'frameId', 'trophyId', 'mapIconId', 'voiceId', 'avatar{Wear/Head/Face/Skin/Item/Front/Back}'
   let userbox: UserBox
   let avatarKinds = ['Wear', 'Head', 'Face', 'Skin', 'Item', 'Front', 'Back'] as const
@@ -66,6 +66,10 @@
     userItems = Object.entries(iKinds).flatMap(([iKey, iKind]) => {
       if (iKey != 'avatarAccessory') {
         let ubKey = `${iKey}Id`
+        if (iKey.slice('trophy'.length, 'trophy'.length + 3) == "Sub") {
+          ubKey = `trophyIdSub${iKey.slice('trophySub'.length, 'trophySub'.length + 1)}`;
+          iKey = `trophy`;
+        }
         if (ubKey == 'namePlateId') ubKey = 'nameplateId'
         if (ubKey == 'systemVoiceId') ubKey = 'voiceId'
         return [{ iKey, ubKey: ubKey as keyof UserBox,

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 }

AquaNet/src/libs/generalTypes.ts

@@ -142,6 +142,8 @@ export interface UserBox {
   frameId: number,
   characterId: number,
   trophyId: number,
+  trophyIdSub1: number,
+  trophyIdSub2: number,
   mapIconId: number,
   voiceId: number,
   avatarWear: number,

AquaNet/src/libs/i18n/en_ref.ts

@@ -191,6 +191,8 @@ export const EN_REF_USERBOX = {
   'userbox.nameplateId': 'Nameplate',
   'userbox.frameId': 'Frame',
   'userbox.trophyId': 'Trophy (Title)',
+  'userbox.trophyIdSub1': 'Trophy Sub #1 (Title)',
+  'userbox.trophyIdSub2': 'Trophy Sub #2 (Title)',
   'userbox.mapIconId': 'Map Icon',
   'userbox.voiceId': 'System Voice',
   'userbox.avatarWear': 'Avatar Wear',

AquaNet/src/pages/UserHome.svelte

@@ -318,7 +318,13 @@
     <RatingComposition title="B15" comp={d.user.ratingComposition.best15} {allMusics} game={game != "auto" ? game : "mai2"}/>
     <!-- <RatingComposition title="Hot 10" comp={d.user.ratingComposition.hot10} {allMusics} {game}/> -->
     <!-- <RatingComposition title="N10" comp={d.user.ratingComposition.next10} {allMusics} {game}/> -->
-    <RatingComposition title="Recent 10" comp={d.user.ratingComposition.recent10} {allMusics} game={game != "auto" ? game : "mai2"} top={10}/>
+     <!-- Chuni -->
+    {#if d.user.ratingComposition.new}
+      <RatingComposition title="New 20" comp={d.user.ratingComposition.new} {allMusics} game="chu3"/>
+    {:else}
+      <RatingComposition title="Recent 10" comp={d.user.ratingComposition.recent10} {allMusics} game={game != "auto" ? game : "mai2"} top={10}/>
+    {/if}
+
 
     <div class="recent">
       <h2>{t('UserHome.RecentScores')}</h2>

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}
         </button>
+        {#if TURNSTILE_SITE_KEY}
         <Turnstile siteKey={TURNSTILE_SITE_KEY} bind:reset={turnstileReset}
                    on:turnstile-callback={e => 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}
       </div>
     {:else if state === "verify"}
       <div class="login-form" transition:slide>