Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(login): disable dark mode by default #137

Merged
merged 2 commits into from
Aug 29, 2024
Merged

fix(login): disable dark mode by default #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb9ec18
fix(login): disable dark mode by default
bas-kirill Aug 29, 2024
e586400
fix(login): remove `SERVER_SPRING_PROFILE`
bas-kirill Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/public/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
};
8 changes: 4 additions & 4 deletions client/src/pages/login/ui/Login.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`}
/>
<input
type="password"
name="password"
placeholder={"Password..."}
className={styles.login__form__input__dark}
className={`${darkMode && styles.login__form__input__dark}`}
/>
<input
type="submit"
value="Login"
className={styles.login__form__input__dark}
className={`${darkMode && styles.login__form__input__dark}`}
/>
<input
type="button"
value="Registration"
onClick={handleRegisterRedirect}
className={styles.login__form__input__dark}
className={`${darkMode && styles.login__form__input__dark}`}
/>
{actionData?.errors.length > 0 && (
<div className={styles.login__error}>
Expand Down
1 change: 0 additions & 1 deletion server/app/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
spring.application.name=muse-server
spring.profiles.active=${SERVER_SPRING_PROFILE}

muse.client-url=${CLIENT_URL}

Expand Down
1 change: 0 additions & 1 deletion tools/docker/env/dev.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion tools/docker/env/local.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion tools/docker/env/prod.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion tools/docker/env/staging.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading