1 files changed, 92 insertions, 46 deletions
diff --git a/src/ui.rs b/src/ui.rs
index def8d76..e200324 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,60 +1,106 @@
-use rocket_contrib::templates::Template;
+use std::collections::HashMap;
+
+use actix_web::{
+    error::ErrorInternalServerError, get, web,
+    Error, HttpResponse
+};
+
+use yarte::{TemplateMin, Render, Template};
 
 use crate::db::*;
 
-// GET: Index.
+use serde::Serialize;
+
+#[derive(TemplateMin)]
+#[template(path = "index")]
+pub struct IndexTemplate {
+    pub query: web::Query<HashMap<String, String>>
+}
+
+/// GET: Index.
 #[get("/")]
-pub fn index() -> Template {
-    Template::render("index", &())
+pub async fn index(
+    query: web::Query<HashMap<String, String>>
+) -> Result<HttpResponse, Error> {
+    IndexTemplate { query }
+        .call()
+        .map(|body| {
+            HttpResponse::Ok()
+                .content_type("text/html; charset=utf-8")
+                .body(body)
+        })
+        .map_err(|_| ErrorInternalServerError("Some error message."))
+}
+
+#[derive(Template)]
+#[template(path = "routes/boards")]
+pub struct BoardsTemplate<S: Render> {
+    // pub threads: serde_json::Value
+    pub threads: S
 }
 
-#[catch(404)]
-pub fn not_found() -> Template {
-    Template::render("404", &())
+/// GET: Check out all public boards.
+#[get("/boards")]
+pub async fn boards() -> Result<HttpResponse, Error> {
+    let context = get_boards().unwrap();
+    let threads = serde_json::json!(&context);
+    BoardsTemplate { threads }
+        .call()
+        .map(|body| {
+            HttpResponse::Ok()
+                .content_type("text/html; charset=utf-8")
+                .body(body)
+        })
+        .map_err(|_| ErrorInternalServerError("Some error message."))
 }
 
-// GET: Make a new thread.
-// #[get("/post")]
-// pub fn make_post() -> Template {
-//     Template::render("post", &())
+// #[catch(404)]
+// pub fn not_found() -> Template {
+//     Template::render("404", &())
 // }
 
-// GET: Check out all the threads.
-// #[get("/threads")]
-// pub fn threads() -> Template {
-//     let context = get_all_threads().unwrap();
+// // GET: Make a new thread.
+// // #[get("/post")]
+// // pub fn make_post() -> Template {
+// //     Template::render("post", &())
+// // }
+
+// // GET: Check out all the threads.
+// // #[get("/threads")]
+// // pub fn threads() -> Template {
+// //     let context = get_all_threads().unwrap();
+// //     let threads = serde_json::json!(&context);
+// //     Template::render("threads", threads)
+// // }
+
+// // GET: Check out all the boards.
+// #[get("/boards")]
+// pub fn boards() -> Template {
+//     let context = get_boards().unwrap();
 //     let threads = serde_json::json!(&context);
-//     Template::render("threads", threads)
+//     Template::render("boards", threads)
 // }
 
-// GET: Check out all the boards.
-#[get("/boards")]
-pub fn boards() -> Template {
-    let context = get_boards().unwrap();
-    let threads = serde_json::json!(&context);
-    Template::render("boards", threads)
-}
+// // GET: Check out all threads within a board.
+// #[get("/board/<board>")]
+// pub fn board(board: String) -> Template {
+//     let boards = serde_json::json!(get_boards().unwrap());
 
-// GET: Check out all threads within a board.
-#[get("/board/<board>")]
-pub fn board(board: String) -> Template {
-    let boards = serde_json::json!(get_boards().unwrap());
-
-    let mut board_count: i32 = 0;
-    for i in boards.as_array().unwrap() {
-        if i.get("tag") == Some(&serde_json::json!(board)) {
-            board_count += 1;
-        }
-    }
-    if board_count == 0 { return Template::render("404", &()); }
-
-    // Return 404 if the board is not found.
-    // This doesn't work, but I kept it because I might try to fix it later.
-    // if !boards.as_array().unwrap().contains(&serde_json::json!(board)) {
-    //     return Template::render("404", &());
-    // }
-
-    let context = get_threads(board).unwrap();
-    let threads = serde_json::json!(&context);
-    Template::render("threads", threads)
-}
+//     let mut board_count: i32 = 0;
+//     for i in boards.as_array().unwrap() {
+//         if i.get("tag") == Some(&serde_json::json!(board)) {
+//             board_count += 1;
+//         }
+//     }
+//     if board_count == 0 { return Template::render("404", &()); }
+
+//     // Return 404 if the board is not found.
+//     // This doesn't work, but I kept it because I might try to fix it later.
+//     // if !boards.as_array().unwrap().contains(&serde_json::json!(board)) {
+//     //     return Template::render("404", &());
+//     // }
+
+//     let context = get_threads(board).unwrap();
+//     let threads = serde_json::json!(&context);
+//     Template::render("threads", threads)
+// }