1 files changed, 14 insertions, 4 deletions
diff --git a/src/main.rs b/src/main.rs
index 04ab18e..e247211 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,11 +3,12 @@ extern crate tracing;
 
 use color_eyre::eyre::Result;
 use std::{net::IpAddr, sync::Arc};
-use warp::Filter;
+use warp::{Filter, path};
 
 use std::str::FromStr;
 
 pub mod blog;
+pub mod misc;
 mod internal;
 
 use internal::SiteState;
@@ -24,15 +25,22 @@ async fn main() -> Result<()> {
 
     let state = Arc::new(internal::init().await?);
 
+    let index = warp::get().and(path::end().and_then(misc::handlers::index));
+
     let blog_base = warp::path!("blog" / ..);
     let blog_list = blog_base.and(give_site_state(state.clone())).and_then(blog::handlers::list);
     let blog_post = blog_base.and(
         warp::path!(String)
-            .and(warp::get()).and_then(blog::handlers::post));
+            .and(give_site_state(state.clone())) 
+            .and_then(blog::handlers::post),
+    );
 
-    let blog = blog_list.or(blog_post);
+    let static_files = warp::path("static")
+        .and(warp::fs::dir("./statics"));
+    let site = index
+        .or(blog_list.or(blog_post))
+        .or(static_files).with(warp::log("site"));
 
-    let site = blog.with(warp::log("site"));
 
     let server = warp::serve(site);
 
@@ -51,3 +59,5 @@ async fn main() -> Result<()> {
 fn give_site_state(sitestate: Arc<SiteState>) -> impl Filter<Extract = (Arc<SiteState>,), Error=std::convert::Infallible> + Clone {
     warp::any().map(move || sitestate.clone())
 }
+
+include!(concat!(env!("OUT_DIR"), "/templates.rs"));