minor changes for ux

Shabang-Systems · Sep 10, 2024 · 640dc7d · 640dc7d
1 parent b0635c5
commit 640dc7d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -14,11 +14,10 @@ use state::*;
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    // TODO initial with actual stored state
     let state = GlobalState::new();
     let calendar_listen_handle = state.calendar_listen();
 
-    // rock'n'roll
+        // rock'n'roll
     tauri::Builder::default()
         .manage(state)
         .invoke_handler(tauri::generate_handler![

diff --git a/src/App.css b/src/App.css
@@ -79,10 +79,14 @@
 }
 
 .bottom-nav-button {
-    padding: 5px 0;
+    margin: 5px 0;
     cursor: pointer;
 }
 
+.bottom-nav-button.ds {
+    border-bottom: 2px solid var(--background-decoration);
+}
+
 .bottom-nav-button.active {
     color: var(--foreground-decoration);
 }
@@ -100,3 +104,4 @@
 #logout:hover {
     color: var(--foreground-decoration);
 }
+
diff --git a/src/App.jsx b/src/App.jsx
@@ -50,6 +50,9 @@ function RoutableMain() {
     const ready = useSelector((state) => {
         return state.ui.ready;
     });
+    const captures = useSelector((state) => {
+        return state.capture.scratchpads;
+    });
     const dispatch = useDispatch();
 
     // generate the initial snapshot
@@ -75,7 +78,7 @@ function RoutableMain() {
                         </div>
                     </Link>
                     <Link to={"/capture"} data-tooltip-id="rootp" data-tooltip-content={strings.TOOLTIPS.CAPTURE}>
-                        <div className={"bottom-nav-button"+(loc.pathname == "/capture" ? " active" : "")}>
+                        <div className={"bottom-nav-button"+(loc.pathname == "/capture" ? " active" : "")+(captures.filter(x => x.trim() != "").length > 0 ? " ds" : "")}>
                             <i className="fa-solid fa-inbox"></i>
                         </div>
                     </Link>

diff --git a/src/views/Action.css b/src/views/Action.css
@@ -93,7 +93,8 @@
 }
 
 .action-datelabel.ds .action-left {
-    border-bottom: 0.1px solid var(--due-soon-softer);
+    border-bottom: 2px solid var(--background-decoration);
+    margin-right: 2px;
     padding-bottom: 0.5px;
 }
 

diff --git a/src/views/Browser.jsx b/src/views/Browser.jsx
@@ -25,6 +25,10 @@ export default function Browser() {
     const length = useSelector((state) =>
         state.browse.searches.length
     );
+    const searches = useSelector((state) =>
+        state.browse.searches
+    );
+
     const captureID = useSelector((state) =>
         state.browse.current
     );
@@ -180,9 +184,14 @@ export default function Browser() {
                 </div>
                 <ul className="captureid-wrapper">
                     {
-                        [...Array(length).keys()].map((x) => {
+                        [...Array(length).keys()].map((x, i) => {
                             return (
-                                <li key={x} className={"captureid-dot " + (
+                                <li data-tooltip-id="rootp" onClick={() => {
+                                    if (!currentQuery.query_text && captureID == length-1) {
+                                        dispatch(pop());
+                                    } 
+                                    dispatch(view(i));
+                                }} data-tooltip-content={searches[i].query_text} data-tooltip-place="left" key={x} className={"cursor-pointer captureid-dot " + (
                                     x == captureID ? "active" : ""
                                 )}></li>
                             );