Merge branch 'v1-dev' into v1-dev

AquaNet/docs/nginx.conf

@@ -1,43 +0,0 @@
-# Data server for Aqua frontend
-server
-{
-    listen 443 ssl;
-    listen [::]:443 ssl;
-    server_name aqua-data.example.com;
-
-    # / should redirect to the actual website aquadx.hydev.org 
-    location / {
-        return 301 https://example.com;
-    }
-
-    # /maimai should be a file server on /etc/nginx/aqua-data/maimai
-    # These are generated using:
-
-    # cd Package/Sinmai_Data/StreamingAssets/A000
-    # mkdir -p /etc/nginx/aqua-data/maimai
-    # python3 AquaDX/tools/data_convert.py .. /etc/nginx/aqua-data/maimai/meta
-    # rm -rf MovieData SoundData
-    # (Open AssetRipper and open folder Package/Sinmai_Data)
-    # (Export all assets to /tmp/maimai)
-    # cd /tmp/maimai/ExportedProject/Assets
-    # find -name "*.meta" -delete -print
-    # find -name "*.asset" -delete -print
-    # cp -r assetbundle Texture2D Resources/common/sprites /etc/nginx/aqua-data/maimai
-    # rm -rf /tmp/maimai
-
-    location /maimai {
-        root /etc/nginx/aqua-data;
-
-        # Specify UTF-8 encoding
-        charset utf-8;
-
-        # CORS allow all
-        add_header 'Access-Control-Allow-Origin' '*';
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-
-        autoindex on;
-    }
-
-    ssl_certificate /dev/null;
-    ssl_certificate_key /dev/null;
-}

AquaNet/src/libs/generalTypes.ts

@@ -34,10 +34,8 @@ export interface CardSummaryGame {
 }
 
 export interface CardSummary {
-  maimai: CardSummaryGame | null
-  maimai2: CardSummaryGame | null
-  chusan: CardSummaryGame | null
-  chunithm: CardSummaryGame | null
+  mai2: CardSummaryGame | null
+  chu3: CardSummaryGame | null
   ongeki: CardSummaryGame | null
   diva: CardSummaryGame | null
 }
@@ -105,13 +103,11 @@ export interface MusicMeta {
   bpm: number,
   ver: number,
   notes: {
-    [key: number]: {
-      lv: number
-      designer: string
-      lv_id: number
-      notes: number
-    }
-  }
+    lv: number
+    designer: string
+    lv_id: number
+    notes: number
+  }[]
 }
 
-export type AllMusic = { [key: string]: MusicMeta }
+export type AllMusic = { [key: string]: MusicMeta }

AquaNet/src/pages/UserHome.svelte

@@ -170,9 +170,7 @@
           <div class:alt={i % 2 === 0}>
             <img src={`${DATA_HOST}/d/${game}/music/00${r.musicId.toString().padStart(6, '0').substring(2)}.png`} alt="" on:error={coverNotFound} />
             <div class="info">
-              <div>
-                <span class="name">{r.name ??"Unable find music"}</span>
-              </div>
+              <div>{r.name ??"Unable find music"}</div>
               <div>
                 <span class={`lv level-${r.level}`}>{ r.notes?.[r.level]?.lv?.toFixed(1) ?? r.level ?? '0'}</span>
                 <span class={"rank-" + ("" + getMult(r.achievement, game)[2])[0]}>
@@ -218,7 +216,7 @@ $gap: 20px
       display: flex
       flex-direction: row
       gap: 10px
-      top: 0.5rem
+      top: 4px
       right: 0
 
   .pfp
@@ -349,18 +347,23 @@ $gap: 20px
           object-fit: cover
 
         // Song info and score
-        > div
+        > div.info
           flex: 1
           display: flex
           justify-content: space-between
+          overflow: hidden
 
           // Limit song name to one line
-          overflow: hidden
-          .name
+          > div:first-child
+            flex: 1
+            min-width: 0
             overflow: hidden
-            overflow-wrap: anywhere
-            white-space: nowrap
             text-overflow: ellipsis
+            white-space: nowrap
+
+          // Make song score and rank not wrap
+          > div:last-child
+            white-space: nowrap
 
           @media (max-width: $w-mobile)
             flex-direction: column