From fd48f75245e8e0fb72767463b194d5fcba9285f3 Mon Sep 17 00:00:00 2001 From: rm-dr <96270320+rm-dr@users.noreply.github.com> Date: Sun, 2 Nov 2025 11:08:51 -0800 Subject: [PATCH] Reorganize --- Cargo.toml | 15 ++++++++------- crates/{ => bin}/webpage/Cargo.toml | 0 crates/{ => bin}/webpage/src/cmd/mod.rs | 0 crates/{ => bin}/webpage/src/cmd/serve.rs | 0 crates/{ => bin}/webpage/src/main.rs | 0 crates/{ => lib}/assetserver/Cargo.toml | 0 crates/{ => lib}/assetserver/src/lib.rs | 2 -- crates/{ => lib}/libservice/Cargo.toml | 0 crates/{ => lib}/libservice/src/lib.rs | 0 crates/{ => lib}/toolbox/Cargo.toml | 0 crates/{ => lib}/toolbox/src/cli.rs | 0 crates/{ => lib}/toolbox/src/lib.rs | 0 crates/{ => lib}/toolbox/src/logging.rs | 0 crates/{ => lib}/toolbox/src/mime.rs | 0 crates/{ => lib}/toolbox/src/misc.rs | 0 crates/{ => lib}/toolbox/src/strings.rs | 0 crates/{ => macro}/macro-assets/Cargo.toml | 0 crates/{ => macro}/macro-assets/src/lib.rs | 0 crates/{ => macro}/macro-sass/Cargo.toml | 0 crates/{ => macro}/macro-sass/src/lib.rs | 0 crates/{ => service}/service-webpage/Cargo.toml | 0 .../assets/fonts/fa/fa-brands-400.ttf | Bin .../assets/fonts/fa/fa-brands-400.woff2 | Bin .../assets/fonts/fa/fa-regular-400.ttf | Bin .../assets/fonts/fa/fa-regular-400.woff2 | Bin .../assets/fonts/fa/fa-solid-900.ttf | Bin .../assets/fonts/fa/fa-solid-900.woff2 | Bin .../assets/fonts/fira/FiraCode-Bold.woff2 | Bin .../assets/fonts/fira/FiraCode-Light.woff2 | Bin .../assets/fonts/fira/FiraCode-Medium.woff2 | Bin .../assets/fonts/fira/FiraCode-Regular.woff2 | Bin .../assets/fonts/fira/FiraCode-SemiBold.woff2 | Bin .../assets/fonts/fira/FiraCode-VF.woff2 | Bin .../assets/images/betalupi-map.png | Bin .../assets/images/cover-small.jpg | Bin .../service-webpage/assets/images/icon.png | Bin .../service-webpage/css/blocks.scss | 0 .../css/fontawesome/_animated.scss | 0 .../css/fontawesome/_bordered-pulled.scss | 0 .../service-webpage/css/fontawesome/_core.scss | 0 .../css/fontawesome/_fixed-width.scss | 0 .../css/fontawesome/_functions.scss | 0 .../service-webpage/css/fontawesome/_icons.scss | 0 .../service-webpage/css/fontawesome/_list.scss | 0 .../service-webpage/css/fontawesome/_mixins.scss | 0 .../css/fontawesome/_rotated-flipped.scss | 0 .../css/fontawesome/_screen-reader.scss | 0 .../service-webpage/css/fontawesome/_shims.scss | 0 .../service-webpage/css/fontawesome/_sizing.scss | 0 .../css/fontawesome/_stacked.scss | 0 .../css/fontawesome/_variables.scss | 0 .../service-webpage/css/fontawesome/brands.scss | 0 .../css/fontawesome/fontawesome.scss | 0 .../service-webpage/css/fontawesome/regular.scss | 0 .../service-webpage/css/fontawesome/solid.scss | 0 .../css/fontawesome/v4-shims.scss | 0 .../service-webpage/css/images.scss | 0 .../{ => service}/service-webpage/css/main.scss | 0 .../service-webpage/css/special.scss | 0 .../{ => service}/service-webpage/css/text.scss | 0 .../{ => service}/service-webpage/src/ast/mod.rs | 0 .../service-webpage/src/ast/walk.rs | 0 .../service-webpage/src/ast/walk_mut.rs | 0 .../service-webpage/src/components/base.rs | 0 .../service-webpage/src/components/fa.rs | 0 .../service-webpage/src/components/mangle.rs | 1 - .../service-webpage/src/components/md.rs | 2 -- .../service-webpage/src/components/misc.rs | 0 .../service-webpage/src/components/mod.rs | 0 crates/{ => service}/service-webpage/src/lib.rs | 0 .../service-webpage/src/routes/assets.rs | 1 - .../service-webpage/src/routes/betalupi.rs | 0 .../service-webpage/src/routes/index.rs | 0 .../service-webpage/src/routes/links.rs | 4 ---- .../service-webpage/src/routes/mod.rs | 0 75 files changed, 8 insertions(+), 17 deletions(-) rename crates/{ => bin}/webpage/Cargo.toml (100%) rename crates/{ => bin}/webpage/src/cmd/mod.rs (100%) rename crates/{ => bin}/webpage/src/cmd/serve.rs (100%) rename crates/{ => bin}/webpage/src/main.rs (100%) rename crates/{ => lib}/assetserver/Cargo.toml (100%) rename crates/{ => lib}/assetserver/src/lib.rs (93%) rename crates/{ => lib}/libservice/Cargo.toml (100%) rename crates/{ => lib}/libservice/src/lib.rs (100%) rename crates/{ => lib}/toolbox/Cargo.toml (100%) rename crates/{ => lib}/toolbox/src/cli.rs (100%) rename crates/{ => lib}/toolbox/src/lib.rs (100%) rename crates/{ => lib}/toolbox/src/logging.rs (100%) rename crates/{ => lib}/toolbox/src/mime.rs (100%) rename crates/{ => lib}/toolbox/src/misc.rs (100%) rename crates/{ => lib}/toolbox/src/strings.rs (100%) rename crates/{ => macro}/macro-assets/Cargo.toml (100%) rename crates/{ => macro}/macro-assets/src/lib.rs (100%) rename crates/{ => macro}/macro-sass/Cargo.toml (100%) rename crates/{ => macro}/macro-sass/src/lib.rs (100%) rename crates/{ => service}/service-webpage/Cargo.toml (100%) rename crates/{ => service}/service-webpage/assets/fonts/fa/fa-brands-400.ttf (100%) rename crates/{ => service}/service-webpage/assets/fonts/fa/fa-brands-400.woff2 (100%) rename crates/{ => service}/service-webpage/assets/fonts/fa/fa-regular-400.ttf (100%) rename crates/{ => service}/service-webpage/assets/fonts/fa/fa-regular-400.woff2 (100%) rename crates/{ => service}/service-webpage/assets/fonts/fa/fa-solid-900.ttf (100%) rename crates/{ => service}/service-webpage/assets/fonts/fa/fa-solid-900.woff2 (100%) rename crates/{ => service}/service-webpage/assets/fonts/fira/FiraCode-Bold.woff2 (100%) rename crates/{ => service}/service-webpage/assets/fonts/fira/FiraCode-Light.woff2 (100%) rename crates/{ => service}/service-webpage/assets/fonts/fira/FiraCode-Medium.woff2 (100%) rename crates/{ => service}/service-webpage/assets/fonts/fira/FiraCode-Regular.woff2 (100%) rename crates/{ => service}/service-webpage/assets/fonts/fira/FiraCode-SemiBold.woff2 (100%) rename crates/{ => service}/service-webpage/assets/fonts/fira/FiraCode-VF.woff2 (100%) rename crates/{ => service}/service-webpage/assets/images/betalupi-map.png (100%) rename crates/{ => service}/service-webpage/assets/images/cover-small.jpg (100%) rename crates/{ => service}/service-webpage/assets/images/icon.png (100%) rename crates/{ => service}/service-webpage/css/blocks.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_animated.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_bordered-pulled.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_core.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_fixed-width.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_functions.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_icons.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_list.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_mixins.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_rotated-flipped.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_screen-reader.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_shims.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_sizing.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_stacked.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/_variables.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/brands.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/fontawesome.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/regular.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/solid.scss (100%) rename crates/{ => service}/service-webpage/css/fontawesome/v4-shims.scss (100%) rename crates/{ => service}/service-webpage/css/images.scss (100%) rename crates/{ => service}/service-webpage/css/main.scss (100%) rename crates/{ => service}/service-webpage/css/special.scss (100%) rename crates/{ => service}/service-webpage/css/text.scss (100%) rename crates/{ => service}/service-webpage/src/ast/mod.rs (100%) rename crates/{ => service}/service-webpage/src/ast/walk.rs (100%) rename crates/{ => service}/service-webpage/src/ast/walk_mut.rs (100%) rename crates/{ => service}/service-webpage/src/components/base.rs (100%) rename crates/{ => service}/service-webpage/src/components/fa.rs (100%) rename crates/{ => service}/service-webpage/src/components/mangle.rs (94%) rename crates/{ => service}/service-webpage/src/components/md.rs (99%) rename crates/{ => service}/service-webpage/src/components/misc.rs (100%) rename crates/{ => service}/service-webpage/src/components/mod.rs (100%) rename crates/{ => service}/service-webpage/src/lib.rs (100%) rename crates/{ => service}/service-webpage/src/routes/assets.rs (98%) rename crates/{ => service}/service-webpage/src/routes/betalupi.rs (100%) rename crates/{ => service}/service-webpage/src/routes/index.rs (100%) rename crates/{ => service}/service-webpage/src/routes/links.rs (99%) rename crates/{ => service}/service-webpage/src/routes/mod.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 630aa9b..6381d38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["crates/*"] +members = ["crates/bin/*", "crates/lib/*", "crates/macro/*", "crates/service/*"] resolver = "2" [workspace.package] @@ -64,12 +64,13 @@ type_complexity = "allow" # [workspace.dependencies] -assetserver = { path = "crates/assetserver" } -toolbox = { path = "crates/toolbox" } -libservice = { path = "crates/libservice" } -service-webpage = { path = "crates/service-webpage" } -macro-assets = { path = "crates/macro-assets" } -macro-sass = { path = "crates/macro-sass" } +macro-assets = { path = "crates/macro/macro-assets" } +macro-sass = { path = "crates/macro/macro-sass" } +assetserver = { path = "crates/lib/assetserver" } +libservice = { path = "crates/lib/libservice" } +toolbox = { path = "crates/lib/toolbox" } + +service-webpage = { path = "crates/service/service-webpage" } # diff --git a/crates/webpage/Cargo.toml b/crates/bin/webpage/Cargo.toml similarity index 100% rename from crates/webpage/Cargo.toml rename to crates/bin/webpage/Cargo.toml diff --git a/crates/webpage/src/cmd/mod.rs b/crates/bin/webpage/src/cmd/mod.rs similarity index 100% rename from crates/webpage/src/cmd/mod.rs rename to crates/bin/webpage/src/cmd/mod.rs diff --git a/crates/webpage/src/cmd/serve.rs b/crates/bin/webpage/src/cmd/serve.rs similarity index 100% rename from crates/webpage/src/cmd/serve.rs rename to crates/bin/webpage/src/cmd/serve.rs diff --git a/crates/webpage/src/main.rs b/crates/bin/webpage/src/main.rs similarity index 100% rename from crates/webpage/src/main.rs rename to crates/bin/webpage/src/main.rs diff --git a/crates/assetserver/Cargo.toml b/crates/lib/assetserver/Cargo.toml similarity index 100% rename from crates/assetserver/Cargo.toml rename to crates/lib/assetserver/Cargo.toml diff --git a/crates/assetserver/src/lib.rs b/crates/lib/assetserver/src/lib.rs similarity index 93% rename from crates/assetserver/src/lib.rs rename to crates/lib/assetserver/src/lib.rs index b5ebd62..9fbfcb6 100644 --- a/crates/assetserver/src/lib.rs +++ b/crates/lib/assetserver/src/lib.rs @@ -12,5 +12,3 @@ pub trait Asset { /// The embedded file contents as a byte slice const BYTES: &'static [u8]; } - -// TODO: image manipulation diff --git a/crates/libservice/Cargo.toml b/crates/lib/libservice/Cargo.toml similarity index 100% rename from crates/libservice/Cargo.toml rename to crates/lib/libservice/Cargo.toml diff --git a/crates/libservice/src/lib.rs b/crates/lib/libservice/src/lib.rs similarity index 100% rename from crates/libservice/src/lib.rs rename to crates/lib/libservice/src/lib.rs diff --git a/crates/toolbox/Cargo.toml b/crates/lib/toolbox/Cargo.toml similarity index 100% rename from crates/toolbox/Cargo.toml rename to crates/lib/toolbox/Cargo.toml diff --git a/crates/toolbox/src/cli.rs b/crates/lib/toolbox/src/cli.rs similarity index 100% rename from crates/toolbox/src/cli.rs rename to crates/lib/toolbox/src/cli.rs diff --git a/crates/toolbox/src/lib.rs b/crates/lib/toolbox/src/lib.rs similarity index 100% rename from crates/toolbox/src/lib.rs rename to crates/lib/toolbox/src/lib.rs diff --git a/crates/toolbox/src/logging.rs b/crates/lib/toolbox/src/logging.rs similarity index 100% rename from crates/toolbox/src/logging.rs rename to crates/lib/toolbox/src/logging.rs diff --git a/crates/toolbox/src/mime.rs b/crates/lib/toolbox/src/mime.rs similarity index 100% rename from crates/toolbox/src/mime.rs rename to crates/lib/toolbox/src/mime.rs diff --git a/crates/toolbox/src/misc.rs b/crates/lib/toolbox/src/misc.rs similarity index 100% rename from crates/toolbox/src/misc.rs rename to crates/lib/toolbox/src/misc.rs diff --git a/crates/toolbox/src/strings.rs b/crates/lib/toolbox/src/strings.rs similarity index 100% rename from crates/toolbox/src/strings.rs rename to crates/lib/toolbox/src/strings.rs diff --git a/crates/macro-assets/Cargo.toml b/crates/macro/macro-assets/Cargo.toml similarity index 100% rename from crates/macro-assets/Cargo.toml rename to crates/macro/macro-assets/Cargo.toml diff --git a/crates/macro-assets/src/lib.rs b/crates/macro/macro-assets/src/lib.rs similarity index 100% rename from crates/macro-assets/src/lib.rs rename to crates/macro/macro-assets/src/lib.rs diff --git a/crates/macro-sass/Cargo.toml b/crates/macro/macro-sass/Cargo.toml similarity index 100% rename from crates/macro-sass/Cargo.toml rename to crates/macro/macro-sass/Cargo.toml diff --git a/crates/macro-sass/src/lib.rs b/crates/macro/macro-sass/src/lib.rs similarity index 100% rename from crates/macro-sass/src/lib.rs rename to crates/macro/macro-sass/src/lib.rs diff --git a/crates/service-webpage/Cargo.toml b/crates/service/service-webpage/Cargo.toml similarity index 100% rename from crates/service-webpage/Cargo.toml rename to crates/service/service-webpage/Cargo.toml diff --git a/crates/service-webpage/assets/fonts/fa/fa-brands-400.ttf b/crates/service/service-webpage/assets/fonts/fa/fa-brands-400.ttf similarity index 100% rename from crates/service-webpage/assets/fonts/fa/fa-brands-400.ttf rename to crates/service/service-webpage/assets/fonts/fa/fa-brands-400.ttf diff --git a/crates/service-webpage/assets/fonts/fa/fa-brands-400.woff2 b/crates/service/service-webpage/assets/fonts/fa/fa-brands-400.woff2 similarity index 100% rename from crates/service-webpage/assets/fonts/fa/fa-brands-400.woff2 rename to crates/service/service-webpage/assets/fonts/fa/fa-brands-400.woff2 diff --git a/crates/service-webpage/assets/fonts/fa/fa-regular-400.ttf b/crates/service/service-webpage/assets/fonts/fa/fa-regular-400.ttf similarity index 100% rename from crates/service-webpage/assets/fonts/fa/fa-regular-400.ttf rename to crates/service/service-webpage/assets/fonts/fa/fa-regular-400.ttf diff --git a/crates/service-webpage/assets/fonts/fa/fa-regular-400.woff2 b/crates/service/service-webpage/assets/fonts/fa/fa-regular-400.woff2 similarity index 100% rename from crates/service-webpage/assets/fonts/fa/fa-regular-400.woff2 rename to crates/service/service-webpage/assets/fonts/fa/fa-regular-400.woff2 diff --git a/crates/service-webpage/assets/fonts/fa/fa-solid-900.ttf b/crates/service/service-webpage/assets/fonts/fa/fa-solid-900.ttf similarity index 100% rename from crates/service-webpage/assets/fonts/fa/fa-solid-900.ttf rename to crates/service/service-webpage/assets/fonts/fa/fa-solid-900.ttf diff --git a/crates/service-webpage/assets/fonts/fa/fa-solid-900.woff2 b/crates/service/service-webpage/assets/fonts/fa/fa-solid-900.woff2 similarity index 100% rename from crates/service-webpage/assets/fonts/fa/fa-solid-900.woff2 rename to crates/service/service-webpage/assets/fonts/fa/fa-solid-900.woff2 diff --git a/crates/service-webpage/assets/fonts/fira/FiraCode-Bold.woff2 b/crates/service/service-webpage/assets/fonts/fira/FiraCode-Bold.woff2 similarity index 100% rename from crates/service-webpage/assets/fonts/fira/FiraCode-Bold.woff2 rename to crates/service/service-webpage/assets/fonts/fira/FiraCode-Bold.woff2 diff --git a/crates/service-webpage/assets/fonts/fira/FiraCode-Light.woff2 b/crates/service/service-webpage/assets/fonts/fira/FiraCode-Light.woff2 similarity index 100% rename from crates/service-webpage/assets/fonts/fira/FiraCode-Light.woff2 rename to crates/service/service-webpage/assets/fonts/fira/FiraCode-Light.woff2 diff --git a/crates/service-webpage/assets/fonts/fira/FiraCode-Medium.woff2 b/crates/service/service-webpage/assets/fonts/fira/FiraCode-Medium.woff2 similarity index 100% rename from crates/service-webpage/assets/fonts/fira/FiraCode-Medium.woff2 rename to crates/service/service-webpage/assets/fonts/fira/FiraCode-Medium.woff2 diff --git a/crates/service-webpage/assets/fonts/fira/FiraCode-Regular.woff2 b/crates/service/service-webpage/assets/fonts/fira/FiraCode-Regular.woff2 similarity index 100% rename from crates/service-webpage/assets/fonts/fira/FiraCode-Regular.woff2 rename to crates/service/service-webpage/assets/fonts/fira/FiraCode-Regular.woff2 diff --git a/crates/service-webpage/assets/fonts/fira/FiraCode-SemiBold.woff2 b/crates/service/service-webpage/assets/fonts/fira/FiraCode-SemiBold.woff2 similarity index 100% rename from crates/service-webpage/assets/fonts/fira/FiraCode-SemiBold.woff2 rename to crates/service/service-webpage/assets/fonts/fira/FiraCode-SemiBold.woff2 diff --git a/crates/service-webpage/assets/fonts/fira/FiraCode-VF.woff2 b/crates/service/service-webpage/assets/fonts/fira/FiraCode-VF.woff2 similarity index 100% rename from crates/service-webpage/assets/fonts/fira/FiraCode-VF.woff2 rename to crates/service/service-webpage/assets/fonts/fira/FiraCode-VF.woff2 diff --git a/crates/service-webpage/assets/images/betalupi-map.png b/crates/service/service-webpage/assets/images/betalupi-map.png similarity index 100% rename from crates/service-webpage/assets/images/betalupi-map.png rename to crates/service/service-webpage/assets/images/betalupi-map.png diff --git a/crates/service-webpage/assets/images/cover-small.jpg b/crates/service/service-webpage/assets/images/cover-small.jpg similarity index 100% rename from crates/service-webpage/assets/images/cover-small.jpg rename to crates/service/service-webpage/assets/images/cover-small.jpg diff --git a/crates/service-webpage/assets/images/icon.png b/crates/service/service-webpage/assets/images/icon.png similarity index 100% rename from crates/service-webpage/assets/images/icon.png rename to crates/service/service-webpage/assets/images/icon.png diff --git a/crates/service-webpage/css/blocks.scss b/crates/service/service-webpage/css/blocks.scss similarity index 100% rename from crates/service-webpage/css/blocks.scss rename to crates/service/service-webpage/css/blocks.scss diff --git a/crates/service-webpage/css/fontawesome/_animated.scss b/crates/service/service-webpage/css/fontawesome/_animated.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_animated.scss rename to crates/service/service-webpage/css/fontawesome/_animated.scss diff --git a/crates/service-webpage/css/fontawesome/_bordered-pulled.scss b/crates/service/service-webpage/css/fontawesome/_bordered-pulled.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_bordered-pulled.scss rename to crates/service/service-webpage/css/fontawesome/_bordered-pulled.scss diff --git a/crates/service-webpage/css/fontawesome/_core.scss b/crates/service/service-webpage/css/fontawesome/_core.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_core.scss rename to crates/service/service-webpage/css/fontawesome/_core.scss diff --git a/crates/service-webpage/css/fontawesome/_fixed-width.scss b/crates/service/service-webpage/css/fontawesome/_fixed-width.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_fixed-width.scss rename to crates/service/service-webpage/css/fontawesome/_fixed-width.scss diff --git a/crates/service-webpage/css/fontawesome/_functions.scss b/crates/service/service-webpage/css/fontawesome/_functions.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_functions.scss rename to crates/service/service-webpage/css/fontawesome/_functions.scss diff --git a/crates/service-webpage/css/fontawesome/_icons.scss b/crates/service/service-webpage/css/fontawesome/_icons.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_icons.scss rename to crates/service/service-webpage/css/fontawesome/_icons.scss diff --git a/crates/service-webpage/css/fontawesome/_list.scss b/crates/service/service-webpage/css/fontawesome/_list.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_list.scss rename to crates/service/service-webpage/css/fontawesome/_list.scss diff --git a/crates/service-webpage/css/fontawesome/_mixins.scss b/crates/service/service-webpage/css/fontawesome/_mixins.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_mixins.scss rename to crates/service/service-webpage/css/fontawesome/_mixins.scss diff --git a/crates/service-webpage/css/fontawesome/_rotated-flipped.scss b/crates/service/service-webpage/css/fontawesome/_rotated-flipped.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_rotated-flipped.scss rename to crates/service/service-webpage/css/fontawesome/_rotated-flipped.scss diff --git a/crates/service-webpage/css/fontawesome/_screen-reader.scss b/crates/service/service-webpage/css/fontawesome/_screen-reader.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_screen-reader.scss rename to crates/service/service-webpage/css/fontawesome/_screen-reader.scss diff --git a/crates/service-webpage/css/fontawesome/_shims.scss b/crates/service/service-webpage/css/fontawesome/_shims.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_shims.scss rename to crates/service/service-webpage/css/fontawesome/_shims.scss diff --git a/crates/service-webpage/css/fontawesome/_sizing.scss b/crates/service/service-webpage/css/fontawesome/_sizing.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_sizing.scss rename to crates/service/service-webpage/css/fontawesome/_sizing.scss diff --git a/crates/service-webpage/css/fontawesome/_stacked.scss b/crates/service/service-webpage/css/fontawesome/_stacked.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_stacked.scss rename to crates/service/service-webpage/css/fontawesome/_stacked.scss diff --git a/crates/service-webpage/css/fontawesome/_variables.scss b/crates/service/service-webpage/css/fontawesome/_variables.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/_variables.scss rename to crates/service/service-webpage/css/fontawesome/_variables.scss diff --git a/crates/service-webpage/css/fontawesome/brands.scss b/crates/service/service-webpage/css/fontawesome/brands.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/brands.scss rename to crates/service/service-webpage/css/fontawesome/brands.scss diff --git a/crates/service-webpage/css/fontawesome/fontawesome.scss b/crates/service/service-webpage/css/fontawesome/fontawesome.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/fontawesome.scss rename to crates/service/service-webpage/css/fontawesome/fontawesome.scss diff --git a/crates/service-webpage/css/fontawesome/regular.scss b/crates/service/service-webpage/css/fontawesome/regular.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/regular.scss rename to crates/service/service-webpage/css/fontawesome/regular.scss diff --git a/crates/service-webpage/css/fontawesome/solid.scss b/crates/service/service-webpage/css/fontawesome/solid.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/solid.scss rename to crates/service/service-webpage/css/fontawesome/solid.scss diff --git a/crates/service-webpage/css/fontawesome/v4-shims.scss b/crates/service/service-webpage/css/fontawesome/v4-shims.scss similarity index 100% rename from crates/service-webpage/css/fontawesome/v4-shims.scss rename to crates/service/service-webpage/css/fontawesome/v4-shims.scss diff --git a/crates/service-webpage/css/images.scss b/crates/service/service-webpage/css/images.scss similarity index 100% rename from crates/service-webpage/css/images.scss rename to crates/service/service-webpage/css/images.scss diff --git a/crates/service-webpage/css/main.scss b/crates/service/service-webpage/css/main.scss similarity index 100% rename from crates/service-webpage/css/main.scss rename to crates/service/service-webpage/css/main.scss diff --git a/crates/service-webpage/css/special.scss b/crates/service/service-webpage/css/special.scss similarity index 100% rename from crates/service-webpage/css/special.scss rename to crates/service/service-webpage/css/special.scss diff --git a/crates/service-webpage/css/text.scss b/crates/service/service-webpage/css/text.scss similarity index 100% rename from crates/service-webpage/css/text.scss rename to crates/service/service-webpage/css/text.scss diff --git a/crates/service-webpage/src/ast/mod.rs b/crates/service/service-webpage/src/ast/mod.rs similarity index 100% rename from crates/service-webpage/src/ast/mod.rs rename to crates/service/service-webpage/src/ast/mod.rs diff --git a/crates/service-webpage/src/ast/walk.rs b/crates/service/service-webpage/src/ast/walk.rs similarity index 100% rename from crates/service-webpage/src/ast/walk.rs rename to crates/service/service-webpage/src/ast/walk.rs diff --git a/crates/service-webpage/src/ast/walk_mut.rs b/crates/service/service-webpage/src/ast/walk_mut.rs similarity index 100% rename from crates/service-webpage/src/ast/walk_mut.rs rename to crates/service/service-webpage/src/ast/walk_mut.rs diff --git a/crates/service-webpage/src/components/base.rs b/crates/service/service-webpage/src/components/base.rs similarity index 100% rename from crates/service-webpage/src/components/base.rs rename to crates/service/service-webpage/src/components/base.rs diff --git a/crates/service-webpage/src/components/fa.rs b/crates/service/service-webpage/src/components/fa.rs similarity index 100% rename from crates/service-webpage/src/components/fa.rs rename to crates/service/service-webpage/src/components/fa.rs diff --git a/crates/service-webpage/src/components/mangle.rs b/crates/service/service-webpage/src/components/mangle.rs similarity index 94% rename from crates/service-webpage/src/components/mangle.rs rename to crates/service/service-webpage/src/components/mangle.rs index fdf296c..49e524e 100644 --- a/crates/service-webpage/src/components/mangle.rs +++ b/crates/service/service-webpage/src/components/mangle.rs @@ -1,6 +1,5 @@ use maud::{Markup, Render, html}; -// TODO: turn these into one self-contained struct pub struct MangledBetaEmail {} impl Render for MangledBetaEmail { diff --git a/crates/service-webpage/src/components/md.rs b/crates/service/service-webpage/src/components/md.rs similarity index 99% rename from crates/service-webpage/src/components/md.rs rename to crates/service/service-webpage/src/components/md.rs index e1ee6f4..ec81979 100644 --- a/crates/service-webpage/src/components/md.rs +++ b/crates/service/service-webpage/src/components/md.rs @@ -71,8 +71,6 @@ const OPTS: Options = Options { impl Render for Markdown<'_> { fn render(&self) -> Markup { - // TODO: cache - /* let mut ast = markdown::to_mdast(MD_A, &opts.parse).unwrap(); let walk = AstWalkMut::new(&mut ast); diff --git a/crates/service-webpage/src/components/misc.rs b/crates/service/service-webpage/src/components/misc.rs similarity index 100% rename from crates/service-webpage/src/components/misc.rs rename to crates/service/service-webpage/src/components/misc.rs diff --git a/crates/service-webpage/src/components/mod.rs b/crates/service/service-webpage/src/components/mod.rs similarity index 100% rename from crates/service-webpage/src/components/mod.rs rename to crates/service/service-webpage/src/components/mod.rs diff --git a/crates/service-webpage/src/lib.rs b/crates/service/service-webpage/src/lib.rs similarity index 100% rename from crates/service-webpage/src/lib.rs rename to crates/service/service-webpage/src/lib.rs diff --git a/crates/service-webpage/src/routes/assets.rs b/crates/service/service-webpage/src/routes/assets.rs similarity index 98% rename from crates/service-webpage/src/routes/assets.rs rename to crates/service/service-webpage/src/routes/assets.rs index 14ca3a9..230051e 100644 --- a/crates/service-webpage/src/routes/assets.rs +++ b/crates/service/service-webpage/src/routes/assets.rs @@ -1,7 +1,6 @@ use assetserver::Asset; use macro_assets::assets; -// TODO: auto-generate from dir assets! { prefix: "/assets" router: asset_router() diff --git a/crates/service-webpage/src/routes/betalupi.rs b/crates/service/service-webpage/src/routes/betalupi.rs similarity index 100% rename from crates/service-webpage/src/routes/betalupi.rs rename to crates/service/service-webpage/src/routes/betalupi.rs diff --git a/crates/service-webpage/src/routes/index.rs b/crates/service/service-webpage/src/routes/index.rs similarity index 100% rename from crates/service-webpage/src/routes/index.rs rename to crates/service/service-webpage/src/routes/index.rs diff --git a/crates/service-webpage/src/routes/links.rs b/crates/service/service-webpage/src/routes/links.rs similarity index 99% rename from crates/service-webpage/src/routes/links.rs rename to crates/service/service-webpage/src/routes/links.rs index 8c4066c..d522b18 100644 --- a/crates/service-webpage/src/routes/links.rs +++ b/crates/service/service-webpage/src/routes/links.rs @@ -9,10 +9,6 @@ use crate::{ routes::assets::Image_Icon, }; -// TODO: emoji -// TODO: spellcheck -// TODO: check links - pub async fn links() -> Markup { let meta = PageMetadata { title: "Links".into(), diff --git a/crates/service-webpage/src/routes/mod.rs b/crates/service/service-webpage/src/routes/mod.rs similarity index 100% rename from crates/service-webpage/src/routes/mod.rs rename to crates/service/service-webpage/src/routes/mod.rs