diff --git a/src/pages/LoginPage.vue b/src/pages/ConnectPage.vue similarity index 100% rename from src/pages/LoginPage.vue rename to src/pages/ConnectPage.vue diff --git a/src/pages/MainPanel.vue b/src/pages/MainPanel.vue index 6a17f1fb..1d8092d5 100644 --- a/src/pages/MainPanel.vue +++ b/src/pages/MainPanel.vue @@ -100,7 +100,7 @@ export default defineComponent({ if (notification) { notyf.dismiss(notification); } - await router.push({path: "/login", query: {auto_connect: "false"}}); + await router.push({path: "/connect", query: {auto_connect: "false"}}); }, }, created() { diff --git a/src/router/index.ts b/src/router/index.ts index f8882191..5bf6fe9d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -4,7 +4,7 @@ import {createRouter, createWebHashHistory, RouteRecordRaw} from "vue-router"; import MainPanel from "../pages/MainPanel.vue"; -import LoginPage from "../pages/LoginPage.vue"; +import ConnectPage from "../pages/ConnectPage.vue"; import ConfigPage from "../pages/ConfigPage.vue"; import EVBackendClient from "@/modules/evbc/client"; import {inject} from "vue"; @@ -12,9 +12,9 @@ import {inject} from "vue"; const routes: RouteRecordRaw[] = [ { - path: "/login", - name: "login", - component: LoginPage, + path: "/connect", + name: "connect", + component: ConnectPage, }, { path: "/", @@ -37,17 +37,17 @@ export const router = createRouter({ router.beforeEach((to, from, next) => { const evbc = inject("evbc"); - const userIsLoggedIn = evbc?.initialized; + const userIsConnected = evbc?.initialized; // Redirect to ConfigPage if the user is logged in and navigating to the root path - if (to.path === "/" && userIsLoggedIn) { + if (to.path === "/" && userIsConnected) { next("/config"); } else if (to.matched.some(record => record.meta.requiresConnection)) { // Require connection for specific routes - if (userIsLoggedIn) { + if (userIsConnected) { next(); } else { - next("/login"); // Redirect to login if not logged in and trying to access a protected route + next("/connect"); // Redirect to connect if not connected } } else { // Proceed with the navigation for all other cases