ui changed before object slices

1 files changed, 10 insertions, 5 deletions

diff --git a/ui/src/components/login.rs b/ui/src/components/login.rs
index d291165..7d19a38 100644
--- a/ui/src/components/login.rs
+++ b/ui/src/components/login.rs
@@ -4,19 +4,24 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 
-use jellycommon::{SETPW_PASSWORD, SETPW_USERNAME, jellyobject::Object};
+use crate::{RenderInfo, page};
 use jellyui_locale::tr;
 
-use crate::RenderInfo;
+page!(AccountLogin<'_>, |x| tr(x.ri.lang, "account.login"));
+page!(AccountLogout<'_>, |x| tr(x.ri.lang, "account.logout"));
+page!(AccountSetPassword<'_>, |x| tr(
+    x.ri.lang,
+    "account.login.set_password"
+));
 
 markup::define! {
-    AccountSetPassword<'a>(ri: &'a RenderInfo<'a>, data: Object<'a>) {
+    AccountSetPassword<'a>(ri: &'a RenderInfo<'a>, username: &'a str, password: &'a str) {
         form.account[method="POST", action=""] {
             h1 { @tr(ri.lang, "account.login.set_password") }
             p { @tr(ri.lang, "account.login.set_password.par") }
 
-            input[type="hidden", name="username", value=data.get(SETPW_USERNAME)];
-            input[type="hidden", name="password", value=data.get(SETPW_PASSWORD)];
+            input[type="hidden", name="username", value=username];
+            input[type="hidden", name="password", value=password];
 
             label[for="password"] { @tr(ri.lang, "account.new_password") }
             input[type="password", id="password", name="new_password"]; br;