Merge pull request #139 from JamesKirkAndSpock/local

Local
JamesKirkAndSpock · Dec 8, 2019 · 4a5ec4e · 4a5ec4e
2 parents 753ea34 + eca5fb8
commit 4a5ec4e
Show file tree

Hide file tree

Showing 24 changed files with 199 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,7 @@ hirola/db.sqlite3
 # Ignore environment file
 .env
 hi-venv/
-env/
+
 # Mock Images
 test_image_1_*
 test_image_2_*

diff --git a/hirola/front/templates/front/about.html b/hirola/front/templates/front/about.html
@@ -1,5 +1,15 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
 
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
+
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/about.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" />
 {% endblock %}
@@ -11,15 +21,15 @@
             <div class="nav-wrapper">
                 <div class="col s12">
                     <a href="#!" class="breadcrumb">teke</a>
-                    <a href="#!" class="breadcrumb" id="last-link">about</a>
+                    <a href="#!" class="breadcrumb" id="last-link">about teke</a>
                     <!-- <a href="#!" class="breadcrumb">about</a> -->
                 </div>
             </div>
         </nav>
     </div>
     <div class="row welcome">
         <h4 class="center">About Tekesquared</h4>
-        <p class="center">Tekesquared is an online store that sells mint condition phones to the Kenyan community</p>
+        <p class="center">Tekesquared is an online store that sells mint condition electronics to the Kenyan community</p>
     </div>
     <div class="row boxes">
         <div class="row box box-one">
@@ -46,7 +56,7 @@ <h5 class="center">Quality Assurance</h5>
                 <div class="center">
                     <i id="quality-icon" class="material-icons">brightness_auto</i>
                 </div>
-                <p>On Tekesquared you buy quality mint condition smartphones sourced directly from the USA and delivered to your doorstep at an affordable price.
+                <p>On Tekesquared you buy quality mint condition electronics sourced directly from the USA/Canada and delivered to your doorstep at an affordable price.
                   Mint condition phones are phones that are resold with (1) perfect screen condition (2) function flawlessly and (3) have no signs of use.</p>
             </div>
             <div class="col m6 s12">

diff --git a/hirola/front/templates/front/base.html b/hirola/front/templates/front/base.html
@@ -2,6 +2,16 @@
 <html lang="en">
 
 <head>
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
+
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 

diff --git a/hirola/front/templates/front/before_checkout.html b/hirola/front/templates/front/before_checkout.html
@@ -1,4 +1,14 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
+
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/before_checkout.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" />
 {% endblock %} {% block content %}
@@ -10,7 +20,7 @@
         <nav class="this-black">
             <div class="nav-wrapper">
                 <div class="col s12">
-                    <a href="/" class="breadcrumb">teke</a>
+                    <a href="/" class="breadcrumb">Tekesquared</a>
                     <a href="/before_checkout" class="breadcrumb">My Cart</a>
                 </div>
             </div>

diff --git a/hirola/front/templates/front/change_email_activation_email.html b/hirola/front/templates/front/change_email_activation_email.html
@@ -5,5 +5,5 @@
 
 Kind Regards,
 
-The Teke Team.
+The Tekesquared Team.
 {% endautoescape %}
diff --git a/hirola/front/templates/front/change_email_activation_subject.txt b/hirola/front/templates/front/change_email_activation_subject.txt
@@ -1 +1 @@
-Activate your new email.
+Activate your new email.
diff --git a/hirola/front/templates/front/change_password.html b/hirola/front/templates/front/change_password.html
@@ -8,7 +8,7 @@
         <div class="col m2"></div>
         <div class="col m8">
             <div class="col s12 form-content">
-                <p>Please provide new password for your teke account</p>
+                <p>Please provide new password for your Tekesquared account</p>
                 <form method="post">
                   {% csrf_token %}
                     <div class="row">

diff --git a/hirola/front/templates/front/checkout.html b/hirola/front/templates/front/checkout.html
@@ -1,5 +1,14 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
 
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/checkout.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" />
 {% endblock %} {% block content %}
@@ -27,8 +36,11 @@ <h5 class="center">{teke}<sup>2</sup> checkout</h5>
                   <h6><b></b></h6>
                   <div class="row">
                       <div class="col s12">
-                          <p>At {teke}<sup>2</sup>, we work on a pay on delivery system. You will only pay once we have delivered your ordered item to you, or
-                            when you pick it up at our office. Shipping takes about 1 to 3 weeks.
+                          <p>At Tekesquared, we work on a pay on delivery system. You will only pay once we have delivered your ordered item to you, or
+                            when you pick it up at our office. However, if your item's price is more than ksh. 25,000, you need to pay the balance first
+                            before we can process your order (e.g. if you buy an iphone 7 of Kes. 28,000, you'll need to pay Kes. 3,000 after you have ordered,
+                            then you will pay the balance upon delivery. We will email you instructions on how to pay the balance before we process your order. Shipping
+                            takes 17 business days.
                           </p>
                       </div>
                   </div>
@@ -40,7 +52,7 @@ <h6><b>1. Delivery Options</b></h6>
                             <div class="col s12">
                             <label for="pickup">
                             <input class="with-gap" name="pickup" type="radio" id="pickup" required value="1" />
-                            <span>Pick up at our office: 1234 Kiambu (Kiambu-Nairobi Road next to Thindigua Realtors)</span>
+                            <span>Pick up at our office: Ever Green Shopping Center (Kiambu-Nairobi Road opposite Four Ways Junction)</span>
                             </label>
                             </div>
                             <div class="col s12">
@@ -85,7 +97,7 @@ <h6><b>1. Delivery Options</b></h6>
             <div class="col m4 push-m1 confirmation">
                 <div class="row">
                     <div class="col s6"><p><b>Order Total:</b></p></div>
-                    <div class="col s6"><p class="green-text"><b>Ksh {{ cart_total|intcomma }}</b></p></div>
+                    <div class="col s6"><p class="green-text"><b>Ksh. {{ cart_total|intcomma }}</b></p></div>
                 </div>
                 <hr>
                 <div class="row">

diff --git a/hirola/front/templates/front/checkout_complete.html b/hirola/front/templates/front/checkout_complete.html
@@ -1,4 +1,13 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/repair_network.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" />
 {% endblock %}

diff --git a/hirola/front/templates/front/confirmation_email_body.html b/hirola/front/templates/front/confirmation_email_body.html
@@ -62,7 +62,7 @@ <h2 style="color: #3cba54">Shipping Details</h2>
         <div class="row" style="font-size: 120%">
                 <div class="content">
                         <p>
-                           Have a question? please visit <span><a href="{{ protocol }}://{{ domain }}{% url 'front:help' %}" style="text-decoration: none; color: #3cba54;">teke help center</a></span>
+                           Have a question? please visit <span><a href="{{ protocol }}://{{ domain }}{% url 'front:help' %}" style="text-decoration: none; color: #3cba54;">Tekesquared help center</a></span>
                         </p>
                         <p>
                            We hope to see you soon again.
@@ -79,4 +79,4 @@ <h2 style="color: #3cba54">Shipping Details</h2>
                 </p>
         </div>
 </body>
-</html>
+</html>
diff --git a/hirola/front/templates/front/contact_us.html b/hirola/front/templates/front/contact_us.html
@@ -1,4 +1,13 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/contact_us.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" /> {% endblock %} {% block content %}
 <div class="container main-content">
@@ -52,7 +61,7 @@ <h4 class="left">Contact Tekesquared</h4>
     			<tr>
     				<td>
     					<i class="material-icons tiny green-text">looks_6</i>
-    					<a href="http://twitter.com/teke" target="https://www.instagram.com/teke_squared/" class="green-text">@teke on instagram</a>
+    					<a href="http://instagram.com/teke" target="https://www.instagram.com/teke_squared/" class="green-text">@teke_squared on instagram</a>
     				</td>
     			</tr>
     			<tr>

diff --git a/hirola/front/templates/front/dashboard.html b/hirola/front/templates/front/dashboard.html
@@ -1,5 +1,14 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
 
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/dashboard.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" /> {% endblock %} {% block content %}
 <div class="main-content">

diff --git a/hirola/front/templates/front/error.html b/hirola/front/templates/front/error.html
@@ -19,7 +19,7 @@
                 <h6><b>Oops! We can't seem to find the page you were looking for</b></h6>
                 <p>Here is what you can do:</p>
                 <ol>
-                    <li>Report this page as missing to the teke <a class="green-text" href="/help#help-center"><u>Help Center</u></a></li>
+                    <li>Report this page as missing to the Tekesquared <a class="green-text" href="/help#help-center"><u>Help Center</u></a></li>
                     <li><a class="green-text" href="/help#help-center"><u>Request a phone or tablet</u></a> that's not on our site</li>
                     <li>Go back to the <a class="green-text" href="/home"><u>homepage</u></a></li>
                 </ol>

diff --git a/hirola/front/templates/front/help.html b/hirola/front/templates/front/help.html
@@ -1,4 +1,13 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/help.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" /> {% endblock %} {% block content %}
 <div class="container main-content">
@@ -7,7 +16,7 @@
             <div class="nav-wrapper">
                 <div class="col s12">
                     <a href="#!" class="breadcrumb">teke</a>
-                    <a href="#!" class="breadcrumb" id="last-link">news</a>
+                    <a href="#!" class="breadcrumb" id="last-link">help</a>
                 </div>
             </div>
         </nav>
@@ -136,7 +145,7 @@ <h5><b>teke Delivery Processing Questions</b></h5>
 
         <div class="row contact" id="help-center">
             <h5><b>Contact our support team</b></h5>
-            <p>You can fill the form below or contact our support team at <b>support@gmail.com</b></p>
+            <p>Please fill out the form below, or contact our customer support team at <b>info@tekesquared.com</b></p>
             <div class="row">
                 <form class="col s12 m6" method="POST">
                     {% csrf_token %}

diff --git a/hirola/front/templates/front/landing_page.html b/hirola/front/templates/front/landing_page.html
@@ -2,6 +2,15 @@
 {% block styles %}
 {{ block.super }}
 {% load static %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/landing_page.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/phone_panels.css' %}" />

diff --git a/hirola/front/templates/front/login.html b/hirola/front/templates/front/login.html
@@ -1,4 +1,13 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/login.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" />
 {% endblock %} {% block content %}
@@ -30,7 +39,7 @@
                         <div class="input-field col s12">
                             <i class="material-icons prefix">account_circle</i>
                             {{ form.email }}
-                            <span class="helper-text right" data-error="Phone number format is incorrect" data-success="OK!">Number format should be +254*********</span>
+                            <span class="helper-text right" data-error="Phone number format is incorrect" data-success="OK!"></span>
 
                         </div>
                     {% if form.email.errors %}

diff --git a/hirola/front/templates/front/news_press.html b/hirola/front/templates/front/news_press.html
@@ -1,4 +1,13 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/press.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" /> {% endblock %} {% block content %}
 <div class="container main-content">
@@ -7,16 +16,16 @@
             <div class="nav-wrapper">
                 <div class="col s12">
                     <a href="/" class="breadcrumb">teke</a>
-                    <a href="/news" class="breadcrumb" id="last-link">news</a>
+                    <a href="/news" class="breadcrumb" id="last-link">news & press</a>
                 </div>
             </div>
         </nav>
     </div>
     <div class="row content">
         <div class="row landing">
             <div class="landing-content center">
-                <h4>teke news and press</h4>
-                <p>We do things differently at Tekesquared. We are revolutionizing the phone tech industry in Kenya, one quality tech gadget at a time.<br>
+                <h4>Tekesquared news and press</h4>
+                <p>We do things differently at Tekesquared. We are revolutionizing the technology industry in Kenya, one quality tech gadget at a time.
                 Below is a list of articles and news about the impactful work we are doing: providing Kenyans with quality technology at affordable prices.</p>
             </div>
         </div>

diff --git a/hirola/front/templates/front/phone_category.html b/hirola/front/templates/front/phone_category.html
@@ -1,4 +1,13 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/phone_category.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/phone_panels.css' %}" />
@@ -60,4 +69,4 @@ <h5>Oops! We currently do not have it</h5>
 <script src="{% static 'front/js/slick.min.js' %}"></script>
 <script src="{% static 'front/js/slick-init.js' %}"></script>
 {% endblock %}
-{% endblock %}
+{% endblock %}
diff --git a/hirola/front/templates/front/phone_profile.html b/hirola/front/templates/front/phone_profile.html
@@ -1,4 +1,13 @@
 {% extends "front/base.html" %} {% block styles %} {{ block.super }} {% load static %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/phone_profile.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" />
 <link rel="stylesheet" href="{% static 'front/css/lightslider.css' %}">
@@ -120,7 +129,7 @@ <h5 id="price" class="green-text">{{ phone.currency }} {{ phone.price|intcomma }
                                     <i class="medium material-icons inline-icon">local_atm</i>
                                     Pay on delivery<br>
                                     <i class="medium material-icons inline-icon">loop</i>
-                                    7 day free return<br>
+                                    30 day free return<br>
                                     <i class="medium material-icons inline-icon">check</i>
                                     Genuine product<br>
                                     <i class="material-icons inline-icon">sentiment_very_satisfied</i>

diff --git a/hirola/front/templates/front/privacy.html b/hirola/front/templates/front/privacy.html
@@ -1,4 +1,13 @@
 {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-153583848-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-153583848-1');
+</script>
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/style.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'front/css/old_password.css' %}" />
 {% endblock %}