From 7a7e57fc80e96aa416284a03a8f0b0032f11dcda Mon Sep 17 00:00:00 2001
From: ivarlovlie <git@ivarlovlie.no>
Date: Wed, 10 Aug 2022 23:34:08 +0200
Subject: refactor: Rename Users to Organisation and add placeholder page; Open
 Apps in current tab instead of a new one

---
 apps/portal/src/app/index.svelte             | 121 ++++++++++++++-------------
 apps/portal/src/app/pages/admin/index.svelte |  18 ++++
 apps/portal/src/app/pages/home.svelte        |  17 ++--
 3 files changed, 88 insertions(+), 68 deletions(-)
 create mode 100644 apps/portal/src/app/pages/admin/index.svelte

(limited to 'apps')

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>
diff --git a/apps/portal/src/app/pages/admin/index.svelte b/apps/portal/src/app/pages/admin/index.svelte
new file mode 100644
index 0000000..f9b91d2
--- /dev/null
+++ b/apps/portal/src/app/pages/admin/index.svelte
@@ -0,0 +1,18 @@
+<script>
+    import Layout from "../_layout@loggedin.svelte";
+    import {Bread, Crumb} from "$shared/components/breadcrumb";
+    import {push} from "svelte-spa-router";
+    
+</script>
+
+<Layout>
+    <Bread>
+        <Crumb name="Home"
+               withArrow="true"
+               isLink="true"
+               on:click={() => push("/")}/>
+        <Crumb name="Organisation"/>
+    </Bread>
+
+    <main class="max-width-sm"></main>
+</Layout>
diff --git a/apps/portal/src/app/pages/home.svelte b/apps/portal/src/app/pages/home.svelte
index eaa5947..0e325ee 100644
--- a/apps/portal/src/app/pages/home.svelte
+++ b/apps/portal/src/app/pages/home.svelte
@@ -26,8 +26,7 @@
                 <LinkCard name="Projects"
                           description="The home for your projects"
                           text="Open in a new tab"
-                          target="_blank"
-                          title="Open Projects in a new tab"
+                          title="Open Projects"
                           href="{projects_base()}">
                     <figure slot="icon">
                         <div class="bg-primary bg-opacity-10% padding-xs border-left border-primary border-2">
@@ -41,8 +40,7 @@
                           description="The home for your tickets"
                           class="c-disabled user-select-none"
                           text="Coming soon"
-                          target="_blank"
-                          title="Open Tickets in a new tab"
+                          title="Open Tickets"
                           href="{projects_base()}">
                     <figure slot="icon">
                         <div class="bg-primary bg-opacity-10% padding-xs border-left border-primary border-2">
@@ -56,8 +54,7 @@
                           description="The home for your todos"
                           class="c-disabled user-select-none"
                           text="Coming soon"
-                          target="_blank"
-                          title="Open Todo in a new tab"
+                          title="Open Todo"
                           href="{projects_base()}">
                     <figure slot="icon">
                         <div class="bg-primary bg-opacity-10% padding-xs border-left border-primary border-2">
@@ -86,11 +83,11 @@
                     </figure>
                 </LinkCard>
                 {#if showUsers}
-                    <LinkCard name="Users"
-                              description="Manage your users"
-                              title="Go to your users management page"
+                    <LinkCard name="Organisation"
+                              description="Manage your organisation"
+                              title="Go to your organisations management page"
                               text="Open"
-                              href="{projects_base()}">
+                              on:click={() => push("/admin")}>
                         <figure slot="icon">
                             <div class="bg-primary bg-opacity-10% padding-xs border-left border-primary border-2">
                                 <UsersIcon size="42"
-- 
cgit v1.3