refactor: Rename Users to Organisation and add placeholder page; Open Apps in current tab instead of a new one

1 files changed, 63 insertions, 58 deletions

diff --git a/apps/portal/src/app/index.svelte b/apps/portal/src/app/index.svelte
index fe143bc..af2b6d0 100644
--- a/apps/portal/src/app/index.svelte
+++ b/apps/portal/src/app/index.svelte
@@ -2,69 +2,74 @@
 <svelte:window bind:online={online}/>
 
 <script>
-	import Router, {replace} from "svelte-spa-router";
-	import {wrap} from "svelte-spa-router/wrap";
-	import {is_active} from "$shared/lib/session";
-	import SignUp from "$app/pages/sign-up.svelte";
-	import Login from "$app/pages/login.svelte";
-	import Forgot from "$app/pages/forgot.svelte";
-	import Reset from "$app/pages/reset-password.svelte";
-	import Home from "$app/pages/home.svelte";
-	import ProfileHome from "$app/pages/profile/index.svelte";
-	import PreHeader from "$shared/components/pre-header.svelte";
+    import Router, {replace} from "svelte-spa-router";
+    import {wrap} from "svelte-spa-router/wrap";
+    import {is_active} from "$shared/lib/session";
+    import SignUp from "$app/pages/sign-up.svelte";
+    import Login from "$app/pages/login.svelte";
+    import Forgot from "$app/pages/forgot.svelte";
+    import Reset from "$app/pages/reset-password.svelte";
+    import Home from "$app/pages/home.svelte";
+    import ProfileHome from "$app/pages/profile/index.svelte";
+    import AdminHome from "$app/pages/admin/index.svelte";
+    import PreHeader from "$shared/components/pre-header.svelte";
 
-	let online = true;
+    let online = true;
 
-	const publicRoutes = ["/login", "/signup", "/reset-password", "/forgot"];
-	const guardedRoutes = ["/", "/home", "/profile"];
+    const publicRoutes = ["/login", "/signup", "/reset-password", "/forgot"];
+    const guardedRoutes = ["/", "/home", "/profile", "/admin"];
 
-	async function user_is_logged_in(event) {
-		const isActive = await is_active();
-		if (!isActive && !publicRoutes.includes(event.route)) {
-			return false;
-		}
-		if (isActive && !guardedRoutes.includes(event.route)) {
-			await replace("/");
-		}
-		return true;
-	}
+    async function user_is_logged_in(event) {
+        const isActive = await is_active();
+        if (!isActive && !publicRoutes.includes(event.route)) {
+            return false;
+        }
+        if (isActive && !guardedRoutes.includes(event.route)) {
+            await replace("/");
+        }
+        return true;
+    }
 
-	function route_guarded(event) {
-		if (!publicRoutes.includes(event.detail.route)) {
-			replace("/login");
-		}
-	}
+    function route_guarded(event) {
+        if (!publicRoutes.includes(event.detail.route)) {
+            replace("/login");
+        }
+    }
 
-	const routes = {
-		"/login": wrap({
-			component: Login,
-			conditions: [user_is_logged_in],
-		}),
-		"/home": wrap({
-			component: Home,
-			conditions: [user_is_logged_in],
-		}),
-		"/profile": wrap({
-			component: ProfileHome,
-			conditions: [user_is_logged_in],
-		}),
-		"/": wrap({
-			component: Home,
-			conditions: [user_is_logged_in],
-		}),
-		"/signup": wrap({
-			component: SignUp,
-			conditions: [user_is_logged_in],
-		}),
-		"/reset-password": wrap({
-			component: Reset,
-			conditions: [user_is_logged_in],
-		}),
-		"/forgot": wrap({
-			component: Forgot,
-			conditions: [user_is_logged_in],
-		})
-	};
+    const routes = {
+        "/login": wrap({
+            component: Login,
+            conditions: [user_is_logged_in],
+        }),
+        "/home": wrap({
+            component: Home,
+            conditions: [user_is_logged_in],
+        }),
+        "/admin": wrap({
+            component: AdminHome,
+            conditions: [user_is_logged_in],
+        }),
+        "/profile": wrap({
+            component: ProfileHome,
+            conditions: [user_is_logged_in],
+        }),
+        "/": wrap({
+            component: Home,
+            conditions: [user_is_logged_in],
+        }),
+        "/signup": wrap({
+            component: SignUp,
+            conditions: [user_is_logged_in],
+        }),
+        "/reset-password": wrap({
+            component: Reset,
+            conditions: [user_is_logged_in],
+        }),
+        "/forgot": wrap({
+            component: Forgot,
+            conditions: [user_is_logged_in],
+        })
+    };
 </script>
 
 <PreHeader show="{!online}">You seem to be offline, please check your internet connection.</PreHeader>