Fixed bug with bad initial loading into store instead of auth

This commit is contained in:
quexeky
2024-10-17 21:14:10 +11:00
parent 1ff74a1bcf
commit 943e649fbc
3 changed files with 8 additions and 6 deletions
+4 -1
View File
@@ -10,6 +10,7 @@ import { invoke } from "@tauri-apps/api/core";
import { AppStatus, type AppState } from "./types.d.ts"; import { AppStatus, type AppState } from "./types.d.ts";
import { listen } from "@tauri-apps/api/event"; import { listen } from "@tauri-apps/api/event";
import { useAppState } from "./composables/app-state.js"; import { useAppState } from "./composables/app-state.js";
import {useRouter} from "#vue-router";
const router = useRouter(); const router = useRouter();
@@ -22,7 +23,7 @@ router.beforeEach(async () => {
switch (state.value.status) { switch (state.value.status) {
case AppStatus.NotConfigured: case AppStatus.NotConfigured:
router.push("/setup"); router.push({ path: "/setup" }).then(() => {console.log("Pushed Setup")});
break; break;
case AppStatus.SignedOut: case AppStatus.SignedOut:
router.push("/auth"); router.push("/auth");
@@ -30,6 +31,8 @@ switch (state.value.status) {
case AppStatus.SignedInNeedsReauth: case AppStatus.SignedInNeedsReauth:
router.push("/auth/signedout"); router.push("/auth/signedout");
break; break;
default:
router.push("/store");
} }
listen("auth/processing", () => { listen("auth/processing", () => {
-2
View File
@@ -1,6 +1,4 @@
<template /> <template />
<script setup lang="ts"> <script setup lang="ts">
const router = useRouter();
router.replace("/store");
</script> </script>
+4 -3
View File
@@ -41,9 +41,12 @@ pub struct Database {
pub base_url: String, pub base_url: String,
pub games: DatabaseGames, pub games: DatabaseGames,
} }
pub static DATA_ROOT_DIR: LazyLock<PathBuf> =
LazyLock::new(|| BaseDirs::new().unwrap().data_dir().join("drop"));
pub type DatabaseInterface = pub type DatabaseInterface =
rustbreak::Database<Database, rustbreak::backend::PathBackend, Bincode>; rustbreak::Database<Database, rustbreak::backend::PathBackend, Bincode>;
pub trait DatabaseImpls { pub trait DatabaseImpls {
fn set_up_database() -> DatabaseInterface; fn set_up_database() -> DatabaseInterface;
fn database_is_set_up(&self) -> bool; fn database_is_set_up(&self) -> bool;
@@ -82,6 +85,4 @@ impl DatabaseImpls for DatabaseInterface {
let handle = self.borrow_data().unwrap(); let handle = self.borrow_data().unwrap();
Url::parse(&handle.base_url).unwrap() Url::parse(&handle.base_url).unwrap()
} }
} }
pub static DATA_ROOT_DIR: LazyLock<PathBuf> =
LazyLock::new(|| BaseDirs::new().unwrap().data_dir().join("drop"));