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 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) { SideCause
  • - Posts + Posts
  • {session?.user ? ( <> 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 5173d12..ba38dfb 100644 --- a/app/layout.tsx +++ b/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 ( - +
    - +
    {children}