SteamWar/Website
9
1
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

refactor: Update loggedIn store type and streamline login/dashboard navigation logic
Some checks failed
SteamWarCI Build failed
Details

Browse Source
This commit is contained in:
Chaoscaot
2025-12-17 21:20:46 +01:00
parent 3ffc715929
commit b0a9d56216
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/repo/authv2.ts
View File

@@ -89,6 +89,6 @@ export class AuthV2Repo {
} }
} }
export const loggedIn = writable(false); export const loggedIn = writable<boolean | undefined>(undefined);
export const authV2Repo = readable(new AuthV2Repo()); export const authV2Repo = readable(new AuthV2Repo());

19
src/pages/dashboard.astro
View File

@@ -1,22 +1,21 @@
--- ---
import DashboardComponent from "@components/DashboardComponent.svelte"; import DashboardComponent from "@components/DashboardComponent.svelte";
import PageLayout from "@layouts/PageLayout.astro"; import PageLayout from "@layouts/PageLayout.astro";
import {t} from "astro-i18n"; import { t } from "astro-i18n";
--- ---
<PageLayout title={t("dashboard.page")}> <PageLayout title={t("dashboard.page")}>
<script> <script is:inline data-astro-rerun>
import {l} from "../util/util"; import { l } from "../util/util";
import {navigate} from "astro:transitions/client"; import { navigate } from "astro:transitions/client";
import {get} from "svelte/store"; import { loggedIn } from "../components/repo/authv2";
import {loggedIn} from "../components/repo/authv2"; loggedIn.subscribe((value) => {
document.addEventListener("astro:page-load", () => {
if (window.location.href.endsWith("/dashboard") || window.location.href.endsWith("/dashboard/")) { if (window.location.href.endsWith("/dashboard") || window.location.href.endsWith("/dashboard/")) {
if (!get(loggedIn)) { if (value === false) {
navigate(l("/login"), {}); navigate(l("/dashboard"), { history: "replace" });
} }
} }
}); });
</script> </script>
<DashboardComponent client:only="svelte" /> <DashboardComponent client:only="svelte" />
</PageLayout> </PageLayout>

7
src/pages/login.astro
View File

@@ -6,15 +6,14 @@ import BackgroundImage from "../components/BackgroundImage.astro";
--- ---
<NavbarLayout title={t("login.page")}> <NavbarLayout title={t("login.page")}>
<script> <script is:inline data-astro-rerun>
import { l } from "../util/util"; import { l } from "../util/util";
import { navigate } from "astro:transitions/client"; import { navigate } from "astro:transitions/client";
import { loggedIn } from "../components/repo/authv2"; import { loggedIn } from "../components/repo/authv2";
import { get } from "svelte/store";
document.addEventListener("astro:page-load", () => { loggedIn.subscribe((value) => {
if (window.location.href.endsWith("/login") || window.location.href.endsWith("/login/")) { if (window.location.href.endsWith("/login") || window.location.href.endsWith("/login/")) {
if (get(loggedIn)) { if (value) {
navigate(l("/dashboard"), { history: "replace" }); navigate(l("/dashboard"), { history: "replace" });
} }
} }