improvements with app layout

Author: indpurvesh

src/adapters/grpc_api/misc_api.rs

@@ -53,16 +53,16 @@ impl Misc for MiscGrpcApi {
 
         let password_salt = get_env("AVORED_PASSWORD_SALT")?;
 
-        println!("Pass salt: {}", password_salt);
+        // println!("Pass salt: {}", password_salt);
 
         let password_hash = storable_admin_user.password_hash.get_password_hash(&password_salt)?;
 
-        println!("Pass hash: {}", password_hash);
+        // println!("Pass hash: {}", password_hash);
         storable_admin_user.logged_in_user = "ApplicationSetupProcess".to_string();
         storable_admin_user.is_super_admin = true;
         storable_admin_user.password_hash = password_hash;
 
-        println!("Got a setup request: {:?}", storable_admin_user);
+        // println!("Got a setup request: {:?}", storable_admin_user);
 
         // Think of implementing a generic result handler
         let setup_result = match  self.misc_use_case.setup(storable_admin_user).await {

src/infra/repositories/user_repository.rs

@@ -23,7 +23,7 @@ impl UserRepository for SurrealUserRepository {
         // let object = response
         let results = response.take::<Vec<Value>>(0).ok()?;
 
-        println!("Results: {:#?}", results);
+        // println!("Results: {:#?}", results);
 
         let user = match results.first() {
             Some(value) => value,

src/infra/setup.rs

@@ -42,7 +42,7 @@ impl FromRef<AppState> for LeptosOptions {
 fn load_env() -> Result<()>{
     dotenvy::dotenv()?;
 
-    println!("here");
+    // println!("here");
     match get_env("APP_ENV")?.as_str() {
         "prod" => dotenvy::from_filename_override(".env.prod")?,
         "stag" => dotenvy::from_filename_override(".env.stag")?,

src/pages/app_layout.rs

@@ -21,6 +21,10 @@ pub fn AppLayout() -> impl IntoView {
         }
     };
 
+    let auth_context = use_context::<crate::pages::protected_routes::AuthContext>().expect("AuthContext should be provided");
+    let full_name = auth_context.full_name;
+    let is_super_admin = auth_context.is_super_admin;
+
     view! {
         <div class="flex h-screen bg-gray-100">
             // Sidebar
@@ -66,7 +70,7 @@ pub fn AppLayout() -> impl IntoView {
                     </a>
                     <a href="/admin/settings" class="flex items-center gap-3 px-3 py-2 rounded-lg text-gray-300 hover:bg-slate-800 hover:text-white transition-colors">
                         <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924-1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
                             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
                         </svg>
                         <span>"Settings"</span>
@@ -111,12 +115,14 @@ pub fn AppLayout() -> impl IntoView {
 
                         <div class="flex items-center gap-3 border-l pl-4 border-gray-200">
                             <div class="text-right hidden sm:block">
-                                <div class="text-sm font-medium text-gray-900">"Admin User"</div>
-                                <div class="text-xs text-gray-500">"Super Admin"</div>
+                                <div class="text-sm font-medium text-gray-900">{full_name}</div>
+                                <div class="text-xs text-gray-500">
+                                    {move || if is_super_admin.get() { "Super Admin" } else { "Admin" }}
+                                </div>
                             </div>
                             <img
                                 class="h-8 w-8 rounded-full border border-gray-300 cursor-pointer"
-                                src="https://ui-avatars.com/api/?name=Admin+User&background=0D8ABC&color=fff"
+                                src=move || format!("https://ui-avatars.com/api/?name={}&background=0D8ABC&color=fff", full_name.get())
                                 alt="User Profile"
                                 on:click=on_logout_click
                             />

src/pages/auth/login_page.rs

@@ -63,10 +63,15 @@ pub fn LoginPage() -> impl IntoView {
             if !token.is_empty() {
                 #[cfg(target_arch = "wasm32")]
                 {
+                    use crate::pages::protected_routes::AuthData;
                     use gloo_storage::{LocalStorage, Storage};
                     let _ = LocalStorage::set("avored_admin_token", token.clone());
-                    auth_context.auth_token.set(token);
-                    auth_context.is_logged_in.set(true);
+                    if let Ok(auth_data) = serde_json::from_str::<AuthData>(&token) {
+                        auth_context.auth_token.set(auth_data.token);
+                        auth_context.is_logged_in.set(true);
+                        auth_context.full_name.set(auth_data.admin_user.full_name);
+                        auth_context.is_super_admin.set(auth_data.admin_user.is_super_admin);
+                    }
 
                     let navigate = leptos_router::hooks::use_navigate();
                     navigate("/admin/dashboard", Default::default());

src/pages/protected_routes.rs

@@ -1,20 +1,45 @@
-use leptos::prelude::*;
+use leptos::{prelude::*};
 use leptos_router::hooks::use_navigate;
 // use gloo_storage::{LocalStorage, Storage};
 // use anyhow::Result;
 #[cfg(target_arch = "wasm32")]
 use gloo_storage::Storage;
 
+
 #[derive(Clone, Default)]
 pub struct AuthContext {
     pub is_logged_in: RwSignal<bool>,
     pub auth_token: RwSignal<String>,
+    pub full_name: RwSignal<String>,
+    pub is_super_admin: RwSignal<bool>,
+}
+
+#[derive(Clone, Default, serde::Serialize, serde::Deserialize, Debug)]
+pub struct AdminUserContext {
+    pub full_name: String,
+    pub email: String,
+    pub profile_image: String,
+    pub is_super_admin: bool,
+    pub created_by: String,
+    pub updated_by: String,
+    pub created_at: String,
+    pub updated_at: String,
+
+}
+
+#[derive(Clone, Default, serde::Serialize, serde::Deserialize, Debug)]
+pub struct AuthData {
+    pub admin_user: AdminUserContext,
+    pub token: String,
 }
 
 // Function to provide the AuthContext
 pub fn provide_auth_context() {
     let is_logged_in = RwSignal::new(false);
     let auth_token = RwSignal::new(String::new());
+    let full_name = RwSignal::new(String::new());
+    let is_super_admin = RwSignal::new(false);
+
     // On the client, read from local storage
     #[cfg(target_arch = "wasm32")]
     {
@@ -24,12 +49,21 @@ pub fn provide_auth_context() {
             // Also need to ensure gloo_storage is available or use runtime check if needed, but strict cfg is safer.
             // Using a block to contain the usage.
             if let Ok(value) = gloo_storage::LocalStorage::get::<String>("avored_admin_token") {
-                auth_token.set(value.clone());
-                is_logged_in.set(!value.is_empty());
+                if let Ok(auth_data) = serde_json::from_str::<AuthData>(&value) {
+                    auth_token.set(auth_data.token.clone());
+                    is_logged_in.set(!auth_data.token.is_empty());
+                    full_name.set(auth_data.admin_user.full_name.clone());
+                    is_super_admin.set(auth_data.admin_user.is_super_admin);
+                }
             }
         });
     }
-    provide_context(AuthContext { is_logged_in, auth_token });
+    provide_context(AuthContext {
+        is_logged_in,
+        auth_token,
+        full_name,
+        is_super_admin,
+    });
 }
 
 #[component]