From f2bd378e1a8cdfa7d1520b3734a748dd1cd9de25 Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Sat, 7 Sep 2024 22:39:41 -0400 Subject: feat: serve static and assets add policies and index from base --- Cargo.lock | 72 +++++- Cargo.toml | 2 + assets/amy-sunny.png | Bin 511942 -> 0 bytes assets/amy-sunny.webp | Bin 58450 -> 0 bytes assets/amy.png | Bin 346630 -> 0 bytes assets/amy.webp | Bin 44532 -> 0 bytes assets/bg.png | Bin 150111 -> 0 bytes assets/brochure/brochure-back-center.png | Bin 332534 -> 0 bytes assets/brochure/brochure-back-left.png | Bin 316496 -> 0 bytes assets/brochure/brochure-back-right.png | Bin 304208 -> 0 bytes assets/brochure/brochure-front-center.png | Bin 334345 -> 0 bytes assets/brochure/brochure-front-left.png | Bin 402732 -> 0 bytes assets/brochure/brochure-front-right.png | Bin 295297 -> 0 bytes assets/favicon.ico | Bin 327262 -> 0 bytes assets/icons/close-box.svg | 1 - assets/icons/dots-horizontal-circle.svg | 1 - assets/icons/email-variant.svg | 1 - assets/icons/phone-classic.svg | 1 - assets/icons/send-circle.svg | 1 - assets/icons/star-box.svg | 5 - assets/logo-simple.png | Bin 9332 -> 0 bytes assets/logo-small.png | Bin 46158 -> 0 bytes assets/logo.png | Bin 89452 -> 0 bytes assets/logo.webp | Bin 10338 -> 0 bytes assets/signature.png | Bin 17196 -> 0 bytes assets/signature.webp | Bin 11102 -> 0 bytes desktop.css | 81 ------ src/main.rs | 82 +++--- static/desktop.css | 81 ++++++ static/widescreen.css | 8 + templates/base.html | 67 +++++ templates/index.html | 407 ++++++++++++++++++++++++++++++ templates/policies.html | 65 +++++ templates/posts.html | 13 + templates/styles.css | 272 ++++++++++++++++++++ widescreen.css | 8 - 36 files changed, 1032 insertions(+), 136 deletions(-) delete mode 100644 assets/amy-sunny.png delete mode 100644 assets/amy-sunny.webp delete mode 100644 assets/amy.png delete mode 100644 assets/amy.webp delete mode 100644 assets/bg.png delete mode 100644 assets/brochure/brochure-back-center.png delete mode 100644 assets/brochure/brochure-back-left.png delete mode 100644 assets/brochure/brochure-back-right.png delete mode 100644 assets/brochure/brochure-front-center.png delete mode 100644 assets/brochure/brochure-front-left.png delete mode 100644 assets/brochure/brochure-front-right.png delete mode 100644 assets/favicon.ico delete mode 100644 assets/icons/close-box.svg delete mode 100644 assets/icons/dots-horizontal-circle.svg delete mode 100644 assets/icons/email-variant.svg delete mode 100644 assets/icons/phone-classic.svg delete mode 100644 assets/icons/send-circle.svg delete mode 100644 assets/icons/star-box.svg delete mode 100644 assets/logo-simple.png delete mode 100644 assets/logo-small.png delete mode 100644 assets/logo.png delete mode 100644 assets/logo.webp delete mode 100644 assets/signature.png delete mode 100644 assets/signature.webp delete mode 100644 desktop.css create mode 100644 static/desktop.css create mode 100644 static/widescreen.css create mode 100644 templates/base.html create mode 100644 templates/index.html create mode 100644 templates/policies.html create mode 100644 templates/posts.html create mode 100644 templates/styles.css delete mode 100644 widescreen.css diff --git a/Cargo.lock b/Cargo.lock index c3394de..11b2bd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -127,7 +127,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -184,6 +184,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + [[package]] name = "bumpalo" version = "3.16.0" @@ -204,6 +210,8 @@ dependencies = [ "askama_axum", "axum", "tokio", + "tower 0.5.0", + "tower-http", ] [[package]] @@ -278,6 +286,12 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + [[package]] name = "futures-task" version = "0.3.30" @@ -342,6 +356,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" + [[package]] name = "httparse" version = "1.9.4" @@ -605,7 +625,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -808,6 +828,19 @@ dependencies = [ "syn", ] +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "tower" version = "0.4.13" @@ -824,6 +857,41 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36b837f86b25d7c0d7988f00a54e74739be6477f2aac6201b8f429a7569991b7" +dependencies = [ + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "http-range-header", + "httpdate", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower-layer" version = "0.3.3" diff --git a/Cargo.toml b/Cargo.toml index a496dbf..afb71dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,3 +10,5 @@ askama = { version = "0.12", features = ["markdown", "with-axum"], default-featu askama_axum = "0.4.0" axum = "0.7.5" tokio = { version = "1.40.0", features = ["full"] } +tower = "0.5.0" +tower-http = { version = "0.5.2", features = ["fs"] } diff --git a/assets/amy-sunny.png b/assets/amy-sunny.png deleted file mode 100644 index 003c700..0000000 Binary files a/assets/amy-sunny.png and /dev/null differ diff --git a/assets/amy-sunny.webp b/assets/amy-sunny.webp deleted file mode 100644 index 680335f..0000000 Binary files a/assets/amy-sunny.webp and /dev/null differ diff --git a/assets/amy.png b/assets/amy.png deleted file mode 100644 index ea2f165..0000000 Binary files a/assets/amy.png and /dev/null differ diff --git a/assets/amy.webp b/assets/amy.webp deleted file mode 100644 index 6ca2282..0000000 Binary files a/assets/amy.webp and /dev/null differ diff --git a/assets/bg.png b/assets/bg.png deleted file mode 100644 index a0c9ab8..0000000 Binary files a/assets/bg.png and /dev/null differ diff --git a/assets/brochure/brochure-back-center.png b/assets/brochure/brochure-back-center.png deleted file mode 100644 index 48ee7e2..0000000 Binary files a/assets/brochure/brochure-back-center.png and /dev/null differ diff --git a/assets/brochure/brochure-back-left.png b/assets/brochure/brochure-back-left.png deleted file mode 100644 index 5a2cc4a..0000000 Binary files a/assets/brochure/brochure-back-left.png and /dev/null differ diff --git a/assets/brochure/brochure-back-right.png b/assets/brochure/brochure-back-right.png deleted file mode 100644 index 73a5b8d..0000000 Binary files a/assets/brochure/brochure-back-right.png and /dev/null differ diff --git a/assets/brochure/brochure-front-center.png b/assets/brochure/brochure-front-center.png deleted file mode 100644 index 59f9f82..0000000 Binary files a/assets/brochure/brochure-front-center.png and /dev/null differ diff --git a/assets/brochure/brochure-front-left.png b/assets/brochure/brochure-front-left.png deleted file mode 100644 index 2ed6c56..0000000 Binary files a/assets/brochure/brochure-front-left.png and /dev/null differ diff --git a/assets/brochure/brochure-front-right.png b/assets/brochure/brochure-front-right.png deleted file mode 100644 index 1fd53c7..0000000 Binary files a/assets/brochure/brochure-front-right.png and /dev/null differ diff --git a/assets/favicon.ico b/assets/favicon.ico deleted file mode 100644 index 8ba4c15..0000000 Binary files a/assets/favicon.ico and /dev/null differ diff --git a/assets/icons/close-box.svg b/assets/icons/close-box.svg deleted file mode 100644 index 717756e..0000000 --- a/assets/icons/close-box.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/icons/dots-horizontal-circle.svg b/assets/icons/dots-horizontal-circle.svg deleted file mode 100644 index ca1de94..0000000 --- a/assets/icons/dots-horizontal-circle.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/icons/email-variant.svg b/assets/icons/email-variant.svg deleted file mode 100644 index e8ef2dd..0000000 --- a/assets/icons/email-variant.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/icons/phone-classic.svg b/assets/icons/phone-classic.svg deleted file mode 100644 index 814990b..0000000 --- a/assets/icons/phone-classic.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/icons/send-circle.svg b/assets/icons/send-circle.svg deleted file mode 100644 index 1b7e5c3..0000000 --- a/assets/icons/send-circle.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/icons/star-box.svg b/assets/icons/star-box.svg deleted file mode 100644 index 2973ca8..0000000 --- a/assets/icons/star-box.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/assets/logo-simple.png b/assets/logo-simple.png deleted file mode 100644 index b299e66..0000000 Binary files a/assets/logo-simple.png and /dev/null differ diff --git a/assets/logo-small.png b/assets/logo-small.png deleted file mode 100644 index a128e24..0000000 Binary files a/assets/logo-small.png and /dev/null differ diff --git a/assets/logo.png b/assets/logo.png deleted file mode 100644 index 81e0776..0000000 Binary files a/assets/logo.png and /dev/null differ diff --git a/assets/logo.webp b/assets/logo.webp deleted file mode 100644 index 16ab275..0000000 Binary files a/assets/logo.webp and /dev/null differ diff --git a/assets/signature.png b/assets/signature.png deleted file mode 100644 index 7d115de..0000000 Binary files a/assets/signature.png and /dev/null differ diff --git a/assets/signature.webp b/assets/signature.webp deleted file mode 100644 index 8ce6e28..0000000 Binary files a/assets/signature.webp and /dev/null differ diff --git a/desktop.css b/desktop.css deleted file mode 100644 index 1b0eb43..0000000 --- a/desktop.css +++ /dev/null @@ -1,81 +0,0 @@ -@media only screen and (min-width: 700px) { - section { - padding: 3em; - } - - nav { - flex-direction: row-reverse; - margin: 0; - padding: 0; - top: 0; - position: fixed; - width: 100%; - } - - div.buttons { - flex-direction: row-reverse; - } - - .banner { - padding-top: 7em; - text-align: right; - background: linear-gradient( - to right, - rgba(255, 255, 255, 0) 0%, - rgba(255, 255, 255, 1) 50% - ); - } - - form { - margin-right: 10%; - margin-left: 10%; - } - - table td, - table th { - padding: 0.5em; - } - - section.flexible { - flex-direction: row; - } - - section.flexible div, - section.flexible figure { - flex-basis: 0; - } - - section.flexible div { - flex-grow: 2; - } - - section.flexible figure { - flex-grow: 1; - } - - .signature img { - width: 30%; - } - - .logo img { - width: 15%; - display: block; - margin-left: auto; - margin-right: auto; - } - - .card { - padding: 2em; - } - - #reviews .card, - #offerings .card { - display: block; - flex: none; - width: 20%; - } - - .modal .card { - width: 25%; - } -} diff --git a/src/main.rs b/src/main.rs index 43b6fa6..ca0a3d9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,4 @@ +use tower_http::services::ServeDir; use axum::response::Html; use axum::extract::State; use std::sync::Arc; @@ -11,29 +12,12 @@ use std::io::*; use std::path::Path; use std::path::PathBuf; -trait Post<'a>: fmt::Debug { +trait Post: fmt::Debug { fn dump(&self); - fn display_name(&'a self) -> &'a str; + fn display_name(&self) -> Cow; fn get_content(&self) -> Cow; } -#[derive(Debug)] -struct MockPost; - -impl<'a> Post<'a> for MockPost { - fn dump(&self) { - println!("Post content goes here."); - } - - fn display_name(&'a self) -> &'a str { - "" - } - - fn get_content(&self) -> Cow { - Cow::Borrowed("") - } -} - struct MdFilePost { path: PathBuf, name: OsString, @@ -48,13 +32,13 @@ impl MdFilePost { } } -impl<'a> Post<'a> for MdFilePost { +impl Post for MdFilePost { fn dump(&self) { println!("{}: {}", &self.display_name(), &self.get_content()); } - fn display_name(&'a self) -> &'a str { - self.name.to_str().unwrap() + fn display_name(&self) -> Cow { + self.name.to_string_lossy() } fn get_content(&self) -> Cow { @@ -94,8 +78,8 @@ impl Posts for FsDirPosts { } } -trait Page<'a>: Template { - fn from_post(post: &impl Post<'a>) -> Self; +trait Page: Template { + fn from_post(post: &impl Post) -> Self; } #[derive(Template)] @@ -104,32 +88,60 @@ struct MdPage { article: String, } -impl<'a> Page<'a> for MdPage { - fn from_post(post: &impl Post<'a>) -> Self { +impl Page for MdPage { + fn from_post(post: &impl Post) -> Self { Self { article: post.get_content().into_owned(), } } } -fn test_get_posts(posts: &impl Posts) { - for post in posts.get_posts() { - let page = MdPage::from_post(&post); - println!("{}", page.render().unwrap()); +#[derive(Template)] +#[template(path = "posts.html")] +struct PostsView { + post_titles: Vec +} + +impl PostsView { + fn with_posts(posts: &impl Posts) -> Self { + Self { + post_titles: posts.get_posts().map(|p| p.display_name().into_owned()).map(String::from).collect() + } } } -async fn handler(State(posts): State>) -> Html { - let post = posts.get_posts().next().unwrap(); - let page = MdPage::from_post(&post); - Html(page.render().unwrap()) +async fn posts_handler(State(posts): State>) -> Html { + let view = PostsView::with_posts(&*posts); + Html(view.render().unwrap()) +} + +#[derive(Template)] +#[template(path = "index.html")] +struct IndexTemplate; + +async fn index_handler() -> Html { + Html(IndexTemplate {}.render().unwrap()) +} + +#[derive(Template)] +#[template(path = "policies.html")] +struct PoliciesTemplate; + +async fn policies_handler() -> Html { + Html(PoliciesTemplate{}.render().unwrap()) } #[tokio::main] async fn main() { let repo = Arc::new(FsDirPosts::new(&format!("/data/ct/{}", "blog"))); - let app = Router::new().route("/posts", get(handler)).with_state(repo); + let app = Router::new() + .nest_service("/static", ServeDir::new("static")) + .nest_service("/assets", ServeDir::new("/data/ct/assets")) + .route("/posts", get(posts_handler)) + .route("/policies", get(policies_handler)) + .route("/", get(index_handler)) + .with_state(repo); let listener = tokio::net::TcpListener::bind("0.0.0.0:8000").await.unwrap(); axum::serve(listener, app).await.unwrap(); diff --git a/static/desktop.css b/static/desktop.css new file mode 100644 index 0000000..1b0eb43 --- /dev/null +++ b/static/desktop.css @@ -0,0 +1,81 @@ +@media only screen and (min-width: 700px) { + section { + padding: 3em; + } + + nav { + flex-direction: row-reverse; + margin: 0; + padding: 0; + top: 0; + position: fixed; + width: 100%; + } + + div.buttons { + flex-direction: row-reverse; + } + + .banner { + padding-top: 7em; + text-align: right; + background: linear-gradient( + to right, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 1) 50% + ); + } + + form { + margin-right: 10%; + margin-left: 10%; + } + + table td, + table th { + padding: 0.5em; + } + + section.flexible { + flex-direction: row; + } + + section.flexible div, + section.flexible figure { + flex-basis: 0; + } + + section.flexible div { + flex-grow: 2; + } + + section.flexible figure { + flex-grow: 1; + } + + .signature img { + width: 30%; + } + + .logo img { + width: 15%; + display: block; + margin-left: auto; + margin-right: auto; + } + + .card { + padding: 2em; + } + + #reviews .card, + #offerings .card { + display: block; + flex: none; + width: 20%; + } + + .modal .card { + width: 25%; + } +} diff --git a/static/widescreen.css b/static/widescreen.css new file mode 100644 index 0000000..8231129 --- /dev/null +++ b/static/widescreen.css @@ -0,0 +1,8 @@ +@media only screen and (min-width: 2000px) { + section { + padding-top: 3em; + padding-bottom: 3em; + padding-left: 25%; + padding-right: 25%; + } +} diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 0000000..1657ec1 --- /dev/null +++ b/templates/base.html @@ -0,0 +1,67 @@ + + + + + + Tutoring Excellence Online and in Suffolk, VA - Carpenter Tutoring, LLC + + + + + + + + + + + + + + + + + + + + + +
+ {% block main %}

Placeholder content

{% endblock %} +
+ + + + + diff --git a/templates/index.html b/templates/index.html new file mode 100644 index 0000000..48e85e8 --- /dev/null +++ b/templates/index.html @@ -0,0 +1,407 @@ +{% extends "base.html" %} + +{% block main %} + + + + +
+
+

+ Welcome, and thank you for your interest in Carpenter Tutoring! +

+ +

Carpenter Tutoring is a private tutoring service based in Suffolk, + Virginia. We offer high-engagement remote appointments through Zoom. A limited + number of in-person appointments with me are also available for students in the Harbour + View region of Suffolk, VA. Most of our offerings are one-on-one, and siblings + and pre-existing groups of students may opt for group meetings. No matter your + budget, I am confident that we can find an arrangement that will provide your + student services without creating financial strain.

+ +

+ I invite you to explore and learn more about the services we offer, Carpenter Tutoring's background, + and some of our policies. Thank you for visiting, and + please do not hesitate to reach out with any questions. We will be thrilled to + assist you! +

+ +
+ + + + Amy's signature + +
+ +
+ +
+ + + + Amy Carpenter + +
Amy Carpenter, M.Ed.
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+

Subject Tutoring

+

Tutoring for specific courses or disciplines +

+ expand Learn more +
+ +
+

Time Management

+

+ Personalized plans for managing academics, extracurriculars, and + other commitments +

+ expand Learn more +
+ +
+

Study Skills

+

Learn how to make the most of your study time

+ expand Learn more +
+ +
+

Academic Coaching

+

+ Time management and study skills blended with continuing + accountability +

+ expand Learn more +
+ +
+

College Application Assistance

+

+ Assistance with generating a college list and crafting application + essays +

+ expand Learn more +
+ +
+

College-Level Writing

+

Get a head start on meeting professors' expectations

+ expand Learn more +
+ +
+

Dissertation Coaching

+

Ensure your research is communicated effectively and eloquently

+ expand Learn more +
+ +
+

Standardized Test Prep

+

+ Tailored assistance in preparing for a variety of standardized tests +

+ expand Learn more +
+ +
+

Music Lessons

+

Instrument and/or composition lessons for students of all ages

+ expand Learn more +
+ +
+

Proof of Progress Evaluations

+

+ Two levels of portfolio-based evaluations for homeschool families + looking to satisfy Proof of Progress or gain insight into their + child's learning +

+ expand Learn more +
+ +
+ +
+ Click here to view an interactive brochure of our offerings +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Pricing Guide - Remote*

+
+ Single Subject, Time Management, Study Skills Tutoring, Music Lessons + $60/hr
+ Multi-Subject, Academic Coaching, Dissertation Coaching, Test Prep, College + Application Assistance + $70/hr
Small Group Sessions, Group Lessons$40/hr/student
Simplified Homeschool Evaluations$45
Detailed Homeschool Evaluations$80+
+ +

+

*In-person pricing for students in the Harbour View region of Suffolk is $10/hr more in each category.

+ See a list of our policies and procedures regarding scheduling, + payment, and booking. +

+ +
+ + +
+ +
+

C.L. Cannon

+
+ I hired Amy to complete an end-of-the-year evaluation for both of my Elementary aged sons. This being our first year of independent home instruction, the task of testing and/or evaluation was daunting! Amy put my fears to rest! She was super easy to work with, had great communication skills, and answered all my questions in a timely and informative manner! I would highly recommend her services! +
+

+ View on Google + or + leave a review. +

+ star + star + star + star + star +
+ +
+

Lee Crabtree

+
+ Amy is a wonderful tutor who helped my child (who does not like help at all) though some difficult classes where the teacher was not providing the support my child needed. Highly recommended. +
+

+ View on Google + or + leave a review. +

+ star + star + star + star + star +
+ +
+

Connor Fenton

+
+ I was a Graduate student at the College of William and Mary who needed to pass a Latin Language test as part of my degree requirements. I was struggling with refreshing my Latin after a few years out of the classroom and Amy was both professional and helpful. With her tutoring I was able to pass my test and finish my degree. She is very considerate and easy to work with. +
+

+ View on Google + or + leave a review. +

+ star + star + star + star + star +
+ +
+{% endblock %} diff --git a/templates/policies.html b/templates/policies.html new file mode 100644 index 0000000..0d39b38 --- /dev/null +++ b/templates/policies.html @@ -0,0 +1,65 @@ +{% extends "base.html" %} + +{% block main %} + + +
+

+

Payment Methods

+ We accept payments through Zelle (amy@carpentertutoring.com), Venmo + (@AmyCTutoring), and PayPal (amy@carpentertutoring.com). We also accept + checks made out to Carpenter Tutoring, LLC. Please contact Amy for + a mailing address if you would like to pay by check. +

+ +

+

Travel

+ Due to high appointment volumes, Amy is only able to travel to students in the Harbour View area of Suffolk, VA. +

+ +

Please contact other tutors directly to discuss their locations and in-person policies.

+ +

+

Remote sessions

+ Remote sessions are typically conducted from tutors' homes. We use online video conferencing software such as + Zoom and Google Meet. + Your tutor will inform you of their preferred meeting method and provide initial meeting instructions and support. +

+ +

+

Late Cancellations

+ Sessions cancelled within 72 hours of their start time will incur a late + cancellation fee equal to 40% of the cancelled session price. +

+ +

+

No-Shows

+ Sessions which a student does not attend with no notice of + cancellation will be charged the full session price. +

+ +

+

Session Duration

+ Sessions are purchased in half-hour increments, and the shortest + appointment duration is 60 minutes. Families are responsible for the + amount of time they book and will be charged based on that amount. + Students who provide no advance notice of a need to end their meeting early will still be responsible for the full session price. If a student is + late to their appointment, we will work to the end of their scheduled + time, but no later. +

+ +

+

Proof of Progress Evaluations

+ Proof of Progress letters will be returned within 7 days of notification that materials are ready for review. Families are responsible for sending Proof of Progress letters and proof of evaluator credentials to their school system by August 1, the deadline for Proof of Progress submissions in Virginia. Notifications regarding sample readiness sent on or after July 24 of each year will incur a $10 late submission fee per evaluation. All payments are expected within two weeks of receipt of letter(s). Payment method information is available on this site as well as in the email sent along with Proof of Progress letters. +

+ +

+

Learning Acceleration Grants

+ Carpenter Tutoring is proud to serve Virginia students and families as a vendor for the K-12 Learning Acceleration Grant. Families must share student names as they appear on the grants, associated parent name, and associated address for invoicing purposes. Families are expected to upload emailed invoices at their earliest convenience as there are significant lag times between family submission and fund deposits from ClassWallet. While Carpenter Tutoring will provide an overview of funds used with our tutors with each invoice, families are expected to keep track of fund use and communicate with tutors when funds are nearing exhaustion to plan an end date for services or a transition to out-of-pocket payment. Grant vendors cannot see fund totals or funds used with other vendors, so we rely on families completely to communicate their remaining balances. Families who fail to notify us that their funds are nearly or have been depleted or rescinded but continue to use services will be required to pay for any excesses out-of-pocket. +

+
+
+ +{% endblock %} diff --git a/templates/posts.html b/templates/posts.html new file mode 100644 index 0000000..9f522a6 --- /dev/null +++ b/templates/posts.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} + +{% block main %} +
+

+

    + {% for title in post_titles %} +
  • {{ title }}
    • + {% endfor %} +
+

+
+{% endblock %} diff --git a/templates/styles.css b/templates/styles.css new file mode 100644 index 0000000..68eae3b --- /dev/null +++ b/templates/styles.css @@ -0,0 +1,272 @@ +/* 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.png"); +} + +.banner { + font-size: 1em; + text-align: center; + padding: 3em; + background-color: white; +} + +nav { + display: flex; + background-color: white; + flex-direction: column-reverse; +} + +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; +} + +nav a:hover { + color: var(--darkteal); + background-color: lightgray; +} + +div.buttons { + display: flex; + flex-direction: column; +} + +h1 { + font-size: 3em; + color: var(--darkteal); + font-family: "Architects Daughter", cursive; +} + +h2 { + font-size: 2em; + color: var(--darkteal); + font-family: "Indie Flower", cursive; +} + +em { + + color: var(--darkteal); +} + +section { + font-size: 1.5em; + margin: 0; + padding: 1em; +} + +section.quiet { + background-color: white; +} + +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; + font-size: 1.5em; +} + +footer a, +section a { + color: var(--darkteal); + text-decoration: underline; +} + +.card { + font-size: 0.9em; + background-color: white; + padding: 1em; + border-radius: 1em; + margin-left: 0; + margin-right: 0; +} + +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: 1em; + text-align: center; +} + +#reviews, +#offerings { + padding-left: 0; + padding-right: 0; + display: flex; + flex-wrap: wrap; + justify-content: center; +} + +.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; +} diff --git a/widescreen.css b/widescreen.css deleted file mode 100644 index 8231129..0000000 --- a/widescreen.css +++ /dev/null @@ -1,8 +0,0 @@ -@media only screen and (min-width: 2000px) { - section { - padding-top: 3em; - padding-bottom: 3em; - padding-left: 25%; - padding-right: 25%; - } -} -- cgit v1.2.3