aboutsummaryrefslogtreecommitdiffstats
path: root/apps/kit/src/routes
diff options
context:
space:
mode:
authorivarlovlie <git@ivarlovlie.no>2022-09-27 18:21:37 +0200
committerivarlovlie <git@ivarlovlie.no>2022-09-27 18:21:37 +0200
commit2b58ff029107b23617d8c4b246de77876b3bf053 (patch)
tree6fc1fe6dd325e0a9d2af211bd3801dc136bc26f9 /apps/kit/src/routes
parentf8ae7740f4a79d1374e136aba58b4c75f09b1396 (diff)
downloadgreatoffice-2b58ff029107b23617d8c4b246de77876b3bf053.tar.xz
greatoffice-2b58ff029107b23617d8c4b246de77876b3bf053.zip
feat: Move frontend into layout group (main)
This enables /book to load without the usual layout (app layout)
Diffstat (limited to 'apps/kit/src/routes')
-rw-r--r--apps/kit/src/routes/(main)/(app)/+layout.svelte (renamed from apps/kit/src/routes/(app)/+layout.svelte)0
-rw-r--r--apps/kit/src/routes/(main)/(app)/home/+page.svelte (renamed from apps/kit/src/routes/(app)/home/+page.svelte)0
-rw-r--r--apps/kit/src/routes/(main)/(public)/+layout.svelte1
-rw-r--r--apps/kit/src/routes/(main)/(public)/login/+page.svelte (renamed from apps/kit/src/routes/(public)/login/+page.svelte)0
-rw-r--r--apps/kit/src/routes/(main)/(public)/reset/+page.svelte (renamed from apps/kit/src/routes/(public)/reset/+page.svelte)0
-rw-r--r--apps/kit/src/routes/(main)/(public)/signup/+page.svelte (renamed from apps/kit/src/routes/(public)/signup/+page.svelte)0
-rw-r--r--apps/kit/src/routes/(main)/+layout.server.ts (renamed from apps/kit/src/routes/+layout.server.ts)0
-rw-r--r--apps/kit/src/routes/(main)/+layout.svelte (renamed from apps/kit/src/routes/+layout.svelte)4
-rw-r--r--apps/kit/src/routes/(main)/+layout.ts (renamed from apps/kit/src/routes/+layout.ts)0
-rw-r--r--apps/kit/src/routes/(main)/+page.svelte (renamed from apps/kit/src/routes/+page.svelte)0
-rw-r--r--apps/kit/src/routes/(public)/+layout.svelte3
-rw-r--r--apps/kit/src/routes/book/+layout.svelte17
-rw-r--r--apps/kit/src/routes/book/alerts/+page.svelte4
-rw-r--r--apps/kit/src/routes/book/buttons/+page.svelte24
14 files changed, 43 insertions, 10 deletions
diff --git a/apps/kit/src/routes/(app)/+layout.svelte b/apps/kit/src/routes/(main)/(app)/+layout.svelte
index 3f60af3..3f60af3 100644
--- a/apps/kit/src/routes/(app)/+layout.svelte
+++ b/apps/kit/src/routes/(main)/(app)/+layout.svelte
diff --git a/apps/kit/src/routes/(app)/home/+page.svelte b/apps/kit/src/routes/(main)/(app)/home/+page.svelte
index 247ee47..247ee47 100644
--- a/apps/kit/src/routes/(app)/home/+page.svelte
+++ b/apps/kit/src/routes/(main)/(app)/home/+page.svelte
diff --git a/apps/kit/src/routes/(main)/(public)/+layout.svelte b/apps/kit/src/routes/(main)/(public)/+layout.svelte
new file mode 100644
index 0000000..49aeb95
--- /dev/null
+++ b/apps/kit/src/routes/(main)/(public)/+layout.svelte
@@ -0,0 +1 @@
+<slot></slot> \ No newline at end of file
diff --git a/apps/kit/src/routes/(public)/login/+page.svelte b/apps/kit/src/routes/(main)/(public)/login/+page.svelte
index 9e2f6e7..9e2f6e7 100644
--- a/apps/kit/src/routes/(public)/login/+page.svelte
+++ b/apps/kit/src/routes/(main)/(public)/login/+page.svelte
diff --git a/apps/kit/src/routes/(public)/reset/+page.svelte b/apps/kit/src/routes/(main)/(public)/reset/+page.svelte
index 5092b4b..5092b4b 100644
--- a/apps/kit/src/routes/(public)/reset/+page.svelte
+++ b/apps/kit/src/routes/(main)/(public)/reset/+page.svelte
diff --git a/apps/kit/src/routes/(public)/signup/+page.svelte b/apps/kit/src/routes/(main)/(public)/signup/+page.svelte
index d4a1bda..d4a1bda 100644
--- a/apps/kit/src/routes/(public)/signup/+page.svelte
+++ b/apps/kit/src/routes/(main)/(public)/signup/+page.svelte
diff --git a/apps/kit/src/routes/+layout.server.ts b/apps/kit/src/routes/(main)/+layout.server.ts
index 01aae89..01aae89 100644
--- a/apps/kit/src/routes/+layout.server.ts
+++ b/apps/kit/src/routes/(main)/+layout.server.ts
diff --git a/apps/kit/src/routes/+layout.svelte b/apps/kit/src/routes/(main)/+layout.svelte
index f8cdf83..e5b177e 100644
--- a/apps/kit/src/routes/+layout.svelte
+++ b/apps/kit/src/routes/(main)/+layout.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import "../app.pcss";
+ import "../../app.pcss";
import { afterNavigate, beforeNavigate, goto } from "$app/navigation";
import { is_active } from "$lib/session";
import type { Navigation } from "@sveltejs/kit";
@@ -17,7 +17,7 @@
const isPublicRoute =
(ticket.to?.routeId?.startsWith("(public)") ?? true) ||
ticket.to?.routeId?.startsWith("book");
- console.log(ticket);
+
console.log("redir: ", {
isPublicRoute,
sessionIsValid,
diff --git a/apps/kit/src/routes/+layout.ts b/apps/kit/src/routes/(main)/+layout.ts
index de8a5c0..de8a5c0 100644
--- a/apps/kit/src/routes/+layout.ts
+++ b/apps/kit/src/routes/(main)/+layout.ts
diff --git a/apps/kit/src/routes/+page.svelte b/apps/kit/src/routes/(main)/+page.svelte
index 85a4d2d..85a4d2d 100644
--- a/apps/kit/src/routes/+page.svelte
+++ b/apps/kit/src/routes/(main)/+page.svelte
diff --git a/apps/kit/src/routes/(public)/+layout.svelte b/apps/kit/src/routes/(public)/+layout.svelte
deleted file mode 100644
index 84cd442..0000000
--- a/apps/kit/src/routes/(public)/+layout.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-<script>
-</script>
-<slot></slot> \ No newline at end of file
diff --git a/apps/kit/src/routes/book/+layout.svelte b/apps/kit/src/routes/book/+layout.svelte
index 0fcbd51..85ba907 100644
--- a/apps/kit/src/routes/book/+layout.svelte
+++ b/apps/kit/src/routes/book/+layout.svelte
@@ -1,9 +1,22 @@
<script>
+ import { page } from "$app/stores";
+ import "../../app.pcss";
</script>
<div id="wrapper">
- <nav>
- <a href="/book/alerts" class="link">Alerts</a>
+ <nav class="flex flex-col">
+ <a
+ href="/book/alerts"
+ class="link"
+ class:active={$page.url.pathname.startsWith("/book/alerts")}
+ >Alerts</a
+ >
+ <a
+ href="/book/buttons"
+ class="link"
+ class:active={$page.url.pathname.startsWith("/book/alerts")}
+ >Buttons</a
+ >
</nav>
<main>
<slot />
diff --git a/apps/kit/src/routes/book/alerts/+page.svelte b/apps/kit/src/routes/book/alerts/+page.svelte
index 566ccca..15084ca 100644
--- a/apps/kit/src/routes/book/alerts/+page.svelte
+++ b/apps/kit/src/routes/book/alerts/+page.svelte
@@ -7,7 +7,6 @@
<h2>Info</h2>
<Alert type="info" message="This is message" title="This is title" />
</section>
-
<section>
<h2>Warning</h2>
<Alert type="warning" message="This is message" title="This is title" />
@@ -31,7 +30,6 @@
{
id: "confirm",
text: "Yes!",
- color: "green",
},
{
id: "cancel",
@@ -48,7 +46,7 @@
rightLinkText="Link or action"
title="Go here"
message="Hehe"
- type="info"
+ type="error"
/>
</section>
<section>
diff --git a/apps/kit/src/routes/book/buttons/+page.svelte b/apps/kit/src/routes/book/buttons/+page.svelte
new file mode 100644
index 0000000..c8e8c93
--- /dev/null
+++ b/apps/kit/src/routes/book/buttons/+page.svelte
@@ -0,0 +1,24 @@
+<script>
+ import Button from "$lib/components/button.svelte";
+</script>
+
+<h1>Buttons</h1>
+<section>
+ <h2>Primary</h2>
+ <div class="">
+ <Button kind="primary" text="Normal" />
+ <Button kind="primary" text="Large" size="lg" />
+ <Button kind="primary" text="Medium" size="md" />
+ <Button kind="primary" text="Small" size="sm" />
+ <Button kind="primary" text="Extra large" size="xl" />
+ <Button kind="primary" text="Extra small" size="xs" />
+ </div>
+</section>
+<section>
+ <h2>Secondary</h2>
+ <Button kind="secondary" text="Click me!" />
+</section>
+<section>
+ <h2>White</h2>
+ <Button kind="white" text="Click me!" />
+</section>