Fix dynamic import paths, redirect login -> Home (#43)

* fix dynamic imports + redirect user to home route * match all routes
bitsy-ai · Nov 6, 2022 · 957e53e · 957e53e
1 parent 8221054
commit 957e53e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -20,9 +20,9 @@ async fn main() -> Result<()> {
     warn!("Version: {}", GIT_VERSION);
     HttpServer::new(move || {
         let generated = generate();
-        App::new().
-            service(get_version_data::get_version_data).
-            service(ResourceFiles::new("/*", generated).resolve_not_found_to_root())
+        App::new()
+            .service(get_version_data::get_version_data)
+            .service(ResourceFiles::new("/*", generated).resolve_not_found_to_root())
     })
     .workers(config.workers)
     .bind((config.host, config.port))?

diff --git a/ui/src/router/index.ts b/ui/src/router/index.ts
@@ -17,6 +17,8 @@ router.afterEach((_to, _from) => {
 router.beforeEach(async (to, _from) => {
   const cloud = useCloudStore();
   await cloud.fetchUser();
+
+  // redirect unauthenticated users
   if (
     // make sure the user is authenticated before proceeding to dashboard
     !cloud.isAuthenticated &&
@@ -26,6 +28,11 @@ router.beforeEach(async (to, _from) => {
     // redirect to login
     return { name: "login" };
   }
+
+  // redirect authenticated users home
+  if (cloud.isAuthenticated && to.name == "login") {
+    return { name: "Home" }
+  }
 });
 
 export default router;
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
@@ -6,15 +6,15 @@ const TopBarRoutes = [
     path: "/",
     name: "Home",
     components: {
-      default: () => import("../views/HomeView.vue"),
+      default: () => import("@/views/HomeView.vue"),
       TopNav: TopNav,
     },
   },
   {
     path: "/vision",
     name: "PrintNanny Vision",
     components: {
-      default: () => import("../views/VideoView.vue"),
+      default: () => import("@/views/VideoView.vue"),
       TopNav: TopNav,
     },
   },
@@ -25,14 +25,14 @@ const AllRoutes = [
     path: "/login",
     name: "login",
     components: {
-      default: () => import("../views/LoginView.vue"),
+      default: () => import("@/views/LoginView.vue"),
     },
   },
   {
     path: "/settings",
     name: "Settings",
     components: {
-      default: () => import("../views/SettingsView.vue"),
+      default: () => import("@/views/SettingsView.vue"),
       TopNav: TopNav,
     },
   },