Merge branch 'feature/cleanup' into develop

src/core/migrations/0007_product_subtitle.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.2 on 2022-04-30 15:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0006_alter_order_options_order_shipping_total'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='product',
+            name='subtitle',
+            field=models.CharField(blank=True, max_length=250),
+        ),
+    ]

src/core/models.py

@@ -42,6 +42,7 @@ class ProductManager(models.Manager):
 
 class Product(models.Model):
     name = models.CharField(max_length=250)
+    subtitle = models.CharField(max_length=250, blank=True)
     description = models.TextField(blank=True)
     sku = models.CharField(max_length=255, unique=True)
     price = models.DecimalField(

src/static/styles/main.css

@@ -451,17 +451,13 @@ section:not(:last-child) {
 .site__banner {
     background-color: rgba(0, 0, 0, 0.44);
     background-blend-mode: multiply;
-    background-image: url("/static/images/site_banner.jpg");
     background-size: cover;
     background-position: center;
     color: white;
     text-align: center;
-    padding: 4rem 1rem;
+    padding: 2rem 1rem;
     font-family: 'Vollkorn', serif;
 }
-.site__banner h1 {
-    font-size: 3.5rem;
-}
 
 .site__banner p {
     text-transform: lowercase;
@@ -469,6 +465,19 @@ section:not(:last-child) {
     font-size: 2rem;
 }
 
+.site__banner--site {
+    background-image: url("/static/images/site_banner.jpg");
+}
+.site__banner--fairtrade {
+    background-image: url("/static/images/fairtrade_banner.jpg");
+}
+.site__banner--reviews {
+    background-image: url("/static/images/reviews_banner.jpg");
+}
+.site__banner--about {
+    background-image: url("/static/images/coffee_banner.jpg");
+}
+
 /* Messages
    ========================================================================== */
 .messages {

src/storefront/templates/storefront/about.html

@@ -1,50 +1,60 @@
 {% extends "base.html" %}
 {% load static %}
 
+{% block head_title %}About | {% endblock %}
+
 {% block content %}
+<div class="site__banner site__banner--about">
+    <h1>About Port Townsend<br>Roasting Co.</h1>
+</div>
 <article>
-    <header>
-        <h1>About PT Coffee</h1>
-    </header>
-    <section>
-        <figure>
-            <img src="{% static 'images/coffee_banner.jpg' %}" alt="Banner">
-        </figure>
-    </section>
     <section>
         <h2>We love coffee!</h2>
-        <p><strong>If you’ve found Port Townsend Coffee Roasting Co., you probably love coffee so much that you seek out the best tasting, Certified Fair Trade Organic coffees available.</strong></p>
+        <p><strong>If you’ve found Port Townsend Roasting Co., you probably love coffee so much that you seek out the best tasting, Certified Fair Trade Organic coffees available.</strong></p>
         <p>You’ve probably been around coffee for years, perhaps starting with Specialty Coffees in the 1980’s, and know your way around fairly well. How and where coffee is grown and harvested, how it’s roasted, how to brew it. You value fair, guaranteed wages for growers and sustainable stewardship of the land where it’s grown.</p>
         <p>No matter how much you drink, if you’re like us, great coffee is an important perk in your life. You are not alone in this… coffee is the one of the world’s most heavily traded commodities. In addition to the impact it has as a crop on the economies of producing countries, the cafe and coffee house industry touches millions of lives everyday, worldwide, as well.</p>
-        <p>We love the place coffee takes in conversation, culture and commerce. We seek out the world’s rarest coffees for taste and consistency. We roast and blend coffees at <strong>Port Townsend Coffee Roasting Co.</strong> with the hope that you will enjoy every cup.</p>
+        <p>We love the place coffee takes in conversation, culture and commerce. We seek out the world’s rarest coffees for taste and consistency. We roast and blend coffees at <strong>Port Townsend Roasting Co.</strong> with the hope that you will enjoy every cup.</p>
     </section>
     <section>
+        <figure>
+            <img src="{% static '/images/pt_coffee_01.jpg' %}" alt="">
+        </figure>
         <h3>Style of roast</h3>
         <p>We roast in a European style, specifically similar to that of central Italy. The blending and roasting process determines the flavor and body of the coffee equally as much as the kinds of beans used. Italians are noted for their blending skills.</p>
         <p><q>We blend and roast to suit our own personal tastes, creating a smooth, less acidic, sweeter flavor. Our coffee has a perceivably heavy feeling in the mouth. Our roasts take longer and require attention. Controlling air flow around the beans in the roasting drum is crucial in developing the flavor and body of the coffees we roast. At times in the roasting, no heat at all is applied to the beans. Done correctly, this can smooth out an otherwise acidic or snappy roast.</q></p>
         <p>For those who are interested in comparing roasting styles: <q>This is in contrast to the style of many roasters here in the Pacific Northwest. They tend towards lighter, faster roasts with different air flows around the beans, which produces a more acidic, lighter-bodied coffee. This style has many fans. It produces coffees in which the nuances of singular flavors can be discerned, as nuances of flavor can be picked out in wines. However, we prefer smoother, heavier and more rounded flavors and strive to capture them in my roasting.</q></p>
     </section>
     <section>
+        <figure>
+            <img src="{% static '/images/pt_coffee_02.jpg' %}" alt="">
+        </figure>
         <h3>Your Coffee Primer: what gives Port Townsend Coffee its qualities?</h3>
         <p>We roast Port Townsend Coffee in small batches (under 30 lbs), engendering uniformity in the roast level. Coffee roasted in big batches may be unevenly roasted.</p>
         <p>Port Townsend Coffee is air cooled, as opposed to water cooled. Many of the larger roasters must spray water on the coffee as it comes out of the roasting chamber, to cool it down. This affects the quality of the coffee and its ability to remain fresh if the water is not properly evaporated by the heat from the coffee.</p>
         <p>We roast our coffee much more slowly than most roasters, especially coffee roasters in the Pacific Northwest. The slower roasting process allows for greater bean development. The bean is evenly roasted right to the center and our process mutes some of the acidic compounds, which smooths out the flavor.</p>
         <p>Port Townsend Coffee is known for roasts that are darker than others available in the Northwest. Due to our roasting process, which emphasizes patience with the beans as well as air flow adjustments, the darker roasts are smooth and syrupy. Dark roasts from other companies can taste bitter, or slightly burnt due to the size and speed of the roast.</p>
         <p>We have been buying beans from the same brokers for many years. They understand the flavor profiles we prefer and seek to accommodate our needs.</p>
-        <div>
-            <h5>Fair Trade and Organic</h5>
-            <p>We pay a steep premium for these beans, which are typically from smaller farms that are organized into co-ops. These farms take pride in their coffees, as the farmers make a living wage and their families are able to live in a healthier, more secure environment than farmers who grow a conventional coffee crop. The quality of our coffee is consistent, in part due to the quality of organic and fair trade beans.</p>
-            <h5>Freshness and Storage</h5>
-            <p>At Port Townsend Coffee, we roast a batch and within 15 minutes, package it in one-way valve bags so the coffee can “de-gas.” The valve allows the gas to escape, but prevents oxygen from coming into contact with the coffee (oxygen causes coffee to go stale). Many roasters allow their coffee to ‘de-gas’ by holding it in large bins for several days before packaging it. This procedure can cause the taste to go flat.</p>
-            <h5>The Diedrich Roaster</h5>
-            <p>We have used 5 different Diedrich Coffee Roasters since 1985. Compared to other machines, they produce an evenly developed roast. The infrared burners are much gentler than the direct flame burners on most other roasters, and the air flow control give a greater range of what can be done for the beans.</p>
-            <h5>Freshness</h5>
-            <p>Fresh coffee is better! We use one-way valve bags to the coffee is flushed with protective carbon dioxide and protected from the deteriorating effects of oxygen.</p>
-            <p>The best coffee is fresh from the roaster; however, the coffee in our valve bags keeps its flavor intact for a month without a perceivable taste difference to most people.</p>
-            <p>We recommend you buy enough coffee for a one-month supply. Keep it in the valve bags, in a cool place—such as a lower kitchen cabinet. Once the bag is opened, keep air out by rolling down the top of the bag and secure with a rubber band. Remember, air (oxidation) will cause your beans to go stale!</p>
-            <p>We also recommend you buy whole beans and get yourself a coffee grinder. Grinding exposes much more surface area to oxygen.</p>
-            <p>Last, never put coffee beans in the refrigerator or freezer, as this speeds up oxidation.</p>
-        </div>
+        <h5>Fair Trade and Organic</h5>
+        <p>We pay a steep premium for these beans, which are typically from smaller farms that are organized into co-ops. These farms take pride in their coffees, as the farmers make a living wage and their families are able to live in a healthier, more secure environment than farmers who grow a conventional coffee crop. The quality of our coffee is consistent, in part due to the quality of organic and fair trade beans.</p>
+        <figure>
+            <img src="{% static '/images/pt_coffee_03.jpg' %}" alt="">
+        </figure>
+        <h5>Freshness and Storage</h5>
+        <p>At Port Townsend Coffee, we roast a batch and within 15 minutes, package it in one-way valve bags so the coffee can “de-gas.” The valve allows the gas to escape, but prevents oxygen from coming into contact with the coffee (oxygen causes coffee to go stale). Many roasters allow their coffee to ‘de-gas’ by holding it in large bins for several days before packaging it. This procedure can cause the taste to go flat.</p>
+        <figure>
+            <img src="{% static '/images/pt_coffee_04.jpg' %}" alt="">
+        </figure>
+        <h5>The Diedrich Roaster</h5>
+        <p>We have used 5 different Diedrich Coffee Roasters since 1985. Compared to other machines, they produce an evenly developed roast. The infrared burners are much gentler than the direct flame burners on most other roasters, and the air flow control give a greater range of what can be done for the beans.</p>
+        <h5>Freshness</h5>
+        <p>Fresh coffee is better! We use one-way valve bags to the coffee is flushed with protective carbon dioxide and protected from the deteriorating effects of oxygen.</p>
+        <p>The best coffee is fresh from the roaster; however, the coffee in our valve bags keeps its flavor intact for a month without a perceivable taste difference to most people.</p>
+        <p>We recommend you buy enough coffee for a one-month supply. Keep it in the valve bags, in a cool place—such as a lower kitchen cabinet. Once the bag is opened, keep air out by rolling down the top of the bag and secure with a rubber band. Remember, air (oxidation) will cause your beans to go stale!</p>
+        <p>We also recommend you buy whole beans and get yourself a coffee grinder. Grinding exposes much more surface area to oxygen.</p>
+        <p>Last, never put coffee beans in the refrigerator or freezer, as this speeds up oxidation.</p>
+        <figure>
+            <img src="{% static '/images/pt_coffee_05.jpg' %}" alt="">
+        </figure>
     </section>
 </article>
 {% endblock %}

src/storefront/templates/storefront/cart_detail.html

@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block head_title %}Cart | {% endblock %}
+
 {% block content %}
 <article>
     <header>

src/storefront/templates/storefront/checkout_address.html

@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% load static %}
 
+{% block head_title %}Checkout | {% endblock %}
+
 {% block content %}
 <article>
     <header>

src/storefront/templates/storefront/contact_form.html

@@ -1,13 +1,21 @@
 {% extends "base.html" %}
 
+{% block head_title %}Contact | {% endblock %}
+
 {% block content %}
+<div class="site__banner site__banner--site">
+    <h1>Contact us</h1>
+</div>
 <article>
     <header>
-        <h1>Contact us</h1>
         <h4>Problem with your online order or have a question?</h4>
-        <p>Please contact us, we’re happy to help you.</p>
+        <p>
+            Please contact us, we’re happy to help you over the phone<br>
+            <a href="tel:+13603855856">(360) 385-5856</a> Mon-Fri between 9:00 am and 5:00 pm Pacific Time.
+        </p>
     </header>
     <section>
+        <p>Or send us a message using the form below and we'll email you back as soon as we can.</p>
         <form action="{% url 'storefront:contact' %}" method="post" class="contact-form">
             {% csrf_token %}
             {{form.as_p}}

src/storefront/templates/storefront/customer_detail.html

@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% load static %}
 
+{% block head_title %}Account | {% endblock %}
+
 {% block content %}
 <article>
     <header class="article__header--with-action">

src/storefront/templates/storefront/fairtrade.html

@@ -1,16 +1,13 @@
 {% extends "base.html" %}
 {% load static %}
 
+{% block head_title %}Fair Trade | {% endblock %}
+
 {% block content %}
+<div class="site__banner site__banner--fairtrade">
+    <h1>Fair Trade & Organic</h1>
+</div>
 <article>
-    <header>
-        <h1>Fair Trade and Organic</h1>
-    </header>
-    <section>
-        <figure>
-            <img src="{% static 'images/fairtrade_banner.jpg' %}" alt="Banner">
-        </figure>
-    </section>
     <section>
         <p>We value fair, guaranteed wages for growers and sustainable stewardship of the land where it’s grown. We pay a steep premium for these beans, which are typically from smaller farms that are organized into co-ops. These farms take pride in their coffees, as the farmers make a living wage and their families are able to live in a healthier, more secure environment than farmers who grow a conventional coffee crop. The quality of our coffee is consistent, in part due to the quality of organic and fair trade beans.</p>
         <figure style="text-align: center;">

src/storefront/templates/storefront/order_form.html

@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% load static %}
 
+{% block head_title %}Checkout | {% endblock %}
+
 {% block head %}
 <script defer src="https://www.paypal.com/sdk/js?client-id={{PAYPAL_CLIENT_ID}}&currency=USD"></script>
 <script type="module" defer src="{% static 'scripts/payment.js' %}"></script>

src/storefront/templates/storefront/payment_cancelled.html

@@ -1,8 +1,10 @@
 {% extends "base.html" %}
 
+{% block head_title %}Payment Cancelled | {% endblock %}
+
 {% block content %}
 <article>
     <h1>Payment declined</h1>   
     <p>There was a problem collecting payment.</p>
 </article>
-{% endblock %}
+{% endblock %}

src/storefront/templates/storefront/payment_done.html

@@ -1,8 +1,10 @@
 {% extends "base.html" %}
 
+{% block head_title %}Payment Success | {% endblock %}
+
 {% block content %}
 <article>
     <h1>Payment was successful</h1>
     <p>Thank you for your order!</p>
 </article>  
-{% endblock %}
+{% endblock %}

src/storefront/templates/storefront/product_detail.html

@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% load static %}
 
+{% block head_title %}{{ product.name }} | {% endblock %}
+
 {% block head %}
     <script defer src="{% static 'scripts/product_gallery.js' %}"></script>
 {% endblock %}
@@ -17,6 +19,7 @@
     </figure>
     <section class="product__info">
     	<h1>{{product.name}}</h1>
+        <h3>{{product.subtitle}}</h3>
         <p>{{product.description}}</p>
         <p class="site__ft-stamp"><img class="fair_trade--small" src="{% static 'images/fair_trade_stamp.png' %}" alt="Fair trade"></p>
         <p>$<strong>{{product.price}}</strong></p>

src/storefront/templates/storefront/product_list.html

@@ -1,14 +1,16 @@
 {% extends 'base.html' %}
 {% load static %}
 
+{% block head_title %}Shop | {% endblock %}
+
 {% block head %}
     <script defer src="{% static 'scripts/product_list.js' %}"></script>
 {% endblock %}
 
 {% block content %}
-<div class="site__banner">
-    <h1><em>Better</em>, not <em>Bitter</em></h1>
-    <p>ORGANIC COFFEE, SLOW ROASTED, ITALIAN STYLE</p>
+<div class="site__banner site__banner--site">
+    <h1>Organic Coffee, Slow Roasted, Italian Style</h1>
+    <p><em>Better</em>, not <em>Bitter</em></p>
 </div>
 <article>
     <section class="product__list">
@@ -19,6 +21,7 @@
                 </figure>
                 <div>
                     <h3>{{ product.name }}</h3>
+                    <h5>{{ product.subtitle }}</h5>
                     <p>{{product.description|truncatewords:20}}</p>
                     <p>$<strong>{{product.price}}</strong> | {{product.weight.oz|floatformat}}oz</p>
                 </div>

src/storefront/templates/storefront/reviews.html

@@ -1,16 +1,14 @@
 {% extends 'base.html' %}
 {% load static %}
 
+{% block head_title %}Reviews | {% endblock %}
+
 {% block content %}
+<div class="site__banner site__banner--reviews">
+    <h1>Reviews</h1>
+    <p>What people are saying</p>
+</div>
 <article>
-    <header>
-        <h1>Reviews</h1>
-    </header>
-    <section>
-        <figure>
-            <img src="{% static 'images/reviews_banner.jpg' %}" alt="Banner">
-        </figure>
-    </section>
     <section class="review__list">
         <blockquote class="review__item">
             <q>Really good coffee. That's all there is to say. Supposedly the pour over coffee is the best way to go. It is definitely nothing like a Starbucks, and in this case, that's a very good thing!</q>

src/templates/base.html

@@ -8,6 +8,7 @@
     <meta content="width=device-width, initial-scale=1.0" name="viewport">
     <meta content="chrome=1" http-equiv="X-UA-Compatible">
     <title>{% block head_title %}{% endblock %} Port Townsend Coffee</title>
+    <meta name="author" content="Nathan Chapman">
 
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
@@ -88,13 +89,15 @@
         <p><button class="show-modal">Subscribe to our newsletter</button></p>
         <p>
             <strong>Problem with your online order or have a question?</strong><br>
-            Please <a href="{% url 'storefront:contact' %}">contact us</a>, we’re happy to help you.<br>
+            Please <a href="{% url 'storefront:contact' %}">contact us</a>, we’re happy to help you over the phone at <a href="tel:+13603855856">(360) 385-5856</a><br>
+            Mon-Fri between 9:00 am and 5:00 pm Pacific Time.<br>
             <address>854 East Park Ave. Suite 1, Port Townsend, WA 98368</address>
         </p>
         <p>
-            <small>Copyright &copy; 2016-{% now "Y" %} Better Living Food Company Inc.<br>
-                <a href="{% url 'storefront:contact' %}">Contact</a>&nbsp;|&nbsp;Fair Trade&nbsp;|&nbsp;Organic
-            </small>
+            Better Living Food Company Inc.℠<br>
+            <small><a href="{% url 'storefront:contact' %}">Contact</a>&nbsp;|&nbsp;Fair Trade&nbsp;|&nbsp;Organic</small>
+            <br>
+            <small>Website by <a href="https://nathanjchapman.com">Nathan Chapman</a></small>
             <br><br>
             <img class="site__ft-stamp" src="{% static 'images/fair_trade_stamp.png' %}" alt="Fair trade">
         </p>