initial account setup

1 files changed, 15 insertions, 10 deletions

diff --git a/ui/src/components/login.rs b/ui/src/components/login.rs
index c54a541..d291165 100644
--- a/ui/src/components/login.rs
+++ b/ui/src/components/login.rs
@@ -4,32 +4,37 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 
+use jellycommon::{SETPW_PASSWORD, SETPW_USERNAME, jellyobject::Object};
 use jellyui_locale::tr;
 
 use crate::RenderInfo;
 
 markup::define! {
-    AccountSetPassword<'a>(ri: &'a RenderInfo<'a>, session: &'a str) {
+    AccountSetPassword<'a>(ri: &'a RenderInfo<'a>, data: Object<'a>) {
         form.account[method="POST", action=""] {
-            h1 { @tr(ri.lang, "account.set_password") }
-            input[type="text", name="session", hidden, value=session]; br;
+            h1 { @tr(ri.lang, "account.login.set_password") }
+            p { @tr(ri.lang, "account.login.set_password.par") }
 
-            label[for="inp-password"] { @tr(ri.lang, "account.password") }
-            input[type="password", id="inp-password", name="password"]; br;
+            input[type="hidden", name="username", value=data.get(SETPW_USERNAME)];
+            input[type="hidden", name="password", value=data.get(SETPW_PASSWORD)];
 
-            input[type="submit", value=tr(ri.lang, "account.register.submit")];
+            label[for="password"] { @tr(ri.lang, "account.new_password") }
+            input[type="password", id="password", name="new_password"]; br;
 
+            label[for="display_name"] { @tr(ri.lang, "account.display_name") }
+            input[type="text", id="display_name", name="display_name"]; br;
 
+            input[type="submit", value=tr(ri.lang, "account.login.submit")];
         }
     }
     AccountLogin<'a>(ri: &'a RenderInfo<'a>) {
         form.account[method="POST", action=""] {
             h1 { @tr(ri.lang, "account.login") }
 
-            label[for="inp-username"] { @tr(ri.lang, "account.username") }
-            input[type="text", id="inp-username", name="username"]; br;
-            label[for="inp-password"] { @tr(ri.lang, "account.password") }
-            input[type="password", id="inp-password", name="password"]; br;
+            label[for="username"] { @tr(ri.lang, "account.username") }
+            input[type="text", id="username", name="username"]; br;
+            label[for="password"] { @tr(ri.lang, "account.password") }
+            input[type="password", id="password", name="password"]; br;
 
             input[type="submit", value=tr(ri.lang, if ri.user.is_some() { "account.login.submit.switch" } else { "account.login.submit" })];
         }