From bc5fb34e25f4e0fefcc0f404920b448aa92d61d6 Mon Sep 17 00:00:00 2001
From: Parker Close <peclose02@gmail.com>
Date: Wed, 7 Oct 2026 14:11:59 -0700
Subject: [PATCH 1/3] fixed merge mistake

---
 app/Navbar.tsx |  2 +-
 app/layout.tsx | 19 +++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/Navbar.tsx b/app/Navbar.tsx
index 0de4baa..317a24e 100644
--- a/app/Navbar.tsx
+++ b/app/Navbar.tsx
@@ -15,7 +15,7 @@ export default function Navbar({ session }: NavbarProps) {
           <Link href="/">SideCause</Link>
         </li>
         <li>
-          <Link href="/">Posts</Link>
+          <Link href="/posts">Posts</Link>
         </li>
         {session?.user ? (
           <>
diff --git a/app/layout.tsx b/app/layout.tsx
index 5173d12..f38d1e1 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -5,33 +5,24 @@ import './globals.css'
 import Navbar from './Navbar'
 import { auth } from '../auth'
 
-export default async function RootLayout({
-
 export const metadata: Metadata = {
   title: 'SideCause',
-  description:
-    'Complete community service projects and level up!',
+  description: 'Complete community service projects and level up!',
 }
 
-const navLinks = [
-  { text: 'SideCause', url: '/' },
-  { text: 'Posts', url: '/posts' },
-  { text: 'Login', url: '/login' }
-];
-
-export default function RootLayout({
+export default async function RootLayout({
   children,
 }: Readonly<{ children: ReactNode }>) {
   const session = await auth()
 
   return (
     <html lang="en">
-      <body> 
+      <body>
         <div>
-          <Navbar links={navLinks} />
+          <Navbar session={session} />
         </div>
         {children}
       </body>
     </html>
   )
-}
+}
\ No newline at end of file

From 4b42bb61d6b803b467a691ac4717fc460af4ef6f Mon Sep 17 00:00:00 2001
From: Parker Close <peclose02@gmail.com>
Date: Wed, 7 Oct 2026 14:32:43 -0700
Subject: [PATCH 2/3] Updated pr check to use dummy db address for tests

---
 .github/workflows/pr-checks.yml | 2 ++
 Dockerfile                      | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index 4c3482f..fd62631 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -17,6 +17,8 @@ jobs:
           node-version-file: .nvmrc
           cache: npm
       - run: npm ci
+        env:
+          DATABASE_URL: postgresql://sidecause:sidecause@localhost:5432/sidecause?schema=public
       - run: npm run format:check
       - run: npm run lint
       - run: npm run typecheck
diff --git a/Dockerfile b/Dockerfile
index 1fedd64..ed6f455 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,9 @@ ENV NEXT_TELEMETRY_DISABLED=1
 
 FROM base AS dependencies
 COPY package.json package-lock.json ./
-RUN npm ci
+COPY prisma.config.ts ./
+COPY prisma ./prisma
+RUN DATABASE_URL=postgresql://sidecause:sidecause@localhost:5432/sidecause?schema=public npm ci
 
 FROM dependencies AS development
 COPY . .
@@ -25,7 +27,7 @@ RUN addgroup --system --gid 1001 nodejs \
   && adduser --system --uid 1001 nextjs
 COPY --from=build --chown=nextjs:nodejs /workspace/package.json ./package.json
 COPY --from=build --chown=nextjs:nodejs /workspace/package-lock.json ./package-lock.json
-RUN npm ci --omit=dev && npm cache clean --force
+RUN npm ci --omit=dev --ignore-scripts && npm cache clean --force
 COPY --from=build --chown=nextjs:nodejs /workspace/.next ./.next
 USER nextjs
 EXPOSE 3000

From a0137818fd3679c05b645cb6aa0b3bdf09b31d12 Mon Sep 17 00:00:00 2001
From: Parker Close <peclose02@gmail.com>
Date: Wed, 7 Oct 2026 14:35:24 -0700
Subject: [PATCH 3/3] prettier run

---
 app/globals.css | 8 ++++++--
 app/layout.tsx  | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/globals.css b/app/globals.css
index de8cfb5..e63037c 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -38,7 +38,11 @@ p {
   align-items: end;
   padding: 1.5rem 1.5rem;
   background:
-    linear-gradient(15deg, transparent 0 22%, rgba(75, 194, 188, 0.44) 82% 100%),
+    linear-gradient(
+      15deg,
+      transparent 0 22%,
+      rgba(75, 194, 188, 0.44) 82% 100%
+    ),
     var(--accent-soft);
 }
 
@@ -160,7 +164,7 @@ h3 {
 }
 
 .account-panel__intro {
-  margin-top: .25rem;
+  margin-top: 0.25rem;
   color: var(--muted);
 }
 
diff --git a/app/layout.tsx b/app/layout.tsx
index f38d1e1..ba38dfb 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -25,4 +25,4 @@ export default async function RootLayout({
       </body>
     </html>
   )
-}
\ No newline at end of file
+}