aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/components/AppVersion.svelte8
-rw-r--r--lib/screens/BeginScreen.svelte4
-rw-r--r--lib/screens/InitialLoadScreen.svelte8
-rw-r--r--routes/+page.svelte6
4 files changed, 6 insertions, 20 deletions
diff --git a/lib/components/AppVersion.svelte b/lib/components/AppVersion.svelte
index cdede9f..28554a7 100644
--- a/lib/components/AppVersion.svelte
+++ b/lib/components/AppVersion.svelte
@@ -1,12 +1,8 @@
<script lang="ts">
- interface Props {
- version: string
- }
-
- let { version }: Props = $props()
+ import { APP_VERSION } from '@hollowdark/lib/version/version'
</script>
-<p class="app-version">v {version}</p>
+<p class="app-version">v {APP_VERSION}</p>
<style>
.app-version {
diff --git a/lib/screens/BeginScreen.svelte b/lib/screens/BeginScreen.svelte
index 309c35a..5832a42 100644
--- a/lib/screens/BeginScreen.svelte
+++ b/lib/screens/BeginScreen.svelte
@@ -6,7 +6,6 @@
interface Props {
state: BeginState
- version: string
onBegin: () => void
onContinue?: () => void
onSettings: () => void
@@ -15,7 +14,6 @@
let {
state,
- version,
onBegin,
onContinue,
onSettings,
@@ -30,7 +28,7 @@
<BeginActions {state} {onBegin} {onContinue} {onSettings} {onCredits} />
- <AppVersion {version} />
+ <AppVersion />
</section>
<style>
diff --git a/lib/screens/InitialLoadScreen.svelte b/lib/screens/InitialLoadScreen.svelte
index bab53a8..3800715 100644
--- a/lib/screens/InitialLoadScreen.svelte
+++ b/lib/screens/InitialLoadScreen.svelte
@@ -1,13 +1,9 @@
<script lang="ts">
import AppTitle from '@hollowdark/lib/components/AppTitle.svelte'
import ProgressBar from '@hollowdark/lib/components/ProgressBar.svelte'
- import type { LoadingProgress } from '@hollowdark/loading/progress'
+ import { loadingProgress } from '@hollowdark/loading/progress'
- interface Props {
- progress: LoadingProgress
- }
-
- let { progress }: Props = $props()
+ const progress = $derived($loadingProgress)
</script>
<section class="initial-load">
diff --git a/routes/+page.svelte b/routes/+page.svelte
index 624f023..3153e35 100644
--- a/routes/+page.svelte
+++ b/routes/+page.svelte
@@ -3,15 +3,12 @@
import BeginScreen from '@hollowdark/lib/screens/BeginScreen.svelte'
import InitialLoadScreen from '@hollowdark/lib/screens/InitialLoadScreen.svelte'
import { runStubInitialLoad } from '@hollowdark/loading/stub'
- import { loadingProgress } from '@hollowdark/loading/progress'
import { detectBeginState, type BeginState } from '@hollowdark/loading/session'
- import { APP_VERSION } from '@hollowdark/lib/version/version'
type View = 'loading' | 'begin'
let view: View = $state('loading')
let beginState: BeginState = $state({ kind: 'first-ever' })
- const progress = $derived($loadingProgress)
onMount(async () => {
await runStubInitialLoad()
@@ -26,11 +23,10 @@
</script>
{#if view === 'loading'}
- <InitialLoadScreen {progress} />
+ <InitialLoadScreen />
{:else}
<BeginScreen
state={beginState}
- version={APP_VERSION}
onBegin={handleBegin}
onContinue={handleContinue}
onSettings={handleSettings}