From 91c422a1b762aa58802c6bb41f7169bd66e22f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Coze?= <96086580+SebastienCozeDev@users.noreply.github.com> Date: Mon, 18 May 2026 17:34:27 +0200 Subject: [PATCH 1/2] :bug: [DONE] Fix CI/CD (#29) --- apps/api/Dockerfile | 4 +++- apps/web/Dockerfile | 11 +++++++---- apps/web/app/globals.css | 2 +- apps/web/lib/auth.ts | 2 +- docker-compose.yml | 3 +++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile index f87f27c..05d7004 100644 --- a/apps/api/Dockerfile +++ b/apps/api/Dockerfile @@ -3,6 +3,8 @@ FROM node:24-slim AS build WORKDIR /usr/src/app COPY package*.json ./ +COPY apps/api/nest-cli.json apps/api/nest-cli.json +COPY apps/api/tsconfig*.json apps/api/tsconfig*.json COPY apps/api/package.json apps/api/package.json RUN npm ci @@ -19,7 +21,7 @@ ENV NODE_ENV=production COPY --from=build /usr/src/app/package*.json ./ COPY --from=build /usr/src/app/node_modules ./node_modules -COPY --from=build /usr/src/app/dist ./dist +COPY --from=build /usr/src/app/apps/api/dist ./dist COPY --from=build /usr/src/app/apps/api ./apps/api WORKDIR /usr/src/app/apps/api diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index e4cbed8..f15ecf8 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -12,6 +12,9 @@ COPY apps/web apps/web ENV NODE_ENV=production ENV NEXT_TELEMETRY_DISABLED=1 +ARG NEXT_PUBLIC_API_BASE_URL +ENV NEXT_PUBLIC_API_BASE_URL=${NEXT_PUBLIC_API_BASE_URL} + RUN npm run build -w apps/web FROM node:24-slim AS production @@ -23,12 +26,12 @@ ENV NEXT_TELEMETRY_DISABLED=1 ENV PORT=3000 ENV HOSTNAME=0.0.0.0 -COPY --from=builder /usr/src/app/apps/web/.next/standalone ./ -COPY --from=builder /usr/src/app/apps/web/.next/static ./apps/web/.next/static -COPY --from=builder /usr/src/app/apps/web/public ./apps/web/public +COPY --from=build /usr/src/app/apps/web/.next/standalone ./ +COPY --from=build /usr/src/app/apps/web/.next/static ./apps/web/.next/static +COPY --from=build /usr/src/app/apps/web/public ./apps/web/public USER node EXPOSE 3000 -CMD ["node", "apps/web/server.js"] \ No newline at end of file +CMD ["node", "apps/web/server.js"] diff --git a/apps/web/app/globals.css b/apps/web/app/globals.css index 2d71473..b11a31b 100644 --- a/apps/web/app/globals.css +++ b/apps/web/app/globals.css @@ -1,4 +1,4 @@ @import "tailwindcss"; @plugin "daisyui" { themes: light --default; -}; +} diff --git a/apps/web/lib/auth.ts b/apps/web/lib/auth.ts index e0e0d34..487c4cc 100644 --- a/apps/web/lib/auth.ts +++ b/apps/web/lib/auth.ts @@ -31,7 +31,7 @@ export async function registerUser(data: RegisterRequest): Promise { const response = await register(data); if (!response?.displayName) { - removeAccessToken + removeAccessToken(); return false } diff --git a/docker-compose.yml b/docker-compose.yml index 5a6ced2..954acea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -90,12 +90,15 @@ services: build: context: . dockerfile: ./apps/web/Dockerfile + args: + NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL} container_name: taskflow-web-prod env_file: - .env environment: NODE_ENV: production NEXT_TELEMETRY_DISABLED: 1 + NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL} depends_on: - api-prod networks: From 6d1df02470bf9207e60aed4cd1e50677c29dbfe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Coze?= <96086580+SebastienCozeDev@users.noreply.github.com> Date: Mon, 18 May 2026 17:51:30 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9D=20[DONE]=20Revise=20README.md?= =?UTF-8?q?=20for=20project=20clarity=20and=20consistency=20(#31)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated project description and features in README.md. Changed references from 'TaskFlow API' to 'TaskFlow' for consistency. --- README.md | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5e1fb99..9d245ae 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,21 @@ -# 📅 TaskFlow API +# 📅 TaskFlow ![NestJS](https://img.shields.io/badge/NestJS-E0234E?style=flat-square&logo=nestjs&logoColor=white) +![Next.js](https://img.shields.io/badge/Next.js-000000?style=flat-square&logo=nextdotjs&logoColor=white) ![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?style=flat-square&logo=typescript&logoColor=white) ![PostgreSQL](https://img.shields.io/badge/PostgreSQL-4169E1?style=flat-square&logo=postgresql&logoColor=white) ![TypeORM](https://img.shields.io/badge/TypeORM-FE0803?style=flat-square) +![Tailwind CSS](https://img.shields.io/badge/Tailwind_CSS-06B6D4?style=flat-square&logo=tailwindcss&logoColor=white) +![DaisyUI](https://img.shields.io/badge/DaisyUI-5A0EF8?style=flat-square&logo=daisyui&logoColor=white) ![Docker](https://img.shields.io/badge/Docker-2496ED?style=flat-square&logo=docker&logoColor=white) ![Makefile](https://img.shields.io/badge/Makefile-064F8C?style=flat-square&logo=gnu&logoColor=white) -TaskFlow API is a REST API for collaborative task and board management. +TaskFlow is a collaborative task management application for managing boards, tasks, members, and permissions. It helps users manage boards, tasks, members, and permissions in a shared workflow environment. ## 📄 License -TaskFlow API is licensed under the terms described in the [LICENSE file](LICENSE). +TaskFlow is licensed under the terms described in the [LICENSE file](LICENSE). Please refer to the LICENSE file for complete license terms. ## ✨ Features @@ -22,12 +25,16 @@ Please refer to the LICENSE file for complete license terms. - Task management - Board members and roles - Permission-based access control -- Swagger API documentation +- API documentation +- Web interface ## 🛠️ Tech stack - NestJS +- Next.js - TypeScript +- DaisyUI +- TailwindCSS - PostgreSQL - TypeORM - Docker / Docker Compose @@ -82,9 +89,9 @@ The project supports two profiles: Make sure each profile uses its own PostgreSQL service and environment configuration. -## 📘 API documentation +## 📘 Documentation -Swagger documentation is available when the application is running. +API documentation is available when the backend is running. Typical local URL: @@ -96,9 +103,9 @@ Adjust the port or route if your local configuration is different. ## 🎯 Project goal -TaskFlow API provides the backend for a collaborative task manager. -It is designed to support boards, task assignment, member roles, and permission-based actions in a clean REST architecture. +TaskFlow is designed to support collaborative work through boards, tasks, member roles, and permission-based actions. +It provides a structured environment for organizing work, assigning responsibilities, and managing access across teams. ## 🔗 Repository -GitHub repository: [TaskFlow API](https://github.com/SebastienCozeDev/task-flow-api) +GitHub repository: [TaskFlow](https://github.com/SebastienCozeDev/task-flow-api)