From 8b8f985642540d783b31b20ea747e7e7a93d3b9e Mon Sep 17 00:00:00 2001 From: juhanikat Date: Wed, 27 May 2026 13:58:46 +0300 Subject: [PATCH 1/4] remove phpmyadmin service from docker compose files, since they cause issues --- docker-compose.anon.yml | 11 ----------- docker-compose.dev.yml | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/docker-compose.anon.yml b/docker-compose.anon.yml index 22588c370..7f55232da 100644 --- a/docker-compose.anon.yml +++ b/docker-compose.anon.yml @@ -53,16 +53,5 @@ services: timeout: 5s retries: 3 - phpmyadmin: - restart: always - image: phpmyadmin:5.2.1 - environment: - PMA_ARBITRARY: 1 - PMA_HOST: db-anon - PMA_PORT: 3306 - ports: - - "8080:80" - - "9090:443" - volumes: nowdb-db-anon: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index fa8b6030c..5c05eece2 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -45,17 +45,6 @@ services: ports: - 127.0.0.1:3307:3306 - phpmyadmin: - restart: always - image: phpmyadmin:5.2.1 - environment: - PMA_ARBITRARY: 1 - PMA_HOST: db - PMA_PORT: 3306 - ports: - - "8080:80" - - "9090:443" - volumes: nowdb-db-dev: nowdb-db-test: From 32b7cecf8a562fbe8e33800b60dc6b3a8cbe16e0 Mon Sep 17 00:00:00 2001 From: juhanikat Date: Wed, 27 May 2026 14:09:55 +0300 Subject: [PATCH 2/4] Remove vscode settings from repo --- .vscode/settings.json | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 254ce7e8c..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"], - "editor.codeActionsOnSave": { - "source.fixAll.eslint": "explicit" - }, - "eslint.workingDirectories": [ - { "directory": "./frontend", "changeProcessCWD": true }, - { "directory": "./backend", "changeProcessCWD": true } - ], - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true -} From 47edb03e0c53ed70a59f7ce6cdfee29249bcaf60 Mon Sep 17 00:00:00 2001 From: juhanikat Date: Wed, 27 May 2026 14:11:50 +0300 Subject: [PATCH 3/4] Revert "remove phpmyadmin service from docker compose files, since they cause issues" This reverts commit 8b8f985642540d783b31b20ea747e7e7a93d3b9e. --- docker-compose.anon.yml | 11 +++++++++++ docker-compose.dev.yml | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/docker-compose.anon.yml b/docker-compose.anon.yml index 7f55232da..22588c370 100644 --- a/docker-compose.anon.yml +++ b/docker-compose.anon.yml @@ -53,5 +53,16 @@ services: timeout: 5s retries: 3 + phpmyadmin: + restart: always + image: phpmyadmin:5.2.1 + environment: + PMA_ARBITRARY: 1 + PMA_HOST: db-anon + PMA_PORT: 3306 + ports: + - "8080:80" + - "9090:443" + volumes: nowdb-db-anon: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 5c05eece2..fa8b6030c 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -45,6 +45,17 @@ services: ports: - 127.0.0.1:3307:3306 + phpmyadmin: + restart: always + image: phpmyadmin:5.2.1 + environment: + PMA_ARBITRARY: 1 + PMA_HOST: db + PMA_PORT: 3306 + ports: + - "8080:80" + - "9090:443" + volumes: nowdb-db-dev: nowdb-db-test: From e08da32313321049441d688e1c09d2cd66540a76 Mon Sep 17 00:00:00 2001 From: juhanikat Date: Wed, 27 May 2026 14:13:18 +0300 Subject: [PATCH 4/4] update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f66dd6553..1ffce7b36 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ coverage .nyc_output .eslintcache .codex +.vscode/