diff options
Diffstat (limited to 'server/src/ui/admin')
-rw-r--r-- | server/src/ui/admin/mod.rs | 18 | ||||
-rw-r--r-- | server/src/ui/admin/user.rs | 12 |
2 files changed, 7 insertions, 23 deletions
diff --git a/server/src/ui/admin/mod.rs b/server/src/ui/admin/mod.rs index de06610..d380ae2 100644 --- a/server/src/ui/admin/mod.rs +++ b/server/src/ui/admin/mod.rs @@ -6,26 +6,18 @@ pub mod log; pub mod user; -use super::assets::{resolve_asset, AVIF_QUALITY, AVIF_SPEED}; -use crate::{ - database::Database, - logic::session::AdminSession, - ui::{ - admin::log::rocket_uri_macro_r_admin_log, - error::MyResult, - layout::{DynLayoutPage, FlashDisplay, LayoutPage}, - }, - uri, +use super::{ + assets::{resolve_asset, AVIF_QUALITY, AVIF_SPEED}, + error::MyResult, }; +use crate::{database::Database, logic::session::AdminSession}; use anyhow::{anyhow, Context}; use jellybase::{assetfed::AssetInner, federation::Federation, CONF}; -use jellyimport::{import_wrap, is_importing, IMPORT_ERRORS}; -use markup::DynRender; +use jellyimport::{import_wrap, IMPORT_ERRORS}; use rand::Rng; use rocket::{form::Form, get, post, FromForm, State}; use std::time::Instant; use tokio::{sync::Semaphore, task::spawn_blocking}; -use user::rocket_uri_macro_r_admin_users; #[get("/admin/dashboard")] pub async fn r_admin_dashboard( diff --git a/server/src/ui/admin/user.rs b/server/src/ui/admin/user.rs index c5239f7..818e416 100644 --- a/server/src/ui/admin/user.rs +++ b/server/src/ui/admin/user.rs @@ -3,17 +3,9 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2025 metamuffin <metamuffin.org> */ -use crate::{ - database::Database, - logic::session::AdminSession, - ui::{ - error::MyResult, - layout::{DynLayoutPage, FlashDisplay, LayoutPage}, - }, - uri, -}; +use crate::{database::Database, logic::session::AdminSession, ui::error::MyResult, uri}; use anyhow::{anyhow, Context}; -use jellycommon::user::{PermissionSet, UserPermission}; +use jellycommon::user::UserPermission; use rocket::{form::Form, get, post, FromForm, FromFormField, State}; #[get("/admin/users")] |