improved plan view updates hopefully

Vertretungsapp · Jan 13, 2024 · 92d7c0c · 92d7c0c
1 parent d60286a
commit 92d7c0c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 29 deletions.
diff --git a/TODO.md b/TODO.md
@@ -16,8 +16,8 @@ bonus:
   - [ ] Implement credentials
   - [ ] Implement theming (?)
 - [ ] Implement general info on home screen
-- [ ] make PWA
-  - [ ] Implement offline mode
+- [x] make PWA
+  - [x] Implement offline mode
 - [ ] Implement search
 
 ## Bug fixes

diff --git a/src/lib/components/plan/PlanLessonDisplay.svelte b/src/lib/components/plan/PlanLessonDisplay.svelte
@@ -2,16 +2,13 @@
 	import type { PlannedLesson } from 'indiware-api';
 	import PlanLessonItem from './PlanLessonItem.svelte';
 	import type { PlanType } from '$lib/api/planTypes';
-	import { page } from '$app/stores';
 
 	export let lessons: PlannedLesson[] = [];
 	export let type: PlanType;
 </script>
 
 <div class="flex flex-col gap-2 overflow-y-auto">
-	{#key $page.url}
-		{#each lessons as lesson}
-			<PlanLessonItem {lesson} {type} />
-		{/each}
-	{/key}
+	{#each lessons as lesson}
+		<PlanLessonItem {lesson} {type} />
+	{/each}
 </div>
diff --git a/src/lib/components/plan/PlanNavigation.svelte b/src/lib/components/plan/PlanNavigation.svelte
@@ -21,16 +21,14 @@
 	}
 </script>
 
-{#key $page.url}
-	<div class="flex w-full items-center justify-between py-2">
-		<a href={getHrefLink(addDays(-1), short, type)}>
-			<Icon icon={faCircleChevronLeft} scale={1.5} />
-		</a>
+<div class="flex w-full items-center justify-between py-2">
+	<a href={getHrefLink(addDays(-1), short, type)}>
+		<Icon icon={faCircleChevronLeft} scale={1.5} />
+	</a>
 
-		<slot />
+	<slot />
 
-		<a href={getHrefLink(addDays(1), short, type)}>
-			<Icon icon={faCircleChevronRight} scale={1.5} />
-		</a>
-	</div>
-{/key}
+	<a href={getHrefLink(addDays(1), short, type)}>
+		<Icon icon={faCircleChevronRight} scale={1.5} />
+	</a>
+</div>
diff --git a/src/routes/(app)/plan/[type]/[short]/+page.svelte b/src/routes/(app)/plan/[type]/[short]/+page.svelte
@@ -56,14 +56,16 @@
 		<PlanInformation plan={data.substitutionPlan || undefined} />
 	{/key}
 
-	{#if data.plan && data.substitutionPlan}
-		<PlanLessonDisplay
-			lessons={data.plan.plannedLessons.sort((a, b) => a.order - b.order)}
-			type={data.type}
-		/>
-	{:else}
-		<p class="flex items-center justify-center gap-2 font-bold text-secondary-600">
-			<Icon icon={faFaceFrown} />Kein Plan verfügbar
-		</p>
-	{/if}
+	{#key $planStore.currentDate}
+		{#if data.plan && data.substitutionPlan}
+			<PlanLessonDisplay
+				lessons={data.plan.plannedLessons.sort((a, b) => a.order - b.order)}
+				type={data.type}
+			/>
+		{:else}
+			<p class="flex items-center justify-center gap-2 font-bold text-secondary-600">
+				<Icon icon={faFaceFrown} />Kein Plan verfügbar
+			</p>
+		{/if}
+	{/key}
 </div>