split base into asset_token and db

2 files changed, 5 insertions, 6 deletions

diff --git a/server/src/ui/admin/mod.rs b/server/src/ui/admin/mod.rs
index 62c5940..9bf85b5 100644
--- a/server/src/ui/admin/mod.rs
+++ b/server/src/ui/admin/mod.rs
@@ -10,12 +10,11 @@ use super::{
     assets::{resolve_asset, AVIF_QUALITY, AVIF_SPEED},
     error::MyResult,
 };
-use crate::{database::Database, helper::A, locale::AcceptLanguage};
+use crate::{helper::A, locale::AcceptLanguage};
 use anyhow::{anyhow, Context};
-use jellybase::assetfed::AssetInner;
 use jellycommon::routes::u_admin_dashboard;
-use jellyimport::{import_wrap, is_importing, IMPORT_ERRORS};
-use jellylogic::session::AdminSession;
+use jellyimport::{asset_token::AssetInner, import_wrap, is_importing, IMPORT_ERRORS};
+use jellylogic::{session::AdminSession, Database};
 use jellyui::{
     admin::AdminDashboardPage,
     render_page,
diff --git a/server/src/ui/admin/user.rs b/server/src/ui/admin/user.rs
index fb646ab..eedf66c 100644
--- a/server/src/ui/admin/user.rs
+++ b/server/src/ui/admin/user.rs
@@ -3,11 +3,11 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
-use crate::{database::Database, helper::A, locale::AcceptLanguage, ui::error::MyResult};
+use crate::{helper::A, locale::AcceptLanguage, ui::error::MyResult};
 use anyhow::{anyhow, Context};
 use jellycommon::user::UserPermission;
 use jellyimport::is_importing;
-use jellylogic::{admin::user::admin_users, session::AdminSession};
+use jellylogic::{admin::user::admin_users, session::AdminSession, Database};
 use jellyui::{
     admin::user::{AdminUserPage, AdminUsersPage},
     render_page,