diff --git a/app/src/app/page.tsx b/app/src/app/page.tsx
index 219c3ec..8c43026 100644
--- a/app/src/app/page.tsx
+++ b/app/src/app/page.tsx
@@ -1,4 +1,6 @@
-export default function Home() {
+"use server";
+
+export default async function Home() {
return (
Home
diff --git a/app/src/utils/request.ts b/app/src/utils/request.ts
deleted file mode 100644
index f46aa8b..0000000
--- a/app/src/utils/request.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export async function handleJsonResponse(
- response: Response,
- unknownErrorMessageNotHandleByTheApi: string = 'An unknown error occurred.'
-): Promise {
- // The original variable name is too long, so I changed it to a shorter one.
- const uEMNHBTA = unknownErrorMessageNotHandleByTheApi;
-
- if (!response.ok) {
- const data = await response.json();
-
- if ('error' in data) {
- throw new Error(data.error);
- }
-
- throw new Error(uEMNHBTA);
- }
-
- return response.json() as Promise;
-}
From 94d78b3977c63773a1a03b6ab48f38ee36c1cbc2 Mon Sep 17 00:00:00 2001
From: clementvtrd <84911237+clementvtrd@users.noreply.github.com>
Date: Fri, 7 Jun 2024 16:48:35 +0200
Subject: [PATCH 09/13] fix: issue with images imported as module
---
app/src/components/header.tsx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/src/components/header.tsx b/app/src/components/header.tsx
index 74ee0ba..5f2adde 100644
--- a/app/src/components/header.tsx
+++ b/app/src/components/header.tsx
@@ -6,6 +6,7 @@ import AuthButton from '@/components/AuthButton';
import Icon from '@/components/Icon';
import Image from 'next/image';
import Link from 'next/link';
+import LogoKnpWhite from '@/assets/logo-knp-white.svg';
export default async function Header() {
const session = await auth();
@@ -17,7 +18,7 @@ export default async function Header() {
From 87e5cd05f1072250320795c6d7c4ec4be06ab8dd Mon Sep 17 00:00:00 2001
From: clementvtrd <84911237+clementvtrd@users.noreply.github.com>
Date: Fri, 7 Jun 2024 16:49:45 +0200
Subject: [PATCH 10/13] chore: remove .task directory
---
.gitignore | 3 +++
.task/checksum/npm-install | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 .gitignore
delete mode 100644 .task/checksum/npm-install
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aae9732
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+# Taskfile
+
+/.task
diff --git a/.task/checksum/npm-install b/.task/checksum/npm-install
deleted file mode 100644
index 48f4b1b..0000000
--- a/.task/checksum/npm-install
+++ /dev/null
@@ -1 +0,0 @@
-14ac3c3c6846f5e11a3117756346d349
From ebad19afa649e434b7ba0d5159d19eec7947aa02 Mon Sep 17 00:00:00 2001
From: clementvtrd <84911237+clementvtrd@users.noreply.github.com>
Date: Fri, 7 Jun 2024 17:23:16 +0200
Subject: [PATCH 11/13] chore: enhance type safety in middleware
---
app/src/middleware.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/src/middleware.ts b/app/src/middleware.ts
index 02ee96f..beb95d6 100644
--- a/app/src/middleware.ts
+++ b/app/src/middleware.ts
@@ -1,5 +1,6 @@
import NextAuth from "next-auth";
import authConfig from "./auth.config";
+import { MiddlewareConfig } from 'next/server';
export const { auth } = NextAuth(authConfig);
@@ -11,4 +12,4 @@ export default auth((request) => {
export const config = {
matcher: ["/((?!api|_next/static|_next/image|favicon.ico).*)"],
-};
+} satisfies MiddlewareConfig;
From 81856861bfc33aa14fcf9c73f61dcfc89d582d8c Mon Sep 17 00:00:00 2001
From: clementvtrd <84911237+clementvtrd@users.noreply.github.com>
Date: Sun, 9 Jun 2024 20:03:19 +0200
Subject: [PATCH 12/13] fix: use builder target for testing purpose to generate
---
.github/workflows/test.yaml | 28 +++++++++++++------
app/.env.dist | 6 +++-
app/Dockerfile | 28 +++++++------------
app/src/components/{header.tsx => Header.tsx} | 0
app/src/middleware.ts | 4 +--
docker-compose.test.yaml | 2 ++
docker-compose.yaml | 2 --
7 files changed, 38 insertions(+), 32 deletions(-)
rename app/src/components/{header.tsx => Header.tsx} (100%)
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 5e118e7..404412c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -3,21 +3,31 @@ on:
- push
jobs:
- test:
+ ci-cd:
+ name: CI/CD
+
runs-on: ubuntu-latest
+
env:
COMPOSE_FILE: docker-compose.test.yaml
- strategy:
- fail-fast: false
- matrix:
- cmd: [lint, type-check]
-
steps:
+ - name: Install Task
+ uses: arduino/setup-task@v1
+ with:
+ version: 3.x
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+
- uses: actions/checkout@v4
+ - name: Initialize environment
+ run: task init-env
+
- name: Build images
- run: docker compose build app
+ run: task docker-build
+
+ - name: lint
+ run: docker compose run --no-deps --rm app npm run lint
- - name: ${{ matrix.cmd }}
- run: docker compose run --no-deps --rm app npm run ${{ matrix.cmd }}
+ - name: Types checking
+ run: docker compose run --no-deps --rm app npm run type-check
diff --git a/app/.env.dist b/app/.env.dist
index 988617d..5b1ec2a 100644
--- a/app/.env.dist
+++ b/app/.env.dist
@@ -1,4 +1,8 @@
-BASE_URL=http://localhost:3000
+BASE_URL="http://localhost:3000"
+
+## Prisma
+
+DATABASE_URL="postgresql://postgres:password@postgres:5432/app?schema=public"
## Auth JS
diff --git a/app/Dockerfile b/app/Dockerfile
index 50c5621..15194e6 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -8,37 +8,23 @@ COPY package.json package-lock.json ./
RUN corepack enable npm && corepack install
-FROM npm AS deps
-
-ENV NODE_ENV=production
-
RUN npm ci
-FROM npm AS dev-deps
+FROM npm AS development
ENV NODE_ENV=development
-RUN npm ci
-
-FROM dev-deps AS test
-
-ENV NODE_ENV=test
-
-COPY . .
-
-RUN npx prisma generate
-
-FROM npm AS development
-
VOLUME [ "/opt/app/.next" ]
CMD ["npm", "run", "dev"]
FROM npm AS builder
+ENV NODE_ENV=production
+
COPY . .
-COPY --from=dev-deps /opt/app/node_modules /opt/app/node_modules
+COPY --from=npm /opt/app/node_modules /opt/app/node_modules
RUN npx prisma generate
@@ -48,6 +34,12 @@ RUN npm run build \
&& cp -r .next/static .next/standalone/.next/ \
&& cp -r public .next/standalone/
+FROM builder AS test
+
+ENV NODE_ENV=test
+
+COPY . .
+
FROM base AS release
ENV NODE_ENV=production
diff --git a/app/src/components/header.tsx b/app/src/components/Header.tsx
similarity index 100%
rename from app/src/components/header.tsx
rename to app/src/components/Header.tsx
diff --git a/app/src/middleware.ts b/app/src/middleware.ts
index beb95d6..077e9d2 100644
--- a/app/src/middleware.ts
+++ b/app/src/middleware.ts
@@ -10,6 +10,6 @@ export default auth((request) => {
}
});
-export const config = {
+export const config: MiddlewareConfig = {
matcher: ["/((?!api|_next/static|_next/image|favicon.ico).*)"],
-} satisfies MiddlewareConfig;
+};
diff --git a/docker-compose.test.yaml b/docker-compose.test.yaml
index 764aa2d..9b799e4 100644
--- a/docker-compose.test.yaml
+++ b/docker-compose.test.yaml
@@ -3,3 +3,5 @@ services:
build:
context: app
target: test
+ env_file:
+ - app/.env.local
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 486538b..0269ede 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -4,8 +4,6 @@ services:
build:
context: app
target: development
- environment:
- - DATABASE_URL=postgresql://postgres:password@postgres:5432/app?schema=public
ports:
- '3000:3000'
volumes:
From b406e0482856dfa432410d7b96a9af513601af9e Mon Sep 17 00:00:00 2001
From: clementvtrd <84911237+clementvtrd@users.noreply.github.com>
Date: Sun, 9 Jun 2024 23:26:19 +0200
Subject: [PATCH 13/13] chore: rename ci cd workflow
---
.github/workflows/{test.yaml => ci-cd.yaml} | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
rename .github/workflows/{test.yaml => ci-cd.yaml} (89%)
diff --git a/.github/workflows/test.yaml b/.github/workflows/ci-cd.yaml
similarity index 89%
rename from .github/workflows/test.yaml
rename to .github/workflows/ci-cd.yaml
index 404412c..5171ec3 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/ci-cd.yaml
@@ -1,6 +1,10 @@
---
on:
- - push
+ push:
+ branches-ignore:
+ - main
+ tags-ignore:
+ - v*
jobs:
ci-cd: