fix: amy proofreads

9 files changed, 67 insertions, 44 deletions

diff --git a/src/handlers.rs b/src/handlers.rs
index 8b3ea27..aa36e15 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -11,7 +11,7 @@ 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> {
@@ -44,6 +44,10 @@ 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())
 }
diff --git a/src/main.rs b/src/main.rs
index 1a495f2..7e6a164 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,5 @@
+use axum::extract::Path;
+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,8 +43,10 @@ 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))
diff --git a/templates/base.html.j2 b/templates/base.html.j2
index 9c15052..f9c3a52 100644
--- a/templates/base.html.j2
+++ b/templates/base.html.j2
@@ -45,7 +45,7 @@
 		<a href="/k12">K-12</a>
 		<a href="/highered">Higher Ed</a>
 		<a href="/professional">Pros</a>
-		<a href="/posts">Posts</a>
+		<a href="/blog">Blog</a>
 		<a href="/brochure">Brochure</a>
 		<a href="/policies">Policies</a>
 		<a href="/about">Team</a>
diff --git a/templates/highered.html.j2 b/templates/highered.html.j2
index 77f0c4a..6a8417d 100644
--- a/templates/highered.html.j2
+++ b/templates/highered.html.j2
@@ -7,13 +7,13 @@
 </section>
 
 <section>
-    <h2>Personalized partnership and support from a higher education expert.</h2>
+    <h6>Personalized partnership and support from a higher education expert.</h6>
 </section>
 
 <section id="offerings" class="cards">
     <div class="card full">
         <h3>
-            Higher Education Service
+            Higher Education Services
         </h3>
     </div>
 
@@ -30,6 +30,10 @@
     </div>
 
     <div class="card">
+        <p><a href="#offering-dissertation-thesis-coaching">Dissertation and Thesis Coaching</a></p>
+    </div>
+
+    <div class="card">
         <p><a href="#offering-subject-tutoring">Subject Tutoring</a></p>
     </div>
 
@@ -55,7 +59,7 @@
         <li>Effective study techniques</li>
         <li>Note-taking </li>
         <li>Motivation</li>
-        <li>Procrastination</li>
+        <li>Overcoming procrastination</li>
         <li>Self-advocacy </li>
         <li>Communication </li>
         <li>Understanding instructor expectations</li>
@@ -80,7 +84,8 @@
     <h2>College Transition</h2>
 
     <p>
-        When I worked at colleges, I saw talented students struggle, often because they hadn't solidified the skills
+        When I worked in higher education, I saw talented students struggle, often because they hadn't solidified the
+        skills
         they'd need for success in college or hadn't had the opportunity to learn about the resources and services
         available to them on campus. The College Transition offering provides students the toolkit of techniques and
         tips they'll need and introduces relevant university services and resources. Whether you're entering your first
@@ -89,6 +94,24 @@
     </p>
 </section>
 
+<section id="offering-dissertation-thesis-coaching">
+    <h2>Dissertation and Thesis Coaching</h2>
+
+    <p>
+        Creating a large written work requires effective planning, and long-term effort can be difficult to maintain
+        without some help. Bring a partner into your process to help set and reach realistic goals, break through
+        barriers impeding your progress, strengthen your writing and analysis, and stay motivated. On-going coaching
+        relationships that address all stages of the research and writing process as well as editing services are
+        available.
+
+    </p>
+    <p>
+        Past thesis and dissertation client works encompass a wide variety of fields including education, heliophysics,
+        sociology, biostatistics, computer science, and marketing and branding pursued at institutions such as William &
+        Mary, Vanderbilt, University of Michigan, Harvard, and Yonsei University in South Korea.
+    </p>
+</section>
+
 <section id="offering-subject-tutoring">
     <h2>Subject Tutoring</h2>
 
@@ -117,21 +140,12 @@
     <h2>Writing Support</h2>
 
     <p>
-        Creating a large written work requires effective planning, and long-term effort can be difficult to maintain
-        without some help. Bring a partner into your process to help set and reach realistic goals, break through
-        barriers impeding your progress, strengthen your writing, and stay motivated. On-going coaching relationships
-        that address all stages of the writing process as well as editing services are available.
-    </p>
-
-    <p>
-        Writing Support is available for all communication-based course assignments as well as theses and dissertations
-        in any subject.
-    </p>
-
-    <p>
-        Past thesis and dissertation clients encompass a wide variety of fields including education, heliophysics,
-        sociology, biostatistics, computer science, and marketing and branding at institutions such as William &amp;
-        Mary, Vanderbilt, University of Michigan, Harvard, and Yonsei University in South Korea.
+        Whether you've been assigned a brief discussion post or a 15-page research assignment, you've got a partner in
+        producing a meaningful and well-organized response. From brainstorming and conducting research to organizing and
+        editing your paper, tailored support is available at every stage of the writing process for all
+        communication-based course assignments. Additionally, receive support in setting and meeting realistic progress
+        goals, fully understanding assignment expectations, and adhering to assignment guidelines including those
+        pertaining to citations and references.
     </p>
 </section>
 
diff --git a/templates/index.html.j2 b/templates/index.html.j2
index 333dd59..586ab41 100644
--- a/templates/index.html.j2
+++ b/templates/index.html.j2
@@ -9,9 +9,9 @@
 </section>
 
 <section class="centered">
-	<h2>
-		Building confidence on the way to content mastery.
-	</h2>
+	<h6>
+		Discovering your path to success.
+	</h6>
 </section>
 
 <!-- offerings -->
diff --git a/templates/k12.html.j2 b/templates/k12.html.j2
index 232b1a3..9f5d59f 100644
--- a/templates/k12.html.j2
+++ b/templates/k12.html.j2
@@ -7,7 +7,7 @@
 </section>
 
 <section>
-    <h2>See your student thrive with personalized support.</h2>
+    <h6>See your student thrive with personalized support.</h6>
 </section>
 
 <section id="offerings" class="cards">
@@ -82,10 +82,10 @@
         <li>Time and stress management</li>
         <li>Task prioritization</li>
         <li>Organization</li>
-        <li>Effective studio techniques</li>
+        <li>Effective study techniques</li>
         <li>Note-taking</li>
         <li>Motivation</li>
-        <li>Procrastination</li>
+        <li>Overcoming procrastination</li>
         <li>Self-advocacy</li>
         <li>Communication</li>
     </ul>
@@ -112,7 +112,8 @@
     </h2>
 
     <p>
-        When I worked at colleges, I saw talented students struggle, often because they hadn't solidified the skills
+        When I worked in higher education, I saw talented students struggle, often because they hadn't solidified the
+        skills
         they'd need for success in college or hadn't had the opportunity to learn about the resources and services
         available to them on campus. The College Transition offering provides students the toolkit of techniques and
         tips they'll need and introduces relevant university services and resources <em>before</em> students arrive for
@@ -126,7 +127,7 @@
     </h2>
 
     <p>
-        Carpenter Tutoring is proud to have service homeschooling communities in Virginia and North Carolina since 2019.
+        Since 2019, we have proudly served homeschooling families with a variety of services.
     </p>
 
     <p>
@@ -203,7 +204,7 @@
 
     <h6>Science</h6>
     <p>
-    <aside>* High school classes offered at regular level only for content support; studying and organizational support
+    <aside>High school classes offered at regular level only for content support; studying and organizational support
         available for higher levels.</aside>
 
     <ul>
@@ -236,9 +237,9 @@
     <h6>Language Arts / English</h6>
     <p>
     <ul>
-        <li>Elementary level </li>
-        <li>Intermediate level </li>
-        <li>Middle School level </li>
+        <li>Elementary Language Arts </li>
+        <li>Intermediate Language Arts </li>
+        <li>Middle School Language Arts </li>
         <li>English I or 9</li>
         <li>English II or 10 </li>
         <li>English III or 11 </li>
diff --git a/templates/post.html.j2 b/templates/post.html.j2
index 2d70ebc..3d5c7aa 100644
--- a/templates/post.html.j2
+++ b/templates/post.html.j2
@@ -8,7 +8,7 @@
 <meta name="description" content="{{ post.get_description() }}" />
 <meta property="og:description" content="{{ post.get_description() }}" />
 <meta property="og:title" content="{{ post.get_title() }}" />
-<meta property="og:url" content="https://carpentertutoring.com/posts/{{ post.get_title()|e }}" />
+<meta property="og:url" content="https://carpentertutoring.com/blog/{{ post.get_title()|e }}" />
 {% endblock %}
 
 {% block main %}
diff --git a/templates/posts.html.j2 b/templates/posts.html.j2
index eec04a9..311d9c5 100644
--- a/templates/posts.html.j2
+++ b/templates/posts.html.j2
@@ -15,7 +15,7 @@
 	{% for post in posts %}
 	<div class="card">
 		<h2>
-			<a href="/posts/{{ post.get_title()|e }}">{{ post.get_title() }}</a>
+			<a href="/blog/{{ post.get_title()|e }}">{{ post.get_title() }}</a>
 		</h2>
 	</div>
 	{% endfor %}
diff --git a/templates/pro.html.j2 b/templates/pro.html.j2
index c4cd1dd..591f335 100644
--- a/templates/pro.html.j2
+++ b/templates/pro.html.j2
@@ -7,9 +7,9 @@
 </section>
 
 <section>
-    <h2>
+    <h6>
         Planning, writing, editing, and thought partnership for professionals of all fields and levels.
-    </h2>
+    </h6>
 </section>
 
 <section id="offerings" class="cards">
@@ -37,9 +37,9 @@
 
     <p>
         Making decisions, navigating workplace politics, and guiding the people who work below and alongside you aren't
-        easy &mdash; especially if you're facing them alone. By partnering with a confidential mentor outside your
-        organization, you can freely discuss your situation without fear of repercussions, receive and consider
-        different perspectives, an gain a sounding board in weighing different courses of action. Leadership mentoring
+        easy&mdash;especially if you're facing them alone. By partnering with a confidential mentor outside your
+        organization, you can discuss your situation free of office politics, receive and consider
+        different perspectives, and gain a sounding board in weighing different courses of action. Leadership mentoring
         teaches healthy processes for decision-making and managing difficult situations so professionals can lead with
         confidence.
     </p>
@@ -49,7 +49,7 @@
     <h2>Time Management Coaching</h2>
 
     <p>
-        Time Management Coaching teaches an models the skills professionals need to navigate the demands of their
+        Time Management Coaching teaches and models the skills professionals need to navigate the demands of their
         careers. We work together to create and execute realistic plans to handle the responsibilities of each week.
         Tailored to each client's individual needs, Time Management Coaching provides a partner in navigating both
         professional and personal responsibilities with the goal of decreasing stress and increasing confidence,
@@ -60,7 +60,7 @@
         <li>Task prioritization </li>
         <li>Organization </li>
         <li>Motivation </li>
-        <li>Procrastination </li>
+        <li>Overcoming procrastination </li>
         <li>Self-advocacy </li>
         <li>Communication </li>
         <li>Understanding supervisor expectations</li>