aboutsummaryrefslogtreecommitdiff
path: root/server/src/ui/admin
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2026-01-25 15:01:38 +0100
committermetamuffin <metamuffin@disroot.org>2026-01-25 15:01:38 +0100
commit5075aede44cb8ab2df10e6debba38483e8d11e96 (patch)
treef719e4b4a0c29f3a27b4fa7cf0a6ee6f7739125c /server/src/ui/admin
parent53361f4c6027d1569a707ce58889bc2c2ea3749c (diff)
downloadjellything-5075aede44cb8ab2df10e6debba38483e8d11e96.tar
jellything-5075aede44cb8ab2df10e6debba38483e8d11e96.tar.bz2
jellything-5075aede44cb8ab2df10e6debba38483e8d11e96.tar.zst
remove some unused imports; css reload; port login logic
Diffstat (limited to 'server/src/ui/admin')
-rw-r--r--server/src/ui/admin/import.rs10
-rw-r--r--server/src/ui/admin/log.rs13
-rw-r--r--server/src/ui/admin/mod.rs2
-rw-r--r--server/src/ui/admin/user.rs15
4 files changed, 6 insertions, 34 deletions
diff --git a/server/src/ui/admin/import.rs b/server/src/ui/admin/import.rs
index fb33c67..79b8374 100644
--- a/server/src/ui/admin/import.rs
+++ b/server/src/ui/admin/import.rs
@@ -4,25 +4,19 @@
Copyright (C) 2026 metamuffin <metamuffin.org>
*/
-use std::time::Duration;
-
-use crate::{
- request_info::{A, RequestInfo},
- ui::error::MyResult,
-};
+use crate::{request_info::RequestInfo, ui::error::MyResult};
use jellycommon::routes::u_admin_import;
use jellyimport::{
is_importing,
reporting::{IMPORT_ERRORS, IMPORT_PROGRESS},
};
-use jellylogic::{admin::do_import, session::Session};
-use jellyui::{admin::import::AdminImportPage, locale::tr, render_page};
use rocket::{
get, post,
request::FlashMessage,
response::{Flash, Redirect, content::RawHtml},
};
use rocket_ws::{Message, Stream, WebSocket};
+use std::time::Duration;
use tokio::time::sleep;
#[get("/admin/import", rank = 2)]
diff --git a/server/src/ui/admin/log.rs b/server/src/ui/admin/log.rs
index e948daa..da70360 100644
--- a/server/src/ui/admin/log.rs
+++ b/server/src/ui/admin/log.rs
@@ -3,18 +3,7 @@
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2026 metamuffin <metamuffin.org>
*/
-use crate::{
- request_info::{A, RequestInfo},
- ui::error::MyResult,
-};
-use jellylogic::{
- admin::log::{get_log_buffer, get_log_stream},
- session::Session,
-};
-use jellyui::{
- admin::log::{ServerLogPage, render_log_line},
- render_page,
-};
+use crate::{request_info::RequestInfo, ui::error::MyResult};
use rocket::{get, response::content::RawHtml};
use rocket_ws::{Message, Stream, WebSocket};
use serde_json::json;
diff --git a/server/src/ui/admin/mod.rs b/server/src/ui/admin/mod.rs
index 9759627..5ee05b7 100644
--- a/server/src/ui/admin/mod.rs
+++ b/server/src/ui/admin/mod.rs
@@ -11,8 +11,6 @@ use super::error::MyResult;
use crate::request_info::RequestInfo;
use jellycommon::routes::u_admin_dashboard;
use jellyimport::is_importing;
-use jellylogic::admin::{create_invite, delete_invite, list_invites, update_search_index};
-use jellyui::{admin::AdminDashboardPage, locale::tr, render_page};
use rocket::{
FromForm,
form::Form,
diff --git a/server/src/ui/admin/user.rs b/server/src/ui/admin/user.rs
index 03950df..b4770c8 100644
--- a/server/src/ui/admin/user.rs
+++ b/server/src/ui/admin/user.rs
@@ -5,21 +5,12 @@
*/
use crate::{request_info::RequestInfo, ui::error::MyResult};
use anyhow::Context;
-use jellycommon::{
- routes::{u_admin_user, u_admin_users},
- user::UserPermission,
-};
-use jellylogic::admin::user::{admin_users, delete_user, get_user, update_user_perms, GrantState};
-use jellyui::{
- admin::user::{AdminUserPage, AdminUsersPage},
- locale::tr,
- render_page,
-};
+use jellycommon::routes::{u_admin_user, u_admin_users};
use rocket::{
+ FromForm, FromFormField,
form::Form,
get, post,
- response::{content::RawHtml, Flash, Redirect},
- FromForm, FromFormField,
+ response::{Flash, Redirect, content::RawHtml},
};
#[get("/admin/users")]