From 0dae37a2e98c13fbc78acd58b86565fd6f14c654 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 14 Jan 2018 12:39:50 +0100 Subject: Split out layout from templates. --- src/controllers/home_controller.rs | 14 +++++++++----- src/controllers/posts_controller.rs | 30 +++++++++++++++++++++--------- src/utils/mod.rs | 10 +++++++++- 3 files changed, 39 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/controllers/home_controller.rs b/src/controllers/home_controller.rs index c4c0c56..563be40 100644 --- a/src/controllers/home_controller.rs +++ b/src/controllers/home_controller.rs @@ -3,16 +3,20 @@ use rocket_contrib::Json; #[derive(BartDisplay, Serialize)] #[template = "templates/index.html"] -struct IndexTemplate<'a> { - title: &'a str, +struct IndexTemplate { posts: Vec } -implement_responder_for!(IndexTemplate<'a>); +implement_responder_for!(IndexTemplate); #[get("/", format = "text/html")] -fn index<'a>(conn: utils::DbConn) -> IndexTemplate<'a> { - IndexTemplate { title: "Bloggen", posts: models::Post::get_all(conn) } +fn index(conn: utils::DbConn) -> utils::Page { + utils::Page { + title: String::from("Bloggen"), + content: IndexTemplate { + posts: models::Post::get_all(conn) + } + } } #[get("/", format = "application/json")] diff --git a/src/controllers/posts_controller.rs b/src/controllers/posts_controller.rs index a8c5e1c..38618d3 100644 --- a/src/controllers/posts_controller.rs +++ b/src/controllers/posts_controller.rs @@ -4,16 +4,20 @@ use utils; #[derive(BartDisplay)] #[template = "templates/new_post.html"] -pub struct NewPostTemplate<'a> { - title: &'a str, +pub struct NewPostTemplate { post: ::models::NewPost } -implement_responder_for!(NewPostTemplate<'a>); +implement_responder_for!(NewPostTemplate); #[get("/new", format = "text/html")] -fn new<'a>(_conn: utils::DbConn) -> NewPostTemplate<'a> { - NewPostTemplate { title: "Bloggen", post: Default::default() } +fn new(_conn: utils::DbConn) -> utils::Page { + utils::Page { + title: String::from("New post"), + content: NewPostTemplate { + post: Default::default() + } + } } #[post("/create", data="")] @@ -31,9 +35,14 @@ pub struct ShowPostTemplate { implement_responder_for!(ShowPostTemplate); #[get("/", format = "text/html")] -fn show<'a>(id: i32, conn: utils::DbConn) -> ShowPostTemplate { +fn show(id: i32, conn: utils::DbConn) -> utils::Page { let p = ::models::Post::get(id, conn); - ShowPostTemplate { post: p } + utils::Page { + title: p.title.clone(), + content: ShowPostTemplate { + post: p + }, + } } #[derive(BartDisplay)] @@ -45,9 +54,12 @@ pub struct EditPostTemplate { implement_responder_for!(EditPostTemplate); #[get("//edit", format = "text/html")] -fn edit(id: i32, conn: utils::DbConn) -> EditPostTemplate { +fn edit(id: i32, conn: utils::DbConn) -> utils::Page { let p = ::models::Post::get(id, conn); - EditPostTemplate { post: p } + utils::Page { + title: String::from("Edit post"), + content: EditPostTemplate { post: p } + } } #[post("/update", data="")] diff --git a/src/utils/mod.rs b/src/utils/mod.rs index a1ece8b..2e79934 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -1,4 +1,5 @@ use diesel::pg::PgConnection; +use std::fmt::Display; use r2d2; use r2d2_diesel::ConnectionManager; @@ -44,6 +45,13 @@ impl Deref for DbConn { } } +#[derive(BartDisplay, Serialize)] +#[template = "templates/layout.html"] +pub struct Page { + pub title: String, + pub content: T +} + macro_rules! implement_responder_for { // Implement a responder for the given template type // @@ -52,7 +60,7 @@ macro_rules! implement_responder_for { // So it will have to be passed in to the argument at // the macro incovation instead. ($template_type:ty) => ( - impl<'a> ::rocket::response::Responder<'a> for $template_type { + impl<'a> ::rocket::response::Responder<'a> for ::utils::Page<$template_type> { fn respond_to(self, _: &::rocket::Request) -> Result<::rocket::Response<'static>, ::rocket::http::Status> { ::rocket::Response::build() .header(::rocket::http::ContentType::HTML) -- cgit v1.2.3