From 4680c251d230beeb2d87389a473a48123a0fc6ea Mon Sep 17 00:00:00 2001 From: James Xylight Date: Wed, 30 Jul 2025 17:25:31 -0700 Subject: [PATCH] impr: use custom progress bar --- bun.lockb | Bin 178666 -> 177930 bytes package.json | 2 - .../lemmy/post/media/PostImage.svelte | 2 +- src/lib/components/ui/Expandable.svelte | 2 +- .../ui/layout/NavigationProgress.svelte | 48 ++++++++++++++++++ src/routes/+layout.svelte | 25 ++++----- 6 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 src/lib/components/ui/layout/NavigationProgress.svelte diff --git a/bun.lockb b/bun.lockb index 6480ec873155f1ad454487a2a6c6ad707c52b75e..232920a2ed140a837e72295c7f84dc457ea74dca 100755 GIT binary patch delta 28286 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 DNYrcy diff --git a/package.json b/package.json index cb3d499c..ed884f52 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "@sveltejs/vite-plugin-svelte": "^4.0.0", "@tailwindcss/container-queries": "^0.1.1", "@tailwindcss/postcss": "^4.1.8", - "@types/nprogress": "^0.2.0", "@types/ua-parser-js": "^0.7.39", "eslint": "^9.28.0", "eslint-plugin-svelte": "^3.9.1", @@ -23,7 +22,6 @@ "linkify-it": "^5.0.0", "marked": "7.0.5", "marked-linkify-it": "^3.1.10", - "nprogress": "^0.2.0", "postcss": "^8.4.30", "prettier": "^3.3.3", "prettier-plugin-svelte": "^3.2.7", diff --git a/src/lib/components/lemmy/post/media/PostImage.svelte b/src/lib/components/lemmy/post/media/PostImage.svelte index b50c2735..99c8b0a9 100644 --- a/src/lib/components/lemmy/post/media/PostImage.svelte +++ b/src/lib/components/lemmy/post/media/PostImage.svelte @@ -24,7 +24,7 @@ showImage(bestImageURL(post, false, -1, null))} diff --git a/src/lib/components/ui/Expandable.svelte b/src/lib/components/ui/Expandable.svelte index 8da23450..5976e4bd 100644 --- a/src/lib/components/ui/Expandable.svelte +++ b/src/lib/components/ui/Expandable.svelte @@ -39,7 +39,7 @@ size="16" micro class={[ - open && 'rotate-90', + open && 'rotate-180', 'transition-transform duration-300 ease-out', ]} /> diff --git a/src/lib/components/ui/layout/NavigationProgress.svelte b/src/lib/components/ui/layout/NavigationProgress.svelte new file mode 100644 index 00000000..b88178da --- /dev/null +++ b/src/lib/components/ui/layout/NavigationProgress.svelte @@ -0,0 +1,48 @@ + + +
0 && 'use-transition', + ]} + style="width: {progress}%;" + id="progress-bar" +>
+ + diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 0ed3d9ef..80895789 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -13,25 +13,17 @@ import { inDarkColorScheme, rgbToHex, theme } from '$lib/ui/colors.svelte.js' import { getDefaultColors } from '$lib/ui/presets' import { Button, ModalContainer, Spinner, ToastContainer } from 'mono-svelte' - import nProgress from 'nprogress' - import 'nprogress/nprogress.css' import { onMount } from 'svelte' import { Forward, Icon } from 'svelte-hero-icons' import '../style/app.css' + import NavigationProgress from '$lib/components/ui/layout/NavigationProgress.svelte' interface Props { children?: import('svelte').Snippet } let { children }: Props = $props() - nProgress.configure({ - minimum: 0.4, - trickleSpeed: 200, - easing: 'ease-out', - speed: 300, - showSpinner: false, - }) - + let progressBar = $state<{ start: () => void; stop: () => void }>() onMount(() => { if (browser) { if (window.location.hash == 'main') { @@ -71,12 +63,12 @@ document.documentElement.dir = ($locale == 'he' || $locale == 'ar') && settings.useRtl ? 'rtl' : 'ltr' }) - } - $effect(() => { - if (navigating.to) nProgress.start() - else nProgress.done() - }) + $effect(() => { + if (navigating.to) progressBar?.start() + else progressBar?.stop() + }) + } @@ -104,6 +96,7 @@ + +