From c823dfab9c31956cf2fe9c2e108a056b3e86fa08 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 May 2025 17:18:07 +0200 Subject: [PATCH 1/8] dev --- .nginx/compose/nginx-dev.conf | 108 +++++----- docker-compose-dev.yaml | 396 +++++++++++++++++----------------- 2 files changed, 252 insertions(+), 252 deletions(-) diff --git a/.nginx/compose/nginx-dev.conf b/.nginx/compose/nginx-dev.conf index 46fceda..ca51e31 100644 --- a/.nginx/compose/nginx-dev.conf +++ b/.nginx/compose/nginx-dev.conf @@ -16,41 +16,41 @@ server { proxy_pass http://keycloak/keycloak/; } - location /minigames/bugfinder/api/ { - proxy_pass http://bugfinder-backend/api/; - } + #location /minigames/bugfinder/api/ { + # proxy_pass http://bugfinder-backend/api/; + #} - location /minigames/chickenshock/api/ { - proxy_pass http://chickenshock-backend/api/; - } + #location /minigames/chickenshock/api/ { + # proxy_pass http://chickenshock-backend/api/; + #} - location /minigames/finitequiz/api/ { - proxy_pass http://finitequiz-backend/api/; - } + #location /minigames/finitequiz/api/ { + # proxy_pass http://finitequiz-backend/api/; + #} - location /minigames/crosswordpuzzle/api/ { - proxy_pass http://crosswordpuzzle-backend/api/; - } + #location /minigames/crosswordpuzzle/api/ { + # proxy_pass http://crosswordpuzzle-backend/api/; + #} - location /minigames/memory/api/ { - proxy_pass http://memory-backend/api/; - } + #location /minigames/memory/api/ { + # proxy_pass http://memory-backend/api/; + #} - location /minigames/regexgame/api/ { - proxy_pass http://regexgame-backend/api/; - } + #location /minigames/regexgame/api/ { + # proxy_pass http://regexgame-backend/api/; + #} - location /minigames/towercrush/api/ { - proxy_pass http://towercrush-backend/api/; - } + #location /minigames/towercrush/api/ { + # proxy_pass http://towercrush-backend/api/; + #} location /minigames/umlgame/api/ { proxy_pass http://umlgame-backend/api; } - location /minigames/towerdefense/api/ { - proxy_pass http://towerdefense-backend/api/; - } + #location /minigames/towerdefense/api/ { + # proxy_pass http://towerdefense-backend/api/; + #} location /overworld/api/ { proxy_pass http://overworld-backend/api/; @@ -60,41 +60,41 @@ server { proxy_pass http://overworld/; } - location /minigames/chickenshock/ { - proxy_pass http://chickenshock/; - } - - location /minigames/bugfinder/ { - proxy_pass http://bugfinder/; - } - - location /minigames/finitequiz/ { - proxy_pass http://finitequiz/; - } - - location /minigames/crosswordpuzzle/ { - proxy_pass http://crosswordpuzzle/; - } - - location /minigames/memory/ { - proxy_pass http://memory/; - } - - location /minigames/regexgame/ { - proxy_pass http://regexgame/; - } - - location /minigames/towercrush/ { - proxy_pass http://towercrush/; - } + #location /minigames/chickenshock/ { + # proxy_pass http://chickenshock/; + #} + # + #location /minigames/bugfinder/ { + # proxy_pass http://bugfinder/; + #} + # + #location /minigames/finitequiz/ { + # proxy_pass http://finitequiz/; + #} + # + #location /minigames/crosswordpuzzle/ { + # proxy_pass http://crosswordpuzzle/; + #} + # + #location /minigames/memory/ { + # proxy_pass http://memory/; + #} + # + #location /minigames/regexgame/ { + # proxy_pass http://regexgame/; + #} + # + #location /minigames/towercrush/ { + # proxy_pass http://towercrush/; + #} location /minigames/umlgame/ { proxy_pass http://umlgame/; } - location /minigames/towerdefense/ { - proxy_pass http://towerdefense/; - } + #location /minigames/towerdefense/ { + # proxy_pass http://towerdefense/; + #} location /lecturer-interface/ { proxy_pass http://host.docker.internal:8000/lecturer-interface/; diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml index de88403..5d0f36b 100644 --- a/docker-compose-dev.yaml +++ b/docker-compose-dev.yaml @@ -170,141 +170,141 @@ services: - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT - chickenshock-backend: - container_name: chickenshock-backend - image: ghcr.io/gamify-it/chickenshock-backend:main - restart: always - pull_policy: always - expose: - - "80" - depends_on: - - chickenshock-db - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - - POSTGRES_URL=postgresql://chickenshock-db:5432/postgres - - OVERWORLD_URL=http://overworld-backend/api/v1 - - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT - - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT - - bugfinder-backend: - container_name: bugfinder-backend - image: ghcr.io/gamify-it/bugfinder-backend:main - restart: always - pull_policy: always - expose: - - "80" - depends_on: - - bugfinder-db - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - - POSTGRES_URL=postgresql://bugfinder-db:5432/postgres - - OVERWORLD_URL=http://overworld-backend/api/v1 - - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT - - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT - - finitequiz-backend: - container_name: finitequiz-backend - image: ghcr.io/gamify-it/finitequiz-backend:main - restart: always - pull_policy: always - expose: - - "80" - depends_on: - - chickenshock-db - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - - POSTGRES_URL=postgresql://finitequiz-db:5432/postgres - - OVERWORLD_URL=http://overworld-backend/api/v1 - - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT - - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT - - crosswordpuzzle-backend: - container_name: crosswordpuzzle-backend - image: ghcr.io/gamify-it/crosswordpuzzle-backend:main - restart: always - pull_policy: always - expose: - - "80" - depends_on: - - crosswordpuzzle-db - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - - POSTGRES_URL=postgresql://crosswordpuzzle-db:5432/postgres - - OVERWORLD_URL=http://overworld-backend/api/v1 - - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT - - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT - - memory-backend: - container_name: memory-backend - image: ghcr.io/gamify-it/memory-backend:main - restart: always - pull_policy: always - expose: - - "80" - depends_on: - - memory-db - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - - POSTGRES_URL=postgresql://memory-db:5432/postgres - - OVERWORLD_URL=http://overworld-backend/api/v1 - - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT - - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT - - regexgame-backend: - container_name: regexgame-backend - image: ghcr.io/gamify-it/regexgame-backend:main - restart: always - pull_policy: always - expose: - - "80" - depends_on: - - regexgame-db - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - - POSTGRES_URL=postgresql://regexgame-db:5432/postgres - - OVERWORLD_URL=http://overworld-backend/api/v1 - - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT - - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT - - towercrush-backend: - container_name: towercrush-backend - image: ghcr.io/gamify-it/towercrush-backend:main - restart: always - pull_policy: always - expose: - - "80" - depends_on: - - towercrush-db - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - - POSTGRES_URL=postgresql://towercrush-db:5432/postgres - - OVERWORLD_URL=http://overworld-backend/api/v1 - - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT - - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT - - towerdefense-backend: - container_name: towerdefense-backend - image: ghcr.io/gamify-it/towerdefense-backend:main - restart: always - pull_policy: always - expose: - - "80" - depends_on: - - towerdefense-db - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - - POSTGRES_URL=postgresql://towerdefense-db:5432/postgres - - OVERWORLD_URL=http://overworld-backend/api/v1 - - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT - - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT + #chickenshock-backend: + # container_name: chickenshock-backend + # image: ghcr.io/gamify-it/chickenshock-backend:main + # restart: always + # pull_policy: always + # expose: + # - "80" + # depends_on: + # - chickenshock-db + # environment: + # - POSTGRES_USER=postgres + # - POSTGRES_PASSWORD=postgres + # - POSTGRES_URL=postgresql://chickenshock-db:5432/postgres + # - OVERWORLD_URL=http://overworld-backend/api/v1 + # - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT + # - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT + # + #bugfinder-backend: + # container_name: bugfinder-backend + # image: ghcr.io/gamify-it/bugfinder-backend:main + # restart: always + # pull_policy: always + # expose: + # - "80" + # depends_on: + # - bugfinder-db + # environment: + # - POSTGRES_USER=postgres + # - POSTGRES_PASSWORD=postgres + # - POSTGRES_URL=postgresql://bugfinder-db:5432/postgres + # - OVERWORLD_URL=http://overworld-backend/api/v1 + # - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT + # - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT + # + #finitequiz-backend: + # container_name: finitequiz-backend + # image: ghcr.io/gamify-it/finitequiz-backend:main + # restart: always + # pull_policy: always + # expose: + # - "80" + # depends_on: + # - chickenshock-db + # environment: + # - POSTGRES_USER=postgres + # - POSTGRES_PASSWORD=postgres + # - POSTGRES_URL=postgresql://finitequiz-db:5432/postgres + # - OVERWORLD_URL=http://overworld-backend/api/v1 + # - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT + # - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT + # + #crosswordpuzzle-backend: + # container_name: crosswordpuzzle-backend + # image: ghcr.io/gamify-it/crosswordpuzzle-backend:main + # restart: always + # pull_policy: always + # expose: + # - "80" + # depends_on: + # - crosswordpuzzle-db + # environment: + # - POSTGRES_USER=postgres + # - POSTGRES_PASSWORD=postgres + # - POSTGRES_URL=postgresql://crosswordpuzzle-db:5432/postgres + # - OVERWORLD_URL=http://overworld-backend/api/v1 + # - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT + # - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT + # + #memory-backend: + # container_name: memory-backend + # image: ghcr.io/gamify-it/memory-backend:main + # restart: always + # pull_policy: always + # expose: + # - "80" + # depends_on: + # - memory-db + # environment: + # - POSTGRES_USER=postgres + # - POSTGRES_PASSWORD=postgres + # - POSTGRES_URL=postgresql://memory-db:5432/postgres + # - OVERWORLD_URL=http://overworld-backend/api/v1 + # - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT + # - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT + # + #regexgame-backend: + # container_name: regexgame-backend + # image: ghcr.io/gamify-it/regexgame-backend:main + # restart: always + # pull_policy: always + # expose: + # - "80" + # depends_on: + # - regexgame-db + # environment: + # - POSTGRES_USER=postgres + # - POSTGRES_PASSWORD=postgres + # - POSTGRES_URL=postgresql://regexgame-db:5432/postgres + # - OVERWORLD_URL=http://overworld-backend/api/v1 + # - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT + # - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT + # + #towercrush-backend: + # container_name: towercrush-backend + # image: ghcr.io/gamify-it/towercrush-backend:main + # restart: always + # pull_policy: always + # expose: + # - "80" + # depends_on: + # - towercrush-db + # environment: + # - POSTGRES_USER=postgres + # - POSTGRES_PASSWORD=postgres + # - POSTGRES_URL=postgresql://towercrush-db:5432/postgres + # - OVERWORLD_URL=http://overworld-backend/api/v1 + # - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT + # - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT + # + #towerdefense-backend: + # container_name: towerdefense-backend + # image: ghcr.io/gamify-it/towerdefense-backend:main + # restart: always + # pull_policy: always + # expose: + # - "80" + # depends_on: + # - towerdefense-db + # environment: + # - POSTGRES_USER=postgres + # - POSTGRES_PASSWORD=postgres + # - POSTGRES_URL=postgresql://towerdefense-db:5432/postgres + # - OVERWORLD_URL=http://overworld-backend/api/v1 + # - KEYCLOAK_ISSUER=http://localhost/keycloak/realms/Gamify-IT + # - KEYCLOAK_URL=http://keycloak/keycloak/realms/Gamify-IT umlgame-backend: container_name: umlgame-backend @@ -339,69 +339,69 @@ services: expose: - "80" - chickenshock: - container_name: chickenshock - image: ghcr.io/gamify-it/chickenshock:main - pull_policy: always - restart: always - expose: - - "80" - - finitequiz: - container_name: finitequiz - image: ghcr.io/gamify-it/finitequiz:main - pull_policy: always - restart: always - expose: - - "80" - - crosswordpuzzle: - container_name: crosswordpuzzle - image: ghcr.io/gamify-it/crosswordpuzzle:main - pull_policy: always - restart: always - expose: - - "80" - - bugfinder: - container_name: bugfinder - image: ghcr.io/gamify-it/bugfinder:main - pull_policy: always - restart: always - expose: - - "80" - - memory: - container_name: memory - image: ghcr.io/gamify-it/memory:main - pull_policy: always - restart: always - expose: - - "80" - - regexgame: - container_name: regexgame - image: ghcr.io/gamify-it/regexgame:main - pull_policy: always - restart: always - expose: - - "80" - - towercrush: - container_name: towercrush - image: ghcr.io/gamify-it/towercrush:main - pull_policy: always - restart: always - expose: - - "80" - - towerdefense: - container_name: towerdefense - image: ghcr.io/gamify-it/towerdefense:main - pull_policy: always - restart: always - expose: - - "80" + #chickenshock: + # container_name: chickenshock + # image: ghcr.io/gamify-it/chickenshock:main + # pull_policy: always + # restart: always + # expose: + # - "80" + # + #finitequiz: + # container_name: finitequiz + # image: ghcr.io/gamify-it/finitequiz:main + # pull_policy: always + # restart: always + # expose: + # - "80" + # + #crosswordpuzzle: + # container_name: crosswordpuzzle + # image: ghcr.io/gamify-it/crosswordpuzzle:main + # pull_policy: always + # restart: always + # expose: + # - "80" + # + #bugfinder: + # container_name: bugfinder + # image: ghcr.io/gamify-it/bugfinder:main + # pull_policy: always + # restart: always + # expose: + # - "80" + # + #memory: + # container_name: memory + # image: ghcr.io/gamify-it/memory:main + # pull_policy: always + # restart: always + # expose: + # - "80" + # + #regexgame: + # container_name: regexgame + # image: ghcr.io/gamify-it/regexgame:main + # pull_policy: always + # restart: always + # expose: + # - "80" + # + #towercrush: + # container_name: towercrush + # image: ghcr.io/gamify-it/towercrush:main + # pull_policy: always + # restart: always + # expose: + # - "80" + # + #towerdefense: + # container_name: towerdefense + # image: ghcr.io/gamify-it/towerdefense:main + # pull_policy: always + # restart: always + # expose: + # - "80" umlgame: container_name: umlgame From 379ce4f4c72b9f5d27c13424194f92672c101a9d Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 May 2025 17:20:52 +0200 Subject: [PATCH 2/8] Update UmlEditorModal.vue --- .../UmlModals/UmlEditorModal.vue | 395 +++++++++++++----- 1 file changed, 296 insertions(+), 99 deletions(-) diff --git a/src/components/EditMinigameModals/UmlModals/UmlEditorModal.vue b/src/components/EditMinigameModals/UmlModals/UmlEditorModal.vue index 5cd95fa..4c75d2a 100644 --- a/src/components/EditMinigameModals/UmlModals/UmlEditorModal.vue +++ b/src/components/EditMinigameModals/UmlModals/UmlEditorModal.vue @@ -13,45 +13,19 @@
Objects
-
+
Class
-
+
Interface
-
+
Abstract
-
+
Enum
- -
+
Circle
@@ -70,43 +44,64 @@
-
+
+
+ +
-
-
- - Delete All Relations - - - - Delete Object - - - Classname: - - - - -
-
- - Delete Relation - +
+
+
+ + Delete All Relations + + + + Delete Object + + + Classname: + + + + +
+
+ + Delete Relation + + + + + + +
@@ -121,7 +116,7 @@