diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 12cc6f0..280afa2 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -35,7 +35,7 @@ jobs: node-version: lts/* - name: Install dependencies run: | - corepack enable + corepack enable yarn install - name: Build run: yarn bundle:demo diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 892fa80..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "recommendations": [ - "dbaeumer.vscode-eslint", - "rvest.vs-code-prettier-eslint", - "editorconfig.editorconfig", - "formulahendry.auto-rename-tag", - "aaron-bond.better-comments", - "ms-vscode.vscode-typescript-next", - "esbenp.prettier-vscode", - "vadimcn.vscode-lldb", - "rust-lang.rust-analyzer" - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index faa5c34..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[css]": { - "editor.defaultFormatter": "vscode.css-language-features" - } -} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95cb390..86d74ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,8 +62,16 @@ yarn action:devtool ## Theming -Theming is done via the [light-dark](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/light-dark) CSS color function. The theme is then being changed by setting a different `color-scheme` value in a CSS root tag. Try to follow the general styling. - +Theming is done via the [light-dark](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/light-dark) CSS color function. The theme is then being changed by setting a different `color-scheme` value in a CSS root tag. `color-scheme` has the following valid values `light`,`dark` and `light dark`. The same is true for `AppContext.appearances.colorTheme`. Depending on the App-Context, a different stylesheet is being linked (see [`App.tsx`](./src/App.tsx)). Those stylesheets are: +- [`theme-light.css`](./src/theme-light.css) +- [`theme-dark.css`](./src/theme-dark.css) +- [`theme-lightdark.css`](./src/theme-lightdark.css) + +As for the Styling itself, try to follow the general styling. +- Secondary color for active/selected elements, rarely accents. +- Primary color for interactive elements, unless it breaks with the overall element styling. The table row navigator buttons are a good example ([`TableBody.tsx`](./src/comps/Table/TableBody.tsx)), for when to break with theme. +- Links are underlined and mostly not focusable (`tabindex: -1;`). +- ...expect this list to grow over time ## Data Storage diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 8e8b154..e6b848e 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -2,6 +2,7 @@ ## Version v2.1.2 - bugfixes and polishing + - dependency upgrades ## Version v2.1.1 - sanding and optimizations diff --git a/factor.code-workspace b/factor.code-workspace index 56e2f4d..e6d2d2e 100644 --- a/factor.code-workspace +++ b/factor.code-workspace @@ -1,12 +1,12 @@ { - "folders": [ + "folders": [ { "path": "." } ], - "settings": { - "typescript.tsdk": "node_modules\\typescript\\lib", - "files.exclude": { + "settings": { + "typescript.tsdk": "node_modules\\typescript\\lib", + "files.exclude": { "**/.git": true, "**/.svn": true, "**/.hg": true, @@ -30,10 +30,49 @@ "LICENSE": true, "node_modules": true, ".yarn": true, - }, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.indentSize": "tabSize", - "editor.tabSize": 3, - }, - + }, + "editor.indentSize": "tabSize", + "editor.tabSize": 3, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[json]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, + "[css]": { + "editor.defaultFormatter": "vscode.css-language-features" + }, + "[rust]": { + "editor.defaultFormatter": "rust-lang.rust-analyzer" + }, + "[jsonc]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, + "[jsonl]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, + "[yaml]": { + "editor.insertSpaces": true, + "editor.tabSize": 2, + "editor.autoIndent": "advanced", + "diffEditor.ignoreTrimWhitespace": false + } + }, + "extensions": { + "recommendations": [ + "dbaeumer.vscode-eslint", + "rvest.vs-code-prettier-eslint", + "editorconfig.editorconfig", + "formulahendry.auto-rename-tag", + "aaron-bond.better-comments", + "ms-vscode.vscode-typescript", + "esbenp.prettier-vscode", + "vadimcn.vscode-lldb", + "rust-lang.rust-analyzer", + "tauri-apps.tauri-vscode" + ] + } } diff --git a/package.json b/package.json index a6db0df..7740a34 100644 --- a/package.json +++ b/package.json @@ -11,20 +11,20 @@ "action:devtools": "react-devtools", "action:format": "prettier --write .", "action:lint": "eslint ./src -c ./eslint.config.mjs --fix", - "action:version": "node ./scripts/upgradeVersion.js", - "action:check-types": "tsc", - "build": "node ./scripts/preTauriBuild.mjs && tauri build", + "action:version": "node ./scripts/upgradeVersion.js", + "action:check-types": "tsc", + "build": "node ./scripts/preTauriBuild.js && tauri build", "bundle:dev": "vite build -c ./vite.dev.config.ts", - "bundle:demo": "node ./scripts/preDemoBundle.mjs && vite build -c ./vite.demo.config.ts && node ./scripts/includeFiles.mjs ", + "bundle:demo": "node ./scripts/preDemoBundle.js && vite build -c ./vite.demo.config.ts && node ./scripts/includeFiles.js ", "bundle:prod": "tsc && vite build -c ./vite.prod.config.ts", "dev:vite": "vite -c ./vite.dev.config.ts", - "dev:demo": "node ./scripts/preDemoBundle.mjs && vite -c ./vite.demo.config.ts", - "dev:tauri": "node ./scripts/preTauriDev.mjs && tauri dev", + "dev:demo": "node ./scripts/preDemoBundle.js && vite -c ./vite.demo.config.ts", + "dev:tauri": "node ./scripts/preTauriDev.js && tauri dev", "gen:sample-customers": "node ./scripts/genData.cli.js" }, "dependencies": { - "@react-pdf/renderer": "^3.4.5", - "@tauri-apps/api": "^2.0.0-rc.5", + "@react-pdf/renderer": "^4.0.0", + "@tauri-apps/api": "^2.0.0-rc.6", "@tauri-apps/plugin-fs": "^2.0.0-rc.2", "@tauri-apps/plugin-notification": "^2.0.0-rc.1", "@tauri-apps/plugin-shell": "^2.0.0-rc.1", @@ -35,16 +35,16 @@ }, "devDependencies": { "@eslint/js": "^9.11.1", - "@tauri-apps/cli": "^2.0.0-rc.16", + "@tauri-apps/cli": "^2.0.0-rc.17", "@types/eslint__js": "^8.42.3", - "@types/node": "^20.16.8", - "@types/react": "^18.3.9", + "@types/node": "^20.16.10", + "@types/react": "^18.3.10", "@types/react-dom": "^18.3.0", "@typescript-eslint/eslint-plugin": "^8.7.0", "@typescript-eslint/parser": "^8.7.0", "@vitejs/plugin-react": "^4.3.1", "eslint": "^9.11.1", - "eslint-plugin-react": "^7.36.1", + "eslint-plugin-react": "^7.37.0", "globals": "^15.9.0", "prettier": "^3.3.3", "typescript": "^5.6.2", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index f2a9c24..312eda2 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -11,12 +11,6 @@ dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -173,7 +167,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -208,7 +202,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -242,9 +236,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -255,7 +249,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.0", + "miniz_oxide", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -442,9 +436,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.21" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" dependencies = [ "shlex", ] @@ -663,7 +657,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -673,7 +667,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -697,7 +691,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -708,7 +702,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -742,7 +736,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -823,7 +817,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -864,9 +858,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "embed-resource" -version = "2.4.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" +checksum = "f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa" dependencies = [ "cc", "memchr", @@ -915,7 +909,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1006,12 +1000,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1047,7 +1041,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1128,7 +1122,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1268,19 +1262,6 @@ dependencies = [ "x11", ] -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1385,7 +1366,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1464,7 +1445,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1906,21 +1887,6 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - [[package]] name = "mac" version = "0.1.1" @@ -1963,15 +1929,6 @@ dependencies = [ "tendril", ] -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "matches" version = "0.1.10" @@ -1999,16 +1956,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2016,6 +1963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -2032,16 +1980,17 @@ dependencies = [ [[package]] name = "muda" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" +checksum = "b8123dfd4996055ac9b15a60ad263b44b01e539007523ad7a4a533a3d93b0591" dependencies = [ - "cocoa", "crossbeam-channel", "dpi", "gtk", "keyboard-types", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", "png", "serde", @@ -2116,16 +2065,6 @@ dependencies = [ "zbus", ] -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -2159,7 +2098,7 @@ dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2311,9 +2250,12 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "open" @@ -2352,12 +2294,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "pango" version = "0.18.3" @@ -2528,7 +2464,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2602,15 +2538,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide", ] [[package]] @@ -2628,6 +2564,12 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "powerfmt" version = "0.2.0" @@ -2844,47 +2786,32 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" @@ -2951,12 +2878,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - [[package]] name = "ryu" version = "1.0.18" @@ -2984,6 +2905,7 @@ dependencies = [ "serde", "serde_json", "url", + "uuid", ] [[package]] @@ -2995,15 +2917,9 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.79", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -3067,7 +2983,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3078,7 +2994,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3101,7 +3017,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3152,7 +3068,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3209,15 +3125,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - [[package]] name = "shared_child" version = "1.0.1" @@ -3334,15 +3241,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "state" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" -dependencies = [ - "loom", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -3405,9 +3303,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -3483,7 +3381,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3494,9 +3392,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0-rc.15" +version = "2.0.0-rc.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3c3b1c7ac5b72d59da307b84af900a0098c74c9d7369f65018cd8ec0eb50fb" +checksum = "246bd333561c5601241b7a09f19957d5f659667f3c1191c869a066fb309e1841" dependencies = [ "anyhow", "bytes", @@ -3525,7 +3423,6 @@ dependencies = [ "serde_json", "serde_repr", "serialize-to-javascript", - "state", "swift-rs", "tauri-build", "tauri-macros", @@ -3545,9 +3442,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-rc.12" +version = "2.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5713e81e02e0b99f5219b275abbd7d2c0cc0f30180e25b1b650e08feeac63" +checksum = "e5bc30f14b3c1548d75dfdf3e40bffe20a53bc4e3381e9bacc21dc765d701d0a" dependencies = [ "anyhow", "cargo_toml", @@ -3567,9 +3464,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.12" +version = "2.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5370f2591dcc93d4ff08d9dd168f5097f79b34e859883586a409c627544190e3" +checksum = "b1cfb6089cfc626b81bb8aa4692ede527732011dfd22486d8ac5bf299189841f" dependencies = [ "base64 0.22.1", "brotli", @@ -3583,7 +3480,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "syn 2.0.77", + "syn 2.0.79", "tauri-utils", "thiserror", "time", @@ -3594,23 +3491,23 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.11" +version = "2.0.0-rc.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19442dc8ee002ab1926586f6aecb90114f3a1226766008b0c9ac2d9fec9eeb7e" +checksum = "1f04ed6fadd294ef8061137463fe31abccbb5fa61ff9946aab2896acd140cff1" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "tauri-codegen", "tauri-utils", ] [[package]] name = "tauri-plugin" -version = "2.0.0-rc.12" +version = "2.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3368e91a98aa55ea4e3e8ccff516bc1ed2f85872c335ec35e9b345469032e0" +checksum = "6de7ffe64afa61c4cc13d450d64643b8db6cbb177a802beb88bf595594505ddf" dependencies = [ "anyhow", "glob", @@ -3701,9 +3598,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-rc.12" +version = "2.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f38d8aaa1e81d20e8e208e3e317f81b59fb75c530fbae8a90e72d02001d687" +checksum = "8d9465366fd7f9e9c77385fa8b7cb583b060544e8800bd0309deb100008c312d" dependencies = [ "dpi", "gtk", @@ -3720,9 +3617,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.13" +version = "2.0.0-rc.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1ef5171e14c8fe3b5a63e75004c20d057747bc3e7fdc5f8ded625f0b29f5c7" +checksum = "a03a49d6bcc0e65d64ea4420e2097270a25a9e1ff0fb2ece75e54fbbd54e45f7" dependencies = [ "gtk", "http", @@ -3746,9 +3643,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-rc.12" +version = "2.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31fe4c9148e1b35225e1c00753f24b517ce00041d02eb4b4d6fd10613a47736c" +checksum = "a271545e4c25b36b922d98cf7e0c1755f64e92355705f656893e352aef0331e3" dependencies = [ "brotli", "cargo_metadata", @@ -3776,6 +3673,7 @@ dependencies = [ "toml 0.8.2", "url", "urlpattern", + "uuid", "walkdir", ] @@ -3802,9 +3700,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -3847,17 +3745,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", + "syn 2.0.79", ] [[package]] @@ -4018,7 +3906,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4028,43 +3916,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", ] [[package]] name = "tray-icon" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044d7738b3d50f288ddef035b793228740ad4d927f5466b0af55dc15e7e03cfe" +checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f" dependencies = [ "core-graphics", "crossbeam-channel", @@ -4215,14 +4073,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom 0.2.15", + "serde", ] -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "version-compare" version = "0.2.0" @@ -4308,7 +4161,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -4342,7 +4195,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4355,9 +4208,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -4442,7 +4295,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4501,15 +4354,6 @@ dependencies = [ "windows-version", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.56.0" @@ -4572,7 +4416,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4583,7 +4427,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4594,7 +4438,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4605,7 +4449,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4891,9 +4735,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.43.1" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d715cf5fe88e9647f3d17b207b6d060d4a88e7171d4ccb2d2c657dd1d44728" +checksum = "440600584cfbd8b0d28eace95c1f2c253db05dae43780b79380aa1e868f04c73" dependencies = [ "base64 0.22.1", "block", @@ -5042,7 +4886,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index b9bd3ea..6402b30 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -6,22 +6,25 @@ authors = ["39zde"] license = "Apache-2.0" repository = "https://github.com/39zde/factor" edition = "2021" -rust-version = "1.81" +#rust-version = "1.81" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [lib] -name = "app_lib" -crate-type = ["staticlib", "cdylib", "lib"] +name = "factor_lib" +crate-type = ["staticlib", "cdylib", "rlib"] [build-dependencies] -tauri-build = { version = "2.0.0-rc.12", features = [] } +tauri-build = { version = "2.0.0-rc", features = [] } [dependencies] -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } -tauri = { version = "2.0.0-rc.15", features = [] } -tauri-plugin-fs = { version = "2.0.0-rc.5", features = [] } -tauri-plugin-window-state = { version = "2.0.0-rc.5", features = [] } -tauri-plugin-notification = { version = "2.0.0-rc.5", features = [] } -tauri-plugin-shell = { version = "2.0.0-rc.3", features = [] } +tauri = { version = "2.0.0-rc", features = [] } +tauri-plugin-shell = "2.0.0-rc" +serde = { version = "1", features = ["derive"] } +serde_json = "1" +tauri-plugin-fs = "2.0.0-rc" +tauri-plugin-notification = "2.0.0-rc" + +[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies] +tauri-plugin-window-state = "2.0.0-rc" + diff --git a/src-tauri/README.md b/src-tauri/README.md index c449bb2..ac62fad 100644 --- a/src-tauri/README.md +++ b/src-tauri/README.md @@ -1,3 +1,9 @@ # React Project Source Code This folder contains the Rust/BackendEnd side of things + +# Config + +The Tauri configurations are stored in [`./conf`](./conf/) and are copied to [`src-tauri`](.), depending on the used package.json script. +Sure there may be better ways to do it, but I have not found the time to implement them. Feel free to do so. + diff --git a/src-tauri/capabilities/main.json b/src-tauri/capabilities/main.json index 72b155c..96532a1 100644 --- a/src-tauri/capabilities/main.json +++ b/src-tauri/capabilities/main.json @@ -1,11 +1,11 @@ { - "$schema": "../gen/schemas/desktop-schema.json", - "identifier": "default", - "description": "enables the default permissions", - "windows": [ - "main" - ], - "permissions": [ + "$schema": "../gen/schemas/desktop-schema.json", + "identifier": "main", + "description": "enables the default permissions", + "windows": [ + "main" + ], + "permissions": [ "core:app:allow-tauri-version", "core:app:allow-app-hide", "core:app:allow-app-show", diff --git a/src-tauri/conf/tauri.dev.conf.json b/src-tauri/conf/tauri.dev.conf.json index baf585a..c930d87 100644 --- a/src-tauri/conf/tauri.dev.conf.json +++ b/src-tauri/conf/tauri.dev.conf.json @@ -3,98 +3,98 @@ "version": "2.1.2", "identifier": "factor", "build": { - "frontendDist": "../bundle-dev", - "devUrl": "https://localhost:5173", - "beforeDevCommand": "yarn dev:vite", - "beforeBuildCommand": "yarn bundle:dev" + "frontendDist": "../bundle-dev", + "devUrl": "https://localhost:5173", + "beforeDevCommand": "yarn dev:vite", + "beforeBuildCommand": "yarn bundle:dev" }, "app": { - "windows": [ - { - "title": "Factor", - "resizable": true, - "fullscreen": false, - "center": true, - "zoomHotkeysEnabled": false - } - ], - "security": { - "capabilities": [ + "windows": [ + { + "title": "Factor", + "resizable": true, + "fullscreen": false, + "center": true, + "zoomHotkeysEnabled": false + } + ], + "security": { + "capabilities": [ "main" - ], - "assetProtocol": { - "enable": false, - "scope": [] - }, - "pattern": { - "use": "brownfield" - }, - "dangerousDisableAssetCspModification": false, - "freezePrototype": false - }, - "withGlobalTauri": true + ], + "assetProtocol": { + "enable": false, + "scope": [] + }, + "pattern": { + "use": "brownfield" + }, + "csp": null, + "dangerousDisableAssetCspModification": false, + "freezePrototype": false + }, + "withGlobalTauri": true }, "bundle": { - "linux": { - "appimage": { - "bundleMediaFramework": false, - "files": {} - }, - "deb": { - "files": {} - }, - "rpm": { - "epoch": 0, - "files": {}, - "release": "1" - } - }, - "macOS": { - "dmg": { - "appPosition": { - "x": 180, - "y": 170 - }, - "applicationFolderPosition": { - "x": 480, - "y": 170 - }, - "windowSize": { - "height": 400, - "width": 660 - } - }, - "files": {}, - "hardenedRuntime": true, - "minimumSystemVersion": "10.13" - }, - "windows": { - "allowDowngrades": true, - "certificateThumbprint": null, - "digestAlgorithm": null, - "nsis": null, - "signCommand": null, - "timestampUrl": null, - "tsp": false, - "webviewInstallMode": { - "silent": true, - "type": "downloadBootstrapper" - }, - "wix": null - }, - "active": true, - "targets": "all", - "icon": [ - "./icons/32x32.png", - "./icons/128x128.png", - "./icons/128x128@2x.png", - "./icons/icon.icns", - "./icons/icon.ico" - ], - "category": "Utility", - "licenseFile": "../LICENSE", - "homepage": "https://github.com/39zde/factor" - + "linux": { + "appimage": { + "bundleMediaFramework": false, + "files": {} + }, + "deb": { + "files": {} + }, + "rpm": { + "epoch": 0, + "files": {}, + "release": "1" + } + }, + "macOS": { + "dmg": { + "appPosition": { + "x": 180, + "y": 170 + }, + "applicationFolderPosition": { + "x": 480, + "y": 170 + }, + "windowSize": { + "height": 400, + "width": 660 + } + }, + "files": {}, + "hardenedRuntime": true, + "minimumSystemVersion": "10.13" + }, + "windows": { + "allowDowngrades": true, + "certificateThumbprint": null, + "digestAlgorithm": null, + "nsis": null, + "signCommand": null, + "timestampUrl": null, + "tsp": false, + "webviewInstallMode": { + "silent": true, + "type": "downloadBootstrapper" + }, + "wix": null + }, + "active": true, + "targets": "all", + "icon": [ + "./icons/32x32.png", + "./icons/128x128.png", + "./icons/128x128@2x.png", + "./icons/icon.icns", + "./icons/icon.ico" + ], + "category": "Utility", + "licenseFile": "../LICENSE", + "homepage": "https://github.com/39zde/factor" }, - "$schema": "../../node_modules/@tauri-apps/cli/config.schema.json" - } + "$schema": "https://schema.tauri.app/config/2.0.0-rc" +} diff --git a/src-tauri/conf/tauri.prod.conf.json b/src-tauri/conf/tauri.prod.conf.json index 667d038..6147fa8 100644 --- a/src-tauri/conf/tauri.prod.conf.json +++ b/src-tauri/conf/tauri.prod.conf.json @@ -1,100 +1,100 @@ { - "productName": "Factor", - "version": "2.1.2", - "identifier": "factor", - "build": { - "frontendDist": "../bundle-prod", - "beforeBuildCommand": "yarn bundle:prod" - }, - "app": { - "windows": [ - { - "title": "Factor", - "resizable": true, - "fullscreen": false, - "center": true, - "zoomHotkeysEnabled": false - } - ], - "security": { - "capabilities": [ - "main" + "productName": "Factor", + "version": "2.1.2", + "identifier": "factor", + "build": { + "frontendDist": "../bundle-prod", + "beforeBuildCommand": "yarn bundle:prod" + }, + "app": { + "windows": [ + { + "title": "Factor", + "resizable": true, + "fullscreen": false, + "center": true, + "zoomHotkeysEnabled": false + } ], - "csp": "default-src 'self'; script-src 'self'; connect-src 'self'; worker-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:", - "devCsp": "default-src 'self'", - "assetProtocol": { - "enable": false, - "scope": [] - }, - "pattern": { - "use": "brownfield" - }, - "dangerousDisableAssetCspModification": false, - "freezePrototype": false - }, - "withGlobalTauri": true - }, - "bundle": { - "linux": { - "appimage": { - "bundleMediaFramework": false, - "files": {} - }, - "deb": { - "files": {} + "security": { + "capabilities": [ + "main" + ], + "csp": "default-src 'self'; script-src 'self'; connect-src 'self'; worker-src 'self'; style-src 'self'; img-src 'self'; object-src 'none'; base-uri 'none'; frame-ancestors 'none'; frame-src: 'none'; upgrade-insecure-requests", + "devCsp": null, + "assetProtocol": { + "enable": false, + "scope": [] + }, + "pattern": { + "use": "brownfield" + }, + "dangerousDisableAssetCspModification": false, + "freezePrototype": false }, - "rpm": { - "epoch": 0, - "files": {}, - "release": "1" - } + "withGlobalTauri": true }, - "macOS": { - "dmg": { - "appPosition": { - "x": 180, - "y": 170 + "bundle": { + "linux": { + "appimage": { + "bundleMediaFramework": false, + "files": {} }, - "applicationFolderPosition": { - "x": 480, - "y": 170 + "deb": { + "files": {} }, - "windowSize": { - "height": 400, - "width": 660 + "rpm": { + "epoch": 0, + "files": {}, + "release": "1" } }, - "files": {}, - "hardenedRuntime": true, - "minimumSystemVersion": "10.13" - }, - "windows": { - "allowDowngrades": true, - "certificateThumbprint": null, - "digestAlgorithm": null, - "nsis": null, - "signCommand": null, - "timestampUrl": null, - "tsp": false, - "webviewInstallMode": { - "silent": true, - "type": "downloadBootstrapper" + "macOS": { + "dmg": { + "appPosition": { + "x": 180, + "y": 170 + }, + "applicationFolderPosition": { + "x": 480, + "y": 170 + }, + "windowSize": { + "height": 400, + "width": 660 + } + }, + "files": {}, + "hardenedRuntime": true, + "minimumSystemVersion": "10.13" }, - "wix": null + "windows": { + "allowDowngrades": true, + "certificateThumbprint": null, + "digestAlgorithm": null, + "nsis": null, + "signCommand": null, + "timestampUrl": null, + "tsp": false, + "webviewInstallMode": { + "silent": true, + "type": "downloadBootstrapper" + }, + "wix": null + }, + "active": true, + "targets": "all", + "icon": [ + "./icons/32x32.png", + "./icons/128x128.png", + "./icons/128x128@2x.png", + "./icons/icon.icns", + "./icons/icon.ico" + ], + "category": "Utility", + "licenseFile": "../LICENSE", + "homepage": "https://github.com/39zde/factor" }, - "active": true, - "targets": "all", - "icon": [ - "./icons/32x32.png", - "./icons/128x128.png", - "./icons/128x128@2x.png", - "./icons/icon.icns", - "./icons/icon.ico" - ], - "category": "Utility", - "licenseFile": "../LICENSE", - "homepage": "https://github.com/39zde/factor" - - }, - "$schema": "../../node_modules/@tauri-apps/cli/config.schema.json" + "plugins": {}, + "$schema": "https://schema.tauri.app/config/2.0.0-rc" } diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index fad8c1a..9125192 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1,10 +1,12 @@ +// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command + #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { - ::tauri::Builder::default() - .plugin(tauri_plugin_fs::init()) - .plugin(tauri_plugin_window_state::Builder::default().build()) - .plugin(tauri_plugin_notification::init()) - .plugin(tauri_plugin_shell::init()) - .run(tauri::generate_context!()) - .expect("error while running tauri application"); + tauri::Builder::default() + .plugin(tauri_plugin_shell::init()) + .plugin(tauri_plugin_window_state::Builder::default().build()) + .plugin(tauri_plugin_fs::init()) + .plugin(tauri_plugin_notification::init()) + .run(tauri::generate_context!()) + .expect("error while running tauri application"); } diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index ba72af8..11a4465 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -2,11 +2,5 @@ #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] fn main() { - ::tauri::Builder::default() - .plugin(tauri_plugin_fs::init()) - .plugin(tauri_plugin_window_state::Builder::default().build()) - .plugin(tauri_plugin_notification::init()) - .plugin(tauri_plugin_shell::init()) - .run(tauri::generate_context!()) - .expect("error while running tauri application"); + factor_lib::run() } diff --git a/src/App.tsx b/src/App.tsx index b027537..25c548b 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -180,7 +180,7 @@ function App(): JSX.Element {
diff --git a/src/comps/SideBar/RouterButton.tsx b/src/comps/SideBar/RouterButton.tsx index f0b0984..2cc8deb 100644 --- a/src/comps/SideBar/RouterButton.tsx +++ b/src/comps/SideBar/RouterButton.tsx @@ -20,7 +20,7 @@ export function RouterButton({ route, handler, routeName, icon, textOverride, ac : route === routeName && active ? 'light-dark(var(--color-light-1),var(--color-dark-1))' : 'light-dark(var(--color-light-2),var(--color-dark-2))', - color: route === routeName && active ? 'var(--color-primary)' : 'inherit', + color: route === routeName && active ? 'light-dark(var(--color-primary-dark),var(--color-primary-light))' : 'inherit', fontWeight: route === routeName && active ? 'bold' : 'initial', }} className="sideBarButton"> diff --git a/src/comps/SideBar/SideBar.tsx b/src/comps/SideBar/SideBar.tsx index 89e3d90..9410d25 100644 --- a/src/comps/SideBar/SideBar.tsx +++ b/src/comps/SideBar/SideBar.tsx @@ -44,7 +44,7 @@ export function SideBar({ routesHook }: SideBarProps): React.JSX.Element { } color={ routesHook.route === 'Home' && !routesHook.showHelp && !routesHook.showSettings - ? 'var(--color-primary)' + ? 'light-dark(var(--color-primary-dark),var(--color-primary-light))' : 'light-dark(var(--color-dark-1),var(--color-light-1))' } /> @@ -67,7 +67,7 @@ export function SideBar({ routesHook }: SideBarProps): React.JSX.Element { } color={ routesHook.route === 'Upload' && !routesHook.showHelp && !routesHook.showSettings - ? 'var(--color-primary)' + ? 'light-dark(var(--color-primary-dark),var(--color-primary-light))' : 'light-dark(var(--color-dark-1),var(--color-light-1))' } /> @@ -91,7 +91,7 @@ export function SideBar({ routesHook }: SideBarProps): React.JSX.Element { } color={ routesHook.route === 'ExportPage' && !routesHook.showHelp && !routesHook.showSettings - ? 'var(--color-primary)' + ? 'light-dark(var(--color-primary-dark),var(--color-primary-light))' : 'light-dark(var(--color-dark-1),var(--color-light-1))' } /> @@ -113,7 +113,7 @@ export function SideBar({ routesHook }: SideBarProps): React.JSX.Element { } color={ routesHook.route === 'Templates' && !routesHook.showHelp && !routesHook.showSettings - ? 'var(--color-primary)' + ? 'light-dark(var(--color-primary-dark),var(--color-primary-light))' : 'light-dark(var(--color-dark-1),var(--color-light-1))' } /> @@ -151,7 +151,7 @@ export function SideBar({ routesHook }: SideBarProps): React.JSX.Element { routesHook.route === getDataBaseDisplayName('english', key as DataBaseNames) && !routesHook.showHelp && !routesHook.showSettings - ? 'var(--color-primary)' + ? 'light-dark(var(--color-primary-dark),var(--color-primary-light))' : 'light-dark(var(--color-dark-1),var(--color-light-1))' } /> @@ -171,7 +171,7 @@ export function SideBar({ routesHook }: SideBarProps): React.JSX.Element { routesHook.route === getDataBaseDisplayName('english', key as DataBaseNames) && !routesHook.showHelp && !routesHook.showSettings - ? 'var(--color-primary)' + ? 'light-dark(var(--color-primary-dark),var(--color-primary-light))' : 'light-dark(var(--color-dark-1),var(--color-light-1))' } /> @@ -191,7 +191,7 @@ export function SideBar({ routesHook }: SideBarProps): React.JSX.Element { routesHook.route === getDataBaseDisplayName('english', key as DataBaseNames) && !routesHook.showHelp && !routesHook.showSettings - ? 'var(--color-primary)' + ? 'light-dark(var(--color-primary-dark),var(--color-primary-light))' : 'light-dark(var(--color-dark-1),var(--color-light-1))' } /> @@ -217,7 +217,7 @@ export function SideBar({ routesHook }: SideBarProps): React.JSX.Element { } text={general.language === 'deutsch' ? 'Hilfe' : 'Help'} @@ -232,7 +232,7 @@ export function SideBar({ routesHook }: SideBarProps): React.JSX.Element { } text={general.language === 'deutsch' ? 'Einstellungen' : 'Settings'} diff --git a/src/index.demo.html b/src/index.demo.html index d6de700..a6d78c0 100644 --- a/src/index.demo.html +++ b/src/index.demo.html @@ -1,14 +1,21 @@ - + + - + + + + Factor +
+ diff --git a/src/index.dev.html b/src/index.dev.html index 271e058..2c5300f 100644 --- a/src/index.dev.html +++ b/src/index.dev.html @@ -1,14 +1,17 @@ - + + - - + + Factor-Dev +
+ diff --git a/src/index.prod.html b/src/index.prod.html index 387430d..c9df972 100644 --- a/src/index.prod.html +++ b/src/index.prod.html @@ -1,12 +1,19 @@ - + + - - + + + + + Factor +
+ diff --git a/src/light.css b/src/light.css new file mode 100644 index 0000000..e69de29 diff --git a/src/scrollbarColor-dark.css b/src/theme-dark.css similarity index 56% rename from src/scrollbarColor-dark.css rename to src/theme-dark.css index b4b763c..11c3c61 100644 --- a/src/scrollbarColor-dark.css +++ b/src/theme-dark.css @@ -1,6 +1,10 @@ @import url('@base'); -@supports (scrollbar-color: white black){ +:root { + color-scheme: dark; +} + +@supports (scrollbar-color: white black) { :root { scrollbar-color: var(--color-light-3) var(--color-dark-1); } diff --git a/src/scrollbarColor-light.css b/src/theme-light.css similarity index 56% rename from src/scrollbarColor-light.css rename to src/theme-light.css index c917c09..3636c44 100644 --- a/src/scrollbarColor-light.css +++ b/src/theme-light.css @@ -1,6 +1,10 @@ @import url('@base'); -@supports (scrollbar-color: white black){ +:root { + color-scheme: light; +} + +@supports (scrollbar-color: white black) { :root { scrollbar-color: var(--color-dark-3) var(--color-light-1); } diff --git a/src/scrollbarColor-lightdark.css b/src/theme-lightdark.css similarity index 89% rename from src/scrollbarColor-lightdark.css rename to src/theme-lightdark.css index a2f770c..8ebb4d3 100644 --- a/src/scrollbarColor-lightdark.css +++ b/src/theme-lightdark.css @@ -1,5 +1,8 @@ @import url('@base'); +:root { + color-scheme: light dark; +} @supports (scrollbar-color: white black) { @media screen and (prefers-color-scheme: dark) { diff --git a/src/util/App/AppUtil.ts b/src/util/App/AppUtil.ts index 51e156f..214db88 100644 --- a/src/util/App/AppUtil.ts +++ b/src/util/App/AppUtil.ts @@ -7,7 +7,6 @@ import type { AppSettingsDatabaseDatabases, AppContextType, AppAction, - AppSettingsAppearance, CustomerDBObjectStores, ArticleDBObjectStores, DocumentDBObjectStores, @@ -156,15 +155,6 @@ export function appReducer(appState: AppContextType, action: AppAction): AppCont switch (action.type) { case 'set': { if (action.change !== undefined) { - if (action.change.appearances !== undefined) { - const appearanceChanges = action.change.appearances as AppSettingsAppearance; - if (appearanceChanges.colorTheme !== undefined) { - const themeTag = document.getElementById('theme'); - if (themeTag !== null) { - themeTag.innerText = `:root{ color-scheme: ${appearanceChanges.colorTheme} ; }`; - } - } - } if (action.change.database !== undefined) { if (action.change.database.databases !== undefined) { for (const [key, val] of Object.entries(action.change.database.databases)) { diff --git a/vite.demo.config.ts b/vite.demo.config.ts index a57751c..8f46b48 100644 --- a/vite.demo.config.ts +++ b/vite.demo.config.ts @@ -3,17 +3,6 @@ import { resolve } from 'path'; import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; -interface PreRenderedChunk { - exports: string[]; - facadeModuleId: string | null; - isDynamicEntry: boolean; - isEntry: boolean; - isImplicitEntry: boolean; - moduleIds: string[]; - name: string; - type: 'chunk'; -} - // https://vitejs.dev/config/ export default defineConfig({ plugins: [react(), mkcert()], diff --git a/yarn.lock b/yarn.lock index 5530aba..5929846 100644 --- a/yarn.lock +++ b/yarn.lock @@ -770,120 +770,120 @@ __metadata: languageName: node linkType: hard -"@react-pdf/fns@npm:2.2.1": - version: 2.2.1 - resolution: "@react-pdf/fns@npm:2.2.1" +"@react-pdf/fns@npm:3.0.0": + version: 3.0.0 + resolution: "@react-pdf/fns@npm:3.0.0" dependencies: "@babel/runtime": "npm:^7.20.13" - checksum: 10c0/457bdff57eaebbf09f1a78a23118e711589a2afc229bade3de91776db24ebce5c61ebe46032b9a550d47c98611e0c84fc4e1bb7ea89d4847fb00bddc010ca814 + checksum: 10c0/24975e5735e2b49cfb820072e97b775af7679aa27990e60b7398c03cc8610aaf3c776089263cbf7b499f81181663ecd671e7dea8ca41052bc28ff1b9650ef8d9 languageName: node linkType: hard -"@react-pdf/font@npm:^2.5.2": - version: 2.5.2 - resolution: "@react-pdf/font@npm:2.5.2" +"@react-pdf/font@npm:^3.0.0": + version: 3.0.0 + resolution: "@react-pdf/font@npm:3.0.0" dependencies: "@babel/runtime": "npm:^7.20.13" - "@react-pdf/types": "npm:^2.6.0" + "@react-pdf/types": "npm:^2.7.0" cross-fetch: "npm:^3.1.5" fontkit: "npm:^2.0.2" is-url: "npm:^1.2.4" - checksum: 10c0/471c824bcde68d39bc2f8e9bd21f993f40c3e1bbec2391a6f1abcc4a5408c8405fa86e1ca15733205f658ac01e65a6d275277fc457d194cc1408a3555baaf81b + checksum: 10c0/154f846d254ecaa2e8301c424296f51b49e5b8104c0efd6f539a5fe9135012c17c29549d7151cdbcc062a851985a0ef34a17d0121f99c7d775f81263bea68ae9 languageName: node linkType: hard -"@react-pdf/image@npm:^2.3.6": - version: 2.3.6 - resolution: "@react-pdf/image@npm:2.3.6" +"@react-pdf/image@npm:^3.0.0": + version: 3.0.0 + resolution: "@react-pdf/image@npm:3.0.0" dependencies: "@babel/runtime": "npm:^7.20.13" - "@react-pdf/png-js": "npm:^2.3.1" + "@react-pdf/png-js": "npm:^3.0.0" cross-fetch: "npm:^3.1.5" - jay-peg: "npm:^1.0.2" - checksum: 10c0/7ff4994f53beef0b54233178dec404601396024484ee0ff94cb0cc8df1fb20e0cc706436037b6634bfa67e918a73dd5db7ded59285eadfe29da520a9f1cf09b1 + jay-peg: "npm:^1.1.0" + checksum: 10c0/49cf34f5b5d26b27c4faab3d741a3c6b6fe8fd1b067d417ea01f63695670a6acd770663d1c5ef9f13dd8948f8686a8a9ad79290d88a2c3bcccd27dcf3ca7e21e languageName: node linkType: hard -"@react-pdf/layout@npm:^3.13.0": - version: 3.13.0 - resolution: "@react-pdf/layout@npm:3.13.0" +"@react-pdf/layout@npm:^4.0.0": + version: 4.0.0 + resolution: "@react-pdf/layout@npm:4.0.0" dependencies: "@babel/runtime": "npm:^7.20.13" - "@react-pdf/fns": "npm:2.2.1" - "@react-pdf/image": "npm:^2.3.6" - "@react-pdf/pdfkit": "npm:^3.2.0" - "@react-pdf/primitives": "npm:^3.1.1" - "@react-pdf/stylesheet": "npm:^4.3.0" - "@react-pdf/textkit": "npm:^4.4.1" - "@react-pdf/types": "npm:^2.6.0" + "@react-pdf/fns": "npm:3.0.0" + "@react-pdf/image": "npm:^3.0.0" + "@react-pdf/pdfkit": "npm:^4.0.0" + "@react-pdf/primitives": "npm:^4.0.0" + "@react-pdf/stylesheet": "npm:^5.0.0" + "@react-pdf/textkit": "npm:^5.0.0" + "@react-pdf/types": "npm:^2.7.0" cross-fetch: "npm:^3.1.5" emoji-regex: "npm:^10.3.0" queue: "npm:^6.0.1" - yoga-layout: "npm:^2.0.1" - checksum: 10c0/868e6f5d3e34b776cebafaa44c15b9a357553daa49dce2ef829087aaec9edcc530bbfcd66f2786f4b1cf1339b9319fdaa884eede401f9df6622b21036b614b8a + yoga-layout: "npm:^3.1.0" + checksum: 10c0/d58b1d148c365e7a89c8afc26130129c388b3fc18aabd04513179e714c42c7d61622729e0dadddf457c158bfb34ea1ca8aa45fb635cc7971faded45fa1ca1e64 languageName: node linkType: hard -"@react-pdf/pdfkit@npm:^3.2.0": - version: 3.2.0 - resolution: "@react-pdf/pdfkit@npm:3.2.0" +"@react-pdf/pdfkit@npm:^4.0.0": + version: 4.0.0 + resolution: "@react-pdf/pdfkit@npm:4.0.0" dependencies: "@babel/runtime": "npm:^7.20.13" - "@react-pdf/png-js": "npm:^2.3.1" + "@react-pdf/png-js": "npm:^3.0.0" browserify-zlib: "npm:^0.2.0" crypto-js: "npm:^4.2.0" fontkit: "npm:^2.0.2" - jay-peg: "npm:^1.0.2" + jay-peg: "npm:^1.1.0" vite-compatible-readable-stream: "npm:^3.6.1" - checksum: 10c0/da0c0614c6eef9931bc2cad554b78c4edca07fbdf5b965077ecad076129a856f8eab74c6b8aaf79af5239a38da93433c442f819a8c8df0424868ad6e28c2ba7e + checksum: 10c0/eabad2fe1127ab4bc8362a528c826c0efca9104c91d665882e29b90b2c578f11b39329f3db6e78fa30724f8213b9580bf9792149e5658106aaa8102e8db5d53f languageName: node linkType: hard -"@react-pdf/png-js@npm:^2.3.1": - version: 2.3.1 - resolution: "@react-pdf/png-js@npm:2.3.1" +"@react-pdf/png-js@npm:^3.0.0": + version: 3.0.0 + resolution: "@react-pdf/png-js@npm:3.0.0" dependencies: browserify-zlib: "npm:^0.2.0" - checksum: 10c0/63f54ab19be2de9efd8704b943eec4b032386cad9bd4154af7f03f81f66ea95fc4b8c5ae4b1d2531f18ae6141cb107b6a50898ef0f7f561c3eaecd4b441baeae + checksum: 10c0/8ed9b4936df2440b4cec66b56d4da9150458a8d38d4f53fd569a590e8d7cf7629819a0ce0cff22bcb60ccda2252734501cd2b6d6d372b5b7e50026a1a840a43e languageName: node linkType: hard -"@react-pdf/primitives@npm:^3.1.1": - version: 3.1.1 - resolution: "@react-pdf/primitives@npm:3.1.1" - checksum: 10c0/da8453f923d09bae8fff89c861dc06d8028138fcf765c53cf17126de209348ebbdd2dac434a36ba4c3ed4895594cb2507b231a011944ae3105789b11fd683839 +"@react-pdf/primitives@npm:^4.0.0": + version: 4.0.0 + resolution: "@react-pdf/primitives@npm:4.0.0" + checksum: 10c0/f906f138835914c932b69e730e7b738ab197fd021d1053a75259af2e158abeafae41cffa231be55b1532a6d0a0dbfbcf3a8aa8ed7a101c9304eb4b1d7b79cf13 languageName: node linkType: hard -"@react-pdf/render@npm:^3.5.0": - version: 3.5.0 - resolution: "@react-pdf/render@npm:3.5.0" +"@react-pdf/render@npm:^4.0.0": + version: 4.0.0 + resolution: "@react-pdf/render@npm:4.0.0" dependencies: "@babel/runtime": "npm:^7.20.13" - "@react-pdf/fns": "npm:2.2.1" - "@react-pdf/primitives": "npm:^3.1.1" - "@react-pdf/textkit": "npm:^4.4.1" - "@react-pdf/types": "npm:^2.6.0" + "@react-pdf/fns": "npm:3.0.0" + "@react-pdf/primitives": "npm:^4.0.0" + "@react-pdf/textkit": "npm:^5.0.0" + "@react-pdf/types": "npm:^2.7.0" abs-svg-path: "npm:^0.1.1" color-string: "npm:^1.9.1" normalize-svg-path: "npm:^1.1.0" parse-svg-path: "npm:^0.1.2" svg-arc-to-cubic-bezier: "npm:^3.2.0" - checksum: 10c0/7a4136a05229e245276a077d06f03c334ea81f9c42db828b0708f78e0d845b43a5168c711cda86ddecdce1223a97e851064a563e2524e3b15d74f6813ed3c45f + checksum: 10c0/a76502842deca71e6120efaa437f0966f42c346aae1fe341dc53ae0ce5f5cf57f2e2acad20d97ab19cde2d9da139495fefee3c98e5637fb809222bd7135c7818 languageName: node linkType: hard -"@react-pdf/renderer@npm:^3.4.5": - version: 3.4.5 - resolution: "@react-pdf/renderer@npm:3.4.5" +"@react-pdf/renderer@npm:^4.0.0": + version: 4.0.0 + resolution: "@react-pdf/renderer@npm:4.0.0" dependencies: "@babel/runtime": "npm:^7.20.13" - "@react-pdf/font": "npm:^2.5.2" - "@react-pdf/layout": "npm:^3.13.0" - "@react-pdf/pdfkit": "npm:^3.2.0" - "@react-pdf/primitives": "npm:^3.1.1" - "@react-pdf/render": "npm:^3.5.0" - "@react-pdf/types": "npm:^2.6.0" + "@react-pdf/font": "npm:^3.0.0" + "@react-pdf/layout": "npm:^4.0.0" + "@react-pdf/pdfkit": "npm:^4.0.0" + "@react-pdf/primitives": "npm:^4.0.0" + "@react-pdf/render": "npm:^4.0.0" + "@react-pdf/types": "npm:^2.7.0" events: "npm:^3.3.0" object-assign: "npm:^4.1.1" prop-types: "npm:^15.6.2" @@ -891,42 +891,42 @@ __metadata: scheduler: "npm:^0.17.0" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10c0/e6cba95ce8d6c23b3f830d73b2c54baff0ce645a2b3ecef8b5a9f0b2113ea05956d240e572f366bc80b69c266877bab22f2373be31296a86dac93413c00fddf2 + checksum: 10c0/aef20fc0bb4d576b426c37fa120ec7d65568dbae0c321355bbbc04a2b57e67cbdac50983815d7f1cd93dbedb1310affa9c4f0d68c1b629272b68767dfc8a5cd2 languageName: node linkType: hard -"@react-pdf/stylesheet@npm:^4.3.0": - version: 4.3.0 - resolution: "@react-pdf/stylesheet@npm:4.3.0" +"@react-pdf/stylesheet@npm:^5.0.0": + version: 5.0.0 + resolution: "@react-pdf/stylesheet@npm:5.0.0" dependencies: "@babel/runtime": "npm:^7.20.13" - "@react-pdf/fns": "npm:2.2.1" - "@react-pdf/types": "npm:^2.6.0" + "@react-pdf/fns": "npm:3.0.0" + "@react-pdf/types": "npm:^2.7.0" color-string: "npm:^1.9.1" hsl-to-hex: "npm:^1.0.0" media-engine: "npm:^1.0.3" postcss-value-parser: "npm:^4.1.0" - checksum: 10c0/0df5f138804febe5ce6ffc4eea3ed22fa36d0bdf76eedd4c639cd8790b355f1247d3e3969049ebf310fcb7b5c274a639d8a95d32d3a6c0fb815a0e22bae3370b + checksum: 10c0/4f150e23d386aa426474f81636110ec93528aff4558a1e6bfa0e945e3b94ac08ff2766856ae4afe7722f30b390b772fd45544a920a7dc7b42bfa2228d39cb944 languageName: node linkType: hard -"@react-pdf/textkit@npm:^4.4.1": - version: 4.4.1 - resolution: "@react-pdf/textkit@npm:4.4.1" +"@react-pdf/textkit@npm:^5.0.0": + version: 5.0.0 + resolution: "@react-pdf/textkit@npm:5.0.0" dependencies: "@babel/runtime": "npm:^7.20.13" - "@react-pdf/fns": "npm:2.2.1" + "@react-pdf/fns": "npm:3.0.0" bidi-js: "npm:^1.0.2" hyphen: "npm:^1.6.4" unicode-properties: "npm:^1.4.1" - checksum: 10c0/261c9130c80f6a8df95559244cf5de39d7ca53bed15865338d9f33f36dba085d3864f06e3d3b0fef37aca0e7a1d9ad1085086de4a0015b180bb66270146aa445 + checksum: 10c0/57e991364612c79c89fb7d64bbd3632d829d15df5345a7dcbfe531c17dd2b712907abb91c5c4d0c1072ba9891d0a353dc66e3b2e3f87933663ac5304fb38c7b2 languageName: node linkType: hard -"@react-pdf/types@npm:^2.6.0": - version: 2.6.0 - resolution: "@react-pdf/types@npm:2.6.0" - checksum: 10c0/831c449d63c5156e28e4fa28b69e603a162ebca3460e00dd2da442ef6bee6d4bd0c0b30d9ad7b38d8c56fabd495be9328fc772b0641dfb0991fd754a05816bf3 +"@react-pdf/types@npm:^2.7.0": + version: 2.7.0 + resolution: "@react-pdf/types@npm:2.7.0" + checksum: 10c0/820ca4fefe4ff31a7b9a2e138600282f9675d2c9c1c1deff4ef81821a6b69351a8cf52ab2ddb72acce27db57bba2ef4dc2a5e73cc98bc6306a69ddbc630a7f25 languageName: node linkType: hard @@ -1059,97 +1059,97 @@ __metadata: languageName: node linkType: hard -"@tauri-apps/api@npm:^2.0.0-rc.5": - version: 2.0.0-rc.5 - resolution: "@tauri-apps/api@npm:2.0.0-rc.5" - checksum: 10c0/40e816e5b78c7c2c48c08c1a0ca51952366abdf407695eec2882f26c3bd9044c244478375decc2b9d37d9f2bd45b1513ffa8f01e8aa1be01faaf08374ae30c2e +"@tauri-apps/api@npm:^2.0.0-rc.6": + version: 2.0.0-rc.6 + resolution: "@tauri-apps/api@npm:2.0.0-rc.6" + checksum: 10c0/77a58617cefc2c27ac4d077276fea6f39930c4246513e931a057875bd94df55ebaed939cb375d44489e334f7c951fa30672b7d84f1ed51668775b2552f5a701f languageName: node linkType: hard -"@tauri-apps/cli-darwin-arm64@npm:2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli-darwin-arm64@npm:2.0.0-rc.16" +"@tauri-apps/cli-darwin-arm64@npm:2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli-darwin-arm64@npm:2.0.0-rc.17" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@tauri-apps/cli-darwin-x64@npm:2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli-darwin-x64@npm:2.0.0-rc.16" +"@tauri-apps/cli-darwin-x64@npm:2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli-darwin-x64@npm:2.0.0-rc.17" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-rc.16" +"@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-rc.17" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-rc.16" +"@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-rc.17" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-rc.16" +"@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-rc.17" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-rc.16" +"@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-rc.17" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@tauri-apps/cli-linux-x64-musl@npm:2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli-linux-x64-musl@npm:2.0.0-rc.16" +"@tauri-apps/cli-linux-x64-musl@npm:2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli-linux-x64-musl@npm:2.0.0-rc.17" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-rc.16" +"@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-rc.17" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-rc.16" +"@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-rc.17" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-rc.16" +"@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-rc.17" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@tauri-apps/cli@npm:^2.0.0-rc.16": - version: 2.0.0-rc.16 - resolution: "@tauri-apps/cli@npm:2.0.0-rc.16" +"@tauri-apps/cli@npm:^2.0.0-rc.17": + version: 2.0.0-rc.17 + resolution: "@tauri-apps/cli@npm:2.0.0-rc.17" dependencies: - "@tauri-apps/cli-darwin-arm64": "npm:2.0.0-rc.16" - "@tauri-apps/cli-darwin-x64": "npm:2.0.0-rc.16" - "@tauri-apps/cli-linux-arm-gnueabihf": "npm:2.0.0-rc.16" - "@tauri-apps/cli-linux-arm64-gnu": "npm:2.0.0-rc.16" - "@tauri-apps/cli-linux-arm64-musl": "npm:2.0.0-rc.16" - "@tauri-apps/cli-linux-x64-gnu": "npm:2.0.0-rc.16" - "@tauri-apps/cli-linux-x64-musl": "npm:2.0.0-rc.16" - "@tauri-apps/cli-win32-arm64-msvc": "npm:2.0.0-rc.16" - "@tauri-apps/cli-win32-ia32-msvc": "npm:2.0.0-rc.16" - "@tauri-apps/cli-win32-x64-msvc": "npm:2.0.0-rc.16" + "@tauri-apps/cli-darwin-arm64": "npm:2.0.0-rc.17" + "@tauri-apps/cli-darwin-x64": "npm:2.0.0-rc.17" + "@tauri-apps/cli-linux-arm-gnueabihf": "npm:2.0.0-rc.17" + "@tauri-apps/cli-linux-arm64-gnu": "npm:2.0.0-rc.17" + "@tauri-apps/cli-linux-arm64-musl": "npm:2.0.0-rc.17" + "@tauri-apps/cli-linux-x64-gnu": "npm:2.0.0-rc.17" + "@tauri-apps/cli-linux-x64-musl": "npm:2.0.0-rc.17" + "@tauri-apps/cli-win32-arm64-msvc": "npm:2.0.0-rc.17" + "@tauri-apps/cli-win32-ia32-msvc": "npm:2.0.0-rc.17" + "@tauri-apps/cli-win32-x64-msvc": "npm:2.0.0-rc.17" dependenciesMeta: "@tauri-apps/cli-darwin-arm64": optional: true @@ -1173,7 +1173,7 @@ __metadata: optional: true bin: tauri: tauri.js - checksum: 10c0/2c646c120057ae9f5e03ab09a9955be249925f4e6e7bb858bb67894a5871ce73ea40feae210d6a2489ad2f0680be4bd47a17bb13e57e1b874ea7a1116f9b89c4 + checksum: 10c0/2f821b2c8e7338f2c05ec2cdce9c705418895dd411f44e09d6e02efef6538024a01f9530c1b90c77679de0b7b51704e1c9c655facadbd45fab720611dc41af96 languageName: node linkType: hard @@ -1294,12 +1294,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^20.16.8": - version: 20.16.8 - resolution: "@types/node@npm:20.16.8" +"@types/node@npm:^20.16.10": + version: 20.16.10 + resolution: "@types/node@npm:20.16.10" dependencies: undici-types: "npm:~6.19.2" - checksum: 10c0/3b3bd96885cbbe49e5f701be91f9a69b904a60b23fd4812083b053a802a03e38227919ff800aff2961fd11147b471a1a4fc09f1df171f372698f16d39859aebf + checksum: 10c0/c0c0c7ecb083ec638c2118e54b5242bb4c39a75608cbac9475cf15aaceb64b8bc997a87a0798e700a81d61651c8a7750ae0455be0f0996ada6e8b2bb818d90c5 languageName: node linkType: hard @@ -1329,13 +1329,13 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:^18.3.9": - version: 18.3.9 - resolution: "@types/react@npm:18.3.9" +"@types/react@npm:^18.3.10": + version: 18.3.10 + resolution: "@types/react@npm:18.3.10" dependencies: "@types/prop-types": "npm:*" csstype: "npm:^3.0.2" - checksum: 10c0/a92b8e061d0c833e096254782c56a802316593f4a907fb834b557cabe848a0829b9eb6056404ea239eb4d5ec5ac7b7724309761516c0a7a277916fa04dd4f805 + checksum: 10c0/f5be1de1b0331c1fdb33d577f4cf7f1b949d4bded5347b2351a537f03c51dade5be115e21b161dcf1b37061954d320f6a0bdf8d7b70e24eda51071fdd614383d languageName: node linkType: hard @@ -2382,9 +2382,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react@npm:^7.36.1": - version: 7.36.1 - resolution: "eslint-plugin-react@npm:7.36.1" +"eslint-plugin-react@npm:^7.37.0": + version: 7.37.0 + resolution: "eslint-plugin-react@npm:7.37.0" dependencies: array-includes: "npm:^3.1.8" array.prototype.findlast: "npm:^1.2.5" @@ -2406,7 +2406,7 @@ __metadata: string.prototype.repeat: "npm:^1.0.0" peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7 - checksum: 10c0/8cb37f7fb351213bc44263580ff77627e14e27870fd81dae593e3de2826340b9bd8bbac7ae00fd5de69751a0660b2e51bd26760596f4ae85548f6b1bd76706e6 + checksum: 10c0/c9b02cd425c2a7c36b07fe223e405ae235500ac98f04898529cd8842c78fdd5b54f7c29189db5d6eab390ac5ac531af6e7b94a1f3fe9ad1e6564f7d78fd0eb6b languageName: node linkType: hard @@ -2548,22 +2548,22 @@ __metadata: resolution: "factor@workspace:." dependencies: "@eslint/js": "npm:^9.11.1" - "@react-pdf/renderer": "npm:^3.4.5" - "@tauri-apps/api": "npm:^2.0.0-rc.5" - "@tauri-apps/cli": "npm:^2.0.0-rc.16" + "@react-pdf/renderer": "npm:^4.0.0" + "@tauri-apps/api": "npm:^2.0.0-rc.6" + "@tauri-apps/cli": "npm:^2.0.0-rc.17" "@tauri-apps/plugin-fs": "npm:^2.0.0-rc.2" "@tauri-apps/plugin-notification": "npm:^2.0.0-rc.1" "@tauri-apps/plugin-shell": "npm:^2.0.0-rc.1" "@tauri-apps/plugin-window-state": "npm:^2.0.0-rc.1" "@types/eslint__js": "npm:^8.42.3" - "@types/node": "npm:^20.16.8" - "@types/react": "npm:^18.3.9" + "@types/node": "npm:^20.16.10" + "@types/react": "npm:^18.3.10" "@types/react-dom": "npm:^18.3.0" "@typescript-eslint/eslint-plugin": "npm:^8.7.0" "@typescript-eslint/parser": "npm:^8.7.0" "@vitejs/plugin-react": "npm:^4.3.1" eslint: "npm:^9.11.1" - eslint-plugin-react: "npm:^7.36.1" + eslint-plugin-react: "npm:^7.37.0" globals: "npm:^15.9.0" lucide-react: "npm:^0.446.0" prettier: "npm:^3.3.3" @@ -3380,12 +3380,12 @@ __metadata: languageName: node linkType: hard -"jay-peg@npm:^1.0.2": - version: 1.0.2 - resolution: "jay-peg@npm:1.0.2" +"jay-peg@npm:^1.1.0": + version: 1.1.0 + resolution: "jay-peg@npm:1.1.0" dependencies: restructure: "npm:^3.0.0" - checksum: 10c0/5681959a180cdc59bf84884118e5e2c26ea3d30da6e46ccd41381b698cd434d2df66cf361e85a8ae3aa153c7660074a702bb53e1c584e5d932bf3001a2e8d7a3 + checksum: 10c0/c749afb288ae304620a70c08ca518c84ea15f7049bd3fffcbcc0a878ca592bf7ae17d7c315e18d24fb7f4d8ab447631b976dcd32f06dd2cace76ba2c04ca747b languageName: node linkType: hard @@ -5132,9 +5132,9 @@ __metadata: languageName: node linkType: hard -"yoga-layout@npm:^2.0.1": - version: 2.0.1 - resolution: "yoga-layout@npm:2.0.1" - checksum: 10c0/beb0375b2f0b3e0f67955bc1e548753665b67158d825f8788d812b62887b502ea17d89b34276a3a58e66bd583fb5afdbe70f8933a06eccd57e9b47fc4ec003ff +"yoga-layout@npm:^3.1.0": + version: 3.1.0 + resolution: "yoga-layout@npm:3.1.0" + checksum: 10c0/0de05dda9d10f0008be1a8ab5047d7bc6ce04f09376d917b09c75a4ccd3e3af44e3a9315f697f579439b28112d8f66b8797d9a27855a31b9ac947e3c1a826204 languageName: node linkType: hard