diff --git a/src/data/RouterEvents.ts b/src/data/RouterEvents.ts index ed5cf07..29459a1 100644 --- a/src/data/RouterEvents.ts +++ b/src/data/RouterEvents.ts @@ -18,24 +18,24 @@ function makeStore(): Readable { return derived(page, ($page) => { return { navigating: false, target_url: $page.url }; }); - } else { - // On client. - let current = new URL(location.href); - - // Return store that responds to navigation events. - // The `navigating` store immediately "pushes" `null`. - // This in turn causes this derived store to immediately "push" the current URL. - return derived(navigating, ($nav) => { - let navigating = false; - // $nav is null when navigation finishes. - if ($nav != null && $nav.to != null) { - current = $nav.to.url; - navigating = true; - } - - return { navigating, target_url: current }; - }); } + + // On client. + let current = new URL(location.href); + + // Return store that responds to navigation events. + // The `navigating` store immediately "pushes" `null`. + // This in turn causes this derived store to immediately "push" the current URL. + return derived(navigating, ($nav) => { + let navigating = false; + // $nav is null when navigation finishes. + if ($nav != null && $nav.to != null) { + current = $nav.to.url; + navigating = true; + } + + return { navigating, target_url: current }; + }); } // Do not subscribe to it outside of components! diff --git a/src/data/api/index.ts b/src/data/api/index.ts index f9565cc..a5771fe 100644 --- a/src/data/api/index.ts +++ b/src/data/api/index.ts @@ -9,8 +9,7 @@ import type { DonationPlatform, CryptoWallet, Social, - About, - CompatiblePackage + About } from '$lib/types'; export type ContributorsData = { contributables: Contributable[] }; @@ -41,20 +40,21 @@ async function patches(): Promise { const json = await get_json('v4/patches/list'); const packagesWithCount: { [key: string]: number } = {}; - json.forEach((patch) => { - if (!patch.compatiblePackages) return; + for (const patch of json) { + if (!patch.compatiblePackages) continue; patch.compatiblePackages = Object.keys(patch.compatiblePackages).map((name) => ({ name, versions: patch.compatiblePackages[name] })); - }); + } // gets packages and patch count - for (let i = 0; i < json.length; i++) { - json[i].compatiblePackages?.forEach((pkg: CompatiblePackage) => { + for (const { compatiblePackages } of json) { + if (!compatiblePackages) continue; + for (const pkg of compatiblePackages) { packagesWithCount[pkg.name] = (packagesWithCount[pkg.name] || 0) + 1; - }); + } } // sort packages by patch count to get most relevant apps on top diff --git a/src/data/api/settings.ts b/src/data/api/settings.ts index bfe6f77..0b81e7f 100644 --- a/src/data/api/settings.ts +++ b/src/data/api/settings.ts @@ -12,7 +12,7 @@ function set_status_url(apiUrl: string) { .then((data) => { if (data?.status) { localStorage.setItem(STATUS_KEY, data.status); - console.log('status is now ' + localStorage.getItem(STATUS_KEY)); + console.log('Status is now:', localStorage.getItem(STATUS_KEY)); } }); } diff --git a/src/layout/Hero/HeroSection.svelte b/src/layout/Hero/HeroSection.svelte index 625daa4..1e74a19 100644 --- a/src/layout/Hero/HeroSection.svelte +++ b/src/layout/Hero/HeroSection.svelte @@ -28,10 +28,6 @@ margin-bottom: 2rem; } - .hero { - padding-bottom: 9rem; - } - .hero-text { align-items: center; } diff --git a/src/layout/Navbar/NavHost.svelte b/src/layout/Navbar/NavHost.svelte index 96a2d61..7289098 100644 --- a/src/layout/Navbar/NavHost.svelte +++ b/src/layout/Navbar/NavHost.svelte @@ -202,17 +202,10 @@ } #nav-container { + top: 0; position: sticky; z-index: 666; width: 100%; - - &:has(.nav-buttons > li:first-child.selected) { - margin-bottom: 2.65rem; - - &:has(.banner) { - margin-bottom: 1.5rem; - } - } } nav { diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index 7f2cf1c..5a8307a 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -13,7 +13,7 @@ {#if status == 404}

This page received a cease and desist letter from a multi-billion dollar tech company.


- + {:else}

{$page.error?.message} @@ -23,6 +23,9 @@