From 1313ba8a5845cc361495fbc8b197f35336e02a16 Mon Sep 17 00:00:00 2001 From: 53hornet Date: Sat, 28 Aug 2021 22:18:45 -0400 Subject: feat(evals): moved from PHP to Rust+Warp --- .gitignore | 1 + .prettierrc.json | 11 -- Cargo.lock | 294 +--------------------------- Cargo.toml | 6 +- src/main.rs | 56 ++++-- static/about/index.php | 50 ----- static/assets/favicon.ico | Bin 327262 -> 0 bytes static/footer.php | 28 --- static/header.php | 286 --------------------------- static/index.php | 479 ---------------------------------------------- static/policies/index.php | 55 ------ templates/about.hbs | 52 +++++ templates/base.hbs | 4 +- templates/policies.hbs | 57 ++++++ 14 files changed, 161 insertions(+), 1218 deletions(-) delete mode 100644 .prettierrc.json delete mode 100644 static/about/index.php delete mode 100644 static/assets/favicon.ico delete mode 100644 static/footer.php delete mode 100644 static/header.php delete mode 100644 static/index.php delete mode 100644 static/policies/index.php create mode 100644 templates/about.hbs create mode 100644 templates/policies.hbs diff --git a/.gitignore b/.gitignore index afa3bec..06c8164 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ PHPMailer-master /target *.core +*.core diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index a455f4e..0000000 --- a/.prettierrc.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "proseWrap": "always", - "overrides": [ - { - "files": "*.liquid", - "options": { - "parser": "html" - } - } - ] -} diff --git a/Cargo.lock b/Cargo.lock index 8372740..17bfde5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" dependencies = [ - "getrandom 0.2.3", + "getrandom", "once_cell", "version_check", ] @@ -61,16 +61,6 @@ dependencies = [ "byte-tools", ] -[[package]] -name = "buf_redux" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" -dependencies = [ - "memchr", - "safemem", -] - [[package]] name = "byte-tools" version = "0.3.1" @@ -228,7 +218,6 @@ dependencies = [ "futures-task", "pin-project-lite", "pin-utils", - "slab", ] [[package]] @@ -250,17 +239,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.3" @@ -269,7 +247,7 @@ checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -300,7 +278,7 @@ dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.1", + "quick-error", "serde", "serde_json", ] @@ -415,17 +393,6 @@ dependencies = [ "want", ] -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "indexmap" version = "1.7.0" @@ -436,15 +403,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "input_buffer" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413" -dependencies = [ - "bytes", -] - [[package]] name = "itoa" version = "0.4.7" @@ -538,24 +496,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "multipart" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050aeedc89243f5347c3e237e3e13dc76fbe4ae3742a57b94dc14f69acf76d4" -dependencies = [ - "buf_redux", - "httparse", - "log", - "mime", - "mime_guess", - "quick-error 1.2.3", - "rand 0.7.3", - "safemem", - "tempfile", - "twoway", -] - [[package]] name = "ntapi" version = "0.3.6" @@ -680,12 +620,6 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - [[package]] name = "proc-macro2" version = "1.0.28" @@ -695,12 +629,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quick-error" version = "2.0.1" @@ -716,105 +644,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags", -] - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "rusqlite" version = "0.25.3" @@ -836,12 +665,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - [[package]] name = "scoped-tls" version = "1.0.0" @@ -958,20 +781,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "tempfile" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" -dependencies = [ - "cfg-if", - "libc", - "rand 0.8.4", - "redox_syscall", - "remove_dir_all", - "winapi", -] - [[package]] name = "time" version = "0.1.43" @@ -982,21 +791,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "tinyvec" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - [[package]] name = "tokio" version = "1.9.0" @@ -1038,19 +832,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-tungstenite" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1a5f475f1b9d077ea1017ecbc60890fda8e54942d680ca0b1d2b47cfa2d861b" -dependencies = [ - "futures-util", - "log", - "pin-project", - "tokio", - "tungstenite", -] - [[package]] name = "tokio-util" version = "0.6.7" @@ -1098,34 +879,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -[[package]] -name = "tungstenite" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ada8297e8d70872fa9a551d93250a9f407beb9f37ef86494eb20012a2ff7c24" -dependencies = [ - "base64", - "byteorder", - "bytes", - "http", - "httparse", - "input_buffer", - "log", - "rand 0.8.4", - "sha-1 0.9.7", - "url", - "utf-8", -] - -[[package]] -name = "twoway" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" -dependencies = [ - "memchr", -] - [[package]] name = "typenum" version = "1.13.0" @@ -1147,45 +900,12 @@ dependencies = [ "version_check", ] -[[package]] -name = "unicode-bidi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-xid" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "vcpkg" version = "0.2.15" @@ -1222,7 +942,6 @@ dependencies = [ "log", "mime", "mime_guess", - "multipart", "percent-encoding", "pin-project", "scoped-tls", @@ -1231,18 +950,11 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-stream", - "tokio-tungstenite", "tokio-util", "tower-service", "tracing", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index 2a7bb32..ea7eed6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,11 +7,13 @@ authors = ["Adam T. Carpenter "] [dependencies] #env_logger = { version = "0.8", default-features = false } #log = "0.4" -#serde_urlencoded = "0.7" handlebars = "3" lazy_static = "1.4" rusqlite = "0.25" -warp = "0.3" + +[dependencies.warp] +version = "0.3" +default-features = false [dependencies.serde] version = "1" diff --git a/src/main.rs b/src/main.rs index cbabc10..5359661 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,9 +1,7 @@ use handlebars::Handlebars; use serde::Serialize; -use serde_json::json; use std::sync::Arc; -use std::time::SystemTime; -use warp::{Filter, Rejection}; +use warp::{http::Uri, Filter, Rejection}; #[tokio::main] async fn main() -> Result<(), Box> { @@ -11,10 +9,14 @@ async fn main() -> Result<(), Box> { let mut hbs = Handlebars::new(); hbs.register_template_file("base", "templates/base.hbs")?; hbs.register_template_file("index", "templates/index.hbs")?; + hbs.register_template_file("policies", "templates/policies.hbs")?; + hbs.register_template_file("about", "templates/about.hbs")?; let hbs = Arc::new(hbs); // Build routes let routes = index_filter(hbs.clone()) + .or(template_filter(hbs.clone())) + .or(redirect_static_ext()) .or(evals_list()) .or(warp::fs::dir("static")); @@ -30,7 +32,44 @@ fn index_filter( ) -> impl Filter + Clone { warp::get() .and(warp::path::end()) - .map(move || render("index", hbs.clone(), json!({"year", year().unwrap()}))) + .map(move || render("index", hbs.clone(), "")) +} + +fn template_filter( + hbs: Arc>, +) -> impl Filter + Clone { + warp::path!(String).and_then(move |name: String| { + let hbs = hbs.clone(); + async move { + if hbs.has_template(&name) { + Ok(render(&name, hbs, "")) + } else { + Err(warp::reject::not_found()) + } + } + }) +} + +fn redirect_static_ext() -> impl Filter + Clone { + warp::path!(String).and_then(move |path: String| async move { + if let Some(prefix) = path.strip_suffix(".php") { + return Ok(warp::redirect( + prefix + .parse::() + .unwrap_or_else(|_| Uri::from_static("/")), + )); + } + + if let Some(prefix) = path.strip_suffix(".html") { + return Ok(warp::redirect( + prefix + .parse::() + .unwrap_or_else(|_| Uri::from_static("/")), + )); + } + + Err(warp::reject::not_found()) + }) } fn evals_list() -> impl Filter + Clone { @@ -49,12 +88,3 @@ where .unwrap_or_else(|err| err.to_string()); warp::reply::html(render) } - -const UNIX_YEAR: u64 = 31556926; - -fn year() -> Result> { - let date = SystemTime::now() - .duration_since(SystemTime::UNIX_EPOCH)? - .as_secs(); - Ok(date / UNIX_YEAR) -} diff --git a/static/about/index.php b/static/about/index.php deleted file mode 100644 index 0b09bfc..0000000 --- a/static/about/index.php +++ /dev/null @@ -1,50 +0,0 @@ - - - -
-

- School is tricky, and there is no universal pathway to success. I started - Carpenter Tutoring for those seeking a little help finding their way. -

- -

- I received my B.A. from The College of William and Mary in 2018 and received - my M.Ed. from W&M in 2020. As an undergraduate, I worked and was trained - as a tutor at W&M's peer tutoring center, the Tribe TutorZone. During - this period, I conducted over 150 one-on-one appointments with W&M - students in 26 different content areas. I earned lifetime Advanced Tutor - Certification, the highest level W&M can grant, through the College - Reading and Learning Association, and I was trained as a time management - consultant. I took on leadership roles within the TutorZone until I was - working alongside its director. As a graduate student, I became one of the - Graduate Assistants helping oversee the TutorZone as well as an academic - coach to students with high need for academic support. -

- -

- I loved getting to work with the Tribe TutorZone tutors, but I realized that - I missed being the tutor. There's just nothing like watching the light bulb - of understanding go off or seeing students who had struggled with material - master it! With that realization, I decided to dedicate my life to my - passion -- helping students of all ages learn, succeed, and believe in - themselves. -

- -

- My instructional approach focuses on meeting students where they are and - supporting them through any hesitations or discomforts from which academic - difficulties may arise. Whether your student only has to brush up on a few - concepts or is resistant to completing coursework, I will come to each - session with patience, understanding, and just the right amount of - discipline. I truly believe that excellent educational relationships begin - with mutual respect, and I work to build meaningful relationships with all - of my clients. -

- -

Thank you for considering Carpenter Tutoring.

- -
-
- diff --git a/static/assets/favicon.ico b/static/assets/favicon.ico deleted file mode 100644 index 8ba4c15..0000000 Binary files a/static/assets/favicon.ico and /dev/null differ diff --git a/static/footer.php b/static/footer.php deleted file mode 100644 index 91bc9d6..0000000 --- a/static/footer.php +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - diff --git a/static/header.php b/static/header.php deleted file mode 100644 index 42925fa..0000000 --- a/static/header.php +++ /dev/null @@ -1,286 +0,0 @@ - - - - - - Tutoring Excellence Online and in Hampton Roads, VA - Carpenter Tutoring, - LLC - - - - - - - - - - - - - - - - - - - - - -
diff --git a/static/index.php b/static/index.php deleted file mode 100644 index c3aef21..0000000 --- a/static/index.php +++ /dev/null @@ -1,479 +0,0 @@ - - - - - -
-
-

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

- -

- Carpenter Tutoring is a private tutoring service based in Suffolk, - Virginia. I offer in-person sessions throughout the Hampton Roads - area and remote sessions anywhere in the country. Most of my - offerings are one-on-one, and group sessions and classes are also - available. 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 my site to learn more about the - services I offer - , - my background - , - and some of my policies. Thank you for visiting, and - please do not hesitate to reach out with any questions. I would be thrilled to - assist you! -

- -
- - - - - -
- -
- -
- - - - - -
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 -
- -
- - -
-

Pricing Guide

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
RemoteIn-Person
- Subject, Time Management, Study Skills Tutoring, Music Lessons - $50/hr$60/hr
- Academic Coaching, Dissertation Coaching, Test Prep, College - Application Assistance - $60/hr$70/hr
Small Group Sessions, Group Lessons$30/hr$40/hr
Simplified Homeschool Evaluations$30
Detailed Homeschool Evaluations$70
- -

- See a list of my policies and procedures regarding scheduling, - payment, and booking. -

- -
- - -
-
-

Contact

- - - - - - - - - - - - - isSMTP(); - $mail->Host = 'smtp.gmail.com'; - $mail->Port = 465; - $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS; - $mail->SMTPAuth = true; - $mail->Username = $smtpuser; - $mail->Password = $smtppass; - $mail->setFrom($email, $name); - $mail->addAddress($address); - $mail->addReplyTo($email); - $mail->Subject = 'Tutoring Inquiry from ' . $email; - $mail->Body = $body; - - if (!$mail->send()) { - echo 'There was a problem sending your message. Please try again later or send mail to Amy@CarpenterTutoring.com.'; - echo ''; - } else { - echo "Your message was successfully sent."; - } - } else { - echo 'Send us a message and we`ll reply by mail as soon as possible. Please note that your email address will not be stored on our server. It will only be used to contact you with a reply. You may also send mail directly to Amy@CarpenterTutoring.com.'; - } - ?> -
- -
- - -
- -
-

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 -
- -
-

Marie & Robert

-
- I highly recommend Amy as a dissertation coach. Amy is a very kind and patient person. Over the time we worked together, she helped me take down the barriers that were preventing me from moving forward in my process and assisted me in creating a plan to get to the finish line and achieve my goal. She was very helpful with revising and editing my writing to strengthen it. She helped me think creatively, so I could clarify and expand upon my findings. Amy not only pointed out grammatical errors and typos, but she made sure I was able to keep my voice consistent in my writing. Because of her, I was able to finish my doctoral degree, something that I will be forever grateful to her for. -
-

- 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 -
- -
- diff --git a/static/policies/index.php b/static/policies/index.php deleted file mode 100644 index 1fdd037..0000000 --- a/static/policies/index.php +++ /dev/null @@ -1,55 +0,0 @@ - - -
-

-

Payment Methods

- I accept payments through PayPal (amy@carpentertutoring.com), Zelle - (amy@carpentertutoring.com), and Venmo (@AmyCTutoring). If you select to pay - through PayPal, there is an additional $1.50 processing fee - per transaction. I also accept cash and checks made out to Amy Carpenter. - Please contact me for a mailing address if you are a - remote client and would like to pay by check. -

- -

-

Travel policy

- Update due to COVID-19 -- To keep all parties involved as safe as - possible during this pandemic, I have shifted to remote-only tutoring - for the foreseeable future. -

- -

-

Remote sessions

- Remote sessions are conducted from my home in Suffolk. I generally use - Zoom, which requires students to - download a free client on their computer or a free app on their phone - or tablet. I am happy to accommodate if you prefer a different - service. -

- -

-

Cancellation policy

- Sessions cancelled within 72 hours of their start time will incur a - $20 late cancellation fee. -

- -

-

No-Show policy

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

- -

-

Session Duration policy

- 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, - regardless of the length of the actual appointment. If a student is - late to their appointment, we will work to the end of their scheduled - time, but no later. -

-
-
- diff --git a/templates/about.hbs b/templates/about.hbs new file mode 100644 index 0000000..6bb9600 --- /dev/null +++ b/templates/about.hbs @@ -0,0 +1,52 @@ +{{#> base}} +{{#*inline "main"}} + + +
+

+ School is tricky, and there is no universal pathway to success. I started + Carpenter Tutoring for those seeking a little help finding their way. +

+ +

+ I received my B.A. from The College of William and Mary in 2018 and received + my M.Ed. from W&M in 2020. As an undergraduate, I worked and was trained + as a tutor at W&M's peer tutoring center, the Tribe TutorZone. During + this period, I conducted over 150 one-on-one appointments with W&M + students in 26 different content areas. I earned lifetime Advanced Tutor + Certification, the highest level W&M can grant, through the College + Reading and Learning Association, and I was trained as a time management + consultant. I took on leadership roles within the TutorZone until I was + working alongside its director. As a graduate student, I became one of the + Graduate Assistants helping oversee the TutorZone as well as an academic + coach to students with high need for academic support. +

+ +

+ I loved getting to work with the Tribe TutorZone tutors, but I realized that + I missed being the tutor. There's just nothing like watching the light bulb + of understanding go off or seeing students who had struggled with material + master it! With that realization, I decided to dedicate my life to my + passion -- helping students of all ages learn, succeed, and believe in + themselves. +

+ +

+ My instructional approach focuses on meeting students where they are and + supporting them through any hesitations or discomforts from which academic + difficulties may arise. Whether your student only has to brush up on a few + concepts or is resistant to completing coursework, I will come to each + session with patience, understanding, and just the right amount of + discipline. I truly believe that excellent educational relationships begin + with mutual respect, and I work to build meaningful relationships with all + of my clients. +

+ +

Thank you for considering Carpenter Tutoring.

+ +
+
+{{/inline}} +{{/base}} diff --git a/templates/base.hbs b/templates/base.hbs index a16e6eb..f2c0f38 100644 --- a/templates/base.hbs +++ b/templates/base.hbs @@ -298,9 +298,7 @@

- © - - Carpenter Tutoring, LLC. All rights reserved. + © 2020, 2021 Carpenter Tutoring, LLC. All rights reserved.

Visit me on Google diff --git a/templates/policies.hbs b/templates/policies.hbs new file mode 100644 index 0000000..326d61f --- /dev/null +++ b/templates/policies.hbs @@ -0,0 +1,57 @@ +{{#> base}} +{{#*inline "main"}} +

+
+

+

Payment Methods

+ I accept payments through PayPal (amy@carpentertutoring.com), Zelle + (amy@carpentertutoring.com), and Venmo (@AmyCTutoring). If you select to pay + through PayPal, there is an additional $1.50 processing fee + per transaction. I also accept cash and checks made out to Amy Carpenter. + Please contact me for a mailing address if you are a + remote client and would like to pay by check. +

+ +

+

Travel policy

+ Update due to COVID-19 -- To keep all parties involved as safe as + possible during this pandemic, I have shifted to remote-only tutoring + for the foreseeable future. +

+ +

+

Remote sessions

+ Remote sessions are conducted from my home in Suffolk. I generally use + Zoom, which requires students to + download a free client on their computer or a free app on their phone + or tablet. I am happy to accommodate if you prefer a different + service. +

+ +

+

Cancellation policy

+ Sessions cancelled within 72 hours of their start time will incur a + $20 late cancellation fee. +

+ +

+

No-Show policy

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

+ +

+

Session Duration policy

+ 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, + regardless of the length of the actual appointment. If a student is + late to their appointment, we will work to the end of their scheduled + time, but no later. +

+
+
+{{/inline}} +{{/base}} -- cgit v1.2.3