improve project structure; follow nynvr project template structure;

nynvr · Dec 13, 2024 · b794dec · b794dec
1 parent ed4f592
commit b794dec
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 18 deletions.
diff --git a/apps/api/.python-version b/apps/api/.python-version
diff --git a/apps/api/requirements.txt → apps/api/app/requirements.txt b/apps/api/requirements.txt → apps/api/app/requirements.txt
diff --git a/apps/web/.nvmrc b/apps/web/.nvmrc
diff --git a/apps/web/app/package-lock.json b/apps/web/app/package-lock.json
diff --git a/apps/web/app/package.json b/apps/web/app/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "anasa",
+  "name": "app",
   "version": "0.1.0",
   "private": true,
   "scripts": {

diff --git a/deploy/api/api.development.Dockerfile b/deploy/api/api.development.Dockerfile
@@ -5,10 +5,10 @@ FROM python:3.12
 WORKDIR /code
 
 # Copy package.json and package-lock.json
-COPY ./apps/api/requirements.txt /code/requirements.txt
+COPY ./apps/api/app/requirements.txt /code/app/requirements.txt
 
 # Install dependencies
-RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /code/app/requirements.txt
 
 # Copy the current directory contents into the container at /app
 COPY ./apps/api/app /code/app

diff --git a/deploy/web/web.development.Dockerfile b/deploy/web/web.development.Dockerfile
@@ -2,17 +2,17 @@
 FROM node:20.18-slim
 
 # Set the working directory in the container
-WORKDIR /code
+WORKDIR /app
 
 # Copy package.json and package-lock.json
-COPY ./apps/web/app/package*.json ./app/
+COPY ./apps/web/app/package*.json ./
 
 # Install dependencies
-RUN npm --prefix ./app install
+RUN npm install
 
 # Copy the current directory contents into the container at /app
-COPY ./apps/web/app /code/app
-COPY ./deploy/web/web.development.run.sh /code/web.run.sh
+COPY ./apps/web/app .
+COPY ./deploy/web/web.development.run.sh /scripts/web.run.sh
 
-RUN chmod +x /code/web.run.sh
-CMD ["/code/web.run.sh"]
+RUN chmod +x /scripts/web.run.sh
+CMD ["/scripts/web.run.sh"]
diff --git a/deploy/web/web.development.run.sh b/deploy/web/web.development.run.sh
@@ -2,4 +2,4 @@
 
 echo "WEB - Running in development mode..."
 
-npm --prefix ./app run dev
+npm run dev
diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -33,9 +33,9 @@ services:
     depends_on:
       - api
     volumes:
-      - ./apps/web/app:/code/app
-      - ./apps/web/app/node_modules:/code/app/node_modules
-      - ./apps/web/app/.next:/code/app/.next
+      - ./apps/web/app:/app
+      - /app/node_modules
+      - /app/.next
 
 volumes:
   postgres_data:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		echo "WEB - Running in development mode..."

		npm --prefix ./app run dev
		npm run dev