From ad1795ba01db67735aced9d04ac8d7854a334bff Mon Sep 17 00:00:00 2001 From: Danil Date: Wed, 10 Jul 2024 09:20:37 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5,=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api.html | 12 --- src-tauri/src/main.rs | 20 ----- src-tauri/tauri.conf.json | 6 +- src/ApiApp.vue | 7 +- src/App.vue | 178 ++++++++++++++++++++------------------ src/api_window.js | 4 - vite.config.js | 4 +- 7 files changed, 101 insertions(+), 130 deletions(-) delete mode 100644 api.html delete mode 100644 src/api_window.js diff --git a/api.html b/api.html deleted file mode 100644 index ad5ff6d..0000000 --- a/api.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - Api - - -
- - - \ No newline at end of file diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 66d5a4f..4300c75 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -13,25 +13,6 @@ use std::thread; #[path="config.rs"] mod config; #[path="enc_dec_file.rs"] mod enc_dec_file; -#[tauri::command] -fn open_api_window(app_handle: tauri::AppHandle){ - thread::spawn(move || { - match tauri::WindowBuilder::new( - &app_handle, - "api", - tauri::WindowUrl::App("api.html".into()) - ).title("Api") - //.skip_taskbar(true) - .decorations(false) - .build() { - Ok(_) => {} - Err(_) => { - //println!("{err}"); - } - } - }); -} - fn main() { std::env::set_var("WEBKIT_DISABLE_DMABUF_RENDERER", "1"); tauri::Builder::default() @@ -53,7 +34,6 @@ fn main() { tasks::edit_task, tasks::delete_task, tasks::set_task_field, - open_api_window, multi_tcp_listener::start_tcp_server, multi_tcp_listener::get_status, multi_tcp_listener::send_command_to_server, diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 4da76fc..8e41ff5 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -7,7 +7,7 @@ }, "package": { "productName": "to-do-app", - "version": "1.5.0" + "version": "1.6.0" }, "tauri": { "allowlist": { @@ -30,10 +30,10 @@ }, "windows": [ { - "title": "To Do List", "width": 800, "height": 600, - "decorations": false + "decorations": false, + "title": "To Do List" } ], "security": { diff --git a/src/ApiApp.vue b/src/ApiApp.vue index f512dac..db2b807 100644 --- a/src/ApiApp.vue +++ b/src/ApiApp.vue @@ -110,10 +110,9 @@ function select_input(event){