1 files changed, 12 insertions, 25 deletions
diff --git a/server/src/ui/admin/mod.rs b/server/src/ui/admin/mod.rs
index 10037b5..6119b74 100644
--- a/server/src/ui/admin/mod.rs
+++ b/server/src/ui/admin/mod.rs
@@ -9,34 +9,21 @@ pub mod log;
 pub mod users;
 
 use super::error::MyResult;
-use crate::{request_info::RequestInfo, ui_responder::UiResponse};
-use jellycommon::{
-    jellyobject::{OBB, ObjectBuffer},
-    *,
-};
-use jellyui::tr;
-use rocket::get;
+use crate::request_info::RequestInfo;
+use jellyui::components::admin::AdminDashboard;
+use rocket::{get, response::content::RawHtml};
 
 #[get("/admin/dashboard")]
-pub async fn r_admin_dashboard(ri: RequestInfo<'_>) -> MyResult<UiResponse> {
+pub async fn r_admin_dashboard(ri: RequestInfo<'_>) -> MyResult<RawHtml<String>> {
     ri.require_admin()?;
 
-    let mut db_debug = String::new();
-    ri.state.database.transaction(&mut |txn| {
-        db_debug = txn.debug_info()?;
-        Ok(())
-    })?;
+    // let mut db_debug = String::new();
+    // ri.state.database.transaction(&mut |txn| {
+    //     db_debug = txn.debug_info()?;
+    //     Ok(())
+    // })?;
 
-    let mut page = OBB::new();
-    page.push(VIEW_TITLE, &*tr(ri.lang, "admin.dashboard.title"));
-    page.push(VIEW_ADMIN_DASHBOARD, ());
-    page.push(
-        VIEW_ADMIN_INFO,
-        ObjectBuffer::new(&mut [
-            (ADMIN_INFO_TITLE.0, &"Database Debug"),
-            (ADMIN_INFO_TEXT.0, &db_debug.as_str()),
-        ])
-        .as_object(),
-    );
-    Ok(ri.respond_ui(page))
+    Ok(ri.respond_ui(&AdminDashboard {
+        ri: &ri.render_info(),
+    }))
 }