diff --git a/.gitignore b/.gitignore index 1ce99de..cb8c9e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /target -.direnv -dist \ No newline at end of file +.direnv \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 594941c..ab10e89 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -393,8 +393,6 @@ dependencies = [ "strum", "strum_macros", "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", ] [[package]] diff --git a/dist/index.html b/dist/index.html new file mode 100644 index 0000000..81790f4 --- /dev/null +++ b/dist/index.html @@ -0,0 +1,34 @@ + + + + dyesub-tool + + + \ No newline at end of file diff --git a/dyesub-tool/.gitignore b/dyesub-tool/.gitignore new file mode 100644 index 0000000..9bfc447 --- /dev/null +++ b/dyesub-tool/.gitignore @@ -0,0 +1,3 @@ +layout.json +output.svg +dist \ No newline at end of file diff --git a/dyesub-tool/Cargo.toml b/dyesub-tool/Cargo.toml index d3f1121..eea0e69 100644 --- a/dyesub-tool/Cargo.toml +++ b/dyesub-tool/Cargo.toml @@ -14,5 +14,3 @@ serde_json = "1.0.105" strum = "0.25.0" strum_macros = "0.25.2" wasm-bindgen = "0.2.87" -wasm-bindgen-futures = "0.4.37" -web-sys = { version = "0.3.64", features = ["FileList", "Blob"] } diff --git a/dyesub-tool/src/main.rs b/dyesub-tool/src/main.rs index 890fc29..779ad7b 100644 --- a/dyesub-tool/src/main.rs +++ b/dyesub-tool/src/main.rs @@ -1,145 +1,18 @@ -#![feature(async_closure)] - mod render; pub mod svg; -use leptos::{*, ev::SubmitEvent, html::Input}; -use wasm_bindgen::{JsCast, JsValue}; -use web_sys::File; -use strum_macros::IntoStaticStr; -use derive_more::From; - -#[derive(Clone)] -struct ResultMessageData { - title: String, - message: View, - colorway: Colorway, -} - -#[derive(Default, Clone, Copy, IntoStaticStr)] -enum Colorway { - #[default] - #[strum(serialize = "plain")] - Plain, - #[strum(serialize = "info")] - Info, - #[strum(serialize = "ok")] - Ok, - #[strum(serialize = "warn")] - Warn, - #[strum(serialize = "bad")] - Bad, -} - -#[component] -fn ResultMessage(cx: Scope, message: ReadSignal>) -> impl IntoView { - view! { cx, - -
-

{move || message().unwrap().title}

-

{move || message().unwrap().message}

-
- - } -} - -#[derive(From, IntoStaticStr)] -enum ReadKleError { - #[strum(serialize = "No file chosen")] - NoFile, - #[strum(serialize = "Failed to open file")] - TextAwait(JsValue), - #[strum(serialize = "Failed to parse file to string")] - ParseToString, - #[strum(serialize = "Failed to parse KLE JSON")] - Serde(serde_json::Error) -} - -impl ToString for ReadKleError { - fn to_string(&self) -> String { - if let Self::TextAwait(error) = self { - if let Some(error) = error.as_string() { - return error; - } - } else if let Self::Serde(error) = self { - return error.to_string(); - } - "".to_string() - } -} - -async fn read_kle_from_file(file: &ReadSignal>) -> Result { - let file = match file() { - Some(file) => file, - None => return Err(ReadKleError::NoFile), - }; - let file_contents = match wasm_bindgen_futures::JsFuture::from(file.text()).await?.as_string() { - Some(contents) => contents, - None => return Err(ReadKleError::ParseToString), - }; - let keyboard = serde_json::from_str(&file_contents)?; - Ok(keyboard) -} - -#[component] -fn KeyboardFromFile(cx: Scope, set_keyboard: WriteSignal>) -> impl IntoView { - let file_input = create_node_ref::(cx); - let (file, set_file) = create_signal(cx, Option::::None); - let (result_message, set_result_message) = create_signal(cx, Option::::None); - let on_submit = move |e: SubmitEvent| { - e.prevent_default(); - spawn_local(async move { - match read_kle_from_file(&file).await { - Ok(keyboard) => { - set_result_message(Some(ResultMessageData { - title: "Success".to_owned(), - message: view! { cx, - "Loaded KLE layout "{&keyboard.metadata.name}" successfully!" - }.into_view(cx), - colorway: Colorway::Ok, - })); - set_keyboard(Some(keyboard)); - }, - Err(err) => set_result_message(Some(ResultMessageData { - message: view! { cx, - { - err.to_string() - } - }.into_view(cx), - title: >::into(err).to_string(), - colorway: Colorway::Bad, - })) - } - }); - }; - view! { cx, -

"Load KLE JSON from file"

- -
- - - - -
- } -} +use leptos::*; +use wasm_bindgen::JsCast; #[component] fn App(cx: Scope) -> impl IntoView { - let (keyboard, set_keyboard) = create_signal(cx, None); + let (count, set_count) = create_signal(cx, 0); view! { cx, - + } } diff --git a/flake.nix b/flake.nix index eddfd97..92bac71 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ Updating `cargoHash`: version = "0.1.0"; buildAndTestSubdir = "dyesub-tool"; buildInputs = with pkgs; [ trunk ]; - cargoHash = "sha256-UcFVv4lqmZW4Nwjps2u2cNU323hk8ezifeGU9dEZ7Ao="; + cargoHash = "sha256-Bxc2koMKq8cGFiJtA0qL1geWQls1k2PgtByg7LZwdlc="; meta = meta // { description = "A tool for generating dye sublimation transfer sheet SVGs for Japanese thumb shift 拇指シフト keycaps."; };