From 17590cc43dd62d6a051135eabcd43cca5126212f Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Mon, 19 Feb 2024 09:54:41 -0600
Subject: [PATCH] Update build-deploy.yml, Dockerfile, Dockerfile.dev,
 LoginFormController.jsx, docker-compose.prod.yml, and docker-compose.yml

---
 .github/workflows/build-deploy.yml             | 2 +-
 client/Dockerfile                              | 4 ++--
 client/Dockerfile.dev                          | 2 +-
 client/src/controllers/LoginFormController.jsx | 2 +-
 docker-compose.prod.yml                        | 7 +------
 docker-compose.yml                             | 3 ++-
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
index d6a9c5a..c8bf1c8 100644
--- a/.github/workflows/build-deploy.yml
+++ b/.github/workflows/build-deploy.yml
@@ -32,7 +32,7 @@ jobs:
             - name: Write .env to build
               env:
                   DOTENV: '${{ secrets.DOTENV }}'
-              run: echo "$DOTENV" >> .env
+              run: echo "$DOTENV" >> ./client/.env
             - name: Build & push client image
               uses: mr-smithers-excellent/docker-build-push@v6
               with:
diff --git a/client/Dockerfile b/client/Dockerfile
index 11ce21c..064c228 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine as build
+FROM node:16-alpine AS build
 WORKDIR /app
 
 COPY ["package.json", "./"]
@@ -10,7 +10,7 @@ COPY . .
 RUN npm run build
 
 
-FROM node:16-alpine
+FROM node:16-alpine AS production
 WORKDIR /app
 
 COPY --from=build /app/build ./build
diff --git a/client/Dockerfile.dev b/client/Dockerfile.dev
index f9e35c9..ab75ac7 100644
--- a/client/Dockerfile.dev
+++ b/client/Dockerfile.dev
@@ -11,4 +11,4 @@ COPY . .
 
 EXPOSE 3000/tcp
 
-CMD ["npm" "run" "start"]
\ No newline at end of file
+CMD ["npm", "run", "start"]
\ No newline at end of file
diff --git a/client/src/controllers/LoginFormController.jsx b/client/src/controllers/LoginFormController.jsx
index 17d10b9..fe2a897 100644
--- a/client/src/controllers/LoginFormController.jsx
+++ b/client/src/controllers/LoginFormController.jsx
@@ -46,7 +46,7 @@ function LoginFormController({ setToken }) {
 
         try {
             const response = await instance.post('/auth/login', { remember: form.remember });
-            const expires = form.remember ? 365 : 1;
+            const expires = form.remember ? 365 : 1; 
 
             setUserData(() => response.data.user);
             Cookies.set('token', response.data.token, { expires });
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 36aba93..bfee76c 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -5,14 +5,10 @@ services:
     restart: unless-stopped
     build:
       context: ./client
-      dockerfile: Dockerfile
       platforms:
         - linux/amd64
         - linux/arm64/v8
     image: c4thebomb/know-it-all-client
-    env_file:
-      - path: .env
-        required: true
     ports:
       - 127.0.0.1:3000:3000
     networks:
@@ -21,8 +17,7 @@ services:
     restart: unless-stopped
     image: c4thebomb/know-it-all-server
     build:
-      context: ./client
-      dockerfile: Dockerfile
+      context: ./server
       platforms:
         - linux/amd64
         - linux/arm64/v8
diff --git a/docker-compose.yml b/docker-compose.yml
index fd9b227..df41c8c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     ports:
       - 3000:3000
     volumes:
-      - ./client:/app
+      - ./client:/app1
       - /app/node_modules
     networks:
       - know-it-all
@@ -17,6 +17,7 @@ services:
       REACT_APP_API_ROOT: 'http://localhost:3001/api'
       REACT_APP_DOMAIN_ROOT: 'http://localhost:3000'
       WATCHPACK_POLLING: true
+    command: npm start
   server:
     restart: unless-stopped
     build: