Fix links and width of login screen

FAForever · Jan 16, 2025 · eb409e7 · eb409e7
1 parent 5ee0509
commit eb409e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/kotlin/com/faforever/userservice/ui/view/oauth2/LoginView.kt b/src/main/kotlin/com/faforever/userservice/ui/view/oauth2/LoginView.kt
@@ -35,10 +35,10 @@ class LoginView(
     CompactVerticalLayout(), BeforeEnterObserver {
 
     private val footer = VerticalLayout().apply {
-        val resetHref = "https://faforever.com/account/password/reset"
-        val passwordReset = Anchor(resetHref, getTranslation("login.forgotPassword"))
-        val registerHref = "https://faforever.com/account/register"
-        val registerAccount = Anchor(registerHref, getTranslation("login.registerAccount"))
+        val passwordReset =
+            Anchor(fafProperties.account().passwordResetUrl(), getTranslation("login.forgotPassword"))
+        val registerAccount =
+            Anchor(fafProperties.account().registerAccountUrl(), getTranslation("login.registerAccount"))
 
         val links = HorizontalLayout(passwordReset, registerAccount).apply {
             addClassNames("pipe-separated")
@@ -80,7 +80,9 @@ class LoginView(
         addThemeVariants(ButtonVariant.LUMO_PRIMARY)
         addClickShortcut(Key.ENTER)
     }
-    private val loginLayout = CompactVerticalLayout(usernameOrEmail, password, submit)
+    private val loginLayout = CompactVerticalLayout(usernameOrEmail, password, submit).apply {
+        width = "100%"
+    }
 
     private lateinit var challenge: String
 

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -5,7 +5,7 @@ faf:
   hydra-base-url: ${HYDRA_BASE_ADMIN_URL:http://localhost:4445}
   account:
     password-reset-url: ${faf.self-url}/recover-account
-    register-account-url: ${faf.self-url}/recover-account/register
+    register-account-url: ${faf.self-url}/register
     account-link-url: ${ACCOUNT_LINK_URL:`https://www.faforever.com/account/link`}
     registration:
       activation-url-format: ${faf.self-url}/register/activate?token=%s