19 files changed, 77 insertions, 490 deletions
diff --git a/templates/about/blurb.html b/templates/about/blurb.html.j2
index 4389d47..4389d47 100644
--- a/templates/about/blurb.html
+++ b/templates/about/blurb.html.j2
diff --git a/templates/about/figure.html b/templates/about/figure.html.j2
index 168aa4e..168aa4e 100644
--- a/templates/about/figure.html
+++ b/templates/about/figure.html.j2
diff --git a/templates/about/index.html b/templates/about/index.html.j2
index fcbc286..ad4480c 100644
--- a/templates/about/index.html
+++ b/templates/about/index.html.j2
@@ -1,20 +1,18 @@
-{% extends "base.html" %}
+{% extends "base.html.j2" %}
 
 {% block main %}
 <section class="banner">
 	<h1>About Us</h1>
 </section>
 
-<section class=" squarshed">
-	<p>
+<section>
 	<h2 style="font-size: 1.5em; text-align: center;">
 		There are many pathways to success. I started Carpenter Tutoring for
 		those seeking a little help finding their way.
 	</h2>
-	</p>
 </section>
 
-<section class=" flexible squarshed">
+<section class="flexible">
 	<figure class="shadowy">
 		<picture>
 			<source srcset="/assets/amy.webp" type="image/webp" />
@@ -64,6 +62,6 @@
 
 </section>
 
-{% include "team.html" %}
+{% include "team.html.j2" %}
 
 {% endblock %}
 \ No newline at end of file
diff --git a/templates/about/team.html b/templates/about/team.html
deleted file mode 100644
index c2b4498..0000000
--- a/templates/about/team.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% for tutor in tutors %}
-<sectionclass=" flexible">
-	{% if loop.index0 % 2 == 0 %}
-	{% include "blurb.html" %}
-	{% include "figure.html" %}
-	{% else %}
-	{% include "figure.html" %}
-	{% include "blurb.html" %}
-	{% endif %}
-	</section>
-	{% endfor %}
-\ No newline at end of file
diff --git a/templates/about/team.html.j2 b/templates/about/team.html.j2
new file mode 100644
index 0000000..07637c8
--- /dev/null
+++ b/templates/about/team.html.j2
@@ -0,0 +1,11 @@
+{% for tutor in tutors %}
+<section class="flexible">
+	{% if loop.index0 % 2 == 0 %}
+	{% include "blurb.html.j2" %}
+	{% include "figure.html.j2" %}
+	{% else %}
+	{% include "figure.html.j2" %}
+	{% include "blurb.html.j2" %}
+	{% endif %}
+</section>
+{% endfor %}
+\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html.j2
index 49d8c40..e81a8ea 100644
--- a/templates/base.html
+++ b/templates/base.html.j2
@@ -7,11 +7,9 @@
 		Tutoring Excellence Online and in Suffolk, VA - Carpenter Tutoring, LLC
 		{% endblock %}
 	</title>
-	<style>
-		{% block style %}
-			{% include "styles.css" %}
-		{% endblock %}
-	</style>
+	{% block styles %}
+	<link rel="stylesheet" href="/styles.css" />
+	{% endblock %}
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link rel="stylesheet" href="/desktop.css" />
 	<link rel="stylesheet" href="/widescreen.css" />
@@ -33,11 +31,11 @@
 <!-- Google tag (gtag.js) -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=G-RZLJ3ZBKZL"></script>
 <script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
+	window.dataLayer = window.dataLayer || [];
+	function gtag() { dataLayer.push(arguments); }
+	gtag('js', new Date());
 
-  gtag('config', 'G-RZLJ3ZBKZL');
+	gtag('config', 'G-RZLJ3ZBKZL');
 </script>
 
 
@@ -49,7 +47,6 @@
 		<a href="/professional">Pros</a>
 		<a href="/posts">Posts</a>
 		<a href="/brochure">Brochure</a>
-		<a href="/#help">Helpful Links</a>
 		<a href="/policies">Policies</a>
 		<a href="/about">Team</a>
 		<a href="/#reviews">Reviews</a>
@@ -66,16 +63,16 @@
 			<picture>
 				<source srcset="/assets/logo.webp" type="image/webp" />
 				<source srcset="/assets/logo.png" type="image/png" />
-				<img alt="logo" src="/assets/logo.png" />
+				<img alt="Carpenter Tutoring logo" src="/assets/logo.png" />
 			</picture>
 		</figure>
 
 		<div id="contact" class="buttons centered">
-			{% include "contact-buttons.html" %}
+			{% include "contact-buttons.html.j2" %}
 		</div>
 
 		<p>
-		&copy; 2019-{{ self::current_year() }} Carpenter Tutoring, LLC. All rights reserved.
+			&copy; 2019-{{ self::current_year() }} Carpenter Tutoring, LLC. All rights reserved.
 		</p>
 		<p>
 			<a href="https://g.page/carpenter-tutoring?share">Visit me on Google</a>
@@ -89,7 +86,9 @@
 	</footer>
 
 	<script src="/nav.js"></script>
-	<link href="https://fonts.googleapis.com/css2?family=Architects+Daughter&family=Indie+Flower&family=PT+Sans&display=swap" rel="stylesheet" />
+	<link
+		href="https://fonts.googleapis.com/css2?family=Architects+Daughter&family=Indie+Flower&family=PT+Sans&display=swap"
+		rel="stylesheet" />
 </body>
 
-</html>
+</html>
+\ No newline at end of file
diff --git a/templates/brochure/brochure.css b/templates/brochure/brochure.css
deleted file mode 100644
index 2abb118..0000000
--- a/templates/brochure/brochure.css
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-Copyright (c) 2024 by Daniel Pox (https://codepen.io/danielpox/pen/abOopYo)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-
-.paper {
-	display: grid;
-
-	width: 8.25rem;
-
-	grid-template-columns: 8.25rem;
-	grid-template-rows: 19.41rem; /* .425 aspect */
-
-	margin: 2rem auto;
-
-	transform-style: preserve-3d;
-	transition: transform linear 1s;
-}
-.paper.flip {
-	transform: rotateY(180deg);
-}
-
-.paper .page {
-	display: inline-block;
-
-	grid-column: 1 / 2;
-	grid-row: 1 / 2;
-
-	position: relative;
-
-	transform-style: preserve-3d;
-
-	box-shadow: 0 4px 8px #0001;
-}
-
-.paper .page .side {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-
-	background: white;
-	backface-visibility: hidden;
-}
-
-.paper .page .side.back {
-	transform: rotateY(180deg);
-}
-
-.page {
-	transition: transform linear 1s;
-}
-.left.open {
-	transform: rotateY(-180deg);
-}
-.right.open {
-	transform: rotateY(180deg);
-}
-
-.paper .page .side {
-	box-shadow: inset 1px 0 #f2f2f2, inset -1px 0 #f2f2f2;
-}
-
-.side img {
-	max-width: 100%;
-	max-height: 100%;
-}
-
-.left {
-	transform: translateZ(2px);
-	transform-origin: center left;
-}
-
-.right {
-	transform: translateZ(1px);
-	transform-origin: center right;
-}
-
-@media only screen and (min-width: 1500px) {
-	.paper {
-		width: 21.25em;
-
-		grid-template-columns: 21.25em;
-		grid-template-rows: 50em; /* .425 aspect */
-	}
-}
diff --git a/templates/brochure/brochure.html b/templates/brochure/brochure.html.j2
index b5a3cd3..b5a3cd3 100644
--- a/templates/brochure/brochure.html
+++ b/templates/brochure/brochure.html.j2
diff --git a/templates/brochure/index.html b/templates/brochure/index.html.j2
index 6304887..a3a5b33 100644
--- a/templates/brochure/index.html
+++ b/templates/brochure/index.html.j2
@@ -1,8 +1,8 @@
-{% extends "base.html" %}
+{% extends "base.html.j2" %}
 
-{% block style %}
-{% include "../styles.css" %}
-{% include "brochure.css" %}
+{% block styles %}
+<link rel="stylesheet" href="/styles.css" />
+<link rel="stylesheet" href="/brochure.css" />
 {% endblock %}
 
 {% block main %}
@@ -21,12 +21,10 @@
 		desktop screen.
 	</p>
 
-	{% include "brochure.html" %}
+	{% include "brochure.html.j2" %}
 
 </section>
 
-<section></section>
-
 <script>
 	{% include "brochure.js" %}
 </script>
diff --git a/templates/card.html b/templates/card.html
deleted file mode 100644
index 1397bc8..0000000
--- a/templates/card.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="card">
-    <h2>
-        {% block title %}
-        Card Title
-        {% endblock %}
-    </h2>
-
-    <p>
-        {% block content %}
-        Stuff in the card
-        {% endblock %}
-    </p>
-
-</div>
-\ No newline at end of file
diff --git a/templates/contact-buttons.html b/templates/contact-buttons.html.j2
index bae7460..bae7460 100644
--- a/templates/contact-buttons.html
+++ b/templates/contact-buttons.html.j2
diff --git a/templates/index.html b/templates/index.html.j2
index b5f4bd6..333dd59 100644
--- a/templates/index.html
+++ b/templates/index.html.j2
@@ -1,17 +1,11 @@
-{% extends "base.html" %}
+{% extends "base.html.j2" %}
 
 {% block main %}
 <!--banner-->
 <section class="banner">
-	<!-- <section class="banner flexible"> -->
-	<!-- <figure class="logo">
-		<picture>
-			<source srcset="/assets/logo.webp" type="image/webp" />
-			<source srcset="/assets/logo.png" type="image/png" />
-			<img alt="logo" src="/assets/logo.png" />
-		</picture>
-	</figure> -->
-	<h1>CARPENTER TUTORING</h1>
+	<h1>
+		CARPENTER TUTORING
+	</h1>
 </section>
 
 <section class="centered">
@@ -20,6 +14,7 @@
 	</h2>
 </section>
 
+<!-- offerings -->
 <section id="offerings" class="cards">
 	<div class="card full">
 		<h3>
@@ -53,15 +48,17 @@
 </section>
 
 <!-- help -->
-<section class="squarshed centered" id="help">
+<section class="centered" id="help">
 	<h2>Helpful Links</h2>
-	<a class="button primary centered" href="/brochure">View an interactive brochure of our offerings</a>
-	<a class="button centered" href="/policies">See policies and procedures regarding scheduling, payment, and
-		booking</a>
+	<div class="buttons">
+		<a class="button primary centered" href="/brochure">View an interactive brochure of our offerings</a>
+		<a class="button centered" href="/policies">See policies and procedures regarding scheduling, payment, and
+			booking</a>
+	</div>
 </section>
 
 <!-- reviews -->
-<section id="reviews">
+<section id="reviews" class="cards">
 
 	<div class="card">
 		<h2>C.L. Cannon</h2>
diff --git a/templates/k12.html b/templates/k12.html.j2
index 6467d55..bfa9527 100644
--- a/templates/k12.html
+++ b/templates/k12.html.j2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.html.j2" %}
 
 {% block main %}
 
diff --git a/templates/policies.html b/templates/policies.html.j2
index 6a5754a..3d90da5 100644
--- a/templates/policies.html
+++ b/templates/policies.html.j2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.html.j2" %}
 
 {% block main %}
 
@@ -365,6 +365,4 @@
 	</ul>
 </section>
 
-<section></section>
-
 {% endblock %}
 \ No newline at end of file
diff --git a/templates/post.html b/templates/post.html.j2
index 9eb3444..e1c447a 100644
--- a/templates/post.html
+++ b/templates/post.html.j2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.html.j2" %}
 
 {% block title %}
 {{ post.get_title() }} - Carpenter Tutoring, LLC
diff --git a/templates/posts.html b/templates/posts.html
deleted file mode 100644
index 2f1df6b..0000000
--- a/templates/posts.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "base.html" %}
-
-{% block main %}
-<section class="banner">
-	<h1>Posts</h1>
-</section>
-
-<section>
-	<p>
-		{% for post in posts %}
-	<h2><a href="/posts/{{ post.get_title()|e }}">{{ post.get_title() }}</a></h2>
-	{% endfor %}
-	</p>
-	<section>
-		{% endblock %}
-\ No newline at end of file
diff --git a/templates/posts.html.j2 b/templates/posts.html.j2
new file mode 100644
index 0000000..eec04a9
--- /dev/null
+++ b/templates/posts.html.j2
@@ -0,0 +1,23 @@
+{% extends "base.html.j2" %}
+
+{% block main %}
+<section class="banner">
+	<h1>Posts</h1>
+</section>
+
+<section>
+	<h2>
+		Refining how we think and teach.
+	</h2>
+</section>
+
+<section class="cards">
+	{% for post in posts %}
+	<div class="card">
+		<h2>
+			<a href="/posts/{{ post.get_title()|e }}">{{ post.get_title() }}</a>
+		</h2>
+	</div>
+	{% endfor %}
+</section>
+{% endblock %}
+\ No newline at end of file
diff --git a/templates/styles.css b/templates/styles.css
deleted file mode 100644
index 609a0f7..0000000
--- a/templates/styles.css
+++ /dev/null
@@ -1,309 +0,0 @@
-/* Colors */
-:root {
-	--darkteal: rgb(0, 100, 108);
-	--green: rgb(88, 169, 143);
-	--darkerteal: rgb(29, 133, 137);
-	--gray: rgb(157, 210, 211);
-	--teal: rgb(58, 165, 166);
-	--cyan: rgb(156, 210, 210);
-	--darkgray: rgb(127, 177, 181);
-	--darkgreen: rgb(59, 136, 114);
-	--yellow: rgb(186, 214, 187);
-}
-
-/* Elements */
-
-html,
-body {
-	margin: 0;
-	padding: 0;
-	font-family: "PT Sans", sans-serif;
-	color: dimgray;
-}
-
-body {
-	background-image: url("/assets/bg.webp");
-}
-
-nav {
-	display: flex;
-	flex-wrap: wrap;
-	background-color: white;
-	position: fixed;
-	width: 100%;
-}
-
-nav img {
-	height: 1.4em;
-}
-
-nav a {
-	font-family: "PT Sans", sans-serif;
-	color: dimgray;
-	text-align: center;
-	text-decoration: none;
-	padding: 1em 1em;
-	transition: 0.15s;
-	cursor: pointer;
-}
-
-nav a:hover {
-	color: var(--darkteal);
-	background-color: lightgray;
-}
-
-div.buttons {
-	display: flex;
-	flex-direction: column;
-}
-
-h1 {
-	font-size: 2.75em;
-	color: var(--darkteal);
-	font-family: "Architects Daughter", cursive;
-}
-
-h2 {
-	font-size: 2em;
-	color: var(--darkteal);
-	font-family: "Indie Flower", cursive;
-}
-
-h6 {
-	/* blog block paragraphs */
-	color: var(--darkteal);
-	font-size: 1.2em;
-	font-weight: normal;
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-em {
-	color: var(--darkteal);
-}
-
-section {
-	font-size: 1em;
-	margin-top: 0;
-	margin-right: 0;
-	margin-left: 0;
-	margin-bottom: 2em;
-	padding: 1em;
-	background-color: white;
-}
-
-section.banner {
-	text-align: center;
-	padding-left: 0em;
-	padding-right: 0em;
-	margin-bottom: 0;
-	background: linear-gradient(to right,
-			rgba(255, 255, 255, 0) 0%,
-			rgba(255, 255, 255, 1) 75%);
-}
-
-section.banner h1 {
-	background: white;
-	margin-top: 0;
-	padding-top: 1em;
-}
-
-section.cards {
-	background-color: transparent;
-}
-
-section.squarshed {
-	padding-bottom: 1em;
-	padding-top: 1em;
-}
-
-.button img {
-	margin-right: 1em;
-}
-
-button.button,
-a.button {
-	display: flex;
-	align-items: center;
-	background-color: var(--teal);
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;
-	margin-right: 0.5em;
-	margin-bottom: 0.5em;
-	text-decoration: none;
-	color: white;
-	border-radius: 3em;
-	transition: 0.15s;
-}
-
-button.button:hover,
-a.button:hover {
-	box-shadow: 0 4px 8px 0 lightgray, 0 6px 20px 0 lightgray;
-}
-
-button {
-	font-family: "PT Sans", sans-serif;
-	border: none;
-	font-size: 0.75em;
-}
-
-a.primary {
-	background-color: var(--darkteal);
-}
-
-footer {
-	background-color: white;
-	text-align: center;
-	padding: 3em;
-}
-
-footer p {
-	font-size: 1em;
-}
-
-footer a,
-section a {
-	color: var(--darkteal);
-	text-decoration: underline;
-}
-
-.card {
-	background-color: white;
-	padding: 1em;
-	border-radius: 1em;
-	margin-left: 0;
-	margin-right: 0;
-	align-content: center;
-}
-
-form input,
-form textarea {
-	font-family: "PT Sans", sans-serif;
-	margin-bottom: 1.5em;
-	box-sizing: border-box;
-	width: 100%;
-	border: 1px solid lightgray;
-	padding: 1em;
-}
-
-form input {
-	border-radius: 3em;
-}
-
-textarea {
-	border-radius: 1em;
-	resize: none;
-}
-
-/* honeypot */
-textarea#beehive {
-	display: none;
-}
-
-table {
-	width: 100%;
-	border-collapse: collapse;
-}
-
-table caption {
-	text-align: left;
-}
-
-table th {
-	text-align: right;
-	color: var(--darkteal);
-}
-
-table td,
-table th {
-	vertical-align: bottom;
-}
-
-tr:nth-child(even) {
-	background-color: lightgray;
-}
-
-picture img {
-	width: 100%;
-}
-
-.shadowy img {
-	box-shadow: 0 4px 8px 0 dimgray, 0 6px 20px 0 dimgray;
-}
-
-figcaption {
-	text-align: right;
-	color: var(--darkteal);
-	font-family: "Architects Daughter", cursive;
-}
-
-section.flexible {
-	display: flex;
-	flex-direction: column;
-}
-
-#reviews .card,
-#offerings .card {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-	padding: 0.3em;
-	flex: 1 0 21%;
-	align-items: center;
-	text-align: center;
-}
-
-#reviews,
-#offerings {
-	padding-left: 0;
-	padding-right: 0;
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: center;
-}
-
-#offerings .full {
-	flex: 1 1 100%;
-}
-
-.modal {
-	position: fixed;
-	z-index: 1;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	background-color: white;
-	background-color: rgba(1, 1, 1, 0.4);
-	overflow: auto;
-	display: none;
-	font-size: 1.5em;
-}
-
-.modal .card {
-	max-height: 90%;
-	max-width: 60%;
-}
-
-.modal a,
-.card a.button {
-	float: right;
-}
-
-:target.modal {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-:target.modal .card {
-	overflow: auto;
-}
-
-.centered {
-	text-align: center;
-	justify-content: center;
-}
-\ No newline at end of file
diff --git a/templates/stylewrap.html.j2 b/templates/stylewrap.html.j2
new file mode 100644
index 0000000..a68f592
--- /dev/null
+++ b/templates/stylewrap.html.j2
@@ -0,0 +1,5 @@
+<style>
+    {% block style %}
+        {% include "styles.css" %}
+    {% endblock %}
+</style>
+\ No newline at end of file