trying cleanup

Narfinger · Oct 17, 2024 · 63c52b7 · 63c52b7
1 parent 148d5e0
commit 63c52b7
Show file tree

Hide file tree

Showing 8 changed files with 270 additions and 239 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "viola"
 version = "0.6.0"
 license = "GPL-3.0-only"
 authors = ["Narfinger <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = { workspace = true }
@@ -46,17 +46,15 @@ diesel_migrations = "2.2.0"
 directories = "5.0.1"
 env_logger = "0.11.5"
 futures = "0.3.31"
-gloo-net = "0.5.0"
-gstreamer = "0.22.7"
+gstreamer = "0.23.2"
 humantime = "2.1.0"
-indextree = "4.7.2"
 indicatif = "0.17.8"
 itertools = "0.13.0"
 log = "0.4.22"
 open = "5.3.0"
 parking_lot = "0.12.3"
 percent-encoding = "2.3.1"
-preferences = "1.1.0"
+preferences = "2.0.0"
 rand = "0.8.5"
 rayon = "1.10.0"
 serde = "1.0.210"
@@ -66,9 +64,4 @@ tokio = "1.40.0"
 toml = "0.8.19"
 walkdir = "2.5.0"
 warp = "0.3.7"
-wasm-bindgen = "0.2.95"
-wasm-bindgen-futures = "0.4.43"
-wasm-logger = "0.2.0"
-web-sys = "0.3.70"
-yew = "0.21.0"
 zbus = "4.4.0"
diff --git a/viola_common/Cargo.toml b/viola_common/Cargo.toml
@@ -2,7 +2,7 @@
 name = "viola_common"
 version = "1.1.0"
 authors = ["Narfinger <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 backend = ["diesel"]

diff --git a/web_gui_yew/Cargo.toml b/web_gui_yew/Cargo.toml
@@ -3,24 +3,16 @@ name = "web_gui_yew"
 version = "1.1.0"
 edition = "2021"
 
-[profile.release]
-# panic = 'abort'
-codegen-units = 1
-opt-level = 'z'
-lto = true
-
 [dependencies]
-console_error_panic_hook = { workspace = true }
+log = {workspace = true}
 futures = { workspace = true }
-gloo-net = { workspace = true }
+gloo-net = "0.6.0"
 humantime = { workspace = true }
-indextree = { workspace = true }
-log = { workspace = true }
+indextree = "4.7.2"
 serde_json = { workspace = true }
 viola_common = { path = "../viola_common" }
-wasm-bindgen = { workspace = true }
-wasm-bindgen-futures = { workspace = true }
-wasm-logger = { workspace = true }
-web-sys = { workspace = true }
-yew = { workspace = true, features = ["csr"] }
+wasm-bindgen-futures = "0.4"
+wasm-logger = "0.2.0"
+yew = { version = "0.21.0", features = ["csr"] }
+web-sys = "0.3.72"
 
diff --git a/web_gui_yew/index.html b/web_gui_yew/index.html
@@ -3,30 +3,43 @@
 
 <head profile="http://www.w4.org/2005/10/profile">
     <meta charset="UTF-8">
-    <link data-trunk rel="css" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap/dist/js/bootstrap.bundle.min.js" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/x-square.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/play.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/play-btn.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/skip-forward.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/skip-backward.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/pause.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/menu-button.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/arrow-repeat.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/trash.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/save.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/window-fullscreen.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/caret-right-square-fill.svg" />
-    <link data-trunk rel="copy-file" href="node_modules/bootstrap-icons/icons/list-nested.svg" />
-    <link data-trunk rel="css" href="index.css" />
+    <link rel="stylesheet" href="/bootstrap.min-c6c6e17b5bb8f55f.css" integrity="sha384&#x2D;QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW&#x2B;ALEwIH"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <link rel="stylesheet" href="/index-47013ba5af55c8c4.css" integrity="sha384&#x2D;ITaXFdjZilJ3eX88dtTyet2lTyH4JBW0cOf4pPykHKCgBBtmoFaEu4Z02Y5NoNEf"/>
     <script src="/bootstrap.bundle.min.js"></script>
     <title>Viola</title>
     <link rel="icon" type="image/svg" href="/caret-right-square-fill.svg" />
-    <base data-trunk-public-url />
-</head>
+    <base href="/" />
+
+<link rel="modulepreload" href="/web_gui_yew-5802dd5edbf21cec.js" crossorigin=anonymous integrity="sha384-NtZfr+lyuuHaOp3E6a3rZDbZ7ZY2CNJqdfO1lRJ34y+JbkbpHvlm0ERKebkf9110">
+<link rel="preload" href="/web_gui_yew-5802dd5edbf21cec_bg.wasm" crossorigin=anonymous integrity="sha384-liaUl0JP4Av8t6Nd0CZ73usVGfyC9aqLyimhN9P66P5a5cOooDMlfXQcOGUY0kUH" as="fetch" type="application/wasm"></head>
 
 <body>
-</body>
+
+<script type="module" nonce="2ZIkACdOC1mJYh6HOFYV+w==">
+import init, * as bindings from '/web_gui_yew-5802dd5edbf21cec.js';
+const wasm = await init('/web_gui_yew-5802dd5edbf21cec_bg.wasm');
+
+
+window.wasmBindings = bindings;
+
+
+dispatchEvent(new CustomEvent("TrunkApplicationStarted", {detail: {wasm}}));
+
+</script></body>
 
 
 </html>
diff --git a/web_gui_yew/src/delete_range_dialog.rs b/web_gui_yew/src/delete_range_dialog.rs
@@ -2,7 +2,7 @@ use std::ops::Range;
 
 use crate::button::*;
 use gloo_net::http::Request;
-use wasm_bindgen::JsCast;
+use web_sys::wasm_bindgen::JsCast;
 use web_sys::{EventTarget, HtmlInputElement};
 use yew::prelude::*;
 

diff --git a/web_gui_yew/src/main.rs b/web_gui_yew/src/main.rs
@@ -310,6 +310,6 @@ impl Component for App {
 
 fn main() {
     wasm_logger::init(wasm_logger::Config::new(log::Level::Trace));
-    console_error_panic_hook::set_once();
+    //console_error_panic_hook::set_once();
     yew::Renderer::<App>::new().render();
 }
diff --git a/web_gui_yew/src/play_dialog.rs b/web_gui_yew/src/play_dialog.rs
@@ -1,6 +1,6 @@
 use crate::button::*;
 use gloo_net::http::Request;
-use wasm_bindgen::JsCast;
+use web_sys::wasm_bindgen::JsCast;
 use web_sys::{EventTarget, HtmlInputElement};
 use yew::prelude::*;