From e65619de86080d72bf81ba72311dce5325976478 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 16 Jan 2023 21:54:28 +0100 Subject: stuff --- server/src/frontend/mod.rs | 2 +- server/src/frontend/pages/layout.rs | 2 +- server/src/frontend/style/mod.rs | 12 ++++++++---- server/src/main.rs | 10 ++++++++-- 4 files changed, 18 insertions(+), 8 deletions(-) (limited to 'server/src') diff --git a/server/src/frontend/mod.rs b/server/src/frontend/mod.rs index 99c22f8..043be24 100644 --- a/server/src/frontend/mod.rs +++ b/server/src/frontend/mod.rs @@ -1,2 +1,2 @@ -pub mod style; pub mod pages; +pub mod style; diff --git a/server/src/frontend/pages/layout.rs b/server/src/frontend/pages/layout.rs index 5654d3b..1085f84 100644 --- a/server/src/frontend/pages/layout.rs +++ b/server/src/frontend/pages/layout.rs @@ -11,7 +11,7 @@ markup::define! { body { nav { h1 { "Jellything" } - + } #main { @main } } diff --git a/server/src/frontend/style/mod.rs b/server/src/frontend/style/mod.rs index 1e51d10..ca54aa7 100644 --- a/server/src/frontend/style/mod.rs +++ b/server/src/frontend/style/mod.rs @@ -1,6 +1,7 @@ -use std::{fs::{File, read_to_string}, io::Read}; - - +use std::{ + fs::{read_to_string, File}, + io::Read, +}; pub fn css_bundle() -> String { if cfg!(debug_assertions) { @@ -13,7 +14,10 @@ pub fn css_bundle() -> String { pub fn font_bundle() -> Vec { if cfg!(debug_assertions) { let mut woff = Vec::new(); - File::open("server/src/frontend/style/cantarell.woff2").unwrap().read_to_end(&mut woff).unwrap(); + File::open("server/src/frontend/style/cantarell.woff2") + .unwrap() + .read_to_end(&mut woff) + .unwrap(); woff } else { include_bytes!("cantarell.woff2").to_vec() diff --git a/server/src/main.rs b/server/src/main.rs index a9db370..9a2ca47 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -1,6 +1,6 @@ #![feature(box_syntax)] -use crate::frontend::{pages::MyError}; +use crate::frontend::pages::MyError; use anyhow::{anyhow, Context}; use database::Database; use frontend::{ @@ -84,6 +84,12 @@ fn rocket() -> _ { rocket::build().manage(state).mount( "/", - routes![page_home, page_library_node, assets_style, assets_font, stream], + routes![ + page_home, + page_library_node, + assets_style, + assets_font, + stream + ], ) } -- cgit v1.2.3-70-g09d2