From f0bfa96937dd68d6999bdc4d51d8ac90cac877b9 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sun, 21 Apr 2024 14:53:50 -0400 Subject: [PATCH] [F] Fix AquaNet ghost card detection --- AquaNet/src/libs/generalTypes.ts | 2 +- AquaNet/src/pages/Home/LinkCard.svelte | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AquaNet/src/libs/generalTypes.ts b/AquaNet/src/libs/generalTypes.ts index ea0f3e5c..82112ed5 100644 --- a/AquaNet/src/libs/generalTypes.ts +++ b/AquaNet/src/libs/generalTypes.ts @@ -9,7 +9,7 @@ export interface Card { registerTime: string accessTime: string linked: boolean - ghost: boolean + isGhost: boolean } export interface AquaNetUser { diff --git a/AquaNet/src/pages/Home/LinkCard.svelte b/AquaNet/src/pages/Home/LinkCard.svelte index f7ed71a4..32b14249 100644 --- a/AquaNet/src/pages/Home/LinkCard.svelte +++ b/AquaNet/src/pages/Home/LinkCard.svelte @@ -23,7 +23,7 @@ CARD.summary(m.ghostCard.luid).then(s => accountCardSummary = s.summary) // Always put the ghost card at the top - m.cards.sort((a, b) => a.ghost ? -1 : 1) + m.cards.sort((a, b) => a.isGhost ? -1 : 1) state = "ready" }).catch(e => error = e.message) updateMe() @@ -54,7 +54,7 @@ console.log("linking card", id) // Check if this card is already linked in the account - if (me?.cards?.some(c => formatLUID(c.luid, c.ghost).toLowerCase() === id.toLowerCase())) { + if (me?.cards?.some(c => formatLUID(c.luid, c.isGhost).toLowerCase() === id.toLowerCase())) { setError("This card is already linked to your account", type) state = "ready" return @@ -217,13 +217,13 @@ {#if me}
{#each me.cards as card (card.luid)} -
- {card.ghost ? "Account Card" : cardType(card.luid)} +
+ {card.isGhost ? "Account Card" : cardType(card.luid)} Registered: {moment(card.registerTime).format("YYYY MMM DD")} Last used: {moment(card.accessTime).format("YYYY MMM DD")}
- {formatLUID(card.luid, card.ghost)} - {#if !card.ghost} + {formatLUID(card.luid, card.isGhost)} + {#if !card.isGhost} {/if}