Merge pull request #4 from amcelroy/home

Home

Author: amcelroy

.github/workflows/main.yml

@@ -1,5 +1,11 @@
 name: Sveltekit / Postgres CI/CD
-on: [push]
+on: 
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches:
+      [main]
 jobs:
   Unit-Test-Actions:
     runs-on: ubuntu-latest

src/lib/components/Page.svelte

@@ -0,0 +1,34 @@
+<script lang="ts">
+    import * as Breadcrumb from "$lib/components/ui/breadcrumb/index.js";
+
+    export let name;
+
+    export let path: any[] = [];
+
+    export let menu: any[] = [];
+</script>
+
+<div class="p-4 top-0 border-b w-full">
+    <Breadcrumb.Root>
+        <Breadcrumb.List>
+            {#each path as item, i}
+                <Breadcrumb.Item>
+                    <Breadcrumb.Link href={item.href}>{item.name}</Breadcrumb.Link>
+                </Breadcrumb.Item>
+                <Breadcrumb.Separator />
+            {/each}
+            {#each menu as item, i}
+                <Breadcrumb.Item>
+                    <Breadcrumb.Link href={item.href}>{item.name}</Breadcrumb.Link>
+                </Breadcrumb.Item>
+                <Breadcrumb.Separator />
+            {/each}
+            <Breadcrumb.Item>
+                <Breadcrumb.Page>{name}</Breadcrumb.Page>
+            </Breadcrumb.Item>
+        </Breadcrumb.List>
+    </Breadcrumb.Root>
+</div>  
+<div class="p-4 m-4">
+    <slot></slot>
+</div>  

src/routes/+page.server.ts

@@ -17,7 +17,7 @@ export const load: PageServerLoad = (async (event) => {
 		// Check if the session is valid
 		const session_valid = await lucia.validateSession(auth_token);
 		if(session_valid){
-			redirect(302, "/dashboard");
+			redirect(302, "/home");
 		}
 	}
 
@@ -66,6 +66,6 @@ export const actions: Actions = {
 			...sessionCookie.attributes
 		});
 
-		redirect(302, "/dashboard");
+		redirect(302, "/home");
 	}
 };

src/routes/dashboard/+page.svelte

@@ -1,20 +1,18 @@
 <script lang="ts">
-    import { icons } from "lucide-svelte";
-import "../../app.css";
+    import "../../app.css";
     import Icon from '@iconify/svelte';
-
 </script>
 
 <div class="flex flex-row">
     <aside style="fixed top-0 left-0 flex-shrink" aria-label="Sidenav">
         <div class="group flex flex-col justify-between py-5 px-1 bg-white border-r border-gray-200 dark:bg-gray-800 dark:border-gray-700 h-screen">
             <div class="">
-                <a class="flex items-center p-2 text-base font-normal text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group" href="/dashboard">
-                    <Icon icon="hugeicons:dashboard-browsing" style="font-size: 24px"/>
-                    <span class="ml-3 hidden group-hover:block md:block">Dashboard</span>
+                <a class="flex items-center p-2 text-base font-normal text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group" href="/home">
+                    <Icon icon="hugeicons:house-01" style="font-size: 24px"/>
+                    <span class="ml-3 hidden group-hover:block md:block">Home</span>
                 </a>
 
-                <a class="flex items-center p-2 text-base font-normal text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group" href="/dashboard/profile">
+                <a class="flex items-center p-2 text-base font-normal text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group" href="/home/profile">
                     <Icon icon="hugeicons:profile-02" style="font-size: 24px"/>
                     <span class="ml-3 hidden group-hover:block md:block">Profile</span>
                 </a>
@@ -30,7 +28,7 @@ import "../../app.css";
             </div>
         </div>
     </aside>
-    <div class="p-4 top-0">
+    <div class="grow">
         <slot></slot>
-    </div>  
+    </div>
 </div>

src/routes/dashboard/profile/+page.svelte

@@ -16,6 +16,6 @@ export const load: PageServerLoad = (async (event) => {
     if(profile?.profileComplete) {
         return { profile }
     }else{
-        redirect(302, "/dashboard/profile");
+        redirect(302, "/home/profile");
     }
 })

src/routes/dashboard/+layout.svelte renamed to src/routes/home/+layout.svelte

@@ -0,0 +1,15 @@
+<script lang="ts">
+    import { onMount } from 'svelte';
+    import Page from '$lib/components/Page.svelte';
+
+    export let data;
+
+    onMount(() => {
+        
+    });
+</script>
+
+<Page name="Home">
+
+</Page>
+

src/routes/dashboard/+page.server.ts renamed to src/routes/home/+page.server.ts

@@ -0,0 +1,49 @@
+<script lang="ts">
+    import { onMount } from 'svelte';
+    import SuperDebug, { type SuperValidated, superForm, type Infer } from 'sveltekit-superforms';
+    import { zodClient } from 'sveltekit-superforms/adapters';
+    import { schemaProfile, type SchemaProfile } from '$lib/validationSchemas.js';
+    import * as Drawer from '$lib/components/ui/drawer';
+    import { Button } from '$lib/components/ui/button';
+    import ProfileForm from '$lib/components/forms/ProfileForm.svelte';
+    import Page from '$lib/components/Page.svelte';
+   
+    export let data: any;
+
+    var profileComplete = (data.profileComplete as boolean);
+
+    onMount(() => {
+        console.log('Profile page mounted');
+    });
+
+</script>
+
+<Page name="Profile" path={
+    [
+        {name: 'Home', href: '/home'},
+    ]
+}>
+    {#if !profileComplete}
+        <Drawer.Root open={!profileComplete} onOutsideClick={(event) => {event.preventDefault();}} dismissible={false}>
+            <!-- <Drawer.Trigger asChild let:builder> -->
+                <!-- <Button builders={[builder]} variant="outline">Open Drawer</Button> -->
+            <!-- </Drawer.Trigger> -->
+            <Drawer.Content>
+                <div class="w-2/12 sm:w-2/12 md:w-4/12 lg:w-8/12 flex justify-center mx-auto mt-auto">
+                    <div class="">
+                        <div class="p-1">
+                            <p>We noticed you haven't completed your profile. Please fill out the form below.</p>
+                        </div>
+                        <ProfileForm {data} />
+                    </div>
+                </div>
+            </Drawer.Content>
+        </Drawer.Root>
+    {:else}
+        <h1 class="text-3xl mb-4">
+            Profile
+        </h1>
+        <ProfileForm {data} />
+    {/if}
+</Page>
+<!-- <SuperDebug data={$formData} /> -->