From 3631e334d99755e3f30a832b51ec3107c91a27c5 Mon Sep 17 00:00:00 2001 From: FrankLaterza Date: Sat, 21 Oct 2023 19:58:49 -0400 Subject: [PATCH 1/4] button stype update --- package-lock.json | 4 +++- package.json | 4 +++- src-tauri/Cargo.lock | 11 +++++++++++ src-tauri/Cargo.toml | 1 + src/components/message_box.tsx | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e37544..766ce7c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,6 @@ "@nextui-org/react": "^1.0.0-beta.12", "@szhsin/react-menu": "^4.0.3", "@tauri-apps/api": "^1.5.1", - "@tauri-apps/cli": "^1.5.5", "@types/node": "18.16.3", "@types/react": "18.2.5", "@types/react-dom": "18.2.3", @@ -35,6 +34,9 @@ "tailwindcss": "3.3.2", "typescript": "5.0.4", "vue-cli-plugin-tauri": "^1.0.0" + }, + "devDependencies": { + "@tauri-apps/cli": "^1.5.5" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index 25bd1c1..fac3f4e 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "@nextui-org/react": "^1.0.0-beta.12", "@szhsin/react-menu": "^4.0.3", "@tauri-apps/api": "^1.5.1", - "@tauri-apps/cli": "^1.5.5", "@types/node": "18.16.3", "@types/react": "18.2.5", "@types/react-dom": "18.2.3", @@ -39,5 +38,8 @@ "tailwindcss": "3.3.2", "typescript": "5.0.4", "vue-cli-plugin-tauri": "^1.0.0" + }, + "devDependencies": { + "@tauri-apps/cli": "^1.5.5" } } diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index bbc5688..4669dbd 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -89,6 +89,7 @@ version = "0.1.0" dependencies = [ "chrono", "fs", + "openssl", "rfd", "serde", "serde_json", @@ -2269,6 +2270,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.1.5+3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.93" @@ -2277,6 +2287,7 @@ checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index d49e876..5ad6773 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -15,6 +15,7 @@ rust-version = "1.60" tauri-build = { version = "1.4.0", features = [] } [dependencies] +openssl = { version = "0.10", features = ["vendored"] } serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.4.1", features = ["api-all"] } diff --git a/src/components/message_box.tsx b/src/components/message_box.tsx index 689908a..943b2cd 100644 --- a/src/components/message_box.tsx +++ b/src/components/message_box.tsx @@ -252,7 +252,7 @@ function Box({lines, setLines}: BoxProps) { /> From 1db1b7ed99e05bec17a07291bd58ab9236b8087e Mon Sep 17 00:00:00 2001 From: fank Date: Sun, 22 Oct 2023 14:31:27 -0400 Subject: [PATCH 2/4] windows fix --- src-tauri/Cargo.lock | 11 ----------- src-tauri/Cargo.toml | 1 - 2 files changed, 12 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 4669dbd..bbc5688 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -89,7 +89,6 @@ version = "0.1.0" dependencies = [ "chrono", "fs", - "openssl", "rfd", "serde", "serde_json", @@ -2270,15 +2269,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "300.1.5+3.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.93" @@ -2287,7 +2277,6 @@ checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 5ad6773..d49e876 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -15,7 +15,6 @@ rust-version = "1.60" tauri-build = { version = "1.4.0", features = [] } [dependencies] -openssl = { version = "0.10", features = ["vendored"] } serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.4.1", features = ["api-all"] } From 3740c91d4224662138e3d408c6817e6d0709d63a Mon Sep 17 00:00:00 2001 From: fank Date: Sun, 22 Oct 2023 17:39:04 -0400 Subject: [PATCH 3/4] max line update --- src/components/message_box.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/message_box.tsx b/src/components/message_box.tsx index 943b2cd..20dc38f 100644 --- a/src/components/message_box.tsx +++ b/src/components/message_box.tsx @@ -214,8 +214,8 @@ function Box({lines, setLines}: BoxProps) { function writeNewLines(str: string) { setMessageBox((messageBox) => - // max 10,000 lines - messageBox.concat(str).slice(-10000) + // max 1,000,000 lines + messageBox.concat(str).slice(-1000000) ); } From 00ef7186cfd3fca440d2e1bd7ff8838d515ae435 Mon Sep 17 00:00:00 2001 From: fank Date: Sun, 22 Oct 2023 17:41:34 -0400 Subject: [PATCH 4/4] version update --- src-tauri/tauri.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 241f137..6de8aa2 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -7,7 +7,7 @@ }, "package": { "productName": "SerialWizard", - "version": "1.0.1" + "version": "1.0.0" }, "tauri": { "allowlist": {