Merge branch 'development' into cleanup_post_views_with_test

steph-koopmanschap · Jun 7, 2023 · b4b9cad · b4b9cad
2 parents 722b908 + ce1c4e7
commit b4b9cad
Show file tree

Hide file tree

Showing 5 changed files with 971 additions and 267 deletions.
diff --git a/docker-compose-development.yml b/docker-compose-development.yml
@@ -1,7 +1,7 @@
 version: "3.8"
 
-# This could be seen as both advantage / disadvantage of having all container share the same.
-x-environment:
+# This could be seen as both advantage / disadvantage of having all container share the same env.
+x-environment: 
     &dev-environment
     - STAGE=development
     # REDIS DB
@@ -76,7 +76,7 @@ services:
         volumes:
             - ./backend:/backend:z # This allows for realtime changes to be effective
 
-    # NEXTJS frontend
+    # NEXTJS frontend website
     jasma-client:
         container_name: jasma-client-dev
         build:
@@ -87,7 +87,7 @@ services:
                 - BASE_URL=http://localhost
                 - PORT=3000
                 - NEXT_PUBLIC_API_SERVER_URL=localhost
-                - NEXT_PUBLIC_API_SERVER_PORT=5000
+                - NEXT_PUBLIC_API_SERVER_PORT=8000
                 - NEXT_PUBLIC_NODE_ENV=development
                 - ANALYZE=false
                 - SESSION_SECRET=thisisatemporarysecret

diff --git a/frontend/README.md b/frontend/README.md