feat: sort bucket files by modified time(desc)

msyfls123 · Apr 14, 2024 · 0f9c094 · 0f9c094
1 parent 366f91c
commit 0f9c094
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -19,6 +19,7 @@ wasm-bindgen-futures = "0.4.29"
 yew-router = "0.18.0"
 serde = "1.0.136"
 serde-wasm-bindgen = "0.6.5"
+chrono = { version = "0.4.37", features = ["wasmbind", "js-sys"] }
 
 [dependencies.web-sys]
 version = "0.3.57"

diff --git a/client/src/component/bucket.rs b/client/src/component/bucket.rs
@@ -6,13 +6,15 @@ use yew::{prelude::function_component, Html, html, use_context, use_state, use_e
 use web_sys::{console};
 use serde_wasm_bindgen::from_value;
 use serde::{Deserialize};
+use chrono::{Utc, DateTime};
 
 use crate::constants::app::AppContext;
 
 #[derive(Deserialize, PartialEq, Clone)]
 pub struct File {
     Key: Value,
     Size: Value,
+    LastModified: Value,
 }
 
 #[derive(Deserialize)]
@@ -51,8 +53,13 @@ pub fn bucket(props: &BucketProps) -> Html {
                 let promise = Promise::from(result);
                 let data = JsFuture::from(promise).await.unwrap();
                 console::log_2(&JsValue::from_str("data"), &data);
+
                 let info: BucketInfo = from_value(data).unwrap();
-                list_clone.set(Some(info.Contents));
+                let mut contents = info.Contents;
+                contents.sort_by_key(|file| file.LastModified.as_str().unwrap().parse::<DateTime<Utc>>().unwrap());
+                contents.reverse();
+                list_clone.set(Some(contents));
+
                 fetched_clone.set(1);
                 is_loading_clone.set(false);
             });
@@ -85,6 +92,7 @@ pub fn bucket(props: &BucketProps) -> Html {
                                 <tr>
                                     <th>{"File"}</th>
                                     <th>{"Size (bytes)"}</th>
+                                    <th>{"Modified Time"}</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -107,6 +115,11 @@ fn file_item(file: &File) -> Html {
     let file_size = file.Size.as_str().unwrap();
     let href = format!("https://cdn.ebichu.cc/{}", file.Key.as_str().unwrap());
     let file_key2 = file.Key.clone();
+
+    let time = file.LastModified.as_str().unwrap();
+    let time_parsed: DateTime<Utc> = time.parse().unwrap();
+    let time_display = format!("{}", time_parsed.format("%Y-%m-%d %H:%M:%S"));
+
     html! { <tr>
         <td>
             <a href={href.to_owned()} target="_blank">
@@ -116,5 +129,8 @@ fn file_item(file: &File) -> Html {
         <td>
             {file_size}
         </td>
+        <td>
+            {time_display}
+        </td>
     </tr> }
 }
diff --git a/client/src/css/index.styl b/client/src/css/index.styl
@@ -8,3 +8,10 @@ nav
 
 .hidden
   display: none
+
+@font-face
+  font-family: Yuewen Font
+  src: url('https://stawritecdn.yuewen.com/assets/design/fonts/YuewenFont-Regular.678a92.otf') format('opentype')
+
+body
+  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica Neue, Helvetica, Arial, PingFang SC, Hiragino Sans GB, STHeiti, Droid Sans Fallback, Droid Sans, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif