From 5b66e0c5c419f3e5342b051fb05d403e94a4cff8 Mon Sep 17 00:00:00 2001 From: zaanposni Date: Sun, 27 Oct 2024 15:48:14 +0100 Subject: [PATCH 1/4] added @html rendering to announcements --- src/psaggregator/src/routes/+layout.svelte | 35 +++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/psaggregator/src/routes/+layout.svelte b/src/psaggregator/src/routes/+layout.svelte index 8ff5fc6..35dd00a 100644 --- a/src/psaggregator/src/routes/+layout.svelte +++ b/src/psaggregator/src/routes/+layout.svelte @@ -16,9 +16,11 @@ import { browser } from "$app/environment"; import { onMount } from "svelte"; import type { LayoutData } from "./$types"; - import { CloseLarge, WarningAltFilled } from "carbon-icons-svelte"; + import { CloseLarge } from "carbon-icons-svelte"; import { ModeWatcher } from "mode-watcher"; import { Toaster } from "$lib/components/ui/sonner"; + import * as Alert from "$lib/components/ui/alert"; + import { slide } from "svelte/transition"; export let data: LayoutData; @@ -51,22 +53,21 @@
- {#each data.announcements as announcement} - + {#each data.announcements as announcement (announcement.id)} +
+ +
+ {@html announcement.text} +
+ + +
{/each}
From f9947da8033561ac4b1adaeeef8d83cb1425f447 Mon Sep 17 00:00:00 2001 From: zaanposni Date: Sun, 27 Oct 2024 15:51:55 +0100 Subject: [PATCH 2/4] removed labels from footer and made each icon same size --- .../src/lib/components/Footer.svelte | 109 +++++++----------- 1 file changed, 43 insertions(+), 66 deletions(-) diff --git a/src/psaggregator/src/lib/components/Footer.svelte b/src/psaggregator/src/lib/components/Footer.svelte index 5c52ab8..90b2536 100644 --- a/src/psaggregator/src/lib/components/Footer.svelte +++ b/src/psaggregator/src/lib/components/Footer.svelte @@ -2,7 +2,17 @@ import MediaQuery from "$lib/utils/MediaQuery.svelte"; import { GITHUB_AUTHOR_URL, GITHUB_URL, LEGAL_URL, MAIL_TO_URL } from "../../config/config"; import { version } from "$app/environment"; - import { Api, Favorite, Home, Document, Thumbnail_2, Settings, EventSchedule, Binoculars } from "carbon-icons-svelte"; + import { + Api, + Favorite, + Home, + Document, + Thumbnail_2, + Settings, + EventSchedule, + Binoculars, + IbmWatsonxCodeAssistantForZRefactor + } from "carbon-icons-svelte"; import { page } from "$app/stores"; @@ -10,6 +20,10 @@ :global(.tab-list) { justify-content: unset !important; } + + #iconfooter > a { + @apply flex items-center justify-center p-4 pt-4; + } @@ -38,71 +52,34 @@ Dies ist ein privates Projekt und steht in keiner Verbindung zur PietSmiet UG & Co. KG.
{:else} -
-
- -
- -
- Home - -
-
- -
- -
- Uploadplan - -
-
- -
- -
- Videos - -
-
- -
- -
- News - -
-
- -
- -
- Zufall - -
-
- -
- -
- API - -
-
- -
- -
- Motivation - -
-
- -
- -
- Einstellungen - -
+ {/if} From 43c109bdc6599930904fa6ffcbfc2312a15cee9f Mon Sep 17 00:00:00 2001 From: zaanposni Date: Sun, 27 Oct 2024 15:59:05 +0100 Subject: [PATCH 3/4] minor adjustments to frontpage --- src/psaggregator/src/routes/+page.server.ts | 2 +- src/psaggregator/src/routes/+page.svelte | 30 +++++++++------------ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/psaggregator/src/routes/+page.server.ts b/src/psaggregator/src/routes/+page.server.ts index a0aaa21..cffb03c 100644 --- a/src/psaggregator/src/routes/+page.server.ts +++ b/src/psaggregator/src/routes/+page.server.ts @@ -124,7 +124,7 @@ export async function load() { orderBy: { date: "desc" }, - take: 3 + take: 7 }) ]); diff --git a/src/psaggregator/src/routes/+page.svelte b/src/psaggregator/src/routes/+page.svelte index eb50f6f..f125917 100644 --- a/src/psaggregator/src/routes/+page.svelte +++ b/src/psaggregator/src/routes/+page.svelte @@ -58,9 +58,7 @@ {#each data.today as content} {:else} -
- Bisher konnte heute kein Uploadplan importiert werden. -
+
Bisher konnte heute kein Uploadplan importiert werden.
{/each}
@@ -108,29 +106,27 @@ {/each}
-
+
- twitch - Anstehende Streams + reddit + Reddit
- {#each data.upcomingStreams as stream} - - {:else} -
- Momentan sind keine geplanten Streams bekannt. -
+ {#each data.redditPosts.slice(0, matches ? 10 : 5) as reddit} + {/each}
-
+
- reddit - Reddit + twitch + Anstehende Streams
- {#each data.redditPosts.slice(0, matches ? 10 : 5) as reddit} - + {#each data.upcomingStreams as stream} + + {:else} +
Momentan sind keine geplanten Streams bekannt.
{/each}
From 2115b448080dac28e5de751e561f464042628b69 Mon Sep 17 00:00:00 2001 From: zaanposni Date: Sun, 27 Oct 2024 16:00:45 +0100 Subject: [PATCH 4/4] bumped version --- src/psaggregator/package-lock.json | 4 ++-- src/psaggregator/package.json | 2 +- src/psaggregator/src/routes/changelog/+page.svelte | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/psaggregator/package-lock.json b/src/psaggregator/package-lock.json index 92c243f..e558efb 100644 --- a/src/psaggregator/package-lock.json +++ b/src/psaggregator/package-lock.json @@ -1,12 +1,12 @@ { "name": "psaggregator", - "version": "1.12.0", + "version": "1.14.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "psaggregator", - "version": "1.12.0", + "version": "1.14.0", "dependencies": { "@internationalized/date": "^3.5.5", "bits-ui": "^0.21.13", diff --git a/src/psaggregator/package.json b/src/psaggregator/package.json index 719ac45..06f9747 100644 --- a/src/psaggregator/package.json +++ b/src/psaggregator/package.json @@ -1,6 +1,6 @@ { "name": "psaggregator", - "version": "1.13.0", + "version": "1.14.0", "scripts": { "dev": "vite dev", "build": "vite build", diff --git a/src/psaggregator/src/routes/changelog/+page.svelte b/src/psaggregator/src/routes/changelog/+page.svelte index b344363..f51f041 100644 --- a/src/psaggregator/src/routes/changelog/+page.svelte +++ b/src/psaggregator/src/routes/changelog/+page.svelte @@ -24,9 +24,13 @@

Neue Features

+
+ Anpassung Footer + Die Navigationsleiste auf mobilen Endgeräten wurde angepasst. Sie enthält keine Labels mehr dafür größere Icons. +
Anzeige von neuen Videos! - Auf der Videos-Seite erhältst du nun eine Meldung, sollten neue Videos verfügbar sein. + Auf der Videos-Seite erhältst du nun eine Meldung, sollten neue Videos verfügbar sein.
Verlinkung von YouTube-Videos!