Skip to content

Commit

Permalink
Merge pull request #55 from zaanposni/release/1.14.0
Browse files Browse the repository at this point in the history 
Release/1.14.0
  • Loading branch information
@zaanposni
zaanposni authored Oct 27, 2024
2 parents 2db8e0b + 2115b44 commit 782801a
Show file tree
Hide file tree
Showing 7 changed files with 83 additions and 105 deletions.
4 changes: 2 additions & 2 deletions src/psaggregator/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/psaggregator/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "psaggregator",
"version": "1.13.0",
"version": "1.14.0",
"scripts": {
"dev": "vite dev",
"build": "vite build",
Expand Down
109 changes: 43 additions & 66 deletions src/psaggregator/src/lib/components/Footer.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,28 @@
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";
</script>

<style lang="postcss">
:global(.tab-list) {
justify-content: unset !important;
}
#iconfooter > a {
@apply flex items-center justify-center p-4 pt-4;
}
</style>

<MediaQuery query="(min-width: 1280px)" let:matches>
Expand Down Expand Up @@ -38,71 +52,34 @@
<span> Dies ist ein privates Projekt und steht in keiner Verbindung zur PietSmiet UG & Co. KG. </span>
</div>
{:else}
<div class="h-18 flex w-full flex-row items-center gap-x-2 overflow-x-auto overflow-y-hidden border-t">
<div class="shrink-0 p-2 pt-4" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/"}>
<a href="/">
<div class="flex justify-center">
<Home />
</div>
<span>Home</span>
</a>
</div>
<div class="shrink-0 p-2 pt-4" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/plan"}>
<a href="/plan">
<div class="flex justify-center">
<EventSchedule />
</div>
<span>Uploadplan</span>
</a>
</div>
<div class="shrink-0 p-2 pt-4" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/videos"}>
<a href="/videos">
<div class="flex justify-center">
<Thumbnail_2 />
</div>
<span>Videos</span>
</a>
</div>
<div class="shrink-0 p-2 pt-4" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/news"}>
<a href="/news">
<div class="flex justify-center">
<Document />
</div>
<span>News</span>
</a>
</div>
<div class="shrink-0 p-2 pt-4" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/randomvideo"}>
<a href="/randomvideo">
<div class="flex justify-center">
<Binoculars />
</div>
<span>Zufall</span>
</a>
</div>
<div class="shrink-0 p-2 pt-4" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/api"}>
<a href="/api">
<div class="flex justify-center">
<Api />
</div>
<span>API</span>
</a>
</div>
<div class="shrink-0 p-2 pt-4" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/motivation"}>
<a href="/motivation">
<div class="flex justify-center">
<Favorite />
</div>
<span>Motivation</span>
</a>
</div>
<div class="shrink-0 p-2 pt-4" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/settings"}>
<a href="/settings">
<div class="flex justify-center">
<Settings />
</div>
<span>Einstellungen</span>
</a>
</div>
<div class="flex h-16 flex-row items-center overflow-x-auto overflow-y-hidden border-t" id="iconfooter">
<a href="/" class="" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/"}>
<Home size={24} />
</a>
<a href="/plan" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/plan"}>
<EventSchedule size={24} />
</a>
<a href="/videos" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/videos"}>
<Thumbnail_2 size={24} />
</a>
<a href="/news" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/news"}>
<Document size={24} />
</a>
<a href="/randomvideo" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/randomvideo"}>
<Binoculars size={24} />
</a>
<a href="/api" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/api"}>
<Api size={24} />
</a>
<a href="/motivation" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/motivation"}>
<Favorite size={24} />
</a>
<a href="/changelog" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/changelog"}>
<IbmWatsonxCodeAssistantForZRefactor size={24} />
</a>
<a href="/settings" class:bg-[hsl(var(--primary))]={$page.url.pathname === "/settings"}>
<Settings size={24} />
</a>
</div>
{/if}
</MediaQuery>
35 changes: 18 additions & 17 deletions src/psaggregator/src/routes/+layout.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -51,22 +53,21 @@
<div style="display: contents" class="h-full overflow-hidden">
<div class="flex h-full w-full flex-col overflow-hidden">
<BigHeader />
{#each data.announcements as announcement}
<aside class="alert variant-filled-warning flex-row items-center">
<div>
<WarningAltFilled size={32} />
</div>
<div class="alert-message !mt-0 px-2">
<p>{announcement.text}</p>
</div>
<button
class="alert-actions !mt-0"
on:click={() => {
data.announcements = data.announcements.filter((a) => a.id !== announcement.id);
}}>
<CloseLarge />
</button>
</aside>
{#each data.announcements as announcement (announcement.id)}
<div out:slide>
<Alert.Root class="bg-primary flex items-center justify-between gap-x-2 rounded-none border-none">
<div class="text-primary-foreground font-bold">
{@html announcement.text}
</div>
<button
class="alert-actions !mt-0"
on:click={() => {
data.announcements = data.announcements.filter((a) => a.id !== announcement.id);
}}>
<CloseLarge class="text-primary-foreground" />
</button>
</Alert.Root>
</div>
{/each}
<div class="flex h-full w-full flex-auto overflow-hidden">
<div class="flex flex-1 flex-col overflow-x-hidden" style="scrollbar-gutter: auto;" id="page">
Expand Down
2 changes: 1 addition & 1 deletion src/psaggregator/src/routes/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export async function load() {
orderBy: {
date: "desc"
},
take: 3
take: 7
})
]);

Expand Down
30 changes: 13 additions & 17 deletions src/psaggregator/src/routes/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@
{#each data.today as content}
<UploadPlanEntry entry={content} />
{:else}
<div class="flex items-center mt-4">
<span>Bisher konnte heute kein Uploadplan importiert werden.</span>
</div>
<div class="flex items-center">Bisher konnte heute kein Uploadplan importiert werden.</div>
{/each}
</div>
</div>
Expand Down Expand Up @@ -108,29 +106,27 @@
{/each}
</div>
</div>
<div class="order-1 md:order-5">
<div class="order-5">
<div class="mb-2 ml-2 flex items-center text-2xl">
<img alt="twitch" src="/twitch-logo.svg" class="mr-2 inline-block h-8 w-8" />
Anstehende Streams
<img alt="reddit" src="/reddit-logo.svg" class="mr-2 inline-block h-8 w-8" />
Reddit
</div>
<div class="flex flex-col gap-2">
{#each data.upcomingStreams as stream}
<TwitchEntry entry={stream} />
{:else}
<div class="flex items-center mt-4">
<span>Momentan sind keine geplanten Streams bekannt.</span>
</div>
{#each data.redditPosts.slice(0, matches ? 10 : 5) as reddit}
<RedditPost entry={reddit} />
{/each}
</div>
</div>
<div class="order-6">
<div class="order-1 md:order-6">
<div class="mb-2 ml-2 flex items-center text-2xl">
<img alt="reddit" src="/reddit-logo.svg" class="mr-2 inline-block h-8 w-8" />
Reddit
<img alt="twitch" src="/twitch-logo.svg" class="mr-2 inline-block h-8 w-8" />
Anstehende Streams
</div>
<div class="flex flex-col gap-2">
{#each data.redditPosts.slice(0, matches ? 10 : 5) as reddit}
<RedditPost entry={reddit} />
{#each data.upcomingStreams as stream}
<TwitchEntry entry={stream} />
{:else}
<div class="flex items-center">Momentan sind keine geplanten Streams bekannt.</div>
{/each}
</div>
</div>
Expand Down
6 changes: 5 additions & 1 deletion src/psaggregator/src/routes/changelog/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,13 @@
</span>
</div>
<h2 class="mb-2 mt-4 text-2xl font-bold">Neue Features</h2>
<div>
<span>Anpassung Footer</span>
<span>Die Navigationsleiste auf mobilen Endgeräten wurde angepasst. Sie enthält keine Labels mehr dafür größere Icons.</span>
</div>
<div>
<span>Anzeige von neuen Videos!</span>
<span> Auf der Videos-Seite erhältst du nun eine Meldung, sollten neue Videos verfügbar sein. </span>
<span>Auf der Videos-Seite erhältst du nun eine Meldung, sollten neue Videos verfügbar sein.</span>
</div>
<div>
<span>Verlinkung von YouTube-Videos!</span>
Expand Down

0 comments on commit 782801a

Please sign in to comment.