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 diff --git a/AquaNet/src/pages/Home/LinkCard.svelte b/AquaNet/src/pages/Home/LinkCard.svelte index 73357a6f..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 @@ -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 errorAC}

{errorAC}

{/if} +
+ {/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. @@ -270,12 +276,14 @@ on:input={inputSNChange} class:error={inputSN && (!inputSNRegex.test(inputSN) || errorSN)}> {#if inputSN.length > 0} - + {/if} {#if errorSN}

{errorSN}

{/if} +
+ {/if} {#if conflictOld && conflictNew && me}
@@ -365,4 +373,4 @@ .id opacity: 0.7 - \ No newline at end of file +