From b03b59b22c167525c811e31b2b522eaced28a149 Mon Sep 17 00:00:00 2001
From: wjsjwr <wjsjwr@gmail.com>
Date: Tue, 7 Jan 2025 17:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E5=92=8C=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml              | 26 ++++++++++++++++++++++----
 bookkeeper/Cargo.lock            |  2 +-
 bookkeeper/Cargo.toml            |  2 +-
 bookkeeper/deploy.ps1            |  3 +++
 bookkeeper/src/main.rs           |  3 +++
 bookkeeper/templates/nav.html.j2 |  9 +++++----
 6 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 bookkeeper/deploy.ps1

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bd28fe3..49d3c1e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,7 +10,14 @@
     <cargoProject FILE="$PROJECT_DIR$/bookkeeper/Cargo.toml" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="76b3b902-7a5c-4bcd-9c1b-8241d748fb44" name="更改" comment="Refine gain algorithm and some UI update" />
+    <list default="true" id="76b3b902-7a5c-4bcd-9c1b-8241d748fb44" name="更改" comment="Filter by name">
+      <change afterPath="$PROJECT_DIR$/bookkeeper/deploy.ps1" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bookkeeper/Cargo.lock" beforeDir="false" afterPath="$PROJECT_DIR$/bookkeeper/Cargo.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bookkeeper/Cargo.toml" beforeDir="false" afterPath="$PROJECT_DIR$/bookkeeper/Cargo.toml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bookkeeper/src/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/bookkeeper/src/main.rs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bookkeeper/templates/nav.html.j2" beforeDir="false" afterPath="$PROJECT_DIR$/bookkeeper/templates/nav.html.j2" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -76,7 +83,7 @@
   </component>
   <component name="RunManager" selected="Cargo.Run bookkeeper">
     <configuration name="Run bookkeeper" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-      <option name="buildProfileId" value="dev" />
+      <option name="buildProfileId" value="release" />
       <option name="command" value="run --package bookkeeper --bin bookkeeper" />
       <option name="workingDirectory" value="file://$PROJECT_DIR$/bookkeeper" />
       <envs />
@@ -146,6 +153,8 @@
       <workItem from="1735392928494" duration="12910000" />
       <workItem from="1735470376833" duration="16014000" />
       <workItem from="1735553493290" duration="16207000" />
+      <workItem from="1736238929025" duration="646000" />
+      <workItem from="1736239592084" duration="964000" />
     </task>
     <task id="LOCAL-00001" summary="Add bookkeeper">
       <option name="closed" value="true" />
@@ -227,7 +236,15 @@
       <option name="project" value="LOCAL" />
       <updated>1735578317009</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="Filter by name">
+      <option name="closed" value="true" />
+      <created>1736239284738</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1736239284738</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -255,7 +272,8 @@
     <MESSAGE value="Modify Tx and Delete Tx" />
     <MESSAGE value="Release first version" />
     <MESSAGE value="Refine gain algorithm and some UI update" />
-    <option name="LAST_COMMIT_MESSAGE" value="Refine gain algorithm and some UI update" />
+    <MESSAGE value="Filter by name" />
+    <option name="LAST_COMMIT_MESSAGE" value="Filter by name" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
diff --git a/bookkeeper/Cargo.lock b/bookkeeper/Cargo.lock
index 9c22cd7..59bc5ca 100644
--- a/bookkeeper/Cargo.lock
+++ b/bookkeeper/Cargo.lock
@@ -423,7 +423,7 @@ dependencies = [
 
 [[package]]
 name = "bookkeeper"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "chrono",
  "entity",
diff --git a/bookkeeper/Cargo.toml b/bookkeeper/Cargo.toml
index 63dd2a9..1f8d579 100644
--- a/bookkeeper/Cargo.toml
+++ b/bookkeeper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bookkeeper"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 [dependencies]
diff --git a/bookkeeper/deploy.ps1 b/bookkeeper/deploy.ps1
new file mode 100644
index 0000000..1202565
--- /dev/null
+++ b/bookkeeper/deploy.ps1
@@ -0,0 +1,3 @@
+Copy-Item "target\release\bookkeeper.exe" -Destination "\\10.80.15.15\docker-volume\bookkeeper\" -Force
+Copy-Item "static" -Destination "\\10.80.15.15\docker-volume\bookkeeper" -Recurse -Force
+Copy-Item "templates" -Destination "\\10.80.15.15\docker-volume\bookkeeper" -Recurse -Force
diff --git a/bookkeeper/src/main.rs b/bookkeeper/src/main.rs
index 94c3233..08ec2d7 100644
--- a/bookkeeper/src/main.rs
+++ b/bookkeeper/src/main.rs
@@ -76,8 +76,11 @@ async fn index(conn: Connection<'_, Db>, last: Option<u32>, name: Option<&str>)
         .await
         .unwrap();
 
+    let version = env!("CARGO_PKG_VERSION");
+    
     Template::render("index", context! {
         rows: rows,
+        version: version,
     })
 }
 
diff --git a/bookkeeper/templates/nav.html.j2 b/bookkeeper/templates/nav.html.j2
index 5630e3c..3fa66d6 100644
--- a/bookkeeper/templates/nav.html.j2
+++ b/bookkeeper/templates/nav.html.j2
@@ -15,14 +15,15 @@
 <!--                </div>-->
 <!--            </div>-->
         </div>
-<!--        <div class="navbar-end">-->
-<!--            <div class="navbar-item">-->
+        <div class="navbar-end">
+            <div class="navbar-item">
 <!--                <div class="buttons">-->
 <!--                    <a class="button is-primary"><strong>Sign up</strong></a>-->
 <!--                    <a class="button is-light">Log in</a>-->
 <!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
+                <p>ver. {{ version }}</p>
+            </div>
+        </div>
     </div>
 </nav>
 {% block container %}{% endblock container %}