From a7fd414ce6d4e8baad70563a69a735911af8579f Mon Sep 17 00:00:00 2001 From: chiba Date: Mon, 4 Mar 2024 22:26:48 +0800 Subject: [PATCH 1/3] improve LinkCard.svelte more intuitive --- AquaNet/src/pages/Home/LinkCard.svelte | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/AquaNet/src/pages/Home/LinkCard.svelte b/AquaNet/src/pages/Home/LinkCard.svelte index 73357a6f..f2a70e2f 100644 --- a/AquaNet/src/pages/Home/LinkCard.svelte +++ b/AquaNet/src/pages/Home/LinkCard.svelte @@ -233,7 +233,9 @@

Link Card

Please enter the following information:

-

1. The 20-digit access code on the back of your card. + {#if !inputSN} +

+

The 20-digit access code on the back of your card. (If it doesn't work, please try scanning your card in game and enter the access code shown on screen)

+ {/if} -

2. Download the NFC Tools app on your phone + {#if !inputAC} +

+

Download the NFC Tools app on your phone (Android / Apple) and scan your card. Then, enter the Serial Number. @@ -276,6 +282,8 @@ {#if errorSN}

{errorSN}

{/if} +
+ {/if} {#if conflictOld && conflictNew && me}
From 882d04f50c86d5dfd8cfd9a02f7dbaddaefdbb18 Mon Sep 17 00:00:00 2001 From: chiba Date: Mon, 4 Mar 2024 23:27:42 +0800 Subject: [PATCH 2/3] add .editorconfig to improve multiple developers working --- AquaNet/.editorconfig | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 AquaNet/.editorconfig diff --git a/AquaNet/.editorconfig b/AquaNet/.editorconfig new file mode 100644 index 00000000..a945a9e0 --- /dev/null +++ b/AquaNet/.editorconfig @@ -0,0 +1,20 @@ +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +# Matches multiple files: .ts, .json, .svelte .sass +[*.{json,svelte,ts,sass}] +indent_style = space +indent_size = 2 + + +# Markdown files (e.g., README.md) often use a line length of 80 characters +[*.md] +max_line_length = 80 +trim_trailing_whitespace = false \ No newline at end of file From 79dd56d0174e70fb0aa8461bb5ef0eab1363b649 Mon Sep 17 00:00:00 2001 From: chiba Date: Mon, 4 Mar 2024 23:37:56 +0800 Subject: [PATCH 3/3] improve LinkCard.svelte when click button clean input --- AquaNet/src/pages/Home/LinkCard.svelte | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AquaNet/src/pages/Home/LinkCard.svelte b/AquaNet/src/pages/Home/LinkCard.svelte index f2a70e2f..efe269c1 100644 --- a/AquaNet/src/pages/Home/LinkCard.svelte +++ b/AquaNet/src/pages/Home/LinkCard.svelte @@ -125,12 +125,12 @@ // 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 @@ -249,7 +249,7 @@ on:input={inputACChange} class:error={inputAC && (!inputACRegex.test(inputAC) || errorAC)}> {#if inputAC.length > 0} - + {/if} {#if errorAC} @@ -276,7 +276,7 @@ on:input={inputSNChange} class:error={inputSN && (!inputSNRegex.test(inputSN) || errorSN)}> {#if inputSN.length > 0} - + {/if} {#if errorSN} @@ -373,4 +373,4 @@ .id opacity: 0.7 - \ No newline at end of file +