Browse Source

Fix to new routing rules

experimental_plugin
Matthew Aaron Raymer 2 years ago
parent
commit
84af5287de
  1. 25
      src/router/index.ts
  2. 12
      src/store/app.ts

25
src/router/index.ts

@ -112,20 +112,31 @@ const router = createRouter({
router.beforeEach(async (to) => {
// redirect to start page if app is uninitialized
const publicPages = ["/start"];
const authRequired = !publicPages.includes(to.path);
const publicPages = ["/start", "/account", "/import-account"];
const isPublic = publicPages.includes(to.path);
const appStore = useAppStore();
console.log("to:", to.path);
let return_path = "/start";
if (authRequired) {
switch (useAppStore().condition) {
if (isPublic) {
console.log(appStore.condition);
switch (appStore.condition) {
case "uninitialized":
return_path = "/start";
return_path = "";
break;
case "registering":
return_path = useAppStore().lastView;
return_path = to.path;
break;
}
} else {
switch (appStore.condition) {
case "registered":
return_path = to.path;
}
}
if (return_path == "") {
return;
} else {
return return_path;
}
});
export default router;

12
src/store/app.ts

@ -4,19 +4,17 @@ import { defineStore } from "pinia";
export const useAppStore = defineStore({
id: "app",
state: () => ({
condition: JSON.parse(
_condition:
typeof localStorage["condition"] == "undefined"
? "uninitialized"
: localStorage["condition"]
),
lastView: JSON.parse(
: localStorage["condition"],
_lastView:
typeof localStorage["lastView"] == "undefined"
? "/start"
: localStorage["lastView"]
),
: localStorage["lastView"],
}),
getters: {
condition: (state) => state.condition,
condition: (state) => state._condition,
},
actions: {
reset() {

Loading…
Cancel
Save