Revize 287652cf

Refactor of administration page and user registration
re #9627

backend/docker-compose.yml

@@ -5 +5 @@
     image: postgres:14.2
     container_name: postgres-db
     environment:
-      - POSTGRES_DB=backend-db                # database name
-      - POSTGRES_USER=backend-db              # database user
-      - POSTGRES_PASSWORD=gLt7*6d@pL!kAC8A8j8w  # database password
+      - POSTGRES_DB=test                # database name
+      - POSTGRES_USER=test              # database user
+      - POSTGRES_PASSWORD=Password.123  # database password
     expose:
       - 5432
     ports:
       - "5432:5432"                # expose port 5432 (PostgreSQL) out of the docker container to the local machine
     volumes:
-      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
-      - db-data:/var/lib/postgresql/dat
+      - db-data:/var/lib/postgresql/data
 
 
-#  app: # Spring boot application
-#    build: .
-#    container_name: app-backend  # name of the container
-#    image: schwobik/backend-app:1.5
-#    ports:
-#      - "8080:8080"                 # expose port 8080 out of the docker container do the local machine
-#    depends_on:
-#      - db
-#    environment:
-#      - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/test # overwrites application.properties datasource url to connect to the database
-#
-#  frontend:
+  app: # Spring boot application
+    build: .
+    container_name: app-backend  # name of the container
+    image: schwobik/backend-app:1.7
+    ports:
+      - "8080:8080"                 # expose port 8080 out of the docker container do the local machine
+    depends_on:
+      - db
+    environment:
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/test # overwrites application.properties datasource url to connect to the database
+
+  frontend:
 #     Since our Dockerfile for web-server is located in react-app folder, our build context is ./react-app
-#    build: ../frontend
-#    container_name: frontend
-#    image: schwobik/frontend-app:1.5
-#    ports:
-#      - "80:80"
+    build: ../frontend
+    container_name: frontend
+    image: schwobik/frontend-app:1.7
+    ports:
+      - "80:80"
 
 volumes:
   db-data: