From 0ad443ad8d8929fde2b3afeae552af478eaebce0 Mon Sep 17 00:00:00 2001 From: Victor Guyard <19635051+FlipFloop@users.noreply.github.com> Date: Thu, 24 Nov 2022 20:17:21 -0500 Subject: [PATCH 1/6] ugh --- .gitignore | 3 ++- src-tauri/Cargo.toml | 2 +- src-tauri/src/main.rs | 7 ++++++- src-tauri/tauri.conf.json | 17 +++++++++++------ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 0cd0312..c5175b6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ yarn.lock target node_modules -dist \ No newline at end of file +dist +src-tauri/.env diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 93a3b3a..0f83bb4 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -16,7 +16,7 @@ tauri-build = { version = "1.1", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.1", features = ["api-all"] } +tauri = { version = "1.1", features = ["api-all", "updater"] } reqwest = {version = "0.11", features = ["blocking"] } scraper = "0.13.0" diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index bf1979f..65a89f8 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -16,7 +16,7 @@ struct Course { } #[tauri::command] -fn get_courses(courses: String) -> Vec> { +fn get_courses(courses: String) -> Vec> { println!("Courses searched: {}", courses); let mut free_courses: Vec> = vec![vec![], vec![]]; @@ -158,8 +158,13 @@ fn check_course_exists(course_id: String) -> bool { } fn main() { + // tauri::window::emit("tauri://update".to_string(), None); + // tauri::listen("tauri://update-available".to_string(), move |msg| { + // println!("New version available: {:?}", msg); + // }); tauri::Builder::default() .invoke_handler(tauri::generate_handler![get_courses, check_course_exists]) .run(tauri::generate_context!()) .expect("error while running tauri application"); + } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 2d80bd6..fcaeeec 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -7,8 +7,8 @@ "withGlobalTauri": false }, "package": { - "productName": "gatech-course-checker", - "version": "0.1.0" + "productName": "Georgia Tech Course Checker", + "version": "0.2.0" }, "tauri": { "allowlist": { @@ -51,15 +51,20 @@ "csp": null }, "updater": { - "active": false + "active": true, + "endpoints": [ + "https://victorguyard.com/public/GaTechCourseChecker/{{target}}/{{current_version}}" + ], + "dialog": true, + "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDQ0RjhDRDg4QTRCOURFRTEKUldUaDNybWtpTTM0UkhYcHptMzFsTU5CS2FWZmRrcmM5aVRGMWo1MzhkRG9JZWV3SzFEWXZJTkMK" }, "windows": [ { "fullscreen": false, - "height": 600, + "height": 700, "resizable": true, - "title": "gatech-course-checker", - "width": 800 + "title": "Georgia Tech Course Checker", + "width": 900 } ] } From ffa619fa0c40a1113d3466a7c04dc987f36c5aff Mon Sep 17 00:00:00 2001 From: Victor Guyard <19635051+FlipFloop@users.noreply.github.com> Date: Fri, 25 Nov 2022 02:01:44 -0500 Subject: [PATCH 2/6] Testsss --- latest.json | 23 +++++++++++++++++++++++ src-tauri/src/main.rs | 10 +++++++++- src-tauri/tauri.conf.json | 5 +++-- src/App.tsx | 2 ++ 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 latest.json diff --git a/latest.json b/latest.json new file mode 100644 index 0000000..9841d57 --- /dev/null +++ b/latest.json @@ -0,0 +1,23 @@ +{ + "version": "0.3.0", + "notes": "Updater Works version", + "pub_date": "2022-11-25T00:50:57Z", + "platforms": { + "darwin-x86_64": { + "signature": "", + "url": "https://victorguyard-git-dev-flipfloop.vercel.app/public/releases/macos/Test.app.tar.gz" + }, + "darwin-aarch64": { + "signature": "", + "url": "https://victorguyard-git-dev-flipfloop.vercel.app/public/GaTechCourseChecker/macos/app.app" + }, + "linux-x86_64": { + "signature": "", + "url": "https://github.com/lemarier/tauri-test/releases/download/v1.0.0/app.AppImage.tar.gz" + }, + "windows-x86_64": { + "signature": "", + "url": "https://github.com/lemarier/tauri-test/releases/download/v1.0.0/app.x64.msi.zip" + } + } +} diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 65a89f8..f52aac7 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -157,14 +157,22 @@ fn check_course_exists(course_id: String) -> bool { return true; } +use tauri::Manager; fn main() { // tauri::window::emit("tauri://update".to_string(), None); // tauri::listen("tauri://update-available".to_string(), move |msg| { // println!("New version available: {:?}", msg); // }); tauri::Builder::default() + .setup(|app| { + #[cfg(debug_assertions)] // only include this code on debug builds + { + let window = app.get_window("main").unwrap(); + window.open_devtools(); + } + Ok(()) + }) .invoke_handler(tauri::generate_handler![get_courses, check_course_exists]) .run(tauri::generate_context!()) .expect("error while running tauri application"); - } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index fcaeeec..ca14827 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "Georgia Tech Course Checker", - "version": "0.2.0" + "version": "0.3.0" }, "tauri": { "allowlist": { @@ -53,7 +53,8 @@ "updater": { "active": true, "endpoints": [ - "https://victorguyard.com/public/GaTechCourseChecker/{{target}}/{{current_version}}" + "https://gist.githubusercontent.com/FlipFloop/2eb9f445b4ae4e95d5bb86d2ed350b7f/raw/3d5f83f7087d0f3588871e1db5e2202443d8a0d8/GaTechCourseChecker-latest.json" + ], "dialog": true, "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDQ0RjhDRDg4QTRCOURFRTEKUldUaDNybWtpTTM0UkhYcHptMzFsTU5CS2FWZmRrcmM5aVRGMWo1MzhkRG9JZWV3SzFEWXZJTkMK" diff --git a/src/App.tsx b/src/App.tsx index 3a1bac0..9b9840c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -14,6 +14,8 @@ import { import Results from "./components/Results"; import CourseEntry from "./components/CourseEntry"; +// "https://victorguyard-git-dev-flipfloop.vercel.app/releases/macos/0.3.0.json" + const App = () => { const [courseData, setCourseData] = createSignal([]); const [newCourse, setNewCourse] = createSignal(0); From da5b28427e8ecee237a0b39bbbebd125be0193b5 Mon Sep 17 00:00:00 2001 From: Victor Guyard <19635051+FlipFloop@users.noreply.github.com> Date: Fri, 25 Nov 2022 02:15:43 -0500 Subject: [PATCH 3/6] Update latest.json --- latest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest.json b/latest.json index 9841d57..a6d314c 100644 --- a/latest.json +++ b/latest.json @@ -9,7 +9,7 @@ }, "darwin-aarch64": { "signature": "", - "url": "https://victorguyard-git-dev-flipfloop.vercel.app/public/GaTechCourseChecker/macos/app.app" + "url": "https://github.com/FlipFloop/GaTechCourseChecker/releases/download/v0.3.0-beta/Georgia.Tech.Course.Checker_0.3.0_aarch64.dmg" }, "linux-x86_64": { "signature": "", From 11646c6024da9809a99ad7ee390d3e003f1d795c Mon Sep 17 00:00:00 2001 From: Victor Guyard <19635051+FlipFloop@users.noreply.github.com> Date: Fri, 25 Nov 2022 02:15:58 -0500 Subject: [PATCH 4/6] Update latest.json --- latest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest.json b/latest.json index a6d314c..a21cede 100644 --- a/latest.json +++ b/latest.json @@ -9,7 +9,7 @@ }, "darwin-aarch64": { "signature": "", - "url": "https://github.com/FlipFloop/GaTechCourseChecker/releases/download/v0.3.0-beta/Georgia.Tech.Course.Checker_0.3.0_aarch64.dmg" + "url": "https://github.com/FlipFloop/GaTechCourseChecker/releases/download/v0.3.0-beta/Georgia.Tech.Course.Checker.app.tar.gz" }, "linux-x86_64": { "signature": "", From 6e5782a90a089815601206395d63919adbe270ce Mon Sep 17 00:00:00 2001 From: Victor Guyard <19635051+FlipFloop@users.noreply.github.com> Date: Fri, 25 Nov 2022 02:24:27 -0500 Subject: [PATCH 5/6] Update latest.json --- latest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest.json b/latest.json index a21cede..0d19a6e 100644 --- a/latest.json +++ b/latest.json @@ -8,7 +8,7 @@ "url": "https://victorguyard-git-dev-flipfloop.vercel.app/public/releases/macos/Test.app.tar.gz" }, "darwin-aarch64": { - "signature": "", + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5NFQrU0kxcjZBUjcrSnMxaE43aVl2Qlg4OXNWTnZNVlhDVFAwS3ZBODhrRUFBQkFBQUFBQUFBQUFBQUlBQUFBQXBNQ3pvcGJJYWpqRC9GZ1JRNUVZUzhic05iSnNkdU5mS05iaS9IVDNaZ0hFSjMxT3RocHBaOHNKR3hwTmdlRFgzSlN1eXpDWm91ZG03TFBPTVBrYVpVQXpnYVJERkViOXhsRUlOMXYvckdvWDViNXlYVDgzY2ExUWtGNVM0YXQwZXdFMFplUlAydGc9Cg", "url": "https://github.com/FlipFloop/GaTechCourseChecker/releases/download/v0.3.0-beta/Georgia.Tech.Course.Checker.app.tar.gz" }, "linux-x86_64": { From a78c0f317e23f7c671649ad006c1d8e8e87b313d Mon Sep 17 00:00:00 2001 From: Victor Guyard <19635051+FlipFloop@users.noreply.github.com> Date: Fri, 25 Nov 2022 02:33:07 -0500 Subject: [PATCH 6/6] ughugergregr --- latest.json | 2 +- src-tauri/tauri.conf.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/latest.json b/latest.json index 0d19a6e..a21cede 100644 --- a/latest.json +++ b/latest.json @@ -8,7 +8,7 @@ "url": "https://victorguyard-git-dev-flipfloop.vercel.app/public/releases/macos/Test.app.tar.gz" }, "darwin-aarch64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5NFQrU0kxcjZBUjcrSnMxaE43aVl2Qlg4OXNWTnZNVlhDVFAwS3ZBODhrRUFBQkFBQUFBQUFBQUFBQUlBQUFBQXBNQ3pvcGJJYWpqRC9GZ1JRNUVZUzhic05iSnNkdU5mS05iaS9IVDNaZ0hFSjMxT3RocHBaOHNKR3hwTmdlRFgzSlN1eXpDWm91ZG03TFBPTVBrYVpVQXpnYVJERkViOXhsRUlOMXYvckdvWDViNXlYVDgzY2ExUWtGNVM0YXQwZXdFMFplUlAydGc9Cg", + "signature": "", "url": "https://github.com/FlipFloop/GaTechCourseChecker/releases/download/v0.3.0-beta/Georgia.Tech.Course.Checker.app.tar.gz" }, "linux-x86_64": { diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index ca14827..f51599b 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -53,8 +53,7 @@ "updater": { "active": true, "endpoints": [ - "https://gist.githubusercontent.com/FlipFloop/2eb9f445b4ae4e95d5bb86d2ed350b7f/raw/3d5f83f7087d0f3588871e1db5e2202443d8a0d8/GaTechCourseChecker-latest.json" - + "https://raw.githubusercontent.com/FlipFloop/GaTechCourseChecker/updater/latest.json" ], "dialog": true, "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDQ0RjhDRDg4QTRCOURFRTEKUldUaDNybWtpTTM0UkhYcHptMzFsTU5CS2FWZmRrcmM5aVRGMWo1MzhkRG9JZWV3SzFEWXZJTkMK"