diff --git a/.vscode/settings.json b/.vscode/settings.json
index b36583f..4fafcea 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,7 +1,5 @@
{
"rust-analyzer.linkedProjects": [
"./dyesub-tool/Cargo.toml",
- "./dyesub/Cargo.toml",
- "./svg-units/Cargo.toml",
]
}
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index b8c9100..ff223b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -399,31 +399,20 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "669a445ee724c5c69b1b06fe0b63e70a1c84bc9bb7d9696cd4f4e3ec45050408"
-[[package]]
-name = "dyesub"
-version = "0.1.0"
-dependencies = [
- "askama",
- "derive_more",
- "kle-serial",
- "lazy_static",
- "serde_json",
- "svg-units",
-]
-
[[package]]
name = "dyesub-tool"
version = "0.1.0"
dependencies = [
+ "askama",
"class_list",
"derive_more",
"kle-serial",
"lazy_static",
"leptos",
+ "regex",
"serde_json",
"strum",
"strum_macros",
- "svg-units",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
@@ -1787,17 +1776,6 @@ dependencies = [
"syn 2.0.28",
]
-[[package]]
-name = "svg-units"
-version = "0.1.0"
-dependencies = [
- "derive_more",
- "lazy_static",
- "regex",
- "strum",
- "strum_macros",
-]
-
[[package]]
name = "syn"
version = "1.0.109"
diff --git a/Cargo.toml b/Cargo.toml
index 28f5169..7cb6ede 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,3 @@
[workspace]
-members = ["dyesub-tool", "dyesub", "svg-units"]
+members = ["dyesub-tool"]
resolver = "2"
\ No newline at end of file
diff --git a/dyesub-tool/Cargo.toml b/dyesub-tool/Cargo.toml
index 0002f49..db45730 100644
--- a/dyesub-tool/Cargo.toml
+++ b/dyesub-tool/Cargo.toml
@@ -4,12 +4,13 @@ version = "0.1.0"
edition = "2021"
[dependencies]
-svg-units = { path = "../svg-units" }
+askama = "0.12.0"
class_list = "0.1.1"
derive_more = "0.99.17"
kle-serial = "0.2.2"
lazy_static = "1.4.0"
leptos = { version = "0.4.8", features = ["csr", "nightly"] }
+regex = "1.9.3"
serde_json = "1.0.105"
strum = "0.25.0"
strum_macros = "0.25.2"
diff --git a/dyesub-tool/assets/next.svg b/dyesub-tool/assets/next.svg
new file mode 100644
index 0000000..b805ced
--- /dev/null
+++ b/dyesub-tool/assets/next.svg
@@ -0,0 +1,3 @@
+
diff --git a/dyesub-tool/assets/nixos.svg b/dyesub-tool/assets/nixos.svg
new file mode 100644
index 0000000..8041d98
--- /dev/null
+++ b/dyesub-tool/assets/nixos.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/dyesub-tool/assets/playpause.svg b/dyesub-tool/assets/playpause.svg
new file mode 100644
index 0000000..3a02310
--- /dev/null
+++ b/dyesub-tool/assets/playpause.svg
@@ -0,0 +1,3 @@
+
diff --git a/dyesub-tool/assets/previous.svg b/dyesub-tool/assets/previous.svg
new file mode 100644
index 0000000..b55a8f9
--- /dev/null
+++ b/dyesub-tool/assets/previous.svg
@@ -0,0 +1,3 @@
+
diff --git a/dyesub-tool/src/main.rs b/dyesub-tool/src/main.rs
index 174ee5b..4f7358a 100644
--- a/dyesub-tool/src/main.rs
+++ b/dyesub-tool/src/main.rs
@@ -3,6 +3,10 @@
mod components;
mod error;
mod models;
+#[allow(dead_code)]
+mod render;
+#[allow(dead_code)]
+pub mod svg;
mod utils;
use leptos::*;
diff --git a/dyesub/src/lib.rs b/dyesub-tool/src/render.rs
similarity index 95%
rename from dyesub/src/lib.rs
rename to dyesub-tool/src/render.rs
index d68aef9..d8c4bda 100644
--- a/dyesub/src/lib.rs
+++ b/dyesub-tool/src/render.rs
@@ -4,7 +4,7 @@ use askama::Template;
use derive_more::From;
use lazy_static::lazy_static;
-use svg_units::{SVGMeasure, SVGUnit};
+use crate::svg::{SVGMeasure, SVGUnit};
#[derive(Template)]
#[template(path = "document.xml")]
@@ -28,7 +28,7 @@ lazy_static! {
}
mod filters {
- use svg_units::{SVGMeasure, SVGUnit};
+ use crate::svg::{SVGMeasure, SVGUnit};
pub fn kle_font_units(kle_font_units: &usize) -> askama::Result {
Ok(SVGMeasure::new(
diff --git a/svg-units/src/measure.rs b/dyesub-tool/src/svg/measure.rs
similarity index 100%
rename from svg-units/src/measure.rs
rename to dyesub-tool/src/svg/measure.rs
diff --git a/svg-units/src/lib.rs b/dyesub-tool/src/svg/mod.rs
similarity index 100%
rename from svg-units/src/lib.rs
rename to dyesub-tool/src/svg/mod.rs
diff --git a/svg-units/src/tests.rs b/dyesub-tool/src/svg/tests.rs
similarity index 98%
rename from svg-units/src/tests.rs
rename to dyesub-tool/src/svg/tests.rs
index fbf8eb1..c8690b9 100644
--- a/svg-units/src/tests.rs
+++ b/dyesub-tool/src/svg/tests.rs
@@ -1,6 +1,6 @@
use std::str::FromStr;
-use crate::{SVGMeasure, SVGUnit};
+use crate::svg::{SVGMeasure, SVGUnit};
#[test]
fn add() {
diff --git a/svg-units/src/unit.rs b/dyesub-tool/src/svg/unit.rs
similarity index 100%
rename from svg-units/src/unit.rs
rename to dyesub-tool/src/svg/unit.rs
diff --git a/dyesub/templates/document.xml b/dyesub-tool/templates/document.xml
similarity index 100%
rename from dyesub/templates/document.xml
rename to dyesub-tool/templates/document.xml
diff --git a/dyesub/Cargo.toml b/dyesub/Cargo.toml
deleted file mode 100644
index 28d731b..0000000
--- a/dyesub/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name = "dyesub"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-svg-units = { path = "../svg-units" }
-askama = "0.12.0"
-derive_more = "0.99.17"
-kle-serial = "0.2.2"
-lazy_static = "1.4.0"
-serde_json = "1.0.105"
diff --git a/flake.nix b/flake.nix
index c76bdcd..f6d4871 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-52zTjWRXq058BhuRj2A7mvWzC88UCEolodnBcfa3Ol8=";
+ cargoHash = "sha256-d5uj2LjKOhASfHY4anH4CtbZy2JSMzhkukpGp8qfOy0=";
meta = meta // {
description = "A tool for generating dye sublimation transfer sheet SVGs for Japanese thumb shift 拇指シフト keycaps.";
};
diff --git a/svg-units/Cargo.toml b/svg-units/Cargo.toml
deleted file mode 100644
index 4189723..0000000
--- a/svg-units/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "svg-units"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-derive_more = "0.99.17"
-lazy_static = "1.4.0"
-regex = "1.9.3"
-strum = "0.25.0"
-strum_macros = "0.25.2"