diff --git a/core/router.ts b/core/router.ts index e7b15547..f418aaca 100644 --- a/core/router.ts +++ b/core/router.ts @@ -20,7 +20,7 @@ export interface Routes { refresh: {} settings: {} signin: {} - slowAll: {} + slow: { feed?: string; post?: string } start: {} subscriptions: {} welcome: {} @@ -86,12 +86,12 @@ onEnvironment(({ baseRouter }) => { } else if (user) { if (GUEST.has(page.route) || page.route === 'home') { if (withFeeds) { - return redirect('slowAll') + return redirect({ params: {}, route: 'slow' }) } else { return redirect('welcome') } } else if (page.route === 'welcome' && withFeeds) { - return redirect('slowAll') + return redirect({ params: {}, route: 'slow' }) } else if (page.route === 'settings') { return redirect('interface') } else if (page.route === 'feeds') { @@ -148,7 +148,7 @@ export function isFastRoute(route: Route): boolean { } export function isSlowRoute(route: Route): boolean { - return route.route === 'slowAll' + return route.route === 'slow' } export function isGuestRoute(route: Route): boolean { diff --git a/core/test/router.test.ts b/core/test/router.test.ts index 67abbb90..34ae7bdf 100644 --- a/core/test/router.test.ts +++ b/core/test/router.test.ts @@ -44,7 +44,7 @@ test('transforms routers for guest', () => { route: 'start' }) - setBaseRoute({ params: {}, route: 'slowAll' }) + setBaseRoute({ params: {}, route: 'slow' }) deepStrictEqual(router.get(), { params: {}, route: 'start' @@ -106,14 +106,14 @@ test('transforms routers for users with feeds', async () => { deepStrictEqual(router.get(), { params: {}, redirect: true, - route: 'slowAll' + route: 'slow' }) setBaseRoute({ params: {}, route: 'welcome' }) deepStrictEqual(router.get(), { params: {}, redirect: true, - route: 'slowAll' + route: 'slow' }) setBaseRoute({ params: {}, route: 'home' }) @@ -168,7 +168,7 @@ test('has routes groups', () => { equal(isSettingsRoute(router.get()), false) equal(isOrganizeRoute(router.get()), false) - setBaseRoute({ params: {}, route: 'slowAll' }) + setBaseRoute({ params: {}, route: 'slow' }) equal(isFastRoute(router.get()), false) equal(isSlowRoute(router.get()), true) equal(isGuestRoute(router.get()), false) diff --git a/web/.size-limit.json b/web/.size-limit.json index 770b1c10..f903aa00 100644 --- a/web/.size-limit.json +++ b/web/.size-limit.json @@ -8,6 +8,6 @@ "name": "All scripts to execute", "path": "dist/assets/*.js", "brotli": false, - "limit": "195 KB" + "limit": "200 KB" } ] diff --git a/web/stores/router.ts b/web/stores/router.ts index f68818a7..1dceb894 100644 --- a/web/stores/router.ts +++ b/web/stores/router.ts @@ -20,7 +20,7 @@ export const urlRouter = createRouter({ refresh: '/refresh', settings: '/settings', signin: '/signin', - slowAll: '/slow', + slow: '/slow/:feed?/:post?', start: '/start', subscriptions: '/subscriptions', welcome: '/welcome' diff --git a/web/stories/scene.svelte b/web/stories/scene.svelte index fde6de62..76e2f517 100644 --- a/web/stories/scene.svelte +++ b/web/stories/scene.svelte @@ -38,7 +38,7 @@ export let refreshing: false | Partial = false export let route: Route = { params: {}, - route: 'slowAll' + route: 'slow' } export let fast = false export let networkType = DEFAULT_NETWORK @@ -94,7 +94,7 @@ return () => { // @ts-expect-error isRefreshing.set(false) - baseRouter.set({ params: {}, route: 'slowAll' }) + baseRouter.set({ params: {}, route: 'slow' }) setNetworkType(DEFAULT_NETWORK) cleanLogux() } diff --git a/web/stories/ui/button.stories.svelte b/web/stories/ui/button.stories.svelte index 2f9faacf..122a55e3 100644 --- a/web/stories/ui/button.stories.svelte +++ b/web/stories/ui/button.stories.svelte @@ -132,16 +132,11 @@ diff --git a/web/stories/ui/navbar.stories.svelte b/web/stories/ui/navbar.stories.svelte index bd80a22d..6384badd 100644 --- a/web/stories/ui/navbar.stories.svelte +++ b/web/stories/ui/navbar.stories.svelte @@ -15,7 +15,7 @@ - + @@ -53,7 +53,7 @@ name="Dark Slow" parameters={{ layout: 'fullscreen', themes: { themeOverride: 'dark' } }} > - + diff --git a/web/ui/navbar/fast.svelte b/web/ui/navbar/fast.svelte index b614a65a..f1531218 100644 --- a/web/ui/navbar/fast.svelte +++ b/web/ui/navbar/fast.svelte @@ -22,7 +22,7 @@ {#if $fastCategories.isLoading} - + {:else if $fastCategories.categories.length > 0} {#each $fastCategories.categories as category (category.id)} -