From 56e3b74b7cd630e62b6974bcf7e075c5a96a1bee Mon Sep 17 00:00:00 2001 From: ethereal-chxn Date: Sun, 1 Jun 2025 20:19:24 -0700 Subject: [PATCH 1/7] Continued work on sidebar --- src/lib/components/nav/InitialUserNav.svelte | 3 -- src/lib/components/nav/JournalsNav.svelte | 4 ++ src/routes/{ => (home)}/+layout.server.ts | 2 +- src/routes/{ => (home)}/+layout.svelte | 11 ++--- src/routes/(home)/+page.svelte | 41 +++++++++++++++++++ src/routes/(journals)/journals/+layout.svelte | 27 ++++++++++++ .../{ => (journals)}/journals/+page.svelte | 0 .../journals/[journal]/+page.server.ts | 0 .../journals/[journal]/+page.svelte | 2 - .../journals/[journal]/[entry]/+page.svelte | 0 .../journals/shared/+page.svelte | 0 src/routes/{ => (social)}/feed/+page.svelte | 0 .../{ => (social)}/landing/+page.server.ts | 6 +-- .../{ => (social)}/landing/+page.svelte | 0 src/styles/_components.scss | 17 ++++---- src/styles/_layout.scss | 33 +++++++++++---- 16 files changed, 112 insertions(+), 34 deletions(-) create mode 100644 src/lib/components/nav/JournalsNav.svelte rename src/routes/{ => (home)}/+layout.server.ts (73%) rename src/routes/{ => (home)}/+layout.svelte (86%) create mode 100644 src/routes/(home)/+page.svelte create mode 100644 src/routes/(journals)/journals/+layout.svelte rename src/routes/{ => (journals)}/journals/+page.svelte (100%) rename src/routes/{ => (journals)}/journals/[journal]/+page.server.ts (100%) rename src/routes/{ => (journals)}/journals/[journal]/+page.svelte (83%) rename src/routes/{ => (journals)}/journals/[journal]/[entry]/+page.svelte (100%) rename src/routes/{ => (journals)}/journals/shared/+page.svelte (100%) rename src/routes/{ => (social)}/feed/+page.svelte (100%) rename src/routes/{ => (social)}/landing/+page.server.ts (86%) rename src/routes/{ => (social)}/landing/+page.svelte (100%) diff --git a/src/lib/components/nav/InitialUserNav.svelte b/src/lib/components/nav/InitialUserNav.svelte index 81c1c78..1d4a64e 100644 --- a/src/lib/components/nav/InitialUserNav.svelte +++ b/src/lib/components/nav/InitialUserNav.svelte @@ -2,9 +2,6 @@ import PrimaryButton from '../buttons/PrimaryButton.svelte'; - diff --git a/src/lib/components/nav/JournalsNav.svelte b/src/lib/components/nav/JournalsNav.svelte new file mode 100644 index 0000000..51302a5 --- /dev/null +++ b/src/lib/components/nav/JournalsNav.svelte @@ -0,0 +1,4 @@ + + diff --git a/src/routes/+layout.server.ts b/src/routes/(home)/+layout.server.ts similarity index 73% rename from src/routes/+layout.server.ts rename to src/routes/(home)/+layout.server.ts index 1e64dc1..9fdd61b 100644 --- a/src/routes/+layout.server.ts +++ b/src/routes/(home)/+layout.server.ts @@ -1,4 +1,4 @@ -import type { LayoutServerLoad } from './$types'; +import type { LayoutServerLoad } from '../$types'; export const load: LayoutServerLoad = async ({ locals }) => { return { diff --git a/src/routes/+layout.svelte b/src/routes/(home)/+layout.svelte similarity index 86% rename from src/routes/+layout.svelte rename to src/routes/(home)/+layout.svelte index 43dd0f1..b46b6ac 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/(home)/+layout.svelte @@ -1,6 +1,6 @@ - + +
+ {#if showSidebar} + + {/if} +
+
+
+ +
+ +
+ {@render children()} +
+
diff --git a/src/routes/journals/+page.svelte b/src/routes/(journals)/journals/+page.svelte similarity index 100% rename from src/routes/journals/+page.svelte rename to src/routes/(journals)/journals/+page.svelte diff --git a/src/routes/journals/[journal]/+page.server.ts b/src/routes/(journals)/journals/[journal]/+page.server.ts similarity index 100% rename from src/routes/journals/[journal]/+page.server.ts rename to src/routes/(journals)/journals/[journal]/+page.server.ts diff --git a/src/routes/journals/[journal]/+page.svelte b/src/routes/(journals)/journals/[journal]/+page.svelte similarity index 83% rename from src/routes/journals/[journal]/+page.svelte rename to src/routes/(journals)/journals/[journal]/+page.svelte index e8473d9..d8c392d 100644 --- a/src/routes/journals/[journal]/+page.svelte +++ b/src/routes/(journals)/journals/[journal]/+page.svelte @@ -6,7 +6,6 @@ https://svelte.dev/docs/svelte/bind @@ -15,6 +14,5 @@ https://svelte.dev/docs/svelte/bind {JSON.stringify($page, null, 2)} -->
-
diff --git a/src/routes/journals/[journal]/[entry]/+page.svelte b/src/routes/(journals)/journals/[journal]/[entry]/+page.svelte similarity index 100% rename from src/routes/journals/[journal]/[entry]/+page.svelte rename to src/routes/(journals)/journals/[journal]/[entry]/+page.svelte diff --git a/src/routes/journals/shared/+page.svelte b/src/routes/(journals)/journals/shared/+page.svelte similarity index 100% rename from src/routes/journals/shared/+page.svelte rename to src/routes/(journals)/journals/shared/+page.svelte diff --git a/src/routes/feed/+page.svelte b/src/routes/(social)/feed/+page.svelte similarity index 100% rename from src/routes/feed/+page.svelte rename to src/routes/(social)/feed/+page.svelte diff --git a/src/routes/landing/+page.server.ts b/src/routes/(social)/landing/+page.server.ts similarity index 86% rename from src/routes/landing/+page.server.ts rename to src/routes/(social)/landing/+page.server.ts index 2f252f4..ff06ed0 100644 --- a/src/routes/landing/+page.server.ts +++ b/src/routes/(social)/landing/+page.server.ts @@ -1,5 +1,5 @@ import { redirect } from '@sveltejs/kit'; -import type { PageServerLoad } from '../landing/$types'; +import type { PageServerLoad } from './$types'; export const load: PageServerLoad = async ({ locals, url }) => { if (!locals.user) { @@ -15,6 +15,6 @@ export const load: PageServerLoad = async ({ locals, url }) => { //logged in, allow access and pass user data to the page // use user data to get bio and stuff return { - user: locals.user + user: locals.user, }; -}; \ No newline at end of file +}; diff --git a/src/routes/landing/+page.svelte b/src/routes/(social)/landing/+page.svelte similarity index 100% rename from src/routes/landing/+page.svelte rename to src/routes/(social)/landing/+page.svelte diff --git a/src/styles/_components.scss b/src/styles/_components.scss index 85133ef..fc91e8e 100644 --- a/src/styles/_components.scss +++ b/src/styles/_components.scss @@ -72,6 +72,7 @@ .journal-page-content { display: flex; flex-direction: row; + justify-content: flex-start; align-items: center; } @@ -79,7 +80,8 @@ width: 29rem; height: 38.313rem; background-image: url(../assets/journal_book.png); - margin-left: 25rem; + margin: auto; + margin-top: 5rem; } .journal-menu { @@ -91,10 +93,8 @@ width: 18.8rem; height: 7.31rem; padding: 0.188rem; - position: absolute; - top: 25rem; - left: 52rem; margin: auto; + margin-top: 15rem; z-index: 20; } @@ -151,7 +151,7 @@ .entry-sidebar-item { width: 18.75rem; height: 3.563rem; - background-color: variables.$baby-blue + background-color: variables.$baby-blue; } .feed-item { @@ -178,8 +178,7 @@ } &__button { width: 40%; - margin:0; - + margin: 0; } } @@ -216,7 +215,7 @@ .manage-friend { display: flex; - flex-direction: row; + flex-direction: row; justify-content: space-between; align-items: center; gap: 0.5rem; @@ -275,4 +274,4 @@ padding-inline: 2.5rem; align-items: center; } -} \ No newline at end of file +} diff --git a/src/styles/_layout.scss b/src/styles/_layout.scss index 23022c7..b71314f 100644 --- a/src/styles/_layout.scss +++ b/src/styles/_layout.scss @@ -1,12 +1,12 @@ @use 'variables'; .layout { - display: flex; - flex-direction: column; - min-height: 100vh; + display: flex; + flex-direction: column; + min-height: 100vh; &__content { - flex: 1; + flex: 1; padding: 4rem; } @@ -25,13 +25,13 @@ width: 30%; text-align: left; .item { - padding: 0.5rem 0rem 0.5rem 0rem + padding: 0.5rem 0rem 0.5rem 0rem; } .header { - padding: 1rem 0 1rem 0rem + padding: 1rem 0 1rem 0rem; } } - } + } } .cta-section { @@ -51,7 +51,6 @@ &__text { width: 40%; } - } .cta-title { @@ -60,4 +59,20 @@ text-align: center; align-items: center; padding: 3rem; -} \ No newline at end of file +} + +.journals-layout { + display: flex; + flex-direction: column; + min-height: 100vh; + + &__modal { + display: block; + } + + &__content { + display: flex; + flex-direction: row; + justify-content: center; + } +} From 589309e83638237368dd4ac9cfd872ec9e637cc7 Mon Sep 17 00:00:00 2001 From: ethereal-chxn Date: Mon, 2 Jun 2025 16:09:17 -0700 Subject: [PATCH 2/7] Sidebar modal now working --- .../components/buttons/SidebarToggle.svelte | 9 ++++++ src/lib/components/nav/JournalsNav.svelte | 8 ++++- src/routes/(journals)/journals/+layout.svelte | 30 ++++++++++++++----- .../journals/[journal]/[entry]/+page.svelte | 5 ++-- src/styles/_layout.scss | 16 +++++++++- src/styles/_navbar.scss | 2 +- 6 files changed, 58 insertions(+), 12 deletions(-) diff --git a/src/lib/components/buttons/SidebarToggle.svelte b/src/lib/components/buttons/SidebarToggle.svelte index e69de29..7f1811d 100644 --- a/src/lib/components/buttons/SidebarToggle.svelte +++ b/src/lib/components/buttons/SidebarToggle.svelte @@ -0,0 +1,9 @@ + + + diff --git a/src/lib/components/nav/JournalsNav.svelte b/src/lib/components/nav/JournalsNav.svelte index 51302a5..da6e17f 100644 --- a/src/lib/components/nav/JournalsNav.svelte +++ b/src/lib/components/nav/JournalsNav.svelte @@ -1,4 +1,10 @@ - + + + diff --git a/src/routes/(journals)/journals/+layout.svelte b/src/routes/(journals)/journals/+layout.svelte index 8914c83..b6f9a20 100644 --- a/src/routes/(journals)/journals/+layout.svelte +++ b/src/routes/(journals)/journals/+layout.svelte @@ -4,19 +4,23 @@ import type { LayoutProps } from './$types'; let { data, children }: LayoutProps = $props(); - let showSidebar = $state(true); + let showSidebar = $state(false); + + function toggleSidebar() { + showSidebar = !showSidebar; + } -
- {#if showSidebar} - - {/if} -
+
@@ -24,4 +28,16 @@
{@render children()}
+ {#if showSidebar} + + {/if}
diff --git a/src/routes/(journals)/journals/[journal]/[entry]/+page.svelte b/src/routes/(journals)/journals/[journal]/[entry]/+page.svelte index 6d664bf..8606d4f 100644 --- a/src/routes/(journals)/journals/[journal]/[entry]/+page.svelte +++ b/src/routes/(journals)/journals/[journal]/[entry]/+page.svelte @@ -1,8 +1,9 @@

Entry

-
+
diff --git a/src/styles/_layout.scss b/src/styles/_layout.scss
index b71314f..c799ce3 100644
--- a/src/styles/_layout.scss
+++ b/src/styles/_layout.scss
@@ -67,12 +67,26 @@
     min-height: 100vh;
 
     &__modal {
-        display: block;
+        position: fixed;
+        top: 6.875rem;
+        left: 0;
+        z-index: 20;
+
+        &__overlay {
+            position: fixed;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            z-index: 10;
+            background-color: rgba(0, 0, 0, 0.5);
+        }
     }
 
     &__content {
         display: flex;
         flex-direction: row;
         justify-content: center;
+        z-index: 0;
     }
 }
diff --git a/src/styles/_navbar.scss b/src/styles/_navbar.scss
index aa2531f..ea4cb96 100644
--- a/src/styles/_navbar.scss
+++ b/src/styles/_navbar.scss
@@ -29,7 +29,7 @@ body {
 .navbar {
     background-color: variables.$sage;
     padding: 0.5rem;
-    height: 110px;
+    height: 6.875rem;
 
     &__container {
         max-width: 97%;

From 8ed16d26302c07e782d85e41e9e506366ea7df7a Mon Sep 17 00:00:00 2001
From: ethereal-chxn 
Date: Mon, 2 Jun 2025 17:08:05 -0700
Subject: [PATCH 3/7] Entry sidebar buttons now go to entry pages

---
 .../components/journal/EntrySidebar.svelte    | 25 ++++++++++++++++---
 .../journal/EntrySidebarItem.svelte           | 10 ++++++--
 src/lib/types/journal.types.ts                |  2 ++
 .../journals/[journal]/[entry]/+page.svelte   |  4 +--
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/lib/components/journal/EntrySidebar.svelte b/src/lib/components/journal/EntrySidebar.svelte
index 800ca4a..ea84bad 100644
--- a/src/lib/components/journal/EntrySidebar.svelte
+++ b/src/lib/components/journal/EntrySidebar.svelte
@@ -6,6 +6,7 @@ https://svelte.dev/docs/svelte/bind
 
@@ -19,11 +20,27 @@ https://svelte.dev/docs/svelte/bind
         />
     {/each} -->
 
-    
+    
 
-    
+    
 
-    
+    
 
-    
+    
 
diff --git a/src/lib/components/journal/EntrySidebarItem.svelte b/src/lib/components/journal/EntrySidebarItem.svelte
index af53637..0f2fef9 100644
--- a/src/lib/components/journal/EntrySidebarItem.svelte
+++ b/src/lib/components/journal/EntrySidebarItem.svelte
@@ -1,10 +1,16 @@
 
 
-
From 9fe497249827352d4d050c10b8439a004c6ecaf4 Mon Sep 17 00:00:00 2001 From: ethereal-chxn Date: Mon, 2 Jun 2025 23:16:54 -0700 Subject: [PATCH 4/7] Changing props on entry sidebar item for new IEntrySerializable type --- src/lib/components/journal/EntrySidebar.svelte | 8 ++++---- src/lib/components/journal/EntrySidebarItem.svelte | 3 --- src/lib/types/journal.types.ts | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/lib/components/journal/EntrySidebar.svelte b/src/lib/components/journal/EntrySidebar.svelte index ea84bad..b60858f 100644 --- a/src/lib/components/journal/EntrySidebar.svelte +++ b/src/lib/components/journal/EntrySidebar.svelte @@ -12,11 +12,11 @@ https://svelte.dev/docs/svelte/bind