diff --git a/.gitignore b/.gitignore index 8701c8f9..07bf1209 100644 --- 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 index a0a5244c..24c957a1 100644 --- 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 %} + + + + {% endblock %} @@ -11,7 +21,7 @@
teke - about + about teke
@@ -19,7 +29,7 @@

About Tekesquared

-

Tekesquared is an online store that sells mint condition phones to the Kenyan community

+

Tekesquared is an online store that sells mint condition electronics to the Kenyan community

@@ -46,7 +56,7 @@
Quality Assurance
brightness_auto
-

On Tekesquared you buy quality mint condition smartphones sourced directly from the USA and delivered to your doorstep at an affordable price. +

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.

diff --git a/hirola/front/templates/front/base.html b/hirola/front/templates/front/base.html index 3ec127ab..c50174c6 100644 --- a/hirola/front/templates/front/base.html +++ b/hirola/front/templates/front/base.html @@ -2,6 +2,16 @@ + + + + diff --git a/hirola/front/templates/front/before_checkout.html b/hirola/front/templates/front/before_checkout.html index 4289695a..b73d47ba 100644 --- 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 %} + + + + {% endblock %} {% block content %} @@ -10,7 +20,7 @@ @@ -136,7 +145,7 @@
teke Delivery Processing Questions
Contact our support team
-

You can fill the form below or contact our support team at support@gmail.com

+

Please fill out the form below, or contact our customer support team at info@tekesquared.com

{% csrf_token %} diff --git a/hirola/front/templates/front/landing_page.html b/hirola/front/templates/front/landing_page.html index 3ddc0f40..bf7a6dd2 100644 --- 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 %} + + + diff --git a/hirola/front/templates/front/login.html b/hirola/front/templates/front/login.html index f2470a93..79ae740f 100644 --- 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 %} + + + {% endblock %} {% block content %} @@ -30,7 +39,7 @@
account_circle {{ form.email }} - Number format should be +254********* +
{% if form.email.errors %} diff --git a/hirola/front/templates/front/news_press.html b/hirola/front/templates/front/news_press.html index cc102196..97ccc612 100644 --- 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 %} + + + {% endblock %} {% block content %}
@@ -7,7 +16,7 @@
teke - news + news & press
@@ -15,8 +24,8 @@
-

teke news and press

-

We do things differently at Tekesquared. We are revolutionizing the phone tech industry in Kenya, one quality tech gadget at a time.
+

Tekesquared news and press

+

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.

diff --git a/hirola/front/templates/front/phone_category.html b/hirola/front/templates/front/phone_category.html index ab6a2609..29c422bc 100644 --- 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 %} + + + @@ -60,4 +69,4 @@
Oops! We currently do not have it
{% endblock %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/hirola/front/templates/front/phone_profile.html b/hirola/front/templates/front/phone_profile.html index c2e14acc..d82114c9 100644 --- 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 %} + + + @@ -120,7 +129,7 @@
{{ phone.currency }} {{ phone.price|intcomma } local_atm Pay on delivery
loop - 7 day free return
+ 30 day free return
check Genuine product
sentiment_very_satisfied diff --git a/hirola/front/templates/front/privacy.html b/hirola/front/templates/front/privacy.html index 92caacd7..fc2d937b 100644 --- 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 %} + + + {% endblock %} diff --git a/hirola/front/templates/front/repair_network.html b/hirola/front/templates/front/repair_network.html index f0314ca4..15d29465 100644 --- a/hirola/front/templates/front/repair_network.html +++ b/hirola/front/templates/front/repair_network.html @@ -1,4 +1,13 @@ {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %} + + + {% endblock %} diff --git a/hirola/front/templates/front/signup.html b/hirola/front/templates/front/signup.html index 9b74d326..b7d90568 100644 --- a/hirola/front/templates/front/signup.html +++ b/hirola/front/templates/front/signup.html @@ -1,5 +1,14 @@ {% extends "front/base.html" %} {% block styles %} + + + {{ block.super }} {% load static %} @@ -65,7 +74,7 @@
{{ form.phone_number }} - 712 345 678 + e.g. 712 345 678
{% if form.phone_number.errors %} diff --git a/hirola/front/templates/front/teke_vs_others.html b/hirola/front/templates/front/teke_vs_others.html index 26c2882a..69a6aada 100644 --- a/hirola/front/templates/front/teke_vs_others.html +++ b/hirola/front/templates/front/teke_vs_others.html @@ -1,4 +1,13 @@ {% extends "front/base.html" %}{% block styles %} {{ block.super }} {% load static %} + + + {% endblock %} {% block content %}
@@ -7,7 +16,11 @@
teke +<<<<<<< HEAD + tekesquared vs others +======= Tekesquared vs others +>>>>>>> develop
@@ -16,8 +29,13 @@

Tekesquared vs other online stores

+<<<<<<< HEAD +

Tekesquared is the online store that sells mint condition electronics to the Kenyan community. We operate differently from other marketplaces like Jiji, + Jumuia etc. because we mostly sell mint condition electronics from the USA & Canada. Tekesquared is such a different experience with guaranteed quality for the +=======

Tekesquared is the online store that sells mint condition phones to the Kenyan community. We operate differently from other marketplaces like OLX, Jumuia etc. because we mostly sell mint condition phones from the USA. Tekesquared is such a different experience with guaranteed quality for the +>>>>>>> develop products we sell.

@@ -31,8 +49,13 @@

Tekesquared vs other online stores

brightness_auto
Quality Assurance
+<<<<<<< HEAD +

On Tekesquared you buy quality mint condition electronics sourced directly from the USA and delivered to your doorstep at the + cheapest prices in the market. Mint condition electronics are phones that are resold with (1) perfect screen condition (2) function +=======

On Tekesquared you buy quality mint condition smartphones sourced directly from the USA and delivered to your doorstep at the cheapest prices in the market. Mint condition phones are phones that are resold with (1) perfect screen condition (2) function +>>>>>>> develop flawlessly and (3) have no signs of use.

diff --git a/hirola/front/tests/selenium_news_page.py b/hirola/front/tests/selenium_news_page.py index 6f6444e7..c4fd2bfa 100644 --- a/hirola/front/tests/selenium_news_page.py +++ b/hirola/front/tests/selenium_news_page.py @@ -54,7 +54,7 @@ def test_news_page_news_link(self): driver.find_element_by_link_text("News and Press").click() self.assertEqual(driver.current_url, '%s%s' % (self.live_server_url, '/news')) - driver.find_element_by_link_text("news").click() + driver.find_element_by_link_text("news & press").click() self.assertEqual(driver.current_url, '%s%s' % (self.live_server_url, '/news'))