From 27f1e57bfbadbb3557d7649567e49a1e89927012 Mon Sep 17 00:00:00 2001
From: "Adam T. Carpenter" <atc@53hor.net>
Date: Fri, 26 Jun 2020 17:22:38 -0400
Subject: working on new pricing table and blogging system
---
_includes/contact-form.liquid | 121 ++++++++++++++++++++--------------------
_includes/footer.liquid | 29 ++++++----
_includes/head.liquid | 10 ----
_includes/meta.liquid | 9 +++
_includes/nav.liquid | 52 +++++++++--------
_includes/pricing-table.liquid | 33 +++++++++++
_includes/social-sidebar.liquid | 8 +++
7 files changed, 155 insertions(+), 107 deletions(-)
delete mode 100644 _includes/head.liquid
create mode 100644 _includes/meta.liquid
create mode 100644 _includes/pricing-table.liquid
create mode 100644 _includes/social-sidebar.liquid
(limited to '_includes')
diff --git a/_includes/contact-form.liquid b/_includes/contact-form.liquid
index 52f696d..6df4028 100644
--- a/_includes/contact-form.liquid
+++ b/_includes/contact-form.liquid
@@ -1,63 +1,60 @@
- <form name="inquiry">
- <div class="field">
- <div class="control has-icons-left">
- <span class="icon">
- <i class="iconify" data-icon="mdi-account"></i>
- </span>
- <input
- name="name"
- class="input is-rounded"
- type="text"
- placeholder="name"
- />
- </div>
- </div>
- <div class="field">
- <div class="control has-icons-left">
- <span class="icon">
- <i class="iconify" data-icon="mdi-email"></i>
- </span>
- <input
- name="from"
- class="input is-rounded"
- type="text"
- placeholder="email address"
- />
- </div>
- </div>
- <div class="field">
- <div class="control">
- <textarea
- name="body"
- class="textarea"
- placeholder="question/comment"
- spellcheck="true"
- ></textarea>
- </div>
- </div>
- <div class="field is-grouped is-grouped-right">
- <div class="control">
- <button class="button is-rounded is-primary" type="submit">
- <span class="icon">
- <i class="iconify" data-icon="mdi-check"></i>
- </span>
- <span>
- Submit
- </span>
- </button>
- </div>
- </div>
+<!DOCTYPE html>
+<form name="inquiry">
+ <div class="field">
+ <div class="control has-icons-left">
+ <span class="icon">
+ <i class="iconify" data-icon="mdi-account"></i>
+ </span>
+ <input
+ name="name"
+ class="input is-rounded"
+ type="text"
+ placeholder="name"
+ />
+ </div>
+ </div>
+ <div class="field">
+ <div class="control has-icons-left">
+ <span class="icon">
+ <i class="iconify" data-icon="mdi-email"></i>
+ </span>
+ <input
+ name="from"
+ class="input is-rounded"
+ type="text"
+ placeholder="email address"
+ />
+ </div>
+ </div>
+ <div class="field">
+ <div class="control">
+ <textarea
+ name="body"
+ class="textarea"
+ placeholder="question/comment"
+ spellcheck="true"
+ ></textarea>
+ </div>
+ </div>
+ <div class="field is-grouped is-grouped-right">
+ <div class="control">
+ <button class="button is-rounded is-primary" type="submit">
+ <span class="icon">
+ <i class="iconify" data-icon="mdi-check"></i>
+ </span>
+ <span>
+ Submit
+ </span>
+ </button>
+ </div>
+ </div>
- <div
- id="errorBox"
- class="notification is-danger"
- style="display: none;"
- ></div>
- <div
- id="successBox"
- class="notification is-success"
- style="display: none;"
- >
- Message sent!
- </div>
- </form>
+ <div
+ id="errorBox"
+ class="notification is-danger"
+ style="display: none;"
+ ></div>
+ <div id="successBox" class="notification is-success" style="display: none;">
+ Message sent!
+ </div>
+</form>
diff --git a/_includes/footer.liquid b/_includes/footer.liquid
index c086a98..c895449 100644
--- a/_includes/footer.liquid
+++ b/_includes/footer.liquid
@@ -1,13 +1,20 @@
+<!DOCTYPE html>
<footer class="footer">
- <div class="content has-text-centered">
- <p>
- © 2020 Carpenter Tutoring, LLC. All rights reserved.
- </p>
- <p>
- Something wrong?
- <a href="mailto:webmaster@carpentertutoring.com">
- Tell the webmaster.
- </a>
- </p>
- </div>
+ <div class="content has-text-centered">
+ <div class="level">
+ <div class="level-item">
+ <p>
+ © {{ "now" | date: "%Y" }} Carpenter Tutoring. All rights
+ reserved.
+ </p>
+ </div>
+ <div class="level-item">
+ <p>
+ <a href="mailto:webmaster@carpentertutoring.com">
+ Questions, Comments, Feedback
+ </a>
+ </p>
+ </div>
+ </div>
+ </div>
</footer>
diff --git a/_includes/head.liquid b/_includes/head.liquid
deleted file mode 100644
index 17245e8..0000000
--- a/_includes/head.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-<meta charset="utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<meta property="og:type" content="website" />
-<meta property="og:site_name" content="Carpenter Tutoring" />
-<meta property="og:title" content="Carpenter Tutoring" />
-<meta property="og:description" content="" />
-<meta property="og:url" content="" />
-<meta property="og:image" content="" />
-<link rel="stylesheet" href="index.css" />
diff --git a/_includes/meta.liquid b/_includes/meta.liquid
new file mode 100644
index 0000000..6f0cf4b
--- /dev/null
+++ b/_includes/meta.liquid
@@ -0,0 +1,9 @@
+<meta charset="utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta property="og:description" content="Tutoring Excellence in Hampton Roads." />
+<meta property="og:image" content="" />
+<meta property="og:site_name" content="Carpenter Tutoring" />
+<meta property="og:title" content="Carpenter Tutoring" />
+<meta property="og:type" content="website" />
+<meta property="og:url" content="https://carpentertutoring.com" />
diff --git a/_includes/nav.liquid b/_includes/nav.liquid
index 982660b..8d3f9cb 100644
--- a/_includes/nav.liquid
+++ b/_includes/nav.liquid
@@ -1,26 +1,30 @@
+<!DOCTYPE html>
<nav class="navbar is-fixed-top">
- <div class="navbar-brand">
- <a class="navbar-item" href="/#">
- <img src="/assets/logo-simple.png" />
- </a>
- <a role="button" class="navbar-burger" data-target="navMenu">
- <span></span>
- <span></span>
- <span></span>
- </a>
- </div>
- <div class="navbar-menu" id="navMenu">
- <div class="navbar-start"></div>
- <div class="navbar-end">
- <a class="navbar-item" href="/#offerings">
- Offerings
- </a>
- <a class="navbar-item" href="/#about">
- About
- </a>
- <a class="navbar-item" href="/#contact">
- Contact Me
- </a>
- </div>
- </div>
+ <div class="navbar-brand">
+ <a class="navbar-item" href="/#">
+ <img src="/assets/logo-simple.png" />
+ </a>
+ <a role="button" class="navbar-burger" data-target="navMenu">
+ <span></span>
+ <span></span>
+ <span></span>
+ </a>
+ </div>
+ <div class="navbar-menu" id="navMenu">
+ <div class="navbar-start"></div>
+ <div class="navbar-end">
+ <a class="navbar-item" href="/blog">
+ Blog
+ </a>
+ <a class="navbar-item" href="/#offerings">
+ Offerings
+ </a>
+ <a class="navbar-item" href="/#about">
+ About
+ </a>
+ <a class="navbar-item" href="/#contact">
+ Contact Me
+ </a>
+ </div>
+ </div>
</nav>
diff --git a/_includes/pricing-table.liquid b/_includes/pricing-table.liquid
new file mode 100644
index 0000000..3772847
--- /dev/null
+++ b/_includes/pricing-table.liquid
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+{% for each in site.data.prices %}
+<table class="table is-striped is-bordered">
+ <thead>
+ <tr>
+ <th colspan="3" class="has-text-centered">
+ {{ each.name }}
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ {% if each.cost.inperson != each.cost.remote %}
+ <tr>
+ <th style="text-align: right;">
+ In-Person
+ </th>
+ <td>
+ ${{ each.cost.inperson}}/hr
+ </td>
+ </tr>
+ {% endif %}
+ <tr>
+ <th style="text-align: right;">
+ Remote
+ </th>
+
+ <td>
+ ${{ each.cost.remote }}/hr
+ </td>
+ </tr>
+ </tbody>
+</table>
+{% endfor %}
diff --git a/_includes/social-sidebar.liquid b/_includes/social-sidebar.liquid
new file mode 100644
index 0000000..8cb2c15
--- /dev/null
+++ b/_includes/social-sidebar.liquid
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<h1 class="title">
+ Social
+</h1>
+
+<i class="iconify" data-icon="mdi-rss"></i>
+<i class="iconify" data-icon="mdi-facebook"></i>
+<i class="iconify" data-icon="mdi-linkedin"></i>
--
cgit v1.2.3