From f07e5e3bd5e152a876ad44f9f0c2d1d057defda6 Mon Sep 17 00:00:00 2001
From: eraden <adrian.wozniak@ita-prog.pl>
Date: Mon, 31 Jul 2023 12:16:29 +0200
Subject: [PATCH] More admin

---
 Cargo.lock                         |  8 +++-----
 crates/oswilno-admin/Cargo.toml    |  5 +++--
 crates/oswilno-admin/src/lib.rs    |  8 ++++++++
 crates/oswilno-contract/Cargo.toml |  4 ++--
 oswilno-actix-admin/Cargo.toml     |  8 --------
 oswilno-actix-admin/src/lib.rs     | 14 --------------
 6 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 oswilno-actix-admin/Cargo.toml
 delete mode 100644 oswilno-actix-admin/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 19ad59c..281a117 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -35,8 +35,7 @@ dependencies = [
 [[package]]
 name = "actix-admin"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08337d51b14642974696776104f9155632da0133f8eb9ea7a81d55aa4fe638d4"
+source = "git+https://github.com/Eraden/actix-admin.git#72b10d8994a2b7a19e5f0fd3cad187c11ed3cc21"
 dependencies = [
  "actix-admin-macros",
  "actix-files",
@@ -54,14 +53,14 @@ dependencies = [
  "serde",
  "serde_derive",
  "tera",
+ "tracing",
  "urlencoding",
 ]
 
 [[package]]
 name = "actix-admin-macros"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f420d748c93c40781a563e60f01df7ad27ba1574604cbd771f95afa995f9138"
+source = "git+https://github.com/Eraden/actix-admin.git#72b10d8994a2b7a19e5f0fd3cad187c11ed3cc21"
 dependencies = [
  "bae",
  "proc-macro2",
@@ -2171,7 +2170,6 @@ dependencies = [
  "regex",
  "sea-orm",
  "serde",
- "tera",
  "uuid",
 ]
 
diff --git a/crates/oswilno-admin/Cargo.toml b/crates/oswilno-admin/Cargo.toml
index 7db1430..8451b25 100644
--- a/crates/oswilno-admin/Cargo.toml
+++ b/crates/oswilno-admin/Cargo.toml
@@ -4,11 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-actix-admin = "0.5.0"
+# actix-admin = "0.5.0"
+actix-admin = { git = "https://github.com/Eraden/actix-admin.git", features = ['enable-tracing'] }
 actix-web = "4.3.1"
 actix-web-grants = "3.0.2"
 askama = "0.12.0"
 chrono = "0.4.26"
-tera = "1.19.0"
+tera = "1.17.1"
 uuid = { version = "1.4.1", features = ["v4"] }
 oswilno-contract = { path = "../oswilno-contract" }
diff --git a/crates/oswilno-admin/src/lib.rs b/crates/oswilno-admin/src/lib.rs
index 94da9f8..807e605 100644
--- a/crates/oswilno-admin/src/lib.rs
+++ b/crates/oswilno-admin/src/lib.rs
@@ -20,6 +20,11 @@ fn create_actix_admin_builder() -> ActixAdminBuilder {
     };
 
     let mut admin_builder = ActixAdminBuilder::new(configuration);
+    {
+        use oswilno_contract::prelude::Accounts;
+        let view = ActixAdminViewModel::from(Accounts);
+        admin_builder.add_entity::<Accounts>(&view);
+    }
     {
         use oswilno_contract::prelude::ParkingSpaces;
         let view = ActixAdminViewModel::from(ParkingSpaces);
@@ -30,6 +35,9 @@ fn create_actix_admin_builder() -> ActixAdminBuilder {
         let view = ActixAdminViewModel::from(ParkingSpaceRents);
         admin_builder.add_entity_to_category::<ParkingSpaceRents>(&view, "Parking spaces");
     }
+    for scope in admin_builder.scopes.keys() {
+        eprintln!("Scope {scope:?}");
+    }
 
     admin_builder
 }
diff --git a/crates/oswilno-contract/Cargo.toml b/crates/oswilno-contract/Cargo.toml
index 218d396..b45741c 100644
--- a/crates/oswilno-contract/Cargo.toml
+++ b/crates/oswilno-contract/Cargo.toml
@@ -5,12 +5,12 @@ edition = "2021"
 
 [dependencies]
 actix = "0.13.0"
-actix-admin = "0.5.0"
+# actix-admin = "0.5.0"
+actix-admin = { git = "https://github.com/Eraden/actix-admin.git" }
 actix-rt = { version = "2.8.0", features = [] }
 chrono = "0.4.26"
 regex = "1.9.1"
 sea-orm = { version = "0.11", features = ["postgres-array", "runtime-actix-rustls", "sqlx-postgres", "macros", "sqlx"] }
 serde = { version = "1.0.175", features = ["derive"] }
-tera = "1.19.0"
 uuid = { version = "1.4.1", features = ["v4"] }
 oswilno-actix-admin = { path = "../oswilno-actix-admin" }
diff --git a/oswilno-actix-admin/Cargo.toml b/oswilno-actix-admin/Cargo.toml
deleted file mode 100644
index a834d57..0000000
--- a/oswilno-actix-admin/Cargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "oswilno-actix-admin"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
diff --git a/oswilno-actix-admin/src/lib.rs b/oswilno-actix-admin/src/lib.rs
deleted file mode 100644
index 7d12d9a..0000000
--- a/oswilno-actix-admin/src/lib.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-pub fn add(left: usize, right: usize) -> usize {
-    left + right
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
-    }
-}