diff --git a/client/public/config.js b/client/public/config.js index 6dc7bcff..c4514022 100644 --- a/client/public/config.js +++ b/client/public/config.js @@ -1,3 +1,3 @@ window._env_ = { - SERVER_API_URL: "default_value", // Placeholder, will be replaced by a script + SERVER_API_URL: "http://localhost:8080", // default Spring Boot server port }; diff --git a/client/src/pages/login/ui/Login.page.tsx b/client/src/pages/login/ui/Login.page.tsx index 93bcd14d..d2234c64 100644 --- a/client/src/pages/login/ui/Login.page.tsx +++ b/client/src/pages/login/ui/Login.page.tsx @@ -31,24 +31,24 @@ export function LoginPage() { type="text" name="login" placeholder={"Login..."} - className={styles.login__form__input__dark} + className={`${darkMode && styles.login__form__input__dark}`} /> {actionData?.errors.length > 0 && (
diff --git a/server/app/src/main/resources/application.properties b/server/app/src/main/resources/application.properties index 31642c01..bc180d60 100644 --- a/server/app/src/main/resources/application.properties +++ b/server/app/src/main/resources/application.properties @@ -1,5 +1,4 @@ spring.application.name=muse-server -spring.profiles.active=${SERVER_SPRING_PROFILE} muse.client-url=${CLIENT_URL} diff --git a/tools/docker/env/dev.env b/tools/docker/env/dev.env index 492a3958..4d18de87 100644 --- a/tools/docker/env/dev.env +++ b/tools/docker/env/dev.env @@ -1,7 +1,6 @@ SERVER_HOST=88.201.171.120 SERVER_PORT=50005 SERVER_DEBUG_PORT=50006 -SERVER_SPRING_PROFILE=dev SERVER_API_URL=http://${SERVER_HOST}:${SERVER_PORT} CLIENT_HOST=88.201.171.120 diff --git a/tools/docker/env/local.env b/tools/docker/env/local.env index cfdb01bd..2d3ccdb6 100644 --- a/tools/docker/env/local.env +++ b/tools/docker/env/local.env @@ -1,7 +1,6 @@ SERVER_HOST=localhost SERVER_PORT=50000 SERVER_DEBUG_PORT=50001 -SERVER_SPRING_PROFILE=local SERVER_API_URL=http://${SERVER_HOST}:${SERVER_PORT} CLIENT_HOST=localhost diff --git a/tools/docker/env/prod.env b/tools/docker/env/prod.env index dda64e2a..b99db774 100644 --- a/tools/docker/env/prod.env +++ b/tools/docker/env/prod.env @@ -1,7 +1,6 @@ SERVER_HOST=localhost SERVER_PORT=50016 SERVER_DEBUG_PORT=50017 -SERVER_SPRING_PROFILE=local SERVER_API_URL=http://${SERVER_HOST}:${SERVER_PORT} CLIENT_HOST=localhost diff --git a/tools/docker/env/staging.env b/tools/docker/env/staging.env index eee27162..b9dee641 100644 --- a/tools/docker/env/staging.env +++ b/tools/docker/env/staging.env @@ -1,7 +1,6 @@ SERVER_HOST=88.201.171.120 SERVER_PORT=50010 SERVER_DEBUG_PORT=50011 -SERVER_SPRING_PROFILE=staging SERVER_API_URL=http://${SERVER_HOST}:${SERVER_PORT} CLIENT_HOST=88.201.171.120