From 72fd3351b3cb1eeeb70ec22e0af139902034351d Mon Sep 17 00:00:00 2001 From: Bauke Date: Fri, 26 Nov 2021 14:08:13 +0100 Subject: [PATCH] Redo. --- Cargo.toml | 18 +-- Trunk.toml | 9 -- askama.toml | 2 + index.html | 21 ---- package.json | 2 +- source/build.rs | 23 ---- source/components/mod.rs | 10 -- source/components/page_footer.rs | 29 ----- source/components/page_header.rs | 31 ----- source/components/page_main.rs | 43 ------- source/main.rs | 154 +++++++++++++++---------- source/routes/home.rs | 35 ------ source/routes/mod.rs | 7 -- source/routes/userstyles.rs | 57 --------- source/scss/components/_page-main.scss | 1 + source/templates/base.html | 17 +++ source/templates/index.html | 27 +++++ source/templates/mod.rs | 14 +++ source/templates/userstyles.html | 25 ++++ 19 files changed, 184 insertions(+), 341 deletions(-) delete mode 100644 Trunk.toml create mode 100644 askama.toml delete mode 100644 index.html delete mode 100644 source/build.rs delete mode 100644 source/components/mod.rs delete mode 100644 source/components/page_footer.rs delete mode 100644 source/components/page_header.rs delete mode 100644 source/components/page_main.rs delete mode 100644 source/routes/home.rs delete mode 100644 source/routes/mod.rs delete mode 100644 source/routes/userstyles.rs create mode 100644 source/templates/base.html create mode 100644 source/templates/index.html create mode 100644 source/templates/mod.rs create mode 100644 source/templates/userstyles.html diff --git a/Cargo.toml b/Cargo.toml index b15a439..57b182d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,25 +7,13 @@ version = "1.0.0" edition = "2018" repository = "https://git.holllo.cc/Bauke/bauke.xyz" license = "AGPL-3.0-or-later" -build = "source/build.rs" [[bin]] name = "bauke-xyz" path = "source/main.rs" [dependencies] -gloo-console = "0.2.0" -gloo-timers = "0.2.1" -log = "0.4.14" -rand = "0.8.4" -userstyles = { git = "https://git.holllo.cc/Bauke/userstyles" } -wasm-logger = "0.2.0" -yew = "0.18.0" -yew-router = "0.15.0" - -[dependencies.getrandom] -version = "0.2.3" -features = ["js"] - -[build-dependencies] +askama = "0.10.5" +color-eyre = "0.5.11" +rsass = "0.22.2" userstyles = { git = "https://git.holllo.cc/Bauke/userstyles" } diff --git a/Trunk.toml b/Trunk.toml deleted file mode 100644 index 583715f..0000000 --- a/Trunk.toml +++ /dev/null @@ -1,9 +0,0 @@ -[build] -dist = "public" - -[serve] -no_autoreload = false -port = 5500 - -[clean] -dist = "public" diff --git a/askama.toml b/askama.toml new file mode 100644 index 0000000..fcc0ab4 --- /dev/null +++ b/askama.toml @@ -0,0 +1,2 @@ +[general] +dirs = ["source/templates"] diff --git a/index.html b/index.html deleted file mode 100644 index e0c8e0c..0000000 --- a/index.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - bauke.xyz - - - - - - - - - - - diff --git a/package.json b/package.json index 4d08762..bf77b16 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "license": "AGPL-3.0-or-later", "scripts": { - "deploy": "trunk clean && cargo build -q && trunk build --release && yarn deploy:netlify", + "deploy": "cargo run --release -q && yarn deploy:netlify", "deploy:netlify": "netlify deploy --prod --dir 'public/' -s bauke.xyz", "test": "stylelint 'source/**/*.scss'" }, diff --git a/source/build.rs b/source/build.rs deleted file mode 100644 index b9cd1ef..0000000 --- a/source/build.rs +++ /dev/null @@ -1,23 +0,0 @@ -/// Build script for the website. - -fn main() { - println!("cargo:rerun-if-changed=source/**"); - let build_dir = std::path::PathBuf::from("target"); - - for target in userstyles::ALL_USERSTYLES { - let style = userstyles::Userstyle::load(target).unwrap(); - let style_name = style.metadata.name.to_lowercase().replace(" ", "-"); - - let style_dir = build_dir.join("userstyles"); - std::fs::create_dir_all(&style_dir).unwrap(); - - let style_file = style_dir.join(format!("{}.user.css", style_name)); - let formatted = style.format(); - std::fs::write(style_file, formatted).unwrap(); - - if let Some(image) = style.image { - let image_file = style_dir.join(format!("{}.png", style_name)); - std::fs::write(image_file, image).unwrap(); - } - } -} diff --git a/source/components/mod.rs b/source/components/mod.rs deleted file mode 100644 index 17a8efa..0000000 --- a/source/components/mod.rs +++ /dev/null @@ -1,10 +0,0 @@ -/// Contains the main page `