settings view style change

lapce · Aug 22, 2024 · f90d5f1 · f90d5f1
1 parent 1f83081
commit f90d5f1
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -53,6 +53,7 @@ members = [
 ]
 
 [workspace.dependencies]
+rust_decimal = "1.36.0"
 toml = "0.8.11"
 clap = { version = "4.5.2", features = ["derive"] }
 tempfile = "3.8.1"

diff --git a/lapdev-dashboard/Cargo.toml b/lapdev-dashboard/Cargo.toml
@@ -11,6 +11,7 @@ web-sys = "0.3.65"
 urlencoding = "2.1.3"
 leptos = { version = "0.6.5", features = ["csr"] }
 leptos_router = { version = "0.6.5", features = ["csr"] }
+rust_decimal.workspace = true
 chrono.workspace = true
 uuid.workspace = true
 serde.workspace = true

diff --git a/lapdev-dashboard/src/modal.rs b/lapdev-dashboard/src/modal.rs
@@ -323,7 +323,7 @@ where
                 match result {
                     Ok(_) => {
                         update_counter.update(|c| *c += 1);
-                        success.set(Some("save successfully"));
+                        success.set(Some("Saved successfully"));
                     }
                     Err(e) => {
                         error.set(Some(e.error.clone()));
@@ -341,26 +341,6 @@ where
                 view!{ <h5 class="text-lg font-semibold dark:text-white">{title}</h5> }.into_view()
             }
         }
-        { move || if let Some(error) = error.get() {
-                view! {
-                    <div class="my-2 p-4 rounded-lg bg-red-50 dark:bg-gray-800 ">
-                        <span class="text-sm font-medium text-red-800 dark:text-red-400">{ error }</span>
-                    </div>
-                }.into_view()
-            } else {
-                view! {}.into_view()
-            }
-        }
-        { move || if let Some(success) = success.get() {
-                view! {
-                    <div class="my-2 p-4 rounded-lg bg-green-50 dark:bg-gray-800 ">
-                        <span class="text-sm font-medium text-green-800 dark:text-green-400">{ success }</span>
-                    </div>
-                }.into_view()
-            } else {
-                view! {}.into_view()
-            }
-        }
         { body }
         <div class="mt-4 flex flex-row items-center">
             <button
@@ -385,6 +365,26 @@ where
                     view!{}.into_view()
                 }
             }
+            { move || if let Some(error) = error.get() {
+                    view! {
+                        <div class="ml-4 py-2 px-4 rounded-lg bg-red-50 dark:bg-gray-800 ">
+                            <span class="text-sm font-medium text-red-800 dark:text-red-400">{ error }</span>
+                        </div>
+                    }.into_view()
+                } else {
+                    view! {}.into_view()
+                }
+            }
+            { move || if let Some(success) = success.get() {
+                    view! {
+                        <div class="ml-4 py-2 px-4 rounded-lg bg-green-50 dark:bg-gray-800 ">
+                            <span class="text-sm font-medium text-green-800 dark:text-green-400">{ success }</span>
+                        </div>
+                    }.into_view()
+                } else {
+                    view! {}.into_view()
+                }
+            }
         </div>
     }
 }
diff --git a/lapdev-dashboard/src/quota.rs b/lapdev-dashboard/src/quota.rs
@@ -184,6 +184,14 @@ fn QuotaItemView(
         .await
     });
 
+    let current_usage = match kind {
+        QuotaKind::Workspace => value.existing.to_string(),
+        QuotaKind::RunningWorkspace => value.existing.to_string(),
+        QuotaKind::Project => value.existing.to_string(),
+        QuotaKind::DailyCost => format!("{} Hours", value.existing),
+        QuotaKind::MonthlyCost => format!("{} Hours", value.existing),
+    };
+
     view! {
         <div
             class="flex items-center w-full px-4 py-2"
@@ -198,7 +206,7 @@ fn QuotaItemView(
             </div>
             <div class="w-1/2 flex flex-row">
                 <div class="w-1/3 flex flex-col">
-                    <p>{value.existing}</p>
+                    <p>{current_usage}</p>
                 </div>
                 <div class="w-2/3 flex flex-row items-center justify-between">
                     <div class="flex flex-row items-center">

diff --git a/lapdev-dashboard/src/usage.rs b/lapdev-dashboard/src/usage.rs
@@ -7,6 +7,7 @@ use leptos::{
     IntoView, Signal, SignalGet, SignalGetUntracked, SignalSet, SignalUpdate, SignalWith,
     SignalWithUntracked,
 };
+use rust_decimal::{prelude::FromPrimitive, Decimal};
 
 use crate::{
     datepicker::Datepicker,
@@ -185,7 +186,7 @@ pub fn UsageView() -> impl IntoView {
                 {" of "}
                 <span class="font-semibold text-gray-900 dark:text-white">{move || usage.with(|u| u.total_items)}</span>
             </span>
-            <p><span class="text-gray-500 mr-1">{"Total Cost:"}</span>{move || usage.with(|u| u.total_cost)}</p>
+            <p><span class="text-gray-500 mr-1">{"Total Cost:"}</span>{move || usage.with(|u| format_cost(u.total_cost))}</p>
             <div class="flex flex-row items-center">
                 <p class="mr-2">{"rows per page"}</p>
 
@@ -278,8 +279,8 @@ fn RecordItemView(i: usize, record: UsageRecord) -> impl IntoView {
                 <p><span class="text-gray-500 mr-1">{"Machine Type:"}</span>{record.machine_type}</p>
             </div>
             <div class="w-1/4 flex flex-col">
-                <p>{duration}</p>
-                <p><span class="text-gray-500 mr-1">{"Cost:"}</span>{record.cost}</p>
+                <p><span class="text-gray-500 mr-1">{"Duration:"}</span>{duration}</p>
+                <p><span class="text-gray-500 mr-1">{"Cost:"}</span>{ format_cost(record.cost) }</p>
             </div>
             <div class="w-1/4 flex flex-col">
                 <span class="mb-2 truncate pr-2 text-gray-900 dark:text-white flex flex-row items-center">
@@ -295,3 +296,11 @@ fn RecordItemView(i: usize, record: UsageRecord) -> impl IntoView {
         </div>
     }
 }
+
+pub fn format_cost(cost: usize) -> String {
+    let cost = cost as f64 / 60.0 / 60.0;
+    let cost = Decimal::from_f64(cost)
+        .map(|d| d.trunc_with_scale(2).to_string())
+        .unwrap_or_else(|| cost.to_string());
+    format!("{cost} Hours")
+}
diff --git a/lapdev-enterprise/src/quota.rs b/lapdev-enterprise/src/quota.rs
@@ -264,11 +264,15 @@ impl Quota {
                 self.usage
                     .get_daily_cost(organization, None, Utc::now().into(), None)
                     .await?
+                    / 60
+                    / 60
             }
             QuotaKind::MonthlyCost => {
                 self.usage
                     .get_monthly_cost(organization, None, Utc::now().into(), None)
                     .await?
+                    / 60
+                    / 60
             }
         };
         Ok(existing)