refactor ui responder; add admin import pages

1 files changed, 8 insertions, 19 deletions

diff --git a/server/src/ui/account/mod.rs b/server/src/ui/account/mod.rs
index 765b6aa..8c60a2d 100644
--- a/server/src/ui/account/mod.rs
+++ b/server/src/ui/account/mod.rs
@@ -6,40 +6,29 @@
 // pub mod settings;
 
 use super::error::MyError;
-use crate::{auth::login, request_info::RequestInfo, ui::error::MyResult};
+use crate::{
+    auth::login, request_info::RequestInfo, ui::error::MyResult, ui_responder::UiResponse,
+};
 use anyhow::anyhow;
 use jellycommon::{VIEW_ACCOUNT_LOGIN, VIEW_ACCOUNT_LOGOUT, jellyobject::Object, routes::u_home};
-use jellyui::render_view;
 use rocket::{
     FromForm,
     form::{Contextual, Form},
     get,
     http::{Cookie, CookieJar},
     post,
-    response::{Flash, Redirect, content::RawHtml},
+    response::{Flash, Redirect},
 };
 use serde::{Deserialize, Serialize};
 
-#[derive(FromForm)]
-pub struct RegisterForm {
-    #[field(validate = len(8..128))]
-    pub invitation: String,
-    #[field(validate = len(4..32))]
-    pub username: String,
-    #[field(validate = len(4..64))]
-    pub password: String,
-}
-
 #[get("/account/login")]
-pub async fn r_account_login(ri: RequestInfo<'_>) -> RawHtml<String> {
-    let ob = Object::EMPTY.insert(VIEW_ACCOUNT_LOGIN, ());
-    RawHtml(render_view(ri.render_info(), ob.as_object()))
+pub async fn r_account_login(ri: RequestInfo<'_>) -> UiResponse {
+    ri.respond_ui(Object::EMPTY.insert(VIEW_ACCOUNT_LOGIN, ()))
 }
 
 #[get("/account/logout")]
-pub fn r_account_logout(ri: RequestInfo<'_>) -> RawHtml<String> {
-    let ob = Object::EMPTY.insert(VIEW_ACCOUNT_LOGOUT, ());
-    RawHtml(render_view(ri.render_info(), ob.as_object()))
+pub fn r_account_logout(ri: RequestInfo<'_>) -> UiResponse {
+    ri.respond_ui(Object::EMPTY.insert(VIEW_ACCOUNT_LOGOUT, ()))
 }
 
 #[derive(FromForm, Serialize, Deserialize)]