fixed merge mistake

.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

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

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 ? (
           <>

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);
 }
 

app/layout.tsx

@@ -5,30 +5,21 @@ 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>