From 701ff00b72b423b77e3d1e09dc7fc1b817b207cb Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 22 Aug 2020 20:14:03 +0200 Subject: Implement adding rooms through the web ui. --- src/controllers/room.rs | 22 +++++++++++++++++++++- src/db.rs | 7 +++++++ src/lib.rs | 2 +- src/models/room.rs | 2 +- templates/room/list.tera | 6 ++++++ templates/room/new.tera | 14 ++++++++++++++ 6 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 templates/room/new.tera diff --git a/src/controllers/room.rs b/src/controllers/room.rs index 8b85344..6458f86 100644 --- a/src/controllers/room.rs +++ b/src/controllers/room.rs @@ -22,12 +22,15 @@ use crate::{ }; use std::result::Result; -use rocket::get; +use rocket::{get, post}; +use rocket::request::{Form, FromForm}; +use rocket::response::Redirect; use rocket_contrib::{ json::Json, templates::Template, }; use serde::Serialize; +use std::collections::HashMap; use std::error::Error; #[derive(Serialize)] @@ -45,3 +48,20 @@ pub fn list_rooms(db: db::Connection) -> Result> { let ctx = Context { rooms: db.get_rooms()? }; Ok(Template::render("room/list", &ctx)) } + +#[get("/new")] +pub fn new_room() -> Result> { + let ctx: HashMap = HashMap::new(); + Ok(Template::render("room/new", &ctx)) +} + +#[derive(FromForm)] +pub struct NewRoomForm { + name: String, +} + +#[post("/", format = "application/x-www-form-urlencoded", data = "")] +pub fn create_room(db: db::Connection, room: Form) -> Result> { + db.create_room(&room.name)?; + Ok(Redirect::to("/rooms")) +} diff --git a/src/db.rs b/src/db.rs index 60bbcde..09b6f4f 100644 --- a/src/db.rs +++ b/src/db.rs @@ -67,6 +67,13 @@ impl Connection { Ok(models::AggregatedScreening::from_query(s)) } + pub fn create_room(&self, room_name: &String) -> QueryResult { + use crate::schema::rooms::dsl::*; + diesel::insert_into(rooms) + .values(&name.eq(room_name)) + .execute(&**self) + } + pub fn get_rooms(&self) -> QueryResult> { use crate::schema::rooms::dsl::*; rooms.load(&**self) diff --git a/src/lib.rs b/src/lib.rs index 3b35594..41eea66 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -44,7 +44,7 @@ pub fn build_rocket(db_url: &str) -> Result> { .attach(db::Connection::fairing()) .attach(rocket_contrib::templates::Template::fairing()) .mount("/", rocket_contrib::serve::StaticFiles::from("./public")) - .mount("/rooms", routes![room::get_rooms_json, room::list_rooms]) + .mount("/rooms", routes![room::get_rooms_json, room::list_rooms, room::new_room, room::create_room]) .mount("/films", routes![film::get_films]) .mount("/screenings", routes![screening::get_aggregated_screenings])) } diff --git a/src/models/room.rs b/src/models/room.rs index 33fb931..1ec6e56 100644 --- a/src/models/room.rs +++ b/src/models/room.rs @@ -19,7 +19,7 @@ use crate::schema::rooms; use serde::{Deserialize, Serialize}; -#[derive(Clone, Default, Deserialize, Identifiable, PartialEq, Serialize, Queryable)] +#[derive(Clone, Default, Deserialize, Identifiable, Insertable, PartialEq, Serialize, Queryable)] pub struct Room { pub id: i32, pub name: String, diff --git a/templates/room/list.tera b/templates/room/list.tera index fddad57..23b2086 100644 --- a/templates/room/list.tera +++ b/templates/room/list.tera @@ -8,6 +8,12 @@ {% if rooms | length <= 0%} No rooms defined. +{% else %} +

{{ r.name }} ({{ r.id }}) +{% endfor -%} +

{% endif %} diff --git a/templates/room/new.tera b/templates/room/new.tera new file mode 100644 index 0000000..2bbe27c --- /dev/null +++ b/templates/room/new.tera @@ -0,0 +1,14 @@ + + + +New room + + +

New room

+ + + + -- cgit v1.2.3