From d01e1cac586537a795460fb988faa0bf95376a38 Mon Sep 17 00:00:00 2001 From: GlooriousWalrus Date: Sun, 5 Nov 2023 23:17:56 +0200 Subject: [PATCH] WIP: button slide fix, select-all for output, navbar improvements, about tab --- Cargo.lock | 77 +++++++++++++ site/Cargo.toml | 3 +- site/src/app.rs | 84 +++++++------- site/src/pages/{example.rs => about.rs} | 60 +++++----- site/src/pages/mod.rs | 4 +- site/src/pages/{home.rs => transliterator.rs} | 105 +++++++++++++----- 6 files changed, 234 insertions(+), 99 deletions(-) rename site/src/pages/{example.rs => about.rs} (74%) rename site/src/pages/{home.rs => transliterator.rs} (58%) diff --git a/Cargo.lock b/Cargo.lock index 3461a9d..4866561 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,6 +37,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "anyhow" version = "1.0.75" @@ -194,6 +209,20 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets", +] + [[package]] name = "ciborium" version = "0.2.1" @@ -296,6 +325,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + [[package]] name = "derive-where" version = "1.2.5" @@ -603,6 +638,29 @@ dependencies = [ "want", ] +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "idna" version = "0.4.0" @@ -714,6 +772,7 @@ dependencies = [ name = "leptos-tw-site" version = "0.2.0" dependencies = [ + "chrono", "console_error_panic_hook", "console_log", "leptos", @@ -1004,6 +1063,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + [[package]] name = "object" version = "0.32.1" @@ -1948,6 +2016,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.48.0" diff --git a/site/Cargo.toml b/site/Cargo.toml index d1cc043..c4c0570 100644 --- a/site/Cargo.toml +++ b/site/Cargo.toml @@ -12,6 +12,7 @@ leptos_meta = { version = "0.5", features = ["csr", "nightly"] } leptos_router = { version = "0.5", features = ["csr", "nightly"] } log = "0.4" wasm-bindgen = "0.2" -web-sys = { version = "0.3", features = ["Window", "Clipboard", "Navigator", "Element"] } +web-sys = { version = "0.3", features = ["Window", "Clipboard", "Navigator", "Element", "DateTimeValue"] } wana_kana = { path = "../wana_kana_rust" } wasm-bindgen-futures = "0.4" +chrono = { version = "*", features = ["wasmbind"]} \ No newline at end of file diff --git a/site/src/app.rs b/site/src/app.rs index 2c55d0c..91a1a10 100644 --- a/site/src/app.rs +++ b/site/src/app.rs @@ -1,3 +1,5 @@ +use chrono::prelude::*; + use leptos::{logging::log, *}; use leptos_meta::*; use leptos_router::*; @@ -8,10 +10,10 @@ use leptos_tw_ui::components::{ }; use crate::{ - pages::home::Home, + pages::{transliterator::Transliterator, about::ExamplePage}, theme::{ default_page_class, MenuBarVariant, MenuHeaderVariant, - ToggleSwitchClassVariant, + ToggleSwitchClassVariant, ButtonVariant, }, }; @@ -25,9 +27,8 @@ pub fn App() -> impl IntoView { - }/> - // }/> - // }/> + }/> + }/> @@ -40,7 +41,7 @@ pub fn Layout(children: Children) -> impl IntoView { {children()} - //