RGBCube/rgbcube.github.io
1
Fork 0
mirror of https://github.com/RGBCube/rgbcube.github.io synced 2025-05-20 08:35:07 +00:00
Code Issues Activity Actions

Switch to embed-rs

Browse source
This commit is contained in:
RGBCube 2023-12-21 15:54:11 +03:00
parent 397e666ced
commit f8e9d77792
No known key found for this signature in database
6 changed files with 42 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Cargo.lock generated
View file

@ -49,15 +49,15 @@ dependencies = [
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.75" version = "1.0.76"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
[[package]] [[package]]
name = "async-trait" name = "async-trait"
version = "0.1.74" version = "0.1.75"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -191,10 +191,12 @@ dependencies = [
] ]
[[package]] [[package]]
name = "embed-file" name = "embed"
version = "0.1.0" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/RGBCube/embed-rs#2dd76f64949dd983a2e6e7752633c9dcb2330ef6"
checksum = "11c84540ea27680af34e655a36b1b3d362f2a1d2088db07760358a01fa9546ad" dependencies = [
"include_dir",
]
[[package]] [[package]]
name = "env_logger" name = "env_logger"
@ -427,6 +429,25 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "include_dir"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
dependencies = [
"include_dir_macros",
]
[[package]]
name = "include_dir_macros"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
dependencies = [
"proc-macro2",
"quote",
]
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "2.1.0" version = "2.1.0"
@ -842,12 +863,11 @@ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
"dashmap", "dashmap",
"embed-file", "embed",
"env_logger", "env_logger",
"log", "log",
"maud", "maud",
"minify-js", "minify-js",
"stringreader",
"tar", "tar",
"tokio", "tokio",
] ]
@ -877,17 +897,11 @@ dependencies = [
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]]
name = "stringreader"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "913e7b03d63752f6cdd2df77da36749d82669904798fe8944b9ec3d23f159905"
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.41" version = "2.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" checksum = "5b7d0a2c048d661a1a59fcd7355baa232f7ed34e0ee4df2eef3c1c1c0d3852d8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

3
Cargo.toml
View file

@ -12,12 +12,11 @@ edition = "2021"
anyhow = "1.0.75" anyhow = "1.0.75"
axum = "0.7.2" axum = "0.7.2"
dashmap = "5.5.3" dashmap = "5.5.3"
embed-file = "0.1.0" embed = { git = "https://github.com/RGBCube/embed-rs" }
env_logger = "0.10.1" env_logger = "0.10.1"
log = "0.4.20" log = "0.4.20"
maud = { git = "https://github.com/vidhanio/maud", branch = "patch-1", features = [ "axum" ] } maud = { git = "https://github.com/vidhanio/maud", branch = "patch-1", features = [ "axum" ] }
minify-js = "0.5.6" minify-js = "0.5.6"
stringreader = "0.1.1"
tar = "0.4.40" tar = "0.4.40"
tokio = { version = "1.35.1", features = [ "full" ] } tokio = { version = "1.35.1", features = [ "full" ] }

5
src/cube/mod.rs
View file

@ -1,4 +1,3 @@
use embed_file::embed_string as embed;
use maud::{ use maud::{
html, html,
Markup, Markup,
@ -16,7 +15,7 @@ pub fn create<S: AsRef<str>>(styling: S, faces: [Markup; 6]) -> Markup {
page::create( page::create(
html! { html! {
style { style {
(PreEscaped(minify::css(embed!("cube.css")))) (PreEscaped(minify::css(embed::string!("cube.css"))))
} }
}, },
html! { html! {
@ -35,7 +34,7 @@ pub fn create<S: AsRef<str>>(styling: S, faces: [Markup; 6]) -> Markup {
} }
script { script {
(PreEscaped(minify::js(embed!("cube.js")))) (PreEscaped(minify::js(embed::string!("cube.js"))))
} }
}, },
) )

3
src/pages/_404/mod.rs
View file

@ -1,6 +1,5 @@
use std::array; use std::array;
use embed_file::embed_string as embed;
use maud::{ use maud::{
html, html,
Markup, Markup,
@ -13,7 +12,7 @@ use crate::{
pub async fn generate() -> Markup { pub async fn generate() -> Markup {
cube::create( cube::create(
minify::css(embed!("404.css")), minify::css(embed::string!("404.css")),
array::from_fn(|_| { array::from_fn(|_| {
(html! { (html! {
div class="frame" { "404" } div class="frame" { "404" }

11
src/pages/assets.rs
View file

@ -1,16 +1,17 @@
use std::io::Read; use std::io::{
Cursor,
Read,
};
use axum::Router; use axum::Router;
use dashmap::DashMap; use dashmap::DashMap;
use embed_file::embed_string as embed;
use stringreader::StringReader;
use tar::Archive; use tar::Archive;
pub fn router() -> Router { pub fn router() -> Router {
let app = Router::new(); let app = Router::new();
let tar_contents = embed!("assets.tar"); let tar_contents = embed::bytes!("../../assets.tar");
let mut archive = Archive::new(StringReader::new(&tar_contents)); let mut archive = Archive::new(Cursor::new(tar_contents.as_ref()));
let archive_map: DashMap<String, Vec<u8>> = DashMap::new(); let archive_map: DashMap<String, Vec<u8>> = DashMap::new();
for entry in archive.entries().unwrap() { for entry in archive.entries().unwrap() {

3
src/pages/index/mod.rs
View file

@ -1,4 +1,3 @@
use embed_file::embed_string as embed;
use maud::{ use maud::{
html, html,
Markup, Markup,
@ -11,7 +10,7 @@ use crate::{
pub async fn generate() -> Markup { pub async fn generate() -> Markup {
cube::create( cube::create(
minify::css(embed!("index.css")), minify::css(embed::string!("index.css")),
[ [
html! { html! {
a href="contact" { a href="contact" {