diff --git a/config/settings.py b/config/settings.py index 0fc1a10..6c59441 100644 --- a/config/settings.py +++ b/config/settings.py @@ -12,6 +12,7 @@ from pathlib import Path import environ +import os # Initialising environmental variables env = environ.Env() diff --git a/frontend/choose-url.html b/frontend/choose-url.html index 7deb49c..6ed1b0d 100644 --- a/frontend/choose-url.html +++ b/frontend/choose-url.html @@ -1,6 +1,18 @@ +{% load static %} +<<<<<<< HEAD + + + + Choose URL + + + + Choose URL | Clovar @@ -20,6 +32,7 @@ >>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287 rel="stylesheet" /> @@ -29,7 +42,11 @@ >>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287 alt="Clover logo" />
@@ -58,8 +75,13 @@

Choose a URL for your blog

+<<<<<<< HEAD + + +======= +>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
diff --git a/frontend/implemented/change-password.html b/frontend/implemented/change-password.html index 4871b5d..57428ca 100644 --- a/frontend/implemented/change-password.html +++ b/frontend/implemented/change-password.html @@ -1,3 +1,21 @@ +<<<<<<< HEAD +{% load static %} + + + + + + Clovar + + @@ -23,10 +41,33 @@ >>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287 />
+<<<<<<< HEAD + +
+
+
+

+ Verify your email
+ address +

+

+ Click the button below to confirm that
+ onelegtea@gmail.com belongs to you +

+ + + +

Have an issue?. Contact us

+======= @@ -44,6 +85,7 @@

Change Password

+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
diff --git a/frontend/implemented/confirm-sign-out.html b/frontend/implemented/confirm-sign-out.html index 1c0a7de..1800113 100644 --- a/frontend/implemented/confirm-sign-out.html +++ b/frontend/implemented/confirm-sign-out.html @@ -1,3 +1,4 @@ +{% load static %} @@ -23,6 +24,36 @@ + + +
+ +<<<<<<< HEAD + +======= + +>>>>>>> 6c48b4aee873a5c091431021250716970583fc29 + +
+ + +

Are you leaving?

+

Chidi, are you sure you want to sign out.

+
+ +
+ + +======= /> @@ -42,6 +73,7 @@

Are you leaving?

+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287 diff --git a/frontend/implemented/index.html b/frontend/implemented/index.html index 9826a2d..de64fed 100644 --- a/frontend/implemented/index.html +++ b/frontend/implemented/index.html @@ -1,3 +1,4 @@ +{% load static %} @@ -20,11 +21,19 @@ /> + + +======= href="{% static 'assets/images/favicon.ico' %}" type="image/x-icon" /> +>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287 + +======= +>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287 diff --git a/frontend/pick-niche.html b/frontend/pick-niche.html index ff79974..d0eaac6 100644 --- a/frontend/pick-niche.html +++ b/frontend/pick-niche.html @@ -1,3 +1,4 @@ +{% load static %} @@ -5,11 +6,18 @@ Pick niche >>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287 rel="icon" sizes="16x16 32x32" type="image/png" /> +<<<<<<< HEAD + +======= +>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287 alt="clovar logo" class="clovar-logo" /> @@ -138,6 +151,20 @@

What should your blog be known for?

+<<<<<<< HEAD + +
+

Have something else in mind?

+ +
+ +======= +>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
diff --git a/pages/models.py b/pages/models.py index 71a8362..8f9b805 100644 --- a/pages/models.py +++ b/pages/models.py @@ -1,3 +1,16 @@ from django.db import models +from accounts.models import CustomUser # Create your models here. +class DefaultTemplates(models.Model): + name=models.CharField(max_length=50) + description=models.CharField(max_length=100, blank=True) + html=models.TextField() + #css=models.TextField() + +class CustomUserTemplates(models.Model): + name=models.CharField(max_length=50) + description=models.CharField(max_length=100, blank=True) + html=models.TextField() + #css=models.TextField() + created_by=models.ForeignKey(CustomUser, related_name='CustomUserTemplates', on_delete=models.DO_NOTHING) diff --git a/pages/views.py b/pages/views.py index a7c6f34..25d968c 100644 --- a/pages/views.py +++ b/pages/views.py @@ -25,6 +25,3 @@ class BloggerUsersView(TemplateView): def error_404(request, exception): return render(request, "404.html") - -# def error_500(request): -# return render(request, "404.html") diff --git a/templates/dashboard.html b/templates/dashboard.html index 1846342..0f512ba 100644 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -1,5 +1,48 @@ {% load static %} +<<<<<<< HEAD + + + + {% block title %}CMS 15{% endblock title %} + + + + + + + + {% block content %} +

Dashboard

+ + {% if user.is_authenticated %} +

Hi, {{ user.username}}

+

Logout

+ {% else %} +

your username would be displayed if you were logged in

+ {% endif %} {% endblock content %} +======= @@ -122,5 +165,6 @@
Blog like an expert from day one
+>>>>>>> c21584273cec5dd633cf06d05650086e231280e7 diff --git a/templates/login.html b/templates/login.html new file mode 100644 index 0000000..fbfb1df --- /dev/null +++ b/templates/login.html @@ -0,0 +1,79 @@ +{% load static %} + + + + + + + Clovar + + + + + + + + + +
+
+
+ +

+ Build your Blogsites from scratch + CODEFREE! +

+
+ +
+ +
+

Welcome Back

+

Login,your details

+
+ + + +
+ + + +
+ + + + +
+
+
+ +