From 54057922f62d3699bfae8150a1d7f4c4cc83db12 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Wed, 21 Feb 2024 13:36:21 -0500
Subject: [PATCH] [O] Better clazz

---
 AquaNet/src/libs/ui.ts            | 11 +++++++----
 AquaNet/src/pages/UserHome.svelte |  7 ++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/AquaNet/src/libs/ui.ts b/AquaNet/src/libs/ui.ts
index d59382b2..99a2653e 100644
--- a/AquaNet/src/libs/ui.ts
+++ b/AquaNet/src/libs/ui.ts
@@ -91,10 +91,13 @@ export const CHARTJS_OPT: ChartOptions<'line'> = {
 }
 
 /**
- * Usage: clazz({a: false, b: true}) -> "b"
+ * Convert object keys to classes depending on their values
  *
- * @param obj HashMap<string, boolean>
+ * @param obj Dictionary object {classname: truthy}
+ * @param others Other classes to add
  */
-export function clazz(obj: { [key: string]: boolean }) {
-  return Object.keys(obj).filter(k => obj[k]).join(' ')
+export function clz(obj: any, others?: string) {
+  let cls = Object.keys(obj).filter(key => obj[key]).join(' ')
+  if (others) cls += ' ' + others
+  return cls
 }
diff --git a/AquaNet/src/pages/UserHome.svelte b/AquaNet/src/pages/UserHome.svelte
index 64b39ea8..71db92e7 100644
--- a/AquaNet/src/pages/UserHome.svelte
+++ b/AquaNet/src/pages/UserHome.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {CHARTJS_OPT, clazz, registerChart, renderCal, title} from "../libs/ui";
+  import {CHARTJS_OPT, clz, registerChart, renderCal, title} from "../libs/ui";
   import {getMaimaiAllMusic, getMaimaiTrend, getMaimaiUser, getMult} from "../libs/maimai";
   import type {MaimaiMusic, MaimaiUserPlaylog, MaimaiUserSummaryEntry} from "../libs/maimaiTypes";
   import type {TrendEntry} from "../libs/generalTypes";
@@ -161,7 +161,7 @@
       <h2>Recent Scores</h2>
       <div class="scores">
         {#each d.recent as r, i}
-          <div class={clazz({alt: i % 2 === 0})}>
+          <div class={clz({alt: i % 2 === 0})}>
             <img src={`${DATA_HOST}/maimai/assetbundle/jacket_s/00${r.musicId.toString().padStart(6, '0').substring(2)}.png`} alt="">
             <div class="info">
               <div>
@@ -173,7 +173,7 @@
                   <span class="rank-text">{("" + getMult(r.achievement)[2]).replace("p", "+")}</span>
                   <span class="rank-num">{(r.achievement / 10000).toFixed(2)}%</span>
                 </span>
-                <span class={"dx-change " + clazz({increased: r.afterDeluxRating - r.beforeDeluxRating > 0})}>
+                <span class={"dx-change " + clz({increased: r.afterDeluxRating - r.beforeDeluxRating > 0})}>
                   {r.afterDeluxRating - r.beforeDeluxRating}
                 </span>
               </div>
@@ -202,6 +202,7 @@ $gap: 20px
     h2
       font-size: 2rem
       margin: 0
+      white-space: nowrap
 
   .pfp
     width: 100px