Speed up default page loading
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { afterNavigate, beforeNavigate, goto } from '$app/navigation';
|
||||
|
||||
import { navigating, page } from '$app/stores';
|
||||
import { navigating } from '$app/stores';
|
||||
import '$lib/android/http/androidRequests';
|
||||
import colorTheme, { convertToHexColorCode } from '$lib/android/plugins/colorTheme';
|
||||
import { getFeed } from '$lib/api/index';
|
||||
@@ -21,7 +21,6 @@
|
||||
darkModeStore,
|
||||
instanceStore,
|
||||
interfaceAmoledTheme,
|
||||
interfaceDefaultPage,
|
||||
showWarningStore,
|
||||
syncPartyPeerStore,
|
||||
themeColorStore
|
||||
@@ -149,19 +148,6 @@
|
||||
onMount(async () => {
|
||||
ui();
|
||||
|
||||
if (
|
||||
$interfaceDefaultPage &&
|
||||
$interfaceDefaultPage !== '/' &&
|
||||
$interfaceDefaultPage.startsWith('/') &&
|
||||
$page.url.pathname === '/'
|
||||
) {
|
||||
getPages().forEach((page) => {
|
||||
if (page.href === $interfaceDefaultPage && (!page.requiresAuth || $authStore)) {
|
||||
goto($interfaceDefaultPage);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
scrollableRoot = document.querySelector('.root');
|
||||
|
||||
loadSettingsFromEnv();
|
||||
|
||||
@@ -2,7 +2,10 @@ import { browser } from '$app/environment';
|
||||
import { goto } from '$app/navigation';
|
||||
import { getResolveUrl } from '$lib/api';
|
||||
import '$lib/i18n'; // Import to initialize. Important :)
|
||||
import { getPages } from '$lib/navPages.js';
|
||||
import { authStore, interfaceDefaultPage } from '$lib/store.js';
|
||||
import { locale, waitLocale } from 'svelte-i18n';
|
||||
import { get } from 'svelte/store';
|
||||
|
||||
export let ssr = false;
|
||||
|
||||
@@ -18,6 +21,21 @@ export async function load({ url }) {
|
||||
} catch { }
|
||||
}
|
||||
|
||||
const defaultPage = get(interfaceDefaultPage);
|
||||
|
||||
if (
|
||||
defaultPage &&
|
||||
defaultPage !== '/' &&
|
||||
defaultPage.startsWith('/') &&
|
||||
url.pathname === '/'
|
||||
) {
|
||||
getPages().forEach((page) => {
|
||||
if (page.href === defaultPage && (!page.requiresAuth || get(authStore))) {
|
||||
goto(defaultPage);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (browser) {
|
||||
locale.set(window.navigator.language);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user