From dd573945ed8b702cba8986edc847f04697b5f3d3 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Mon, 23 Dec 2024 18:56:44 -0500
Subject: [PATCH] [F] Fix build warnings

---
 AquaNet/src/components/ActionCard.svelte      | 152 ++--
 AquaNet/src/components/CommunityCard.svelte   |   2 +-
 .../src/components/RatingComposition.svelte   |   8 +-
 AquaNet/src/components/UserBox.svelte         |  27 -
 AquaNet/src/components/UserCard.svelte        |   2 +-
 AquaNet/src/pages/Home.svelte                 | 196 ++---
 AquaNet/src/pages/Home/LinkCard.svelte        | 750 +++++++++---------
 AquaNet/src/pages/Ranking.svelte              |   6 +-
 AquaNet/src/pages/UserHome.svelte             |   7 +-
 9 files changed, 560 insertions(+), 590 deletions(-)

diff --git a/AquaNet/src/components/ActionCard.svelte b/AquaNet/src/components/ActionCard.svelte
index 3bb44ac7..036699ae 100644
--- a/AquaNet/src/components/ActionCard.svelte
+++ b/AquaNet/src/components/ActionCard.svelte
@@ -1,76 +1,76 @@
-<!-- Svelte 4.2.11 -->
-
-<script lang="ts">
-  import Icon from "@iconify/svelte";
-
-  export let color: string = '179, 198, 255'
-  export let icon: string
-
-  // Manually positioned icons
-  const iconPos = [
-      [1, 0.5, 2],
-      [6, 2, 1.5],
-      [-0.5, 4.5, 1.3],
-      [5, -0.5],
-      [3.5, 4.5],
-      [9.5, 0.3, 1.2],
-      [12.5, 2.5, 0.8],
-      [10, 4.4, 0.8],
-  ]
-</script>
-
-<div class="action-card" style="--card-color: {color}" on:click role="button" tabindex="0" on:keydown>
-  <slot/>
-
-  <div class="icons">
-    {#each iconPos as [x, y, size], i}
-      <Icon icon={icon} style={`top: ${y}rem; right: ${x}rem; font-size: ${size || 1}em`} />
-    {/each}
-  </div>
-</div>
-
-<style lang="sass">
-  @use '../vars'
-
-  .action-card
-    overflow: hidden
-    padding: 1rem
-    border-radius: vars.$border-radius
-    box-shadow: 0 5px 5px 1px vars.$c-shadow
-    transition: all 0.2s ease
-    cursor: pointer
-    position: relative
-    background: linear-gradient(45deg, transparent 20%, rgba(var(--card-color), 0.5) 100%)
-    outline: 1px solid transparent
-    filter: drop-shadow(0 0 12px rgba(var(--card-color), 0))
-
-    &:hover
-      box-shadow: 0 0 0.5rem 0.2rem vars.$c-shadow
-      transform: translateY(-3px)
-
-      // Drop shadow glow
-      filter: drop-shadow(0 0 12px rgba(var(--card-color), 0.5))
-      outline-color: rgba(var(--card-color), 0.5)
-
-    span
-      font-size: 1.2rem
-      display: block
-      margin-bottom: 0.5rem
-
-    .icons
-      position: absolute
-      inset: 0
-      color: rgba(var(--card-color), 0.5)
-      font-size: 2rem
-      transition: all 0.2s ease
-      z-index: -1
-      mask-image: linear-gradient(45deg, transparent 30%, rgba(255,255,255,0.5) 70%, white 100%)
-      opacity: 0.8
-
-      @media (max-width: vars.$w-mobile)
-        opacity: 0.6
-
-      :global(> svg)
-        position: absolute
-        rotate: 20deg
-</style>
+<!-- Svelte 4.2.11 -->
+
+<script lang="ts">
+  import Icon from "@iconify/svelte";
+
+  export let color: string = '179, 198, 255'
+  export let icon: string
+
+  // Manually positioned icons
+  const iconPos = [
+      [1, 0.5, 2],
+      [6, 2, 1.5],
+      [-0.5, 4.5, 1.3],
+      [5, -0.5],
+      [3.5, 4.5],
+      [9.5, 0.3, 1.2],
+      [12.5, 2.5, 0.8],
+      [10, 4.4, 0.8],
+  ]
+</script>
+
+<div class="action-card" style="--card-color: {color}" on:click role="button" tabindex="0" on:keydown>
+  <slot/>
+
+  <div class="icons">
+    {#each iconPos as [x, y, size], i}
+      <Icon icon={icon} style={`top: ${y}rem; right: ${x}rem; font-size: ${size || 1}em`} />
+    {/each}
+  </div>
+</div>
+
+<style lang="sass">
+  @use '../vars'
+
+  .action-card
+    overflow: hidden
+    padding: 1rem
+    border-radius: vars.$border-radius
+    box-shadow: 0 5px 5px 1px vars.$c-shadow
+    transition: all 0.2s ease
+    cursor: pointer
+    position: relative
+    background: linear-gradient(45deg, transparent 20%, rgba(var(--card-color), 0.5) 100%)
+    outline: 1px solid transparent
+    filter: drop-shadow(0 0 12px rgba(var(--card-color), 0))
+
+    &:hover
+      box-shadow: 0 0 0.5rem 0.2rem vars.$c-shadow
+      transform: translateY(-3px)
+
+      // Drop shadow glow
+      filter: drop-shadow(0 0 12px rgba(var(--card-color), 0.5))
+      outline-color: rgba(var(--card-color), 0.5)
+
+    :global(span)
+      font-size: 1.2rem
+      display: block
+      margin-bottom: 0.5rem
+
+    .icons
+      position: absolute
+      inset: 0
+      color: rgba(var(--card-color), 0.5)
+      font-size: 2rem
+      transition: all 0.2s ease
+      z-index: -1
+      mask-image: linear-gradient(45deg, transparent 30%, rgba(255,255,255,0.5) 70%, white 100%)
+      opacity: 0.8
+
+      @media (max-width: vars.$w-mobile)
+        opacity: 0.6
+
+      :global(> svg)
+        position: absolute
+        rotate: 20deg
+</style>
diff --git a/AquaNet/src/components/CommunityCard.svelte b/AquaNet/src/components/CommunityCard.svelte
index 7b1ba4e3..be2d2d70 100644
--- a/AquaNet/src/components/CommunityCard.svelte
+++ b/AquaNet/src/components/CommunityCard.svelte
@@ -39,7 +39,7 @@
       filter: drop-shadow(0 0 12px rgba(var(--card-color), 0.5))
       outline-color: rgba(var(--card-color), 0.5)
 
-    span
+    :global(span)
       font-size: 1.2rem
       display: block
       margin-bottom: 0.5rem
diff --git a/AquaNet/src/components/RatingComposition.svelte b/AquaNet/src/components/RatingComposition.svelte
index 57aeb1f8..0bfa7a88 100644
--- a/AquaNet/src/components/RatingComposition.svelte
+++ b/AquaNet/src/components/RatingComposition.svelte
@@ -26,16 +26,10 @@
 
 <style lang="sass">
   @use "../vars"
-  
+
   .rating-composition
     display: grid
     // 3 columns
     grid-template-columns: repeat(auto-fill, minmax(260px, 1fr))
     gap: vars.$gap
-
-  .rating-composition-2
-    display: grid
-    // 2 columns
-    grid-template-columns: repeat(auto-fill, minmax(290px, 1fr))
-    gap: vars.$gap
 </style>
diff --git a/AquaNet/src/components/UserBox.svelte b/AquaNet/src/components/UserBox.svelte
index e1669ee7..a3f51d74 100644
--- a/AquaNet/src/components/UserBox.svelte
+++ b/AquaNet/src/components/UserBox.svelte
@@ -434,37 +434,10 @@
 <style lang="sass">
     @use "../vars"
 
-    .outer-container
-        display: flex
-        flex-direction: column
-        gap: 1rem
-
-        nav
-            display: flex
-            gap: 1rem
-
-            div
-                padding: 0.5rem 1rem
-                border-radius: 0.4rem
-                cursor: pointer
-                transition: background-color 0.2s
-                font-weight: 500
-
-                &.active
-                    color: vars.$c-main
-
     img
         width: 100%
         height: auto
 
-    .container
-      display: flex
-      flex-direction: row
-      gap: 3rem
-
-      @media (max-width: vars.$w-max)
-        flex-direction: column
-
     .preview
         display: flex
         flex-direction: column
diff --git a/AquaNet/src/components/UserCard.svelte b/AquaNet/src/components/UserCard.svelte
index c36bf2b2..fb2e0d28 100644
--- a/AquaNet/src/components/UserCard.svelte
+++ b/AquaNet/src/components/UserCard.svelte
@@ -23,7 +23,7 @@
   <div>Error: {error}</div>
 {:else}
   <div class="user-card">
-    <img use:pfp={data.aquaUser} alt="Profile Picture" />
+    <img use:pfp={data.aquaUser} alt="Profile" />
     <div class="details">
       <span class="in-game-name">{data.name}</span>
       <span class="username">@{username}</span>
diff --git a/AquaNet/src/pages/Home.svelte b/AquaNet/src/pages/Home.svelte
index d5da3c4b..1faa9162 100644
--- a/AquaNet/src/pages/Home.svelte
+++ b/AquaNet/src/pages/Home.svelte
@@ -1,98 +1,98 @@
-<script lang="ts">
-  import { fade } from "svelte/transition";
-  import LinkCard from "./Home/LinkCard.svelte";
-  import SetupInstructions from "./Home/SetupInstructions.svelte";
-  import { DISCORD_INVITE, FADE_IN, FADE_OUT } from "../libs/config";
-  import { USER } from "../libs/sdk.js";
-  import type { AquaNetUser } from "../libs/generalTypes";
-  import StatusOverlays from "../components/StatusOverlays.svelte";
-  import ActionCard from "../components/ActionCard.svelte";
-  import { t } from "../libs/i18n";
-  import ImportDataAction from "./Home/ImportDataAction.svelte";
-  import Communities from "./Home/Communities.svelte";
-
-  USER.ensureLoggedIn();
-
-  let me: AquaNetUser
-  let error = ""
-
-  let tab = 0;
-  let tabs = [t('home.nav.portal'), t('home.nav.link-card'), t('home.nav.game-setup')]
-
-  USER.me().then((m) => me = m).catch(e => error = e.message)
-</script>
-
-<main class="content">
-<!--  <h2 class="outer-title">&nbsp;</h2>-->
-  <nav class="tabs">
-    {#each tabs as t, i}
-      <div class="clickable"
-           class:active={tab === i}
-           on:click={() => tab = i}
-           on:keydown={(e) => e.key === "Enter" && (tab = i)}
-           role="button" tabindex={i}>{t}
-      </div>
-    {/each}
-  </nav>
-
-  {#if tab === 0}
-    <div out:fade={FADE_OUT} in:fade={FADE_IN} class="action-cards">
-      <ActionCard color="255, 192, 203" icon="solar:card-bold-duotone" on:click={() => tab = 1}>
-        {#if me && me.cards.length > 1}
-          <h3>{t('home.manage-cards')}</h3>
-          <span>{t('home.manage-cards-description')}</span>
-        {:else if me}
-          <h3>{t('home.link-card')}</h3>
-          <span>{t('home.link-cards-description')}</span>
-        {/if}
-      </ActionCard>
-
-      <ActionCard color="82, 93, 233" icon="fluent:chat-12-filled" on:click={() => tab = 3}>
-        <h3>{t('home.join-community')}</h3>
-        <span>{t('home.join-community-description')}</span>
-      </ActionCard>
-
-      <ActionCard on:click={() => tab = 2} icon="uil:link-alt">
-        <h3>{t('home.setup')}</h3>
-        <span>{t('home.setup-description')}</span>
-      </ActionCard>
-
-      <ImportDataAction/>
-    </div>
-  {:else if tab === 1}
-    <div out:fade={FADE_OUT} in:fade={FADE_IN}>
-      <LinkCard/>
-    </div>
-  {:else if tab === 2}
-    <div out:fade={FADE_OUT} in:fade={FADE_IN}>
-      <SetupInstructions/>
-    </div>
-  {:else if tab === 3}
-    <div out:fade={FADE_OUT} in:fade={FADE_IN}>
-      <Communities/>
-    </div>
-  {/if}
-</main>
-
-<StatusOverlays {error} loading={!me}/>
-
-<style lang="sass">
-  @use "../vars"
-
-  .tabs
-    display: flex
-    gap: 1rem
-
-    div
-      &.active
-        color: vars.$c-main
-
-  h3
-    font-size: 1.3rem
-    margin: 0
-
-  .action-cards
-    display: flex
-    flex-direction: column
-    gap: 1rem
-</style>
+<script lang="ts">
+  import { fade } from "svelte/transition";
+  import LinkCard from "./Home/LinkCard.svelte";
+  import SetupInstructions from "./Home/SetupInstructions.svelte";
+  import { DISCORD_INVITE, FADE_IN, FADE_OUT } from "../libs/config";
+  import { USER } from "../libs/sdk.js";
+  import type { AquaNetUser } from "../libs/generalTypes";
+  import StatusOverlays from "../components/StatusOverlays.svelte";
+  import ActionCard from "../components/ActionCard.svelte";
+  import { t } from "../libs/i18n";
+  import ImportDataAction from "./Home/ImportDataAction.svelte";
+  import Communities from "./Home/Communities.svelte";
+
+  USER.ensureLoggedIn();
+
+  let me: AquaNetUser
+  let error = ""
+
+  let tab = 0;
+  let tabs = [t('home.nav.portal'), t('home.nav.link-card'), t('home.nav.game-setup')]
+
+  USER.me().then((m) => me = m).catch(e => error = e.message)
+</script>
+
+<main class="content">
+<!--  <h2 class="outer-title">&nbsp;</h2>-->
+  <nav class="tabs">
+    {#each tabs as t, i}
+      <div class="clickable"
+           class:active={tab === i}
+           on:click={() => tab = i}
+           on:keydown={(e) => e.key === "Enter" && (tab = i)}
+           role="button" tabindex={i}>{t}
+      </div>
+    {/each}
+  </nav>
+
+  {#if tab === 0}
+    <div out:fade={FADE_OUT} in:fade={FADE_IN} class="action-cards">
+      <ActionCard color="255, 192, 203" icon="solar:card-bold-duotone" on:click={() => tab = 1}>
+        {#if me && me.cards.length > 1}
+          <h3>{t('home.manage-cards')}</h3>
+          <span>{t('home.manage-cards-description')}</span>
+        {:else if me}
+          <h3>{t('home.link-card')}</h3>
+          <span>{t('home.link-cards-description')}</span>
+        {/if}
+      </ActionCard>
+
+      <ActionCard color="82, 93, 233" icon="fluent:chat-12-filled" on:click={() => tab = 3}>
+        <h3>{t('home.join-community')}</h3>
+        <span>{t('home.join-community-description')}</span>
+      </ActionCard>
+
+      <ActionCard on:click={() => tab = 2} icon="uil:link-alt">
+        <h3>{t('home.setup')}</h3>
+        <span>{t('home.setup-description')}</span>
+      </ActionCard>
+
+      <ImportDataAction/>
+    </div>
+  {:else if tab === 1}
+    <div out:fade={FADE_OUT} in:fade={FADE_IN}>
+      <LinkCard/>
+    </div>
+  {:else if tab === 2}
+    <div out:fade={FADE_OUT} in:fade={FADE_IN}>
+      <SetupInstructions/>
+    </div>
+  {:else if tab === 3}
+    <div out:fade={FADE_OUT} in:fade={FADE_IN}>
+      <Communities/>
+    </div>
+  {/if}
+</main>
+
+<StatusOverlays {error} loading={!me}/>
+
+<style lang="sass">
+  @use "../vars"
+
+  .tabs
+    display: flex
+    gap: 1rem
+
+    div
+      &.active
+        color: vars.$c-main
+
+  h3
+    font-size: 1.3rem
+    margin: 0
+
+  .action-cards
+    display: flex
+    flex-direction: column
+    gap: 1rem
+</style>
diff --git a/AquaNet/src/pages/Home/LinkCard.svelte b/AquaNet/src/pages/Home/LinkCard.svelte
index a462f1d4..77ce9218 100644
--- a/AquaNet/src/pages/Home/LinkCard.svelte
+++ b/AquaNet/src/pages/Home/LinkCard.svelte
@@ -1,375 +1,375 @@
-<!-- Svelte 4.2.11 -->
-
-<script lang="ts">
-  import { fade, slide } from "svelte/transition"
-  import type { Card, CardSummary, CardSummaryGame, ConfirmProps, AquaNetUser } from "../../libs/generalTypes";
-  import { CARD, USER } from "../../libs/sdk";
-  import moment from "moment"
-  import Icon from "@iconify/svelte";
-  import StatusOverlays from "../../components/StatusOverlays.svelte";
-  import { t } from "../../libs/i18n";
-
-  // State
-  let state: 'ready' | 'linking-AC' | 'linking-SN' | 'loading' = "loading"
-  let showConfirm: ConfirmProps | null = null
-
-  let error: string = ""
-  let me: AquaNetUser | null = null
-  let accountCardSummary: CardSummary | null = null
-
-  // Fetch data for current user
-  const updateMe = () => USER.me().then(m => {
-    me = m
-    m.cards.sort((a, b) => a.registerTime < b.registerTime ? 1 : -1)
-    CARD.summary(m.ghostCard.luid).then(s => accountCardSummary = s.summary)
-
-    // Always put the ghost card at the top
-    m.cards.sort((a, b) => a.isGhost ? -1 : 1)
-    state = "ready"
-  }).catch(e => error = e.message)
-  updateMe()
-
-  // Data conflict overlay
-  let conflictCardID: string = ""
-  let conflictSummary: CardSummary | null = null
-  let conflictGame: string = ""
-  let conflictNew: CardSummaryGame | null = null
-  let conflictOld: CardSummaryGame | null = null
-  let conflictToMigrate: string[] = []
-
-  function setError(msg: string, type: 'AC' | 'SN') {
-    type === 'AC' ? errorAC = msg : errorSN = msg
-  }
-
-  async function doLink(id: string, migrate: string) {
-    await CARD.link({cardId: id, migrate})
-    await updateMe()
-    state = "ready"
-  }
-
-  async function link(type: 'AC' | 'SN') {
-    if (state !== 'ready' || accountCardSummary === null) return
-    state = "linking-" + type
-    const id = type === 'AC' ? inputAC : inputSN
-
-    console.log("linking card", id)
-
-    // Check if this card is already linked in the account
-    if (me?.cards?.some(c => formatLUID(c.luid, c.isGhost).toLowerCase() === id.toLowerCase())) {
-      setError(t('home.linkcard.linked-own'), type)
-      state = "ready"
-      return
-    }
-
-    // First, lookup the card summary
-    const card = (await CARD.summary(id).catch(e => {
-      // If card is not found, create a card and link it
-      if (e.message === t('home.linkcard.notfound')) {
-        doLink(id, "")
-        return
-      }
-
-      setError(e.message, type)
-      state = "ready"
-      return
-    }))!
-    const summary = card.summary
-
-    // Check if it's already linked
-    if (card.card.linked) {
-      setError(t('home.linkcard.linked-another'), type)
-      state = "ready"
-      return
-    }
-
-    // If all games in summary are null or doesn't conflict with the ghost card,
-    // we can link the card directly
-    if (Object.keys(summary).every(k => summary[k as keyof CardSummary] === null
-        || accountCardSummary!![k as keyof CardSummary] === null)) {
-      console.log("linking card directly")
-      await doLink(id, Object.keys(summary).filter(k => summary[k as keyof CardSummary] !== null).join(","))
-    }
-
-    // For each conflicting game, ask the user if they want to migrate the data
-    else {
-      conflictSummary = summary
-      conflictCardID = id
-      await linkConflictContinue(null)
-    }
-  }
-
-  async function linkConflictContinue(choose: "old" | "new" | null) {
-    if (accountCardSummary === null || conflictSummary === null) return
-    console.log("linking card with migration")
-
-    if (choose) {
-      // If old is chosen, nothing needs to be migrated
-      // If new is chosen, we need to migrate the data
-      if (choose === "new") {
-        conflictToMigrate.push(conflictGame)
-      }
-      // Continue to the next card
-      conflictSummary[conflictGame as keyof CardSummary] = null
-    }
-
-    let isConflict = false
-    for (const k in conflictSummary) {
-      conflictNew = conflictSummary[k as keyof CardSummary]
-      conflictOld = accountCardSummary[k as keyof CardSummary]
-      conflictGame = k
-      if (!conflictNew || !conflictOld) continue
-
-      isConflict = true
-      break
-    }
-
-    // If there are no longer conflicts, we can link the card
-    if (!isConflict) {
-      await doLink(conflictCardID, conflictToMigrate.join(","))
-
-      // Reset the conflict state
-      linkConflictCancel()
-    }
-  }
-
-  function linkConflictCancel() {
-    state = "ready"
-    conflictSummary = null
-    conflictCardID = ""
-    conflictGame = ""
-    conflictNew = null
-    conflictOld = null
-    conflictToMigrate = []
-  }
-
-  async function unlink(card: Card) {
-    showConfirm = {
-      title: t('home.linkcard.unlink'),
-      message: t('home.linkcard.unlink-notice'),
-      confirm: async () => {
-        await CARD.unlink(card.luid)
-        await updateMe()
-        showConfirm = null
-      },
-      cancel: () => showConfirm = null,
-      dangerous: true
-    }
-  }
-
-  // Access code input
-  const inputACRegex = /^(\d{4} ){0,4}\d{0,4}$/
-  let inputAC = ""
-  let errorAC = ""
-
-  function inputACChange(e: any) {
-    e = e as InputEvent
-    // Add spaces to the input
-    const old = inputAC
-    if (e.inputType === "insertText" && inputAC.length % 5 === 4 && inputAC.length < 24)
-      inputAC += " "
-    inputAC = inputAC.slice(0, 24)
-    if (inputAC !== old) errorAC = ""
-  }
-
-  // Serial number input
-  const inputSNRegex = /^([0-9A-Fa-f]{0,2}:){0,7}[0-9A-Fa-f]{0,2}$/
-  let inputSN = ""
-  let errorSN = ""
-
-  function inputSNChange(e: any) {
-    e = e as InputEvent
-    // Add colons to the input
-    const old = inputSN
-    if (e.inputType === "insertText" && inputSN.length % 3 === 2 && inputSN.length < 23)
-      inputSN += ":"
-    inputSN = inputSN.toUpperCase().slice(0, 23)
-    if (inputSN !== old) errorSN = ""
-  }
-
-  function formatLUID(luid: string, ghost: boolean = false) {
-    if (ghost) return luid.slice(0, 6) + " " + (luid.slice(6).match(/.{4}/g)?.join(" ") ?? "")
-    switch (cardType(luid)) {
-      case "Felica SN":
-        return BigInt(luid).toString(16).toUpperCase().padStart(16, "0").match(/.{1,2}/g)!.join(":")
-      case "Access Code":
-        return luid.match(/.{4}/g)!.join(" ")
-      default:
-        return luid
-    }
-  }
-
-  function cardType(luid: string) {
-    if (luid.startsWith("00")) return "Felica SN"
-    if (luid.length === 20) return "Access Code"
-    if (luid.includes(":")) return "Felica SN"
-    if (luid.includes(" ")) return "Access Code"
-    return "Unknown"
-  }
-
-  function isInput(e: KeyboardEvent) {
-    return e.key.length === 1 && !e.altKey && !e.ctrlKey && !e.metaKey && !e.shiftKey
-  }
-</script>
-
-<div class="link-card">
-  <h2>{t('home.linkcard.cards')}</h2>
-  <p>{t('home.linkcard.description')}:</p>
-
-  {#if me}
-    <div class="existing-cards" transition:slide>
-      {#each me.cards as card (card.luid)}
-        <div class:ghost={card.isGhost} class='existing card' transition:fade|global>
-          <span class="type">{card.isGhost ? t('home.linkcard.account-card') : cardType(card.luid)}</span>
-          <span class="register">{t('home.linkcard.registered')}: {moment(card.registerTime).format("YYYY MMM DD")}</span>
-          <span class="last">{t('home.linkcard.lastused')}: {moment(card.accessTime).format("YYYY MMM DD")}</span>
-          <div/>
-          <span class="id">{formatLUID(card.luid, card.isGhost)}</span>
-          {#if !card.isGhost}
-            <button class="icon error" on:click={() => unlink(card)}><Icon icon="tabler:trash-x-filled"/></button>
-          {/if}
-        </div>
-      {/each}
-    </div>
-  {/if}
-
-  <h2>{t('home.link-card')}</h2>
-  <p>{t('home.linkcard.enter-info')}:</p>
-  {#if !inputSN}
-    <div out:slide={{ duration: 250 }}>
-  <p>{t('home.linkcard.access-code')}</p>
-  <label>
-    <!-- DO NOT change the order of bind:value and on:input. Their order determines the order of reactivity -->
-    <input placeholder="e.g. 5200 1234 5678 9012 3456"
-           on:keydown={(e) => {
-             e.key === "Enter" && link('AC')
-             // Ensure key is numeric
-             if (isInput(e) && !/[\d ]/.test(e.key)) e.preventDefault()
-           }}
-           bind:value={inputAC}
-           on:input={inputACChange}
-           class:error={inputAC && (!inputACRegex.test(inputAC) || errorAC)}>
-    {#if inputAC.length > 0}
-      <button transition:slide={{axis: 'x'}} on:click={() => {link('AC');inputAC=''}}>{t('home.linkcard.link')}</button>
-    {/if}
-  </label>
-  {#if errorAC}
-    <p class="error" transition:slide>{errorAC}</p>
-  {/if}
-    </div>
-    {/if}
-
-  {#if !inputAC}
-    <div out:slide={{ duration: 250 }}>
-  <p>{t('home.linkcard.enter-sn1')}
-    (<a href="https://play.google.com/store/apps/details?id=com.wakdev.wdnfc">Android</a> /
-    <a href="https://apps.apple.com/us/app/nfc-tools/id1252962749">Apple</a>)
-    {t('home.linkcard.enter-sn2')}
-  </p>
-  <label>
-    <input placeholder="e.g. 01:2E:1A:2B:3C:4D:5E:6F"
-           on:keydown={(e) => {
-             e.key === "Enter" && link('SN')
-             // Ensure key is hex or colon
-             if (isInput(e) && !/[0-9A-Fa-f:]/.test(e.key)) e.preventDefault()
-           }}
-           bind:value={inputSN}
-           on:input={inputSNChange}
-           class:error={inputSN && (!inputSNRegex.test(inputSN) || errorSN)}>
-    {#if inputSN.length > 0}
-      <button transition:slide={{axis: 'x'}} on:click={() => {link('SN'); inputSN = ''}}>{t('home.linkcard.link')}</button>
-    {/if}
-  </label>
-  {#if errorSN}
-    <p class="error" transition:slide>{errorSN}</p>
-  {/if}
-    </div>
-    {/if}
-
-  {#if conflictOld && conflictNew && me}
-    <div class="overlay" transition:fade>
-      <div>
-        <h2>{t('home.linkcard.data-conflict')}</h2>
-        <p></p>
-        <div class="conflict-cards">
-          <div class="old card clickable" on:click={() => linkConflictContinue('old')}
-               role="button" tabindex="0" on:keydown={e => e.key === "Enter" && linkConflictContinue('old')}>
-            <span class="type">{t('home.linkcard.account-card')}</span>
-            <span>{t('home.linkcard.name')}: {conflictOld.name}</span>
-            <span>{t('home.linkcard.rating')}: {conflictOld.rating}</span>
-            <span>{t('home.linkcard.last-login')}: {moment(conflictOld.lastLogin).format("YYYY MMM DD")}</span>
-            <span class="id">{formatLUID(me.ghostCard.luid, true)}</span>
-          </div>
-          <div class="new card clickable" on:click={() => linkConflictContinue('new')}
-               role="button" tabindex="0" on:keydown={e => e.key === "Enter" && linkConflictContinue('new')}>
-            <span class="type">{cardType(conflictCardID)}</span>
-            <span>{t('home.linkcard.name')}: {conflictNew.name}</span>
-            <span>{t('home.linkcard.rating')}: {conflictNew.rating}</span>
-            <span>{t('home.linkcard.last-login')}: {moment(conflictNew.lastLogin).format("YYYY MMM DD")}</span>
-            <span class="id">{conflictCardID}</span>
-          </div>
-        </div>
-        <button class="error" on:click={linkConflictCancel}>{t('action.cancel')}</button>
-      </div>
-    </div>
-  {/if}
-
-  <StatusOverlays bind:confirm={showConfirm} bind:error={error} loading={!me} />
-</div>
-
-<style lang="sass">
-  @use "../../vars"
-
-  .link-card
-    input
-      width: 100%
-
-    label
-      display: flex
-
-      button
-        margin-left: 1rem
-
-    .existing-cards, .conflict-cards
-      display: grid
-      grid-template-columns: repeat(auto-fill, minmax(250px, 1fr))
-      gap: 1rem
-
-      .existing.card
-        min-height: 90px
-        position: relative
-        overflow: hidden
-
-        *
-          white-space: nowrap
-
-        &.ghost
-          background: rgba(vars.$c-darker, 0.8)
-
-        .register, .last
-          opacity: 0.7
-
-        span:not(.type)
-          font-size: 0.8rem
-
-        > div
-          flex: 1
-
-        button
-          position: absolute
-          right: 10px
-          bottom: 10px
-
-    .conflict-cards
-      .card
-        transition: vars.$transition
-
-      .card:hover
-        background: vars.$c-darker
-
-      span:not(.type)
-        font-size: 0.8rem
-
-      .id
-        opacity: 0.7
-
-</style>
+<!-- Svelte 4.2.11 -->
+
+<script lang="ts">
+  import { fade, slide } from "svelte/transition"
+  import type { Card, CardSummary, CardSummaryGame, ConfirmProps, AquaNetUser } from "../../libs/generalTypes";
+  import { CARD, USER } from "../../libs/sdk";
+  import moment from "moment"
+  import Icon from "@iconify/svelte";
+  import StatusOverlays from "../../components/StatusOverlays.svelte";
+  import { t } from "../../libs/i18n";
+
+  // State
+  let state: 'ready' | 'linking-AC' | 'linking-SN' | 'loading' = "loading"
+  let showConfirm: ConfirmProps | null = null
+
+  let error: string = ""
+  let me: AquaNetUser | null = null
+  let accountCardSummary: CardSummary | null = null
+
+  // Fetch data for current user
+  const updateMe = () => USER.me().then(m => {
+    me = m
+    m.cards.sort((a, b) => a.registerTime < b.registerTime ? 1 : -1)
+    CARD.summary(m.ghostCard.luid).then(s => accountCardSummary = s.summary)
+
+    // Always put the ghost card at the top
+    m.cards.sort((a, b) => a.isGhost ? -1 : 1)
+    state = "ready"
+  }).catch(e => error = e.message)
+  updateMe()
+
+  // Data conflict overlay
+  let conflictCardID: string = ""
+  let conflictSummary: CardSummary | null = null
+  let conflictGame: string = ""
+  let conflictNew: CardSummaryGame | null = null
+  let conflictOld: CardSummaryGame | null = null
+  let conflictToMigrate: string[] = []
+
+  function setError(msg: string, type: 'AC' | 'SN') {
+    type === 'AC' ? errorAC = msg : errorSN = msg
+  }
+
+  async function doLink(id: string, migrate: string) {
+    await CARD.link({cardId: id, migrate})
+    await updateMe()
+    state = "ready"
+  }
+
+  async function link(type: 'AC' | 'SN') {
+    if (state !== 'ready' || accountCardSummary === null) return
+    state = "linking-" + type
+    const id = type === 'AC' ? inputAC : inputSN
+
+    console.log("linking card", id)
+
+    // Check if this card is already linked in the account
+    if (me?.cards?.some(c => formatLUID(c.luid, c.isGhost).toLowerCase() === id.toLowerCase())) {
+      setError(t('home.linkcard.linked-own'), type)
+      state = "ready"
+      return
+    }
+
+    // First, lookup the card summary
+    const card = (await CARD.summary(id).catch(e => {
+      // If card is not found, create a card and link it
+      if (e.message === t('home.linkcard.notfound')) {
+        doLink(id, "")
+        return
+      }
+
+      setError(e.message, type)
+      state = "ready"
+      return
+    }))!
+    const summary = card.summary
+
+    // Check if it's already linked
+    if (card.card.linked) {
+      setError(t('home.linkcard.linked-another'), type)
+      state = "ready"
+      return
+    }
+
+    // If all games in summary are null or doesn't conflict with the ghost card,
+    // we can link the card directly
+    if (Object.keys(summary).every(k => summary[k as keyof CardSummary] === null
+        || accountCardSummary!![k as keyof CardSummary] === null)) {
+      console.log("linking card directly")
+      await doLink(id, Object.keys(summary).filter(k => summary[k as keyof CardSummary] !== null).join(","))
+    }
+
+    // For each conflicting game, ask the user if they want to migrate the data
+    else {
+      conflictSummary = summary
+      conflictCardID = id
+      await linkConflictContinue(null)
+    }
+  }
+
+  async function linkConflictContinue(choose: "old" | "new" | null) {
+    if (accountCardSummary === null || conflictSummary === null) return
+    console.log("linking card with migration")
+
+    if (choose) {
+      // If old is chosen, nothing needs to be migrated
+      // If new is chosen, we need to migrate the data
+      if (choose === "new") {
+        conflictToMigrate.push(conflictGame)
+      }
+      // Continue to the next card
+      conflictSummary[conflictGame as keyof CardSummary] = null
+    }
+
+    let isConflict = false
+    for (const k in conflictSummary) {
+      conflictNew = conflictSummary[k as keyof CardSummary]
+      conflictOld = accountCardSummary[k as keyof CardSummary]
+      conflictGame = k
+      if (!conflictNew || !conflictOld) continue
+
+      isConflict = true
+      break
+    }
+
+    // If there are no longer conflicts, we can link the card
+    if (!isConflict) {
+      await doLink(conflictCardID, conflictToMigrate.join(","))
+
+      // Reset the conflict state
+      linkConflictCancel()
+    }
+  }
+
+  function linkConflictCancel() {
+    state = "ready"
+    conflictSummary = null
+    conflictCardID = ""
+    conflictGame = ""
+    conflictNew = null
+    conflictOld = null
+    conflictToMigrate = []
+  }
+
+  async function unlink(card: Card) {
+    showConfirm = {
+      title: t('home.linkcard.unlink'),
+      message: t('home.linkcard.unlink-notice'),
+      confirm: async () => {
+        await CARD.unlink(card.luid)
+        await updateMe()
+        showConfirm = null
+      },
+      cancel: () => showConfirm = null,
+      dangerous: true
+    }
+  }
+
+  // Access code input
+  const inputACRegex = /^(\d{4} ){0,4}\d{0,4}$/
+  let inputAC = ""
+  let errorAC = ""
+
+  function inputACChange(e: any) {
+    e = e as InputEvent
+    // Add spaces to the input
+    const old = inputAC
+    if (e.inputType === "insertText" && inputAC.length % 5 === 4 && inputAC.length < 24)
+      inputAC += " "
+    inputAC = inputAC.slice(0, 24)
+    if (inputAC !== old) errorAC = ""
+  }
+
+  // Serial number input
+  const inputSNRegex = /^([0-9A-Fa-f]{0,2}:){0,7}[0-9A-Fa-f]{0,2}$/
+  let inputSN = ""
+  let errorSN = ""
+
+  function inputSNChange(e: any) {
+    e = e as InputEvent
+    // Add colons to the input
+    const old = inputSN
+    if (e.inputType === "insertText" && inputSN.length % 3 === 2 && inputSN.length < 23)
+      inputSN += ":"
+    inputSN = inputSN.toUpperCase().slice(0, 23)
+    if (inputSN !== old) errorSN = ""
+  }
+
+  function formatLUID(luid: string, ghost: boolean = false) {
+    if (ghost) return luid.slice(0, 6) + " " + (luid.slice(6).match(/.{4}/g)?.join(" ") ?? "")
+    switch (cardType(luid)) {
+      case "Felica SN":
+        return BigInt(luid).toString(16).toUpperCase().padStart(16, "0").match(/.{1,2}/g)!.join(":")
+      case "Access Code":
+        return luid.match(/.{4}/g)!.join(" ")
+      default:
+        return luid
+    }
+  }
+
+  function cardType(luid: string) {
+    if (luid.startsWith("00")) return "Felica SN"
+    if (luid.length === 20) return "Access Code"
+    if (luid.includes(":")) return "Felica SN"
+    if (luid.includes(" ")) return "Access Code"
+    return "Unknown"
+  }
+
+  function isInput(e: KeyboardEvent) {
+    return e.key.length === 1 && !e.altKey && !e.ctrlKey && !e.metaKey && !e.shiftKey
+  }
+</script>
+
+<div class="link-card">
+  <h2>{t('home.linkcard.cards')}</h2>
+  <p>{t('home.linkcard.description')}:</p>
+
+  {#if me}
+    <div class="existing-cards" transition:slide>
+      {#each me.cards as card (card.luid)}
+        <div class:ghost={card.isGhost} class='existing card' transition:fade|global>
+          <span class="type">{card.isGhost ? t('home.linkcard.account-card') : cardType(card.luid)}</span>
+          <span class="register">{t('home.linkcard.registered')}: {moment(card.registerTime).format("YYYY MMM DD")}</span>
+          <span class="last">{t('home.linkcard.lastused')}: {moment(card.accessTime).format("YYYY MMM DD")}</span>
+          <div></div>
+          <span class="id">{formatLUID(card.luid, card.isGhost)}</span>
+          {#if !card.isGhost}
+            <button class="icon error" on:click={() => unlink(card)}><Icon icon="tabler:trash-x-filled"/></button>
+          {/if}
+        </div>
+      {/each}
+    </div>
+  {/if}
+
+  <h2>{t('home.link-card')}</h2>
+  <p>{t('home.linkcard.enter-info')}:</p>
+  {#if !inputSN}
+    <div out:slide={{ duration: 250 }}>
+  <p>{t('home.linkcard.access-code')}</p>
+  <label>
+    <!-- DO NOT change the order of bind:value and on:input. Their order determines the order of reactivity -->
+    <input placeholder="e.g. 5200 1234 5678 9012 3456"
+           on:keydown={(e) => {
+             e.key === "Enter" && link('AC')
+             // Ensure key is numeric
+             if (isInput(e) && !/[\d ]/.test(e.key)) e.preventDefault()
+           }}
+           bind:value={inputAC}
+           on:input={inputACChange}
+           class:error={inputAC && (!inputACRegex.test(inputAC) || errorAC)}>
+    {#if inputAC.length > 0}
+      <button transition:slide={{axis: 'x'}} on:click={() => {link('AC');inputAC=''}}>{t('home.linkcard.link')}</button>
+    {/if}
+  </label>
+  {#if errorAC}
+    <p class="error" transition:slide>{errorAC}</p>
+  {/if}
+    </div>
+    {/if}
+
+  {#if !inputAC}
+    <div out:slide={{ duration: 250 }}>
+  <p>{t('home.linkcard.enter-sn1')}
+    (<a href="https://play.google.com/store/apps/details?id=com.wakdev.wdnfc">Android</a> /
+    <a href="https://apps.apple.com/us/app/nfc-tools/id1252962749">Apple</a>)
+    {t('home.linkcard.enter-sn2')}
+  </p>
+  <label>
+    <input placeholder="e.g. 01:2E:1A:2B:3C:4D:5E:6F"
+           on:keydown={(e) => {
+             e.key === "Enter" && link('SN')
+             // Ensure key is hex or colon
+             if (isInput(e) && !/[0-9A-Fa-f:]/.test(e.key)) e.preventDefault()
+           }}
+           bind:value={inputSN}
+           on:input={inputSNChange}
+           class:error={inputSN && (!inputSNRegex.test(inputSN) || errorSN)}>
+    {#if inputSN.length > 0}
+      <button transition:slide={{axis: 'x'}} on:click={() => {link('SN'); inputSN = ''}}>{t('home.linkcard.link')}</button>
+    {/if}
+  </label>
+  {#if errorSN}
+    <p class="error" transition:slide>{errorSN}</p>
+  {/if}
+    </div>
+    {/if}
+
+  {#if conflictOld && conflictNew && me}
+    <div class="overlay" transition:fade>
+      <div>
+        <h2>{t('home.linkcard.data-conflict')}</h2>
+        <p></p>
+        <div class="conflict-cards">
+          <div class="old card clickable" on:click={() => linkConflictContinue('old')}
+               role="button" tabindex="0" on:keydown={e => e.key === "Enter" && linkConflictContinue('old')}>
+            <span class="type">{t('home.linkcard.account-card')}</span>
+            <span>{t('home.linkcard.name')}: {conflictOld.name}</span>
+            <span>{t('home.linkcard.rating')}: {conflictOld.rating}</span>
+            <span>{t('home.linkcard.last-login')}: {moment(conflictOld.lastLogin).format("YYYY MMM DD")}</span>
+            <span class="id">{formatLUID(me.ghostCard.luid, true)}</span>
+          </div>
+          <div class="new card clickable" on:click={() => linkConflictContinue('new')}
+               role="button" tabindex="0" on:keydown={e => e.key === "Enter" && linkConflictContinue('new')}>
+            <span class="type">{cardType(conflictCardID)}</span>
+            <span>{t('home.linkcard.name')}: {conflictNew.name}</span>
+            <span>{t('home.linkcard.rating')}: {conflictNew.rating}</span>
+            <span>{t('home.linkcard.last-login')}: {moment(conflictNew.lastLogin).format("YYYY MMM DD")}</span>
+            <span class="id">{conflictCardID}</span>
+          </div>
+        </div>
+        <button class="error" on:click={linkConflictCancel}>{t('action.cancel')}</button>
+      </div>
+    </div>
+  {/if}
+
+  <StatusOverlays bind:confirm={showConfirm} bind:error={error} loading={!me} />
+</div>
+
+<style lang="sass">
+  @use "../../vars"
+
+  .link-card
+    input
+      width: 100%
+
+    label
+      display: flex
+
+      button
+        margin-left: 1rem
+
+    .existing-cards, .conflict-cards
+      display: grid
+      grid-template-columns: repeat(auto-fill, minmax(250px, 1fr))
+      gap: 1rem
+
+    .existing-cards .existing.card
+      min-height: 90px
+      position: relative
+      overflow: hidden
+
+      *
+        white-space: nowrap
+
+      &.ghost
+        background: rgba(vars.$c-darker, 0.8)
+
+      .register, .last
+        opacity: 0.7
+
+      span:not(.type)
+        font-size: 0.8rem
+
+      > div
+        flex: 1
+
+      button
+        position: absolute
+        right: 10px
+        bottom: 10px
+
+    .conflict-cards
+      .card
+        transition: vars.$transition
+
+      .card:hover
+        background: vars.$c-darker
+
+      span:not(.type)
+        font-size: 0.8rem
+
+      .id
+        opacity: 0.7
+
+</style>
diff --git a/AquaNet/src/pages/Ranking.svelte b/AquaNet/src/pages/Ranking.svelte
index d1026995..86cb9345 100644
--- a/AquaNet/src/pages/Ranking.svelte
+++ b/AquaNet/src/pages/Ranking.svelte
@@ -38,7 +38,7 @@
 
   {#if d}
     <div class="leaderboard-container">
-      <div class="lb-user" on:mouseenter={() => hoveringUser = d.users[0].username}>
+      <div class="lb-user" on:mouseenter={() => hoveringUser = d.users[0].username} role="heading" aria-level="2">
         <span class="rank">{t("Leaderboard.Rank")}</span>
         <span class="name"></span>
         <span class="rating">{t("Leaderboard.Rating")}</span>
@@ -47,7 +47,9 @@
         <span class="ap">{t("Leaderboard.AP")}</span>
       </div>
       {#each d.users as user, i (user.rank)}
-        <div class="lb-user" class:alternate={i % 2 === 1} on:mouseover={() => hoveringUser = user.username}>
+        <div class="lb-user" class:alternate={i % 2 === 1} role="listitem"
+          on:mouseover={() => hoveringUser = user.username} on:focus={() => {}}>
+
           <span class="rank">#{user.rank}</span>
           <span class="name">
             {#if user.username !== ""}
diff --git a/AquaNet/src/pages/UserHome.svelte b/AquaNet/src/pages/UserHome.svelte
index eaf357f5..0c75d5d7 100644
--- a/AquaNet/src/pages/UserHome.svelte
+++ b/AquaNet/src/pages/UserHome.svelte
@@ -109,9 +109,10 @@
       <div class="name-box">
         <h2>{d.user.name}</h2>
         {#if typeof d.user.rival === 'boolean' && game === 'mai2'}
-          <a class="clickable" on:click={()=>setRival(!d.user.rival)}>
+          <span class="clickable" on:click={() => setRival(!d?.user.rival)} role="button" tabindex="0"
+             on:keydown={e => e.key === "Enter" && setRival(!d?.user.rival)}>
             {d.user.rival ? t("UserHome.RemoveRival") : t("UserHome.AddRival")}
-          </a>
+          </span>
         {/if}
         {#if me && me.username === username}
           <a class="setting-icon clickable" use:tooltip={t("UserHome.Settings")} href="/settings">
@@ -219,7 +220,7 @@
     <div>
       <h2>{t('UserHome.PlayActivity')}</h2>
       <div class="activity-info">
-        <div class="hide-scrollbar" id="cal-heatmap" bind:this={calElement} />
+        <div class="hide-scrollbar" id="cal-heatmap" bind:this={calElement}></div>
 
         <div class="info-bottom">
           <div class="plays">