From 1a2f3bf80e06c1d425715d2a9f7df2694487994e Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Tue, 5 Mar 2024 02:50:00 -0500
Subject: [PATCH] [F] Fix user page css text overflow

---
 AquaNet/src/libs/generalTypes.ts  | 14 ++++++--------
 AquaNet/src/pages/UserHome.svelte | 21 ++++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/AquaNet/src/libs/generalTypes.ts b/AquaNet/src/libs/generalTypes.ts
index 4e0355f8..3565e2de 100644
--- a/AquaNet/src/libs/generalTypes.ts
+++ b/AquaNet/src/libs/generalTypes.ts
@@ -103,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 }
\ No newline at end of file
+export type AllMusic = { [key: string]: MusicMeta }
diff --git a/AquaNet/src/pages/UserHome.svelte b/AquaNet/src/pages/UserHome.svelte
index e918fd4b..89669bb4 100644
--- a/AquaNet/src/pages/UserHome.svelte
+++ b/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}</span>
-              </div>
+              <div>{r.name}</div>
               <div>
                 <span class={`lv level-${r.level}`}>{r.notes ? r.notes[r.level]?.lv.toFixed(1) : ""}</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