From 7f5e8887e9b1a90d1ed3dd31f053dadec4c75d94 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Tue, 31 Jul 2018 16:49:42 +0200 Subject: Add view to list all users --- src/controllers/users_controller.rs | 31 ++++++++++++++++++++----------- src/models/user.rs | 5 +++++ templates/users.html | 16 ++++++++++++++++ 3 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 templates/users.html diff --git a/src/controllers/users_controller.rs b/src/controllers/users_controller.rs index 9708a1b..9bfb5e1 100644 --- a/src/controllers/users_controller.rs +++ b/src/controllers/users_controller.rs @@ -4,23 +4,32 @@ use rocket::response::{Flash, Redirect}; use utils; #[derive(BartDisplay)] -#[template = "templates/new_user.html"] -pub struct NewUserTemplate { - user: ::models::NewUser +#[template = "templates/users.html"] +pub struct UsersTemplate { + users: Vec<::models::User> } -implement_responder_for!(NewUserTemplate); +implement_responder_for!(UsersTemplate); -impl NewUserTemplate { - pub fn realname(&self) -> String { - self.user.realname.as_ref().unwrap_or(&String::new()).clone() +#[get("/", format = "text/html")] +fn index(conn: utils::DbConn) -> utils::Page { + utils::Page { + title: String::from("Users"), + flash: None, + content: UsersTemplate { + users: ::models::User::all(conn).unwrap() + } } +} - pub fn email(&self) -> String { - self.user.email.as_ref().unwrap_or(&String::new()).clone() - } +#[derive(BartDisplay)] +#[template = "templates/new_user.html"] +pub struct NewUserTemplate { + user: ::models::NewUser } +implement_responder_for!(NewUserTemplate); + #[get("/new", format = "text/html")] fn new() -> utils::Page { utils::Page { @@ -41,5 +50,5 @@ fn create(user: Form<::models::NewUser>, conn: utils::DbConn) -> Flash } pub fn routes() -> Vec { - routes![new, create] + routes![index, new, create] } diff --git a/src/models/user.rs b/src/models/user.rs index 537dfe6..7f6fe88 100644 --- a/src/models/user.rs +++ b/src/models/user.rs @@ -13,6 +13,11 @@ pub struct User { } impl User { + pub fn all(conn: utils::DbConn) -> QueryResult> { + use schema::users::dsl::*; + users.load::(&*conn) + } + pub fn by_id(user_id: i32, conn: utils::DbConn) -> QueryResult { use schema::users::dsl::*; users.filter(id.eq(user_id)) diff --git a/templates/users.html b/templates/users.html new file mode 100644 index 0000000..9eeb533 --- /dev/null +++ b/templates/users.html @@ -0,0 +1,16 @@ + +
+ + + + + + + {{# users }} + + + + + {{/ users }} + +
idusernamereal nameemail
{{ .id }}{{ .username }}{{ .realname() }}{{ .email() }}
-- cgit v1.2.3