diff --git a/src/IntroDownloader.svelte b/src/IntroDownloader.svelte index 2552262..656f6a2 100644 --- a/src/IntroDownloader.svelte +++ b/src/IntroDownloader.svelte @@ -4,13 +4,19 @@ import { onMount } from 'svelte'; import { uploadIntro } from './api.js'; + let enteredUploadTitle = ''; + let selectedUploadGuild = null; + let selectedFile = null; + let uploadPromise = null; + let enteredUrl = ''; let enteredTitle = ''; - let selectedFile = null; let selectedGuild = null; - let canDownloadAny = false; let downloadPromise = null; - let uploadPromise = null; + + let canDownloadAny = false; + + let allowedGuildList = []; $: allowedGuildList = $member.guilds @@ -32,9 +38,9 @@ const upload = () => { // TODO: limit to 1 file - if (!!selectedGuild) { + if (!!selectedUploadGuild) { uploadPromise = (async () => { - await uploadIntro(selectedGuild.id, enteredTitle, selectedFile[0], $member.token); + await uploadIntro(selectedUploadGuild.id, enteredUploadTitle, selectedFile[0], $member.token); await intros.fetchIntros($member.guilds); })(); } else { @@ -45,7 +51,7 @@ {#if canDownloadAny}
-
+

Download New Intro

{#if !!downloadPromise} {#await downloadPromise} @@ -60,7 +66,9 @@ {:else} @@ -68,7 +76,7 @@ {/if}
-
+

Upload New Intro

{#if !!uploadPromise} {#await uploadPromise} @@ -81,13 +89,20 @@ {/await} {:else} - {#each allowedGuildList as guild} {/each} - - + + {/if}
@@ -95,16 +110,17 @@ {/if} - -
%sveltekit.body%
- + %sveltekit.body% diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte new file mode 100644 index 0000000..8b95810 --- /dev/null +++ b/src/routes/+layout.svelte @@ -0,0 +1,5 @@ + + + diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index fe65234..0ed531a 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -28,11 +28,10 @@ } -

MemeJoin - A bot for user intros

- {#if !!$member}
-

{$member.username}

+

MemeJoin - A bot for user intros

+

{$member.username}

@@ -82,13 +81,15 @@ {/if}