updates

Author: mjhea0

.gitignore

@@ -1,5 +1,6 @@
 __pycache__
 env
-htmlcov
 .coverage
+htmlcov
+coverage
 node_modules

buildspec.yml

@@ -3,22 +3,22 @@ version: 0.2
 env:
   variables:
     AWS_REGION: "us-west-1"
-    REACT_APP_API_SERVICE_URL: "http://flask-react-alb-166710978.us-west-1.elb.amazonaws.com"
+    VITE_API_SERVICE_URL: "http://<LOAD_BALANCER_DNS_NAME>"
 
 phases:
   pre_build:
     commands:
       - echo logging in to ecr...
-      - >
-        aws ecr get-login-password --region $AWS_REGION \
-          | docker login --username AWS --password-stdin $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com
+      - aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com
       - |
-        if expr "$CODEBUILD_WEBHOOK_TRIGGER" == "branch/master" >/dev/null  && expr "$CODEBUILD_WEBHOOK_HEAD_REF" == "refs/heads/master" >/dev/null; then
+        if expr "$CODEBUILD_WEBHOOK_TRIGGER" == "branch/master" >/dev/null && expr "$CODEBUILD_WEBHOOK_HEAD_REF" == "refs/heads/master" >/dev/null; then
           DOCKER_TAG=prod
         else
           DOCKER_TAG=${CODEBUILD_RESOLVED_SOURCE_VERSION}
         fi
-      - echo "Docker tag:" $DOCKER_TAG
+      - echo "Docker tag $DOCKER_TAG"
+      - echo "Current branch trigger $CODEBUILD_WEBHOOK_TRIGGER"
+      - echo "Current HEAD ref $CODEBUILD_WEBHOOK_HEAD_REF"
       - docker pull $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG || true
       - docker pull $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:builder || true
       - docker pull $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG || true
@@ -34,32 +34,15 @@ phases:
       - docker-compose exec -T client npm run prettier:check
       - docker-compose exec -T client npm run prettier:write
       - echo building prod images...
-      - >
-        docker build \
-          --cache-from $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG \
-          -f services/users/Dockerfile.prod \
-          -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG \
-          ./services/users
-      - >
-        docker build \
-          --target builder \
-          --cache-from $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:builder \
-          -f services/client/Dockerfile.prod \
-          -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:builder \
-          --build-arg NODE_ENV=production \
-          --build-arg REACT_APP_API_SERVICE_URL=$REACT_APP_API_SERVICE_URL \
-          ./services/client
-      - >
-        docker build \
-          --cache-from $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG \
-          -f services/client/Dockerfile.prod \
-          -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG \
-          ./services/client
+      - docker build --cache-from $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG -f services/users/Dockerfile.prod -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG ./services/users
+      - docker build --target builder --cache-from $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:builder -f services/client/Dockerfile.prod -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:builder --build-arg NODE_ENV=production --build-arg VITE_API_SERVICE_URL=$VITE_API_SERVICE_URL ./services/client
+      - docker build --cache-from $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG -f services/client/Dockerfile.prod -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG ./services/client
   post_build:
     commands:
-    - echo pushing prod images to ecr...
-    - docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG
-    - docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:builder
-    - docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG
-    - chmod +x ./deploy.sh
-    - bash deploy.sh
+      - echo "Using docker tag $DOCKER_TAG"
+      - echo pushing prod images to ecr...
+      - docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG
+      - docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:builder
+      - docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG
+      - chmod +x ./deploy.sh
+      - bash deploy.sh

docker-compose.prod.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
 
   api:
@@ -33,7 +31,7 @@ services:
       dockerfile: Dockerfile.prod
       args:
         - NODE_ENV=production
-        - REACT_APP_API_SERVICE_URL=${REACT_APP_API_SERVICE_URL}
+        - VITE_API_SERVICE_URL=${VITE_API_SERVICE_URL}
     ports:
       - 3007:80
     depends_on:

docker-compose.yml

@@ -1,17 +1,16 @@
-version: '3.8'
-
 services:
 
   api:
     build:
-      context: ./services/users
+      context: ./services/users  # updated
       dockerfile: Dockerfile
     entrypoint: ['/usr/src/app/entrypoint.sh']
     volumes:
-      - './services/users:/usr/src/app'
+      - './services/users:/usr/src/app'  # updated
     ports:
       - 5004:5000
     environment:
+      - FLASK_DEBUG=1
       - FLASK_ENV=development
       - APP_SETTINGS=src.config.DevelopmentConfig
       - DATABASE_URL=postgresql://postgres:postgres@api-db:5432/api_dev
@@ -21,7 +20,7 @@ services:
 
   api-db:
     build:
-      context: ./services/users/src/db
+      context: ./services/users/src/db  # updated
       dockerfile: Dockerfile
     expose:
       - 5432
@@ -38,9 +37,9 @@ services:
       - './services/client:/usr/src/app'
       - '/usr/src/app/node_modules'
     ports:
-      - 3007:3000
+      - 3007:5173
     environment:
       - NODE_ENV=development
-      - REACT_APP_API_SERVICE_URL=${REACT_APP_API_SERVICE_URL}
+      - VITE_API_SERVICE_URL=${VITE_API_SERVICE_URL}
     depends_on:
       - api

services/client/.env

@@ -0,0 +1 @@
+VITE_API_SERVICE_URL=http://localhost:5004

services/client/.eslintrc.cjs

@@ -0,0 +1,29 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react-hooks/recommended',
+    'plugin:react/recommended' // Add React rules
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs'],
+  parser: '@typescript-eslint/parser',
+  plugins: ['react-refresh', 'react'], // Add React plugin
+  rules: {
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+    'react/jsx-no-bind': ['error', {
+      'allowArrowFunctions': true,
+      'allowBind': false,
+      'ignoreRefs': true
+    }],
+  },
+  settings: {
+    react: {
+      version: '18.0',
+    },
+  },
+};

services/client/.eslintrc.json

@@ -1,23 +1,24 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
+# Logs
+logs
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

services/client/.gitignore

@@ -1,5 +1,5 @@
 # pull official base image
-FROM node:17-alpine
+FROM node:20.16.0
 
 # set working directory
 WORKDIR /usr/src/app
@@ -11,7 +11,6 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH
 COPY package.json .
 COPY package-lock.json .
 RUN npm ci
-RUN npm install [email protected] -g --silent
 
 # start app
-CMD ["npm", "start"]
+CMD ["npm", "run", "dev", "--", "--host", "0.0.0.0"]

services/client/Dockerfile

@@ -3,7 +3,7 @@
 ###########
 
 # pull official base image
-FROM node:17-alpine as builder
+FROM node:20.16.0 AS builder
 
 # set working directory
 WORKDIR /usr/src/app
@@ -15,18 +15,16 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH
 COPY package.json .
 COPY package-lock.json .
 RUN npm ci
-RUN npm install [email protected] --silent
-
 
 # set environment variables
-ARG REACT_APP_API_SERVICE_URL
-ENV REACT_APP_API_SERVICE_URL $REACT_APP_API_SERVICE_URL
+ARG VITE_API_SERVICE_URL
+ENV VITE_API_SERVICE_URL=$VITE_API_SERVICE_URL
 ARG NODE_ENV
-ENV NODE_ENV $NODE_ENV
+ENV NODE_ENV=$NODE_ENV
 
 # create build
 COPY . .
-RUN npm run build
+RUN vite build
 
 
 #########
@@ -41,7 +39,7 @@ RUN rm -rf /etc/nginx/conf.d
 COPY conf /etc/nginx
 
 # copy static files
-COPY --from=builder /usr/src/app/build /usr/share/nginx/html
+COPY --from=builder /usr/src/app/dist /usr/share/nginx/html
 
 # expose port
 EXPOSE 80