14 files changed, 49 insertions, 12 deletions
diff --git a/src/handlers.rs b/src/handlers.rs
index 43d31fd..aa36e15 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -2,14 +2,16 @@ use crate::posts::abstractions::repo::PostRepo;
 use crate::tutors::abstractions::tutor_repo::TutorRepo;
 use crate::views::about::AboutView;
 use crate::views::brochure::BrochureTemplate;
+use crate::views::highered::HigherEdTemplate;
 use crate::views::index::IndexTemplate;
 use crate::views::k12::K12Template;
 use crate::views::policies::PoliciesTemplate;
 use crate::views::post::PostView;
 use crate::views::posts::PostsView;
+use crate::views::pro::ProTemplate;
 use askama::Template;
 use axum::extract::{Path, State};
-use axum::response::Html;
+use axum::response::{Html, Redirect};
 use std::sync::Arc;
 
 pub async fn about_handler(State(repo): State<Arc<impl TutorRepo>>) -> Html<String> {
@@ -42,6 +44,18 @@ pub async fn post_handler(
     Html(view.render().unwrap())
 }
 
+pub async fn post_redirect(Path(post_id): Path<String>) -> Redirect {
+    Redirect::permanent(&format!("/blog/{post_id}"))
+}
+
 pub async fn k12_handler() -> Html<String> {
     Html(K12Template {}.render().unwrap())
 }
+
+pub async fn highered_handler() -> Html<String> {
+    Html(HigherEdTemplate {}.render().unwrap())
+}
+
+pub async fn pro_handler() -> Html<String> {
+    Html(ProTemplate {}.render().unwrap())
+}
diff --git a/src/main.rs b/src/main.rs
index 57b0256..a9cd722 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,4 @@
+use axum::response::Redirect;
 use axum::{extract::Request, routing::get, Router, ServiceExt};
 use middleware::cache_control::cache_static;
 use posts::fs_post_repo::FsPostRepo;
@@ -41,13 +42,17 @@ async fn main() {
     info!("initializing router...");
     let app = Router::new()
         .route("/", get(handlers::index_handler))
-        .route("/posts", get(handlers::posts_handler))
-        .route("/posts/:post_id", get(handlers::post_handler))
+        .route("/posts", get(|| async { Redirect::permanent("/blog") }))
+        .route("/posts/{post_id}", get(handlers::post_redirect))
+        .route("/blog", get(handlers::posts_handler))
+        .route("/blog/{post_id}", get(handlers::post_handler))
         .with_state(posts)
         .route("/policies", get(handlers::policies_handler))
         .route("/brochure", get(handlers::brochure_handler))
         .route("/about", get(handlers::about_handler))
         .route("/k12", get(handlers::k12_handler))
+        .route("/highered", get(handlers::highered_handler))
+        .route("/professional", get(handlers::pro_handler))
         .with_state(tutors)
         .nest_service("/assets", ServeDir::new(assets_dir))
         .nest_service("/team", ServeDir::new(tutor_dir))
diff --git a/src/posts/fs_post.rs b/src/posts/fs_post.rs
index 4fc03b2..12ce538 100644
--- a/src/posts/fs_post.rs
+++ b/src/posts/fs_post.rs
@@ -1,3 +1,5 @@
+use comrak::Options;
+
 use crate::posts::abstractions::post::Post;
 use std::{borrow::Cow, fs, path::PathBuf};
 
@@ -19,7 +21,7 @@ impl Post for FsPost {
 
     fn get_article(&self) -> Cow<str> {
         let article = fs::read_to_string(&self.file).unwrap();
-        Cow::Owned(article)
+        Cow::Owned(comrak::markdown_to_html(&article, &Options::default()))
     }
 
     fn get_description(&self) -> Cow<str> {
diff --git a/src/tutors/fs_tutor.rs b/src/tutors/fs_tutor.rs
index dc8a635..6b05fd8 100644
--- a/src/tutors/fs_tutor.rs
+++ b/src/tutors/fs_tutor.rs
@@ -1,3 +1,5 @@
+use comrak::Options;
+
 use crate::tutors::abstractions::tutor::Tutor;
 use std::{borrow::Cow, cmp::Ordering, fs, path::PathBuf};
 
@@ -25,7 +27,7 @@ impl Tutor for FsTutor {
         let mut path = self.dir.to_owned();
         path.push(format!("{}.md", self.get_id()));
         let blurb = fs::read_to_string(path).unwrap();
-        Cow::Owned(blurb)
+        Cow::Owned(comrak::markdown_to_html(&blurb, &Options::default()))
     }
 }
 
diff --git a/src/views.rs b/src/views.rs
index e9f1951..f880818 100644
--- a/src/views.rs
+++ b/src/views.rs
@@ -1,7 +1,9 @@
 pub mod about;
 pub mod brochure;
+pub mod highered;
 pub mod index;
 pub mod k12;
 pub mod policies;
 pub mod post;
 pub mod posts;
+pub mod pro;
diff --git a/src/views/about.rs b/src/views/about.rs
index 349c9de..d2e0958 100644
--- a/src/views/about.rs
+++ b/src/views/about.rs
@@ -3,7 +3,7 @@ use crate::tutors::abstractions::tutor::Tutor;
 use askama::Template;
 
 #[derive(Template)]
-#[template(path = "about/index.html")]
+#[template(path = "about/index.html.j2")]
 pub struct AboutView<T: Tutor> {
     tutors: Vec<T>,
 }
diff --git a/src/views/brochure.rs b/src/views/brochure.rs
index 0d2f8fc..fedf827 100644
--- a/src/views/brochure.rs
+++ b/src/views/brochure.rs
@@ -2,5 +2,5 @@ use crate::helpers::*;
 use askama::Template;
 
 #[derive(Template)]
-#[template(path = "brochure/index.html")]
+#[template(path = "brochure/index.html.j2")]
 pub struct BrochureTemplate;
diff --git a/src/views/highered.rs b/src/views/highered.rs
new file mode 100644
index 0000000..108a76a
--- /dev/null
+++ b/src/views/highered.rs
@@ -0,0 +1,6 @@
+use crate::helpers::*;
+use askama::Template;
+
+#[derive(Template)]
+#[template(path = "highered.html.j2")]
+pub struct HigherEdTemplate;
diff --git a/src/views/index.rs b/src/views/index.rs
index 3ced24d..720749a 100644
--- a/src/views/index.rs
+++ b/src/views/index.rs
@@ -2,5 +2,5 @@ use crate::helpers::*;
 use askama::Template;
 
 #[derive(Template)]
-#[template(path = "index.html")]
+#[template(path = "index.html.j2")]
 pub struct IndexTemplate;
diff --git a/src/views/k12.rs b/src/views/k12.rs
index eb9725f..c7dc019 100644
--- a/src/views/k12.rs
+++ b/src/views/k12.rs
@@ -2,5 +2,5 @@ use crate::helpers::*;
 use askama::Template;
 
 #[derive(Template)]
-#[template(path = "k12.html")]
+#[template(path = "k12.html.j2")]
 pub struct K12Template;
diff --git a/src/views/policies.rs b/src/views/policies.rs
index 3d9787d..4253e6c 100644
--- a/src/views/policies.rs
+++ b/src/views/policies.rs
@@ -2,5 +2,5 @@ use crate::helpers::*;
 use askama::Template;
 
 #[derive(Template)]
-#[template(path = "policies.html")]
+#[template(path = "policies.html.j2")]
 pub struct PoliciesTemplate;
diff --git a/src/views/post.rs b/src/views/post.rs
index 4f0554b..03e5ef2 100644
--- a/src/views/post.rs
+++ b/src/views/post.rs
@@ -3,7 +3,7 @@ use crate::posts::abstractions::post::Post;
 use askama::Template;
 
 #[derive(Template)]
-#[template(path = "post.html")]
+#[template(path = "post.html.j2")]
 pub struct PostView<P: Post> {
     post: P,
 }
diff --git a/src/views/posts.rs b/src/views/posts.rs
index 82b5996..5091059 100644
--- a/src/views/posts.rs
+++ b/src/views/posts.rs
@@ -3,7 +3,7 @@ use crate::posts::abstractions::post::Post;
 use askama::Template;
 
 #[derive(Template)]
-#[template(path = "posts.html")]
+#[template(path = "posts.html.j2")]
 pub struct PostsView<P: Post> {
     posts: Vec<P>,
 }
diff --git a/src/views/pro.rs b/src/views/pro.rs
new file mode 100644
index 0000000..eacfd7c
--- /dev/null
+++ b/src/views/pro.rs
@@ -0,0 +1,6 @@
+use crate::helpers::*;
+use askama::Template;
+
+#[derive(Template)]
+#[template(path = "pro.html.j2")]
+pub struct ProTemplate;