diff --git a/src/routes/(components)/layout/ChangelogDialog.svelte b/src/routes/(components)/layout/ChangelogDialog.svelte index 3e8fb0e1..f33019a3 100644 --- a/src/routes/(components)/layout/ChangelogDialog.svelte +++ b/src/routes/(components)/layout/ChangelogDialog.svelte @@ -7,10 +7,9 @@ import { onMount } from 'svelte'; import LoaderCircle from 'virtual:icons/lucide/loader-circle'; import ReloadIcon from 'virtual:icons/lucide/refresh-ccw'; - import { checkForUpdates, needRefresh, updateDataLossDialog } from './PWAFunctions.svelte'; + import { needRefresh, updateDataLossDialog } from './PWAFunctions.svelte'; let open = $state(false); - let checkedForUpdate = $state(false); let dialogText = $state(); let releases = $state<{ tag_name: string; body: string }[]>([]); @@ -27,13 +26,8 @@ ) { open = true; await loadChangelog(changelogShownOf); - while (checkForUpdates === null) { - await new Promise((resolve) => setTimeout(resolve, 500)); - } - await checkForUpdates(); } ls.setItem('changelogShownOf', latestRelease!.tag_name); - checkedForUpdate = true; }); async function loadChangelog(lastRelease: string) { @@ -50,33 +44,30 @@ } - - {#if dialogText} - -
- {@html dialogText} -
-
- - {:else} -
- - Loading changelog -
- {/if} -
+ + {:else} +
+ + Loading changelog +
+ {/if} + +{/if} diff --git a/src/routes/(components)/layout/PWAButtons.svelte b/src/routes/(components)/layout/PWAButtons.svelte index 26dcfbdd..96e06120 100644 --- a/src/routes/(components)/layout/PWAButtons.svelte +++ b/src/routes/(components)/layout/PWAButtons.svelte @@ -5,6 +5,7 @@ import DownloadIcon from 'virtual:icons/lucide/download'; import UpdateIcon from 'virtual:icons/lucide/refresh-cw'; import { needRefresh, updateDataLossDialog } from './PWAFunctions.svelte'; + import ChangelogDialog from './ChangelogDialog.svelte'; let { isMobile }: { isMobile: boolean } = $props(); @@ -78,3 +79,5 @@ {/if} {/if} + + diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index e51e02a1..1cb2950d 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -4,7 +4,6 @@ import { onMount } from 'svelte'; import { pwaInfo } from 'virtual:pwa-info'; import '../app.pcss'; - import ChangelogDialog from './(components)/layout/ChangelogDialog.svelte'; import DesktopLayout from './(components)/layout/DesktopLayout.svelte'; import MobileLayout from './(components)/layout/MobileLayout.svelte'; import UpdateDataLossDialog from './(components)/layout/UpdateDataLossDialog.svelte'; @@ -32,7 +31,6 @@ - {#if isMobile === true} diff --git a/src/routes/workouts/manage/exercises/(components)/SetsComponent.svelte b/src/routes/workouts/manage/exercises/(components)/SetsComponent.svelte index fb157a2f..687ab2c0 100644 --- a/src/routes/workouts/manage/exercises/(components)/SetsComponent.svelte +++ b/src/routes/workouts/manage/exercises/(components)/SetsComponent.svelte @@ -188,7 +188,7 @@ {/if} {#if !(useActiveMesocycle && workoutData.workoutOfMesocycle?.workoutStatus === 'RestDay')} -
+
{ + e.preventDefault(); + startWorkout(); + }} + > - -
+ + {/if} {#if skippedWorkoutsOfCycle && skippedWorkoutsOfCycle.length > 0} @@ -217,7 +232,12 @@ {/if} {#if workoutData.workoutOfMesocycle?.workoutStatus !== 'RestDay'} -