Update dependencies

server/src/routes/pages.rs

@@ -7,16 +7,17 @@ use crate::status_json::StatusJson;
 use crate::util::EventNotifier;
 use bincode::{deserialize, serialize};
 use rocket::http::Status;
+use rocket::response::content::Html;
 use rocket::response::Redirect;
+use rocket::serde::uuid::Uuid;
 use rocket::{get, post, uri, State};
-use rocket_contrib::templates::Template;
-use rocket_contrib::uuid::Uuid;
+use rocket_dyn_templates::Template;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, HashMap};
 use std::time::Duration;
 
 #[get("/")]
-pub fn index(_auth: Authorized, db: State<'_, sled::Db>) -> Result<Template, StatusJson> {
+pub fn index(_auth: Authorized, db: &State<sled::Db>) -> Result<Html<Template>, StatusJson> {
     #[derive(Debug, Serialize, Deserialize, PartialOrd, Ord, PartialEq, Eq)]
     struct Node {
         category: category::V,
@@ -89,15 +90,15 @@ pub fn index(_auth: Authorized, db: State<'_, sled::Db>) -> Result<Template, Sta
         categories: top_level_nodes,
     };
 
-    Ok(Template::render("index", &context))
+    Ok(Html(Template::render("index", &context)))
 }
 
 #[post("/category/<category_uuid>/start_session")]
 pub fn start_session(
     _auth: Authorized,
     category_uuid: Uuid,
-    event_notifier: State<'_, EventNotifier>,
-    db: State<'_, sled::Db>,
+    event_notifier: &State<EventNotifier>,
+    db: &State<sled::Db>,
 ) -> Result<Redirect, StatusJson> {
     super::api::toggle_category_session(category_uuid, true, event_notifier, db)?;
     Ok(Redirect::to(uri!(index)))
@@ -107,8 +108,8 @@ pub fn start_session(
 pub fn end_session(
     _auth: Authorized,
     category_uuid: Uuid,
-    event_notifier: State<'_, EventNotifier>,
-    db: State<'_, sled::Db>,
+    event_notifier: &State<EventNotifier>,
+    db: &State<sled::Db>,
 ) -> Result<Redirect, StatusJson> {
     super::api::toggle_category_session(category_uuid, false, event_notifier, db)?;
     Ok(Redirect::to(uri!(index)))
@@ -119,12 +120,12 @@ pub fn bump_session(
     _auth: Authorized,
     category_uuid: Uuid,
     minutes: i64,
-    db: State<'_, sled::Db>,
+    db: &State<sled::Db>,
 ) -> Result<Redirect, StatusJson> {
     use crate::database::latest::trees::category;
 
     let duration = chrono::Duration::minutes(minutes);
-    let category_uuid_s = sled::IVec::from(serialize(&category_uuid.into_inner())?);
+    let category_uuid_s = sled::IVec::from(serialize(&category_uuid)?);
 
     let categories_tree = db.open_tree(category::NAME)?;
 
@@ -162,15 +163,15 @@ pub fn bump_session(
 pub fn session_edit(
     _auth: Authorized,
     session_uuid: Uuid,
-    db: State<'_, sled::Db>,
-) -> Result<Template, StatusJson> {
+    db: &State<sled::Db>,
+) -> Result<Html<Template>, StatusJson> {
     #[derive(Debug, Serialize, Deserialize)]
     struct SessionPageContext {
         session: session::V,
         session_id: uuid::Uuid,
     }
 
-    let session_uuid_s = sled::IVec::from(serialize(&session_uuid.into_inner())?);
+    let session_uuid_s = sled::IVec::from(serialize(&session_uuid)?);
 
     let sessions_tree = db.open_tree(session::NAME)?;
     match sessions_tree.get(session_uuid_s)? {
@@ -178,16 +179,16 @@ pub fn session_edit(
         Some(data) => {
             let context = SessionPageContext {
                 session: deserialize(&data).unwrap(),
-                session_id: session_uuid.into_inner(),
+                session_id: session_uuid,
             };
 
-            Ok(Template::render("edit_session", &context))
+            Ok(Html(Template::render("edit_session", &context)))
         }
     }
 }
 
 #[get("/history")]
-pub fn history(_auth: Authorized, db: State<'_, sled::Db>) -> Result<Template, StatusJson> {
+pub fn history(_auth: Authorized, db: &State<sled::Db>) -> Result<Html<Template>, StatusJson> {
     #[derive(Debug, Serialize, Deserialize)]
     struct HistoryEntryContext {
         category: category::V,
@@ -234,5 +235,5 @@ pub fn history(_auth: Authorized, db: State<'_, sled::Db>) -> Result<Template, S
     context.entries.sort_by_key(|entry| entry.session.started);
     context.entries.reverse();
 
-    Ok(Template::render("history", &context))
+    Ok(Html(Template::render("history", &context)))
 }