From 04c3ba25dfd779735633490106e273e15499c52f Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 24 Apr 2024 23:39:55 +0200 Subject: [PATCH] general emote support, room structure --- package.json | 1 + src/routes/emotes/+page.svelte | 84 ------------- src/routes/emotes/{ => [slug]}/+layout.svelte | 0 src/routes/emotes/[slug]/+page.server.js | 7 ++ src/routes/emotes/[slug]/+page.svelte | 111 ++++++++++++++++++ src/routes/emotes/{ => [slug]}/app.css | 15 +++ src/routes/rooms/+layout.svelte | 5 + src/routes/{emotes => rooms}/+page.server.js | 2 +- src/routes/rooms/+page.svelte | 43 +++++++ src/routes/rooms/app.css | 10 ++ 10 files changed, 193 insertions(+), 85 deletions(-) delete mode 100644 src/routes/emotes/+page.svelte rename src/routes/emotes/{ => [slug]}/+layout.svelte (100%) create mode 100644 src/routes/emotes/[slug]/+page.server.js create mode 100644 src/routes/emotes/[slug]/+page.svelte rename src/routes/emotes/{ => [slug]}/app.css (72%) create mode 100644 src/routes/rooms/+layout.svelte rename src/routes/{emotes => rooms}/+page.server.js (72%) create mode 100644 src/routes/rooms/+page.svelte create mode 100644 src/routes/rooms/app.css diff --git a/package.json b/package.json index 5dfdf0d..6fae21a 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "type": "module", "dependencies": { "matrix-js-sdk": "^31.4.0", + "svelte-collapsible": "^0.3.0", "svelte-use-form": "latest" } } diff --git a/src/routes/emotes/+page.svelte b/src/routes/emotes/+page.svelte deleted file mode 100644 index 4cad14f..0000000 --- a/src/routes/emotes/+page.svelte +++ /dev/null @@ -1,84 +0,0 @@ - -{#if isLoading} -

Loading the Emotes...

-{:else} - {#each baskets as basket, basketIndex (basket)} -
-

{basket.name}

- -
- {/each} -{/if} \ No newline at end of file diff --git a/src/routes/emotes/+layout.svelte b/src/routes/emotes/[slug]/+layout.svelte similarity index 100% rename from src/routes/emotes/+layout.svelte rename to src/routes/emotes/[slug]/+layout.svelte diff --git a/src/routes/emotes/[slug]/+page.server.js b/src/routes/emotes/[slug]/+page.server.js new file mode 100644 index 0000000..344dfbc --- /dev/null +++ b/src/routes/emotes/[slug]/+page.server.js @@ -0,0 +1,7 @@ +export const load = (async ({ params, cookies }) => { + const homeserver = cookies.get("hs"); + const token = cookies.get("mToken"); + const slug = params.slug; + + return { homeserver: homeserver, token: token, slug: slug} +}) \ No newline at end of file diff --git a/src/routes/emotes/[slug]/+page.svelte b/src/routes/emotes/[slug]/+page.svelte new file mode 100644 index 0000000..bd6bfc8 --- /dev/null +++ b/src/routes/emotes/[slug]/+page.svelte @@ -0,0 +1,111 @@ + +{#if error} + {error} +
+{:else} + {#if isLoading} +

Loading the Emotes...

+ {:else} + + {#each baskets as basket, basketIndex (basket)} +
+ +

{basket.content.pack.display_name}

+
    hoveringOverBasket = basket.content.pack.display_name} + on:dragleave={() => hoveringOverBasket = null} + on:drop={event => drop(event, basketIndex)} + ondragover="return false" + slot='body' class='body' > + {#each Object.entries(basket.content.images) as [key, value], itemIndex (key)} +
    +
  • dragStart(event, basketIndex, itemIndex)} > + {key} +
  • +
    + {/each} +
+
+
+ {/each} + {/if} +{/if} diff --git a/src/routes/emotes/app.css b/src/routes/emotes/[slug]/app.css similarity index 72% rename from src/routes/emotes/app.css rename to src/routes/emotes/[slug]/app.css index 02de2ee..4c00079 100644 --- a/src/routes/emotes/app.css +++ b/src/routes/emotes/[slug]/app.css @@ -36,4 +36,19 @@ p { } img { height: 32px; +} +button { + background-color: green; + border: none; + color: white; + padding: 15px 32px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 16px; + margin: 10px; +} +err { + color: red; + font-size: 32px; } \ No newline at end of file diff --git a/src/routes/rooms/+layout.svelte b/src/routes/rooms/+layout.svelte new file mode 100644 index 0000000..3ba231c --- /dev/null +++ b/src/routes/rooms/+layout.svelte @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/src/routes/emotes/+page.server.js b/src/routes/rooms/+page.server.js similarity index 72% rename from src/routes/emotes/+page.server.js rename to src/routes/rooms/+page.server.js index 43a27ec..cc33066 100644 --- a/src/routes/emotes/+page.server.js +++ b/src/routes/rooms/+page.server.js @@ -1,4 +1,4 @@ -export const load = (async ({ cookies}) => { +export const load = (async ({ cookies }) => { const homeserver = cookies.get("hs"); const token = cookies.get("mToken"); diff --git a/src/routes/rooms/+page.svelte b/src/routes/rooms/+page.svelte new file mode 100644 index 0000000..2c7ed23 --- /dev/null +++ b/src/routes/rooms/+page.svelte @@ -0,0 +1,43 @@ + + +{#if error} + {error} +
+{:else} + {#if isLoading} +

Loading the Rooms...

+ {:else} +
+ {#each rooms as room} +
{room}
+ {/each} +
+ {/if} +{/if} \ No newline at end of file diff --git a/src/routes/rooms/app.css b/src/routes/rooms/app.css new file mode 100644 index 0000000..6e55ba7 --- /dev/null +++ b/src/routes/rooms/app.css @@ -0,0 +1,10 @@ +.grid { + display: grid; + gap: 1px; + grid-template-columns: repeat(3, 1fr); +} + +div > div { + padding: 10px; + background-color: #ccc; +} \ No newline at end of file