Merge pull request #655 from hackforla/develop

Develop into main

Author: LoTerence

.github/workflows/deploy-stage.yml

@@ -35,7 +35,6 @@ jobs:
           ECR_REPOSITORY: civic-tech-jobs-fullstack
           IMAGE_TAG: dev
         run: |
-          docker pull nmatsui/hello-world-api
-          docker tag nmatsui/hello-world-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          docker build -f ./stage/Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-          
+

dev/dev.env.example

@@ -9,7 +9,7 @@ POSTGRES_PASSWORD=<same as SQL_PASSWORD>
 ENVIRON=dev
 DEBUG=True
 SECRET_KEY=<random string of length 50>
-DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]
+DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1] django
 SQL_ENGINE=django.db.backends.postgresql
 SQL_DATABASE=<same as POSTGRES_DB>
 SQL_USER=postgres

docker-compose.yml

@@ -48,6 +48,9 @@ services:
     container_name: vite
     env_file:
       - dev/dev.env
+    environment:
+      - VITE_APP_SERVER_URL=django://django:8000
+      - VITE_APP_CLIENT_URL=vite://vite:5175
     ports:
       - "5175:5175"
     develop:

frontend/eslint.config.mjs

@@ -28,7 +28,12 @@ export default [
       "no-console": "warn",
       indent: ["error", 2],
       "no-irregular-whitespace": "error",
-      "prettier/prettier": "error",
+      "prettier/prettier": [
+        "error",
+        {
+          endOfLine: "auto",
+        },
+      ],
       "react/no-unescaped-entities": "off",
       "@typescript-eslint/no-unused-vars": ["error"],
       "tailwindcss/no-contradicting-classname": "error",