github actions

setting for ocr language, properly apply them
fix svg icons not showing with a cursed workaround
2024-05-11 13:27:43 +02:00 · 2024-05-09 14:26:31 +02:00 · 2024-05-09 13:53:41 +02:00 · 2024-05-05 22:58:23 +02:00 · 2024-05-05 22:57:40 +02:00 · 2024-05-01 22:20:20 +02:00
34 changed files with 1034 additions and 103 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,64 @@
 name: 'publish'
 on:
  push:
    branches:
      - release
      - main
 # This workflow will trigger on each push to the `release` branch to create or update a GitHub release, build your app, and upload the artifacts to the release.
 jobs:
  publish-tauri:
    permissions:
      contents: write
    strategy:
      fail-fast: false
      matrix:
        settings:
          - platform: 'macos-latest' # for Arm based macs (M1 and above).
            args: '--target aarch64-apple-darwin'
          - platform: 'macos-latest' # for Intel based macs.
            args: '--target x86_64-apple-darwin'
          - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04.
            args: ''
          - platform: 'windows-latest'
            args: ''
    runs-on: ${{ matrix.settings.platform }}
    steps:
      - uses: actions/checkout@v4
      - name: setup node
        uses: actions/setup-node@v4
        with:
          node-version: lts/*
      - name: install Rust stable
        uses: dtolnay/rust-toolchain@stable
        with:
          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
          targets: ${{ matrix.settings.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
      - name: install dependencies (ubuntu only)
        if: matrix.settings.platform == 'ubuntu-22.04' # This must match the platform value defined above.
        run: |
          sudo apt-get update
          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
        # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
        # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
      - name: install frontend dependencies
        run: npm install # change this to npm, pnpm or bun depending on which one you use.
      - uses: tauri-apps/tauri-action@v0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
          releaseName: 'App v__VERSION__'
          releaseBody: 'See the assets to download this version and install.'
          releaseDraft: true
          prerelease: false
          args: ${{ matrix.settings.args }}
--- a/app-icon.png
+++ b/app-icon.png
--- a/index.html
+++ b/index.html
@ -19,22 +19,26 @@
 </head>
 <body>
  <div class="menu" id="contextMenu">
    <button id="deleteButton">Delete</button>
  </div>
  <div class="top-bar">
    <div class="menu" id="contextMenu">
      <button id="deleteButton">Delete</button>
    </div>
    <h1>Maid Notes</h1>
    <div id="button-row">
      <button class="row" id="show-notes-button">Refresh Notes</button>
-      <button type="submit" id="save-button">Save</button>
+      <button class="row" type="submit" id="save-button">Save</button>
      <button class="row" id="new-button">New</button>
      <button class="row" id="image-button">OCR</button>
      <button class="row" id="export-button">Export</button>
      <button class="row" id="settings-button">Settings</button>
      <input type="file" id="fileInput" accept="image/*" style="display: none;" />
    </div>
  </div>
  <div class="container">
    <div class="sidebar">
      <div class="searchbar-container">
-        <input type="search" name="note-search" id="note-searchbar" placeholder="Search...">
+        <img id="reverse-icon-asc" src="./src/assets/sort-from-bottom-to-top.svg">
        <img id="reverse-icon-desc" src="./src/assets/sort-from-top-to-bottom.svg">
        <input type="text" name="note-search" id="note-searchbar" placeholder="Search...">
      </div>
      <div class="note-sidebar-container" id="note-sidebar-container">
        <!-- This is how the generated notes will look like:
@ -47,15 +51,42 @@
      </div>
    </div>
    <div class="editor">
-      <input id="create-tag" placeholder="Tag..." />
+      <input autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" id="create-tag"
-      <textarea id="create-input" placeholder="Type your note here..."></textarea>
+        placeholder="Tag..." />
      <textarea autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" id="create-input"
        placeholder="Type your note here..."></textarea>
      <p id="create-msg"></p>
      <p style="white-space: pre-line" id="notes-list"></p>
    </div>
    <div id="id-modal-bg"></div>
    <div id="id-modal-container">
      <div class="openbyid-bar-container">
        <input type="text" name="id-search" id="id-search" placeholder="Note ID...">
      </div>
    </div>
    <div id="settings-modal-container">
      <div class="settings-flex">
        <div class="fontsize-setting">
          <h3>Font Size (in px)</h3>
          <input type="number" name="fontsize" id="fontsize-setting-input" placeholder="">
        </div>
        <div id="ocrlanguage-setting">
          <div>
            <h3>OCR Language</h3> <a style="display: inline;" href="https://tesseract-ocr.github.io/tessdoc/Data-Files"
              target="_blank">Language
              Codes</a>
          </div>
          <input type="text" name="ocrlanguage" id="ocr-language-setting-input" placeholder="eng">
        </div>
        <button class="save-button" id="save-settings-button">Save</button>
      </div>
    </div>
 </body>
--- a/libsnotes/src/lib.rs
+++ b/libsnotes/src/lib.rs
@ -2,6 +2,8 @@ use chrono::Local;
 use home::home_dir;
 use rusqlite::{Connection, Result};
 use serde_json::json;
 use std::fs;
 use std::path::PathBuf;
 pub struct Note {
    id: i32,
@ -10,9 +12,19 @@ pub struct Note {
    tag: String,
 }
 fn get_db_dir() -> PathBuf {
    let dir = home_dir().unwrap().join(".snotes-data");
    dbg!(&dir);
    if !&dir.exists() {
        fs::create_dir(&dir).unwrap();
    }
    dir.join(".snotes.db")
 }
 pub fn init_db() -> Result<()> {
-    let home = home_dir().unwrap().join(".snotes.db");
+    let db = get_db_dir();
-    let connection = Connection::open(home)?;
+    let connection = Connection::open(db)?;
    let query_table = "
        CREATE TABLE IF NOT EXISTS notes (
@ -32,8 +44,8 @@ pub fn init_db() -> Result<()> {
 }
 pub fn create_note(content: &String, tag: &String) -> Result<()> {
-    let home = home_dir().unwrap().join(".snotes.db");
+    let db = get_db_dir();
-    let connection = Connection::open(home)?;
+    let connection = Connection::open(db)?;
    let date = Local::now();
    let date_string = date.format("%m-%d-%y %H:%M").to_string();
    let tag_string = if *tag == String::new() {
@ -53,8 +65,8 @@ pub fn create_note(content: &String, tag: &String) -> Result<()> {
 }
 pub fn show_notes(all: bool, tag: &str) -> Result<String, String> {
-    let home = home_dir().unwrap().join(".snotes.db");
+    let db = get_db_dir();
-    let connection = Connection::open(home).unwrap();
+    let connection = Connection::open(db).unwrap();
    let mut query = "SELECT * FROM notes LIMIT 10".to_string();
@ -98,8 +110,8 @@ pub fn show_notes(all: bool, tag: &str) -> Result<String, String> {
 }
 pub fn delete_latest_note() -> Result<(), String> {
-    let home = home_dir().unwrap().join(".snotes.db");
+    let db = get_db_dir();
-    let connection = Connection::open(home).map_err(|e| format!("Database Error: {e}"))?;
+    let connection = Connection::open(db).map_err(|e| format!("Database Error: {e}"))?;
    let query = String::from("DELETE FROM NOTES WHERE nid = (SELECT MAX(nid) FROM notes)");
@ -113,8 +125,8 @@ pub fn delete_latest_note() -> Result<(), String> {
 }
 pub fn delete_specific_note(id: i32) -> Result<(), String> {
-    let home = home_dir().unwrap().join(".snotes.db");
+    let db = get_db_dir();
-    let connection = Connection::open(home).map_err(|e| format!("Database Error: {e}"))?;
+    let connection = Connection::open(db).map_err(|e| format!("Database Error: {e}"))?;
    let query = "DELETE FROM notes WHERE nid = ?1";
    match connection.execute(query, [id]) {
@ -125,8 +137,8 @@ pub fn delete_specific_note(id: i32) -> Result<(), String> {
 }
 pub fn edit_specific_note(id: i32, tag: &str, content: &str) -> Result<(), String> {
-    let home = home_dir().unwrap().join(".snotes.db");
+    let db = get_db_dir();
-    let connection = Connection::open(home).map_err(|e| format!("Database Error: {}", e))?;
+    let connection = Connection::open(db).map_err(|e| format!("Database Error: {}", e))?;
    let query = "UPDATE notes SET tag = ?1, content = ?2 WHERE nid = ?3";
    match connection.execute(query, [&tag, &content, &id.to_string().as_str()]) {
@ -138,15 +150,17 @@ pub fn edit_specific_note(id: i32, tag: &str, content: &str) -> Result<(), Strin
 /// Looks for matches in both content and tag.
 pub fn search_notes(query: &str) -> Result<String, String> {
-    let home = home_dir().unwrap().join(".snotes.db");
+    let db = get_db_dir();
-    let connection = Connection::open(home).map_err(|e| format!("Database Error: {}", e))?;
+    let connection = Connection::open(db).map_err(|e| format!("Database Error: {}", e))?;
    let query = format!(
-        "SELECT * FROM notes WHERE content LIKE '%{}%' OR tag LIKE '%{}%'",
+        "SELECT * FROM notes WHERE nid LIKE '%{}%' OR content LIKE '%{}%' OR tag LIKE '%{}%'",
-        query, query
+        query, query, query
    );
-    let mut prepare = connection.prepare(&query).map_err(|e| format!("Query Error: {}", e))?;
+    let mut prepare = connection
        .prepare(&query)
        .map_err(|e| format!("Query Error: {}", e))?;
    let notes = prepare
        .query_map([], |row| {
@ -172,11 +186,93 @@ pub fn search_notes(query: &str) -> Result<String, String> {
        json_array.push(note_json);
    }
-    let json_string = serde_json::to_string(&json_array).map_err(|e| format!("JSON Error: {}", e))?;
+    let json_string =
        serde_json::to_string(&json_array).map_err(|e| format!("JSON Error: {}", e))?;
    Ok(json_string)
 }
 /// get latest note
 /// Returns a json array string of size 1
 pub fn get_latest_note() -> Result<String, String> {
    let db = get_db_dir();
    let connection = Connection::open(db).map_err(|e| format!("Database Error: {}", e))?;
    let query = "SELECT * FROM notes WHERE ROWID IN (SELECT max(ROWID) FROM notes);
    "
    .to_string();
    let mut prepare = connection
        .prepare(&query)
        .map_err(|e| format!("Query Error: {}", e))?;
    let notes = prepare
        .query_map([], |row| {
            Ok(Note {
                id: row.get(0)?,
                content: row.get(1)?,
                date: row.get(2)?,
                tag: row.get(3)?,
            })
        })
        .map_err(|e| format!("Mapping Error: {}", e))?;
    let mut json_array = Vec::new();
    for note in notes {
        let unwrapped = note.map_err(|e| format!("Note Error: {}", e))?;
        let note_json = json!({
            "id": unwrapped.id,
            "date": unwrapped.date,
            "content": unwrapped.content,
            "tag": unwrapped.tag
        });
        json_array.push(note_json);
    }
    let json_string =
        serde_json::to_string(&json_array).map_err(|e| format!("JSON Error: {}", e))?;
    println!("{}", json_string);
    Ok(json_string)
 }
 pub fn get_note_by_id(id: u32) -> Result<String, String> {
    let db = get_db_dir();
    let connection = Connection::open(db).map_err(|e| format!("Database Error: {}", e))?;
    let query = format!("SELECT * FROM notes WHERE nid IS {};", id.to_string());
    let mut prepare = connection
        .prepare(&query)
        .map_err(|e| format!("Query Error: {}", e))?;
    let notes = prepare
        .query_map([], |row| {
            Ok(Note {
                id: row.get(0)?,
                content: row.get(1)?,
                date: row.get(2)?,
                tag: row.get(3)?,
            })
        })
        .map_err(|e| format!("Mapping Error: {}", e))?;
    let mut json_array = Vec::new();
    for note in notes {
        let unwrapped = note.map_err(|e| format!("Note Error: {}", e))?;
        let note_json = json!({
            "id": unwrapped.id,
            "date": unwrapped.date,
            "content": unwrapped.content,
            "tag": unwrapped.tag
        });
        json_array.push(note_json);
    }
    let json_string =
        serde_json::to_string(&json_array).map_err(|e| format!("JSON Error: {}", e))?;
    println!("{}", json_string);
    Ok(json_string)
 }
 #[cfg(test)]
 mod tests {
@ -187,4 +283,12 @@ mod tests {
        let result = init_db();
        assert_eq!(result, Ok(()));
    }
    #[test]
    #[ignore = "debug thing"]
    fn test_id_10() {
        let result = get_note_by_id(10).unwrap();
        println!("{}", result);
        assert!(true)
    }
 }
--- a/package-lock.json
+++ b/package-lock.json
@ -8,7 +8,8 @@
      "name": "snotes-deck",
      "version": "0.0.0",
      "dependencies": {
-        "@tauri-apps/api": "^1"
+        "@tauri-apps/api": "^1",
        "tesseract.js": "^5.0.5"
      },
      "devDependencies": {
        "@tauri-apps/cli": "^1",
@ -787,6 +788,11 @@
      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
      "dev": true
    },
    "node_modules/bmp-js": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz",
      "integrity": "sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw=="
    },
    "node_modules/esbuild": {
      "version": "0.20.2",
      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
@ -839,6 +845,21 @@
        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
      }
    },
    "node_modules/idb-keyval": {
      "version": "6.2.1",
      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz",
      "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg=="
    },
    "node_modules/is-electron": {
      "version": "2.2.2",
      "resolved": "https://registry.npmjs.org/is-electron/-/is-electron-2.2.2.tgz",
      "integrity": "sha512-FO/Rhvz5tuw4MCWkpMzHFKWD2LsfHzIb7i6MdPYZ/KW7AlxawyLkqdy+jPZP1WubqEADE3O4FUENlJHDfQASRg=="
    },
    "node_modules/is-url": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
    },
    "node_modules/nanoid": {
      "version": "3.3.7",
      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
@ -857,6 +878,33 @@
        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
      }
    },
    "node_modules/node-fetch": {
      "version": "2.7.0",
      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
      "dependencies": {
        "whatwg-url": "^5.0.0"
      },
      "engines": {
        "node": "4.x || >=6.0.0"
      },
      "peerDependencies": {
        "encoding": "^0.1.0"
      },
      "peerDependenciesMeta": {
        "encoding": {
          "optional": true
        }
      }
    },
    "node_modules/opencollective-postinstall": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
      "bin": {
        "opencollective-postinstall": "index.js"
      }
    },
    "node_modules/picocolors": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@ -891,6 +939,11 @@
        "node": "^10 || ^12 || >=14"
      }
    },
    "node_modules/regenerator-runtime": {
      "version": "0.13.11",
      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
    },
    "node_modules/rollup": {
      "version": "4.14.1",
      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.1.tgz",
@ -934,6 +987,34 @@
        "node": ">=0.10.0"
      }
    },
    "node_modules/tesseract.js": {
      "version": "5.0.5",
      "resolved": "https://registry.npmjs.org/tesseract.js/-/tesseract.js-5.0.5.tgz",
      "integrity": "sha512-xtTfec4IynE63sl6kAFkGl1mejlNxr9qQXzVGAUHd7IPdQXveopjGO9Eph6xkSuW5sUCC9AT6VdBmODh8ZymGg==",
      "hasInstallScript": true,
      "dependencies": {
        "bmp-js": "^0.1.0",
        "idb-keyval": "^6.2.0",
        "is-electron": "^2.2.2",
        "is-url": "^1.2.4",
        "node-fetch": "^2.6.9",
        "opencollective-postinstall": "^2.0.3",
        "regenerator-runtime": "^0.13.3",
        "tesseract.js-core": "^5.0.0",
        "wasm-feature-detect": "^1.2.11",
        "zlibjs": "^0.3.1"
      }
    },
    "node_modules/tesseract.js-core": {
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/tesseract.js-core/-/tesseract.js-core-5.1.0.tgz",
      "integrity": "sha512-D4gc5ET1DF/sDayF/eVmHgVGo7nqVC2e3d7uVgVOSAk4NOcmUqvJRTj8etqEmI/2390ZkXCRiDMxTD1RFYyp1g=="
    },
    "node_modules/tr46": {
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
    },
    "node_modules/typescript": {
      "version": "5.4.4",
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.4.tgz",
@ -1001,6 +1082,33 @@
          "optional": true
        }
      }
    },
    "node_modules/wasm-feature-detect": {
      "version": "1.6.1",
      "resolved": "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.6.1.tgz",
      "integrity": "sha512-R1i9ED8UlLu/foILNB1ck9XS63vdtqU/tP1MCugVekETp/ySCrBZRk5I/zI67cI1wlQYeSonNm1PLjDHZDNg6g=="
    },
    "node_modules/webidl-conversions": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
    },
    "node_modules/whatwg-url": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
      "dependencies": {
        "tr46": "~0.0.3",
        "webidl-conversions": "^3.0.0"
      }
    },
    "node_modules/zlibjs": {
      "version": "0.3.1",
      "resolved": "https://registry.npmjs.org/zlibjs/-/zlibjs-0.3.1.tgz",
      "integrity": "sha512-+J9RrgTKOmlxFSDHo0pI1xM6BLVUv+o0ZT9ANtCxGkjIVCCUdx9alUF8Gm+dGLKbkkkidWIHFDZHDMpfITt4+w==",
      "engines": {
        "node": "*"
      }
    }
  }
 }
--- a/package.json
+++ b/package.json
@ -10,11 +10,12 @@
    "tauri": "tauri"
  },
  "dependencies": {
-    "@tauri-apps/api": "^1"
+    "@tauri-apps/api": "^1",
    "tesseract.js": "^5.0.5"
  },
  "devDependencies": {
    "@tauri-apps/cli": "^1",
-    "vite": "^5.0.0",
+    "typescript": "^5.0.2",
-    "typescript": "^5.0.2"
+    "vite": "^5.0.0"
  }
 }
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@ -1701,6 +1701,17 @@ dependencies = [
 "objc_exception",
 ]
 [[package]]
 name = "objc-foundation"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
 dependencies = [
 "block",
 "objc",
 "objc_id",
 ]
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@ -2225,6 +2236,30 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 [[package]]
 name = "rfd"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
 dependencies = [
 "block",
 "dispatch",
 "glib-sys",
 "gobject-sys",
 "gtk-sys",
 "js-sys",
 "lazy_static",
 "log",
 "objc",
 "objc-foundation",
 "objc_id",
 "raw-window-handle",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
 "windows 0.37.0",
 ]
 [[package]]
 name = "rusqlite"
 version = "0.31.0"
@ -2494,6 +2529,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 name = "snotes-deck"
 version = "0.0.0"
 dependencies = [
 "home",
 "libsnotes",
 "serde",
 "serde_json",
@ -2726,6 +2762,7 @@ dependencies = [
 "rand 0.8.5",
 "raw-window-handle",
 "regex",
 "rfd",
 "semver",
 "serde",
 "serde_json",
@ -3299,6 +3336,18 @@ dependencies = [
 "wasm-bindgen-shared",
 ]
 [[package]]
 name = "wasm-bindgen-futures"
 version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
 "cfg-if",
 "js-sys",
 "wasm-bindgen",
 "web-sys",
 ]
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.92"
@ -3328,6 +3377,16 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 [[package]]
 name = "web-sys"
 version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
 ]
 [[package]]
 name = "webkit2gtk"
 version = "0.18.2"
@ -3444,6 +3503,19 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "windows"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
 dependencies = [
 "windows_aarch64_msvc 0.37.0",
 "windows_i686_gnu 0.37.0",
 "windows_i686_msvc 0.37.0",
 "windows_x86_64_gnu 0.37.0",
 "windows_x86_64_msvc 0.37.0",
 ]
 [[package]]
 name = "windows"
 version = "0.39.0"
@ -3598,6 +3670,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.39.0"
@ -3622,6 +3700,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 [[package]]
 name = "windows_i686_gnu"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
 [[package]]
 name = "windows_i686_gnu"
 version = "0.39.0"
@ -3646,6 +3730,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 [[package]]
 name = "windows_i686_msvc"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
 [[package]]
 name = "windows_i686_msvc"
 version = "0.39.0"
@ -3670,6 +3760,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.39.0"
@ -3712,6 +3808,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.39.0"
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@ -11,10 +11,11 @@ edition = "2021"
 tauri-build = { version = "1", features = [] }
 [dependencies]
-tauri = { version = "1", features = ["shell-open"] }
+tauri = { version = "1", features = [ "path-all", "fs-read-file", "fs-write-file", "fs-read-dir", "dialog-all", "shell-open"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 libsnotes = { path = "../libsnotes" }
 home = "0.5.9"
 [features]
 # This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!!
--- a/src-tauri/icons/128x128.png
+++ b/src-tauri/icons/128x128.png
--- a/src-tauri/icons/128x128@2x.png
+++ b/src-tauri/icons/128x128@2x.png
--- a/src-tauri/icons/32x32.png
+++ b/src-tauri/icons/32x32.png
--- a/src-tauri/icons/Square107x107Logo.png
+++ b/src-tauri/icons/Square107x107Logo.png
--- a/src-tauri/icons/Square142x142Logo.png
+++ b/src-tauri/icons/Square142x142Logo.png
--- a/src-tauri/icons/Square150x150Logo.png
+++ b/src-tauri/icons/Square150x150Logo.png
--- a/src-tauri/icons/Square284x284Logo.png
+++ b/src-tauri/icons/Square284x284Logo.png
--- a/src-tauri/icons/Square30x30Logo.png
+++ b/src-tauri/icons/Square30x30Logo.png
--- a/src-tauri/icons/Square310x310Logo.png
+++ b/src-tauri/icons/Square310x310Logo.png
--- a/src-tauri/icons/Square44x44Logo.png
+++ b/src-tauri/icons/Square44x44Logo.png
--- a/src-tauri/icons/Square71x71Logo.png
+++ b/src-tauri/icons/Square71x71Logo.png
--- a/src-tauri/icons/Square89x89Logo.png
+++ b/src-tauri/icons/Square89x89Logo.png
--- a/src-tauri/icons/StoreLogo.png
+++ b/src-tauri/icons/StoreLogo.png
--- a/src-tauri/icons/icon.icns
+++ b/src-tauri/icons/icon.icns
--- a/src-tauri/icons/icon.ico
+++ b/src-tauri/icons/icon.ico
--- a/src-tauri/icons/icon.png
+++ b/src-tauri/icons/icon.png
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@ -1,12 +1,15 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 use std::fs;
 use home::home_dir;
 use libsnotes::show_notes;
 // Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
 #[tauri::command]
-fn greet(name: &str) -> String {
+fn init_db() {
-    format!("Hello, {}! You've been greeted from Rust!", name)
+    libsnotes::init_db().unwrap();
    println!("initted")
 }
 /// get ALL notes in the Database. If you don't want this, set show_notes(false)
@ -16,6 +19,17 @@ fn get_notes_list() -> String {
    notes.to_string()
 }
 #[tauri::command]
 fn get_latest_note() -> String {
    let note = libsnotes::get_latest_note().unwrap();
    note.to_string()
 }
 #[tauri::command]
 fn get_note_by_id(id: u32) -> String {
    libsnotes::get_note_by_id(id).unwrap()
 }
 #[tauri::command]
 fn search_notes(query: &str) -> String {
    let results = libsnotes::search_notes(query).unwrap();
@ -38,15 +52,69 @@ fn update_specific_note(id: u32, content: &str, tag: &str) -> bool {
    libsnotes::edit_specific_note(id.try_into().unwrap(), tag, content).is_ok()
 }
 #[tauri::command]
 fn load_settings() -> String {
    let settings_string = fs::read_to_string(
        home_dir()
            .unwrap()
            .join(".snotes-data/snotes-settings.json"),
    )
    .unwrap_or(String::from(""))
    .parse()
    .unwrap_or(String::from(""));
    dbg!(&settings_string);
    settings_string
 }
 #[tauri::command]
 fn init_settings() {
    let dir = home_dir().unwrap().join(".snotes-data");
    dbg!(&dir);
    if !dir.exists() {
        fs::create_dir(dir).unwrap();
    }
    let settings = r#"
    {
        "fontSize": "16px",
        "ocrLanguage": "eng",
    }
    "#;
    fs::write(
        home_dir()
            .unwrap()
            .join(".snotes-data/snotes-settings.json"),
        settings,
    )
    .unwrap();
 }
 #[tauri::command]
 fn save_settings(settings: String) {
    fs::write(
        home_dir()
            .unwrap()
            .join(".snotes-data/snotes-settings.json"),
        settings,
    )
    .unwrap();
 }
 fn main() {
    tauri::Builder::default()
        .invoke_handler(tauri::generate_handler![
-            greet,
+            init_db,
            get_notes_list,
            get_latest_note,
            get_note_by_id,
            search_notes,
            create_note,
            delete_specific_note,
-            update_specific_note
+            update_specific_note,
            init_settings,
            load_settings,
            save_settings
        ])
        .run(tauri::generate_context!())
        .expect("error while running tauri application");
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@ -8,7 +8,7 @@
  },
  "package": {
    "productName": "snotes-deck",
-    "version": "0.0.4"
+    "version": "0.0.11"
  },
  "tauri": {
    "allowlist": {
@ -16,6 +16,25 @@
      "shell": {
        "all": false,
        "open": true
      },
      "dialog": {
        "all": true
      },
      "fs": {
        "all": false,
        "copyFile": false,
        "createDir": false,
        "exists": false,
        "readDir": true,
        "readFile": true,
        "removeDir": false,
        "removeFile": false,
        "renameFile": false,
        "scope": [],
        "writeFile": true
      },
      "path": {
        "all": true
      }
    },
    "windows": [
--- a/src/assets/sort-from-bottom-to-top.svg
+++ b/src/assets/sort-from-bottom-to-top.svg
@ -0,0 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
 <svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M4 8H13" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round"/>
 <path d="M6 13H13" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round"/>
 <path d="M8 18H13" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round"/>
 <path d="M17 20V4L20 8" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/src/assets/sort-from-top-to-bottom.svg
+++ b/src/assets/sort-from-top-to-bottom.svg
@ -0,0 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
 <svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M4 16L13 16" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round"/>
 <path d="M6 11H13" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round"/>
 <path d="M8 6L13 6" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round"/>
 <path d="M17 4L17 20L20 16" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/src/assets/tauri.svg
+++ b/src/assets/tauri.svg
@ -1,6 +0,0 @@
 <svg width="206" height="231" viewBox="0 0 206 231" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M143.143 84C143.143 96.1503 133.293 106 121.143 106C108.992 106 99.1426 96.1503 99.1426 84C99.1426 71.8497 108.992 62 121.143 62C133.293 62 143.143 71.8497 143.143 84Z" fill="#FFC131"/>
 <ellipse cx="84.1426" cy="147" rx="22" ry="22" transform="rotate(180 84.1426 147)" fill="#24C8DB"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M166.738 154.548C157.86 160.286 148.023 164.269 137.757 166.341C139.858 160.282 141 153.774 141 147C141 144.543 140.85 142.121 140.558 139.743C144.975 138.204 149.215 136.139 153.183 133.575C162.73 127.404 170.292 118.608 174.961 108.244C179.63 97.8797 181.207 86.3876 179.502 75.1487C177.798 63.9098 172.884 53.4021 165.352 44.8883C157.82 36.3744 147.99 30.2165 137.042 27.1546C126.095 24.0926 114.496 24.2568 103.64 27.6274C92.7839 30.998 83.1319 37.4317 75.8437 46.1553C74.9102 47.2727 74.0206 48.4216 73.176 49.5993C61.9292 50.8488 51.0363 54.0318 40.9629 58.9556C44.2417 48.4586 49.5653 38.6591 56.679 30.1442C67.0505 17.7298 80.7861 8.57426 96.2354 3.77762C111.685 -1.01901 128.19 -1.25267 143.769 3.10474C159.348 7.46215 173.337 16.2252 184.056 28.3411C194.775 40.457 201.767 55.4101 204.193 71.404C206.619 87.3978 204.374 103.752 197.73 118.501C191.086 133.25 180.324 145.767 166.738 154.548ZM41.9631 74.275L62.5557 76.8042C63.0459 72.813 63.9401 68.9018 65.2138 65.1274C57.0465 67.0016 49.2088 70.087 41.9631 74.275Z" fill="#FFC131"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M38.4045 76.4519C47.3493 70.6709 57.2677 66.6712 67.6171 64.6132C65.2774 70.9669 64 77.8343 64 85.0001C64 87.1434 64.1143 89.26 64.3371 91.3442C60.0093 92.8732 55.8533 94.9092 51.9599 97.4256C42.4128 103.596 34.8505 112.392 30.1816 122.756C25.5126 133.12 23.9357 144.612 25.6403 155.851C27.3449 167.09 32.2584 177.598 39.7906 186.112C47.3227 194.626 57.153 200.784 68.1003 203.846C79.0476 206.907 90.6462 206.743 101.502 203.373C112.359 200.002 122.011 193.568 129.299 184.845C130.237 183.722 131.131 182.567 131.979 181.383C143.235 180.114 154.132 176.91 164.205 171.962C160.929 182.49 155.596 192.319 148.464 200.856C138.092 213.27 124.357 222.426 108.907 227.222C93.458 232.019 76.9524 232.253 61.3736 227.895C45.7948 223.538 31.8055 214.775 21.0867 202.659C10.3679 190.543 3.37557 175.59 0.949823 159.596C-1.47592 143.602 0.768139 127.248 7.41237 112.499C14.0566 97.7497 24.8183 85.2327 38.4045 76.4519ZM163.062 156.711L163.062 156.711C162.954 156.773 162.846 156.835 162.738 156.897C162.846 156.835 162.954 156.773 163.062 156.711Z" fill="#24C8DB"/>
 </svg>
--- a/src/assets/typescript.svg
+++ b/src/assets/typescript.svg
@ -1,25 +0,0 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
 "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <svg version="1.0" xmlns="http://www.w3.org/2000/svg"
 width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"
 preserveAspectRatio="xMidYMid meet">
 <g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
 fill="#2D79C7" stroke="none">
 <path d="M430 5109 c-130 -19 -248 -88 -325 -191 -53 -71 -83 -147 -96 -247
 -6 -49 -9 -813 -7 -2166 l3 -2090 22 -65 c54 -159 170 -273 328 -323 l70 -22
 2140 0 2140 0 66 23 c160 55 272 169 322 327 l22 70 0 2135 0 2135 -22 70
 c-49 157 -155 265 -319 327 l-59 23 -2115 1 c-1163 1 -2140 -2 -2170 -7z
 m3931 -2383 c48 -9 120 -26 160 -39 l74 -23 3 -237 c1 -130 0 -237 -2 -237 -3
 0 -26 14 -53 30 -61 38 -197 84 -310 106 -110 20 -293 15 -368 -12 -111 -39
 -175 -110 -175 -193 0 -110 97 -197 335 -300 140 -61 309 -146 375 -189 30
 -20 87 -68 126 -107 119 -117 164 -234 164 -426 0 -310 -145 -518 -430 -613
 -131 -43 -248 -59 -445 -60 -243 -1 -405 24 -577 90 l-68 26 0 242 c0 175 -3
 245 -12 254 -9 9 -9 12 0 12 7 0 12 -4 12 -9 0 -17 139 -102 223 -138 136 -57
 233 -77 382 -76 145 0 224 19 295 68 75 52 100 156 59 242 -41 84 -135 148
 -374 253 -367 161 -522 300 -581 520 -23 86 -23 253 -1 337 73 275 312 448
 682 492 109 13 401 6 506 -13z m-1391 -241 l0 -205 -320 0 -320 0 0 -915 0
 -915 -255 0 -255 0 0 915 0 915 -320 0 -320 0 0 205 0 205 895 0 895 0 0 -205z"/>
 </g>
 </svg>
--- a/src/assets/vite.svg
+++ b/src/assets/vite.svg
@ -1 +0,0 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
--- a/src/main.ts
+++ b/src/main.ts
@ -1,6 +1,9 @@
 import { invoke } from "@tauri-apps/api/tauri";
-import { Note } from "./model";
+import { save } from "@tauri-apps/api/dialog";
-
+import { Note, Settings } from "./model";
 import { createWorker } from 'tesseract.js';
 import { writeTextFile } from "@tauri-apps/api/fs";
 import { homeDir } from "@tauri-apps/api/path";
 let notesMsgEl: HTMLElement | null;
@ -9,24 +12,39 @@ let createNoteTagEl: HTMLInputElement | null;
 let searchbarEl: HTMLInputElement | null;
 let noteSidebarContainerEl: HTMLDivElement | null;
 let searchbarContents = "";
 let noteArray: Note[] = []
 /** ID of current note, if we're editing an existing note */
 let currentNoteId: number | null = null;
 /** reverse the order of note by id in the sidebar */
 let reversed = true;
 let idModalActive = false;
 let typingTimer: number | null = null;
 const AUTOSAVE_DELAY = 5000;
 enum EditorState {
  NEW,
  EDITING
 }
 enum SearchState {
  EMPTY,
  RESULTS
 }
 /** Editor always initializes in the NEW state */
-let editorState = EditorState.NEW
+let editorState = EditorState.NEW;
 let searchState = SearchState.EMPTY;
 let settings: Settings | null = null;
 /**
 * Saves the note.
 * Or updates an existing note depending on editor state
 * TODO: save note when switching to prevent data loss
 */
 async function saveNote() {
  if (createNoteContentEl && createNoteTagEl) {
@ -37,7 +55,8 @@ async function saveNote() {
          content: createNoteContentEl.value,
          tag: createNoteTagEl.value
        });
-        clearEditor();
+        //clearEditor();
        refreshSidebarAndOpenLatestNote();
        break;
      case EditorState.EDITING:
        console.log("updating existing note..")
@ -59,29 +78,33 @@ async function saveNote() {
 }
 /**
- * Retrieve Notes from DB and fill the sidebar with them
+ * Retrieve Notes from DB and fill the sidebar with them.
 * 
 * If there's something in the searchbar, do not clear that.
 */
 async function showNotes() {
  if (notesMsgEl) {
-    const array: Array<any> = await retrieveNotes();
+    if (searchState == SearchState.EMPTY) {
      const array: Array<any> = await retrieveNotes();
-    noteArray = array.map((jsonObj) => ({
+      noteArray = array.map((jsonObj) => ({
-      id: jsonObj.id,
+        id: jsonObj.id,
-      content: jsonObj.content,
+        content: jsonObj.content,
-      date: jsonObj.date,
+        date: jsonObj.date,
-      tag: jsonObj.tag
+        tag: jsonObj.tag
-    }));
+      }));
-    console.log(noteArray[0])
+      fillNoteSidebar(noteArray, reversed);
-
+    } else {
-    fillNoteSidebar(noteArray);
+      searchNote(searchbarContents);
    }
  }
 }
 async function retrieveNotes(): Promise<Array<JSON>> {
  const notesString: string = await invoke("get_notes_list");
  const notesJson = JSON.parse(notesString);
-  console.log(notesJson);
+
  return notesJson;
 }
@ -89,12 +112,25 @@ async function retrieveNotes(): Promise<Array<JSON>> {
 * Handle even listeners on load.
 * This does not handle listeners for generated fields like
 * the Notes in the sidebar.
 * TODO: consistency
 */
-window.addEventListener("DOMContentLoaded", () => {
+window.addEventListener("DOMContentLoaded", async () => {
  // settings
  settings = await loadSettings();
  // db
  await invoke("init_db");
  console.log("ACTUAL SETTINGS IN FRONTEND: ", settings.fontSize)
  createNoteContentEl = document.querySelector("#create-input");
  createNoteTagEl = document.querySelector("#create-tag");
  searchbarEl = document.querySelector("#note-searchbar");
  notesMsgEl = document.querySelector("#notes-list");
  // apply font size
  if (createNoteContentEl) {
    createNoteContentEl.style.fontSize = settings.fontSize + "px";
  }
  showNotes();
  document.querySelector("#save-button")?.addEventListener("click", (e) => {
    e.preventDefault();
@ -110,6 +146,14 @@ window.addEventListener("DOMContentLoaded", () => {
    e.preventDefault();
    showNotes();
  });
  document.querySelector('#export-button')?.addEventListener("click", (e) => {
    e.preventDefault();
    exportNote(createNoteContentEl ? createNoteContentEl.value : null);
  })
  document.querySelector('#settings-button')?.addEventListener("click", (e) => {
    e.preventDefault();
    handleOpenSettingsModal();
  })
  // Pressing TAB should insert intends in the editor.
  // This could potentially cause issues later...
@ -136,12 +180,98 @@ window.addEventListener("DOMContentLoaded", () => {
    const target = event.target as HTMLInputElement;
    const input = target.value;
    if (target.value == "") {
      searchState = SearchState.EMPTY;
    } else {
      searchState = SearchState.RESULTS;
    }
    searchbarContents = input;
    searchNote(input);
  })
  // sidebar reverse toggle
  let reverseIconAscEl = document.querySelector('#reverse-icon-asc') as HTMLImageElement | null;
  let reverseIconDescEl = document.querySelector('#reverse-icon-desc') as HTMLImageElement | null;
  if (reverseIconAscEl && reverseIconDescEl) {
    reverseIconDescEl.style.display = "none";
    const toggle = () => {
      toggleReverse(reverseIconAscEl as HTMLImageElement, reverseIconDescEl as HTMLImageElement);
    };
    reverseIconAscEl.addEventListener("click", toggle);
    reverseIconDescEl.addEventListener("click", toggle);
  }
  // auto-save timer
  createNoteContentEl?.addEventListener("keyup", () => {
    if (editorState === EditorState.EDITING) {
      if (typingTimer) {
        clearTimeout(typingTimer);
      }
      typingTimer = window.setTimeout(() => saveNote(), AUTOSAVE_DELAY);
    }
  });
  if (createNoteContentEl) {
    createNoteContentEl.style.fontSize = settings.fontSize
  }
  // OCR
  const uploadOcrImageButtonEl = document.getElementById('image-button') as HTMLButtonElement;
  const ocrFileInputEl = document.getElementById('fileInput') as HTMLInputElement;
  uploadOcrImageButtonEl.addEventListener('click', () => {
    ocrFileInputEl.click(); // Simulate click on the file input
  });
  ocrFileInputEl.addEventListener('change', (event) => {
    const files = (event.target as HTMLInputElement).files;
    if (files) {
      console.log('Selected file:', files[0].name);
      ocrFileInputEl.src = URL.createObjectURL(files[0]);
      (async () => {
        // TODO: change ocr language in settings
        const worker = await createWorker(settings ? settings.ocrLanguage : "eng");
        const ret = await worker.recognize(files[0]);
        console.log(ret.data.text);
        if (createNoteContentEl) [
          createNoteContentEl.value += ret.data.text
        ]
        await worker.terminate();
      })();
    }
  });
  refreshContextMenuElements();
 });
 async function loadSettings(): Promise<Settings> {
  const defaultSettings: Settings = {
    fontSize: "16px",
    ocrLanguage: "eng"
  };
  try {
    let loadedSettingsString: string = await invoke("load_settings");
    console.log(loadedSettingsString);
    if (loadedSettingsString === "") {
      await invoke("init_settings");
      return defaultSettings;
    }
    const loadedSettings = JSON.parse(loadedSettingsString);
    return loadedSettings as Settings;
  } catch (error) {
    console.error("An error occurred while loading settings:", error);
    return defaultSettings;
  }
 }
 /**
 * We need to add new event listeners every time we refresh the note list
 */
@ -189,7 +319,7 @@ function refreshContextMenuElements() {
  }
 }
-function fillNoteSidebar(noteArray: Note[]) {
+function fillNoteSidebar(noteArray: Note[], reverse: boolean) {
  noteSidebarContainerEl = document.querySelector("#note-sidebar-container");
@ -197,6 +327,8 @@ function fillNoteSidebar(noteArray: Note[]) {
    // clear previously existing elements
    noteSidebarContainerEl.innerHTML = "";
    reverse ? noteArray.reverse() : noteArray;
    noteArray.forEach((note) => {
      // Create HTML elements for each note
      const noteEl: HTMLDivElement = document.createElement('div');
@ -217,7 +349,7 @@ function fillNoteSidebar(noteArray: Note[]) {
      const tagSpan: HTMLSpanElement = document.createElement('span');
      tagSpan.classList.add('sidebar-note-tag');
-      tagSpan.textContent = note.tag as string;
+      tagSpan.textContent = note.tag.length > 9 ? note.tag.substring(0, 11) + ".." : note.tag as string;
      noteEl.appendChild(idSpan);
@ -234,7 +366,7 @@ function fillNoteSidebar(noteArray: Note[]) {
 function handleSidebarNoteClick(id: Number): any {
-  console.log("huh " + id);
+  console.log("clicked note " + id);
  if (createNoteContentEl && createNoteTagEl) {
    // search for note
    let n: Note = {
@ -251,6 +383,12 @@ function handleSidebarNoteClick(id: Number): any {
    });
    if (n) {
      // save if there's something in the editor currently 
      // before we open the new note to prevent data loss
      if (createNoteContentEl.value != "") {
        saveNote();
      }
      openNote(n);
    } else {
      // don't destory currently editing note if this fails
@ -295,6 +433,7 @@ function openNote(note: Note) {
    currentNoteId = note.id as number;
    // switch state
    editorState = EditorState.EDITING;
    createNoteContentEl.focus();
  }
 }
@ -341,7 +480,47 @@ function handleKeyboardShortcuts(event: KeyboardEvent) {
      console.error("failed to focus on searchbar");
    }
  }
-  // open by id
+  // open by id: open modal
  if (event.ctrlKey && event.key === 't') {
    event.preventDefault();
    const modalBg = document.getElementById("id-modal-bg");
    const modal = document.getElementById("id-modal-container");
    const idSearchBar = document.getElementById("id-search")
    if (modalBg && modal && idSearchBar) {
      modalBg.style.display = "block";
      modal.style.display = "block";
      idSearchBar.focus();
      (idSearchBar as HTMLInputElement).value = "";
      idModalActive = true;
      modalBg.addEventListener("click", () => {
        modal.style.display = "none";
        modalBg.style.display = "none";
        idModalActive = false;
      })
      idSearchBar.addEventListener("keydown", async (event: KeyboardEvent) => {
        if (event.key === "Enter" && idModalActive) {
          let value = (idSearchBar as HTMLInputElement).value;
          console.log("value: " + value);
          if (await openNoteById(value)) {
            modal.style.display = "none";
            modalBg.style.display = "none";
            idModalActive = false;
          } else {
            (idSearchBar as HTMLInputElement).value = "";
            (idSearchBar as HTMLInputElement).placeholder = "no Note found for ID";
          }
        }
        if (event.key === "Escape" && idModalActive) {
          modal.style.display = "none";
          modalBg.style.display = "none";
          idModalActive = false;
        }
      });
    } else { console.error("failed to get modal"); }
  }
  // quick switch note 1-9
 }
@ -359,9 +538,7 @@ async function searchNote(input: string) {
      tag: jsonObj.tag
    }));
-    console.log(noteArray[0])
+    fillNoteSidebar(noteArray, reversed);
    fillNoteSidebar(noteArray);
  }
 }
@ -370,7 +547,163 @@ async function getSearchResults(input: string): Promise<Array<JSON>> {
    query: input
  });
  const resultsJson = JSON.parse(resultsString);
  console.log(resultsJson);
  return resultsJson;
 }
 /**
 * When we save a new note, we want to keep that note
 * in the editor, so we switch out the New note for
 * Editing an existing note (the latest one, the one
 * we just created)
 */
 async function refreshSidebarAndOpenLatestNote() {
  showNotes();
  const noteString = await invoke("get_latest_note");
  const noteJson = JSON.parse(noteString as string);
  const latestNote: Note = {
    id: noteJson[0].id,
    content: noteJson[0].content,
    date: noteJson[0].date,
    tag: noteJson[0].tag
  }
  openNote(latestNote);
 }
 function toggleReverse(reverseIconAscEl: HTMLImageElement | null, reverseIconDescEl: HTMLImageElement | null) {
  reversed = !reversed;
  if (reverseIconAscEl && reverseIconDescEl) {
    if (reverseIconAscEl.style.display !== 'none') {
      reverseIconAscEl.style.display = 'none';
      reverseIconDescEl.style.display = 'block';
    } else {
      reverseIconAscEl.style.display = 'block';
      reverseIconDescEl.style.display = 'none';
    }
  }
  showNotes();
 }
 async function openNoteById(value: string): Promise<boolean> {
  const id: Number | null = parseInt(value);
  if (id) {
    const noteString = await invoke("get_note_by_id", {
      id: id
    });
    console.log("id called: " + id)
    console.log("note string: " + noteString)
    const noteJson = JSON.parse(noteString as string);
    if (noteJson.length == 0) {
      return false;
    }
    const foundNote: Note = {
      id: noteJson[0].id,
      content: noteJson[0].content,
      date: noteJson[0].date,
      tag: noteJson[0].tag
    }
    openNote(foundNote);
    return true;
  }
  return false;
 }
 async function exportNote(contents: string | null) {
  if (contents) {
    const title = contents.slice(0, 10).trim();
    const filePath = await save({
      defaultPath: (await homeDir()) + "/" + title + ".md",
      filters: [{
        name: 'Text',
        extensions: ['txt', 'md']
      }]
    });
    if (filePath) {
      await (writeTextFile(filePath, contents));
    } else {
      console.error("Failed to get filePath")
    }
  } else {
    // TODO: have some kind of error banner at the bottom for
    // these notifications
    console.error("Export note: failed to get note contents");
  }
 }
 function handleOpenSettingsModal() {
  const modalBg = document.getElementById("id-modal-bg");
  const setingsModalContainer = document.getElementById("settings-modal-container");
  const settingsFontsizeInput = document.getElementById("fontsize-setting-input") as HTMLInputElement;
  const settingsOcrLanguageInput = document.getElementById("ocr-language-setting-input") as HTMLInputElement;
  const settingsSaveButton = document.getElementById("save-settings-button");
  if (modalBg && setingsModalContainer && settingsFontsizeInput) {
    modalBg.style.display = "block";
    setingsModalContainer.style.display = "block";
    settingsFontsizeInput.focus();
    settingsFontsizeInput.value = settings ? settings.fontSize : "16";
    settingsOcrLanguageInput.value = settings ? settings.ocrLanguage : "eng";
    modalBg.addEventListener("click", () => {
      setingsModalContainer.style.display = "none";
      modalBg.style.display = "none";
    });
    settingsFontsizeInput.addEventListener("keydown", async (event: KeyboardEvent) => {
      if (event.key === "Enter") {
        console.log("saving settings..")
        settings = {
          fontSize: settingsFontsizeInput.value,
          ocrLanguage: settingsOcrLanguageInput.value === "" ? "eng" : settingsOcrLanguageInput.value
        }
        await invoke("save_settings", {
          settings: JSON.stringify(settings)
        });
        if (createNoteContentEl) {
          createNoteContentEl.style.fontSize = settingsFontsizeInput.value + "px";
        } else {
          console.error("failed to get createNoteContentEl")
        }
        setingsModalContainer.style.display = "none";
        modalBg.style.display = "none";
      }
      if (event.key === "Escape") {
        setingsModalContainer.style.display = "none";
        modalBg.style.display = "none";
      }
    });
    if (settingsSaveButton) {
      settingsSaveButton.addEventListener("click", async () => {
        console.log("saving settings..")
        settings = {
          fontSize: settingsFontsizeInput.value,
          ocrLanguage: settingsOcrLanguageInput.value === "" ? "eng" : settingsOcrLanguageInput.value
        }
        await invoke("save_settings", {
          settings: JSON.stringify(settings)
        });
        if (createNoteContentEl) {
          createNoteContentEl.style.fontSize = settingsFontsizeInput.value + "px";
        } else {
          console.error("failed to get createNoteContentEl")
        }
        setingsModalContainer.style.display = "none";
        modalBg.style.display = "none";
      });
    } else {
      console.error("Failed to get Settings Modal save button.");
    }
  } else {
    console.error("Failed to get Settings Modal elements.");
  }
 }
--- a/src/model.ts
+++ b/src/model.ts
@ -4,3 +4,8 @@ export type Note = {
    date: String,
    tag: String;
 };
 export type Settings = {
    fontSize: string,
    ocrLanguage: string,
 };
--- a/src/styles.css
+++ b/src/styles.css
@ -13,16 +13,22 @@
  -moz-osx-font-smoothing: grayscale;
  -webkit-text-size-adjust: 100%;
  margin-top: 0.25em;
  overflow-y: hidden;
 }
 .top-bar {
  margin: 0;
 }
 #button-row {
  display: flex;
  flex-direction: row;
  flex-flow: wrap;
  justify-content: space-evenly;
  margin: 0;
 }
 .container {
@ -37,14 +43,18 @@
 }
 .editor {
-  background-color: #41005a;
+  background-color: #1f1f1f;
  margin-left: 1em;
  width: 100%;
  height: 100%;
  border-radius: 15px;
  display: flex;
  flex-direction: column;
  justify-content: flex-end;
 }
 .row {
@ -82,19 +92,26 @@ button {
 button {
  cursor: pointer;
  box-sizing: border-box;
 }
 button:hover {
-  border-color: #396cd8;
+  border-color: #c539d8;
  box-shadow: 0 0 5px #c539d8, 0 0 10px #c539d8, 0 0 15px #c539d8, 0 0 20px #c539d8;
  box-sizing: border-box;
 }
 button:active {
-  border-color: #396cd8;
+  border-color: #ab39d8;
-  background-color: #e8e8e8;
+  background-color: #44003e;
 }
 #create-tag {
  margin: 0.5em;
  background-color: #252525;
  color: #f6f6f6;
 }
 #create-input {
@ -146,7 +163,9 @@ button {
 .sidebar {
  background-color: #0f0f0f;
  width: 35%;
-  padding: 20px;
+  padding: 0 20px;
  border-radius: 15px;
 }
 .note-sidebar-container {
@ -166,20 +185,58 @@ button {
 }
 .sidebar-note-id {
-  margin-right: 10px;
+  margin-right: 30px;
  font-weight: bold;
 }
 .sidebar-note-content {
  flex-grow: 1;
  overflow: hidden;
  white-space: nowrap;
  text-overflow: ellipsis;
  text-align: left;
 }
 .sidebar-note-tag {
  margin-left: 10px;
  padding: 2px 6px;
  border-radius: 4px;
  flex-shrink: 0;
  flex-grow: 0;
  overflow: hidden;
  white-space: nowrap;
  text-overflow: ellipsis;
 }
 #reverse-icon-asc {
  display: blocK;
  width: 1.5em;
  height: 1.5em;
  color: white;
  cursor: pointer;
  margin-right: 1.5em;
  margin-left: -0.8em;
 }
 #reverse-icon-desc {
  display: none;
  width: 1.5em;
  height: 1.5em;
  color: white;
  cursor: pointer;
  margin-right: 1.5em;
  margin-left: -0.8em;
 }
 /* CONTEXT MENU */
@ -194,6 +251,8 @@ button {
  z-index: 999;
  border: 1px solid #ccc;
  padding: 5px;
  background-color: #252525;
 }
 .menu button {
@ -211,7 +270,10 @@ button {
 /* Searchbar */
 .searchbar-container {
-  margin: 0.5em;
+  margin: 0.8em 0.5em 0.5em 0.5em;
  display: flex;
  align-items: center;
 }
 #note-searchbar {
@ -222,10 +284,61 @@ button {
  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
  outline: none;
  font-size: 16px;
  line-height: 1.5;
  margin: 0 -0.6em;
  background-color: #252525;
  color: #f6f6f6;
 }
 #note-searchbar::placeholder {}
 /* Open by ID Modal */
 #id-modal-bg {
  display: none;
  position: fixed;
  top: 0;
  left: 0;
  width: 100vw;
  height: 100vh;
  background-color: rgba(0, 0, 0, 0.534);
  filter: grayscale();
  /* Semi-transparent black */
  z-index: 1;
  /* Ensure it's behind the modal */
 }
 #id-modal-container {
  display: none;
  position: fixed;
  margin-top: 20%;
  margin-left: 50%;
  z-index: 3;
 }
 #settings-modal-container {
  display: none;
  position: fixed;
  margin-top: 20%;
  margin-left: 50%;
  z-index: 4;
 }
 #save-settings-button {
  margin: 1em;
 }
 /* MISC */
 /* Fancier Scrollbar */
Author	SHA1	Message	Date
catto	7065a72653	github actions	2024-05-11 13:27:43 +02:00
catto	08951bae4c	setting for ocr language, properly apply them	2024-05-09 14:26:31 +02:00
catto	a40578ea30	fix svg icons not showing with a cursed workaround Tauri really doesn't like importing svg modules in ts	2024-05-09 13:53:41 +02:00
catto	1c0ac3b219	whoops	2024-05-05 22:58:23 +02:00
catto	b5238c7c93	more styling	2024-05-05 22:57:40 +02:00
catto	344c1a033e	some css	2024-05-01 22:20:20 +02:00
catto	d6700e3066	settings modal for font size	2024-04-26 21:33:37 +02:00
catto	61d1776239	save db in new folder	2024-04-23 13:07:04 +02:00
catto	efb306ac05	small fixes	2024-04-22 17:14:58 +02:00
catto	e4c77aa755	export as text file	2024-04-22 14:52:45 +02:00
catto	252c5fd6c6	use input text instead cause under Linux the searchbar always gets rendered with a white background...	2024-04-21 15:01:44 +02:00
catto	b39c271961	check db init when starting	2024-04-21 14:52:57 +02:00
catto	52b4ea16c8	fix searchbar color on linux	2024-04-21 14:34:59 +02:00
catto	75eb5301fd	add janky image OCR	2024-04-19 23:50:33 +02:00
catto	4f86f26972	settings json	2024-04-18 10:16:06 +02:00
catto	86a7fee5e9	focus on editor area	2024-04-17 15:11:47 +02:00
catto	4a4a688da4	open note by id modal menu	2024-04-17 13:11:54 +02:00
catto	aa2e6e76b0	add a new icon?!	2024-04-16 22:55:47 +02:00
catto	a9aaceb967	auto-save!	2024-04-16 22:44:53 +02:00
catto	e0fd2317ef	whoops	2024-04-16 14:03:25 +02:00
catto	91f76c5f63	reverse toggle	2024-04-16 13:50:22 +02:00
catto	c5423eea29	disable default spell checkers in editor	2024-04-15 21:10:39 +02:00
catto	a6d61f6e54	keep new note in editor	2024-04-15 14:22:46 +02:00
catto	c9e2a0eb7f	searchbar state	2024-04-15 11:16:41 +02:00
		`@ -1 +0,0 @@`
			<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>