zuri-training · Prideland-Okoi · Aug 11, 2022 · Aug 11, 2022 · Aug 12, 2022 · Aug 12, 2022
diff --git 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
@@ -1,6 +1,18 @@
+{% load static %}
 <!DOCTYPE html>
 <html lang="en">
   <head>
+<<<<<<< HEAD
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Choose URL</title>
+    <link rel="stylesheet" href="{% static './css/choose-url.css' %}" />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap"
+=======
     <title>Choose URL | Clovar</title>
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -20,6 +32,7 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link
       href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700;800&display=swap"
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
       rel="stylesheet"
     />
   </head>
@@ -29,7 +42,11 @@
         <a href="/"
           ><img
             class="logo"
+<<<<<<< HEAD
+            src="https://github.com/zuri-training/team-15_my-cms/blob/main/frontend/assets/images/logo.png?raw=true"
+=======
             src="./assets/images/logo.png"
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
             alt="Clover logo"
         /></a>
         <div class="mainbreadcrumb">
@@ -58,8 +75,13 @@ <h2>Choose a URL for your blog</h2>
     <section>
       <a href="/" id="skip">skip</a>
       <div class="buttons">
+<<<<<<< HEAD
+        <button><a href="/" id="Back">Back</a></button>
+        <button id="next"><a href="/">Next</a></button>
+=======
         <button id="Back">Back</button>
         <button id="next">Next</button>
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
       </div>
     </section>
   </body>

diff --git a/frontend/implemented/change-password.html b/frontend/implemented/change-password.html
@@ -1,3 +1,21 @@
+<<<<<<< HEAD
+{% load static %}
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Clovar</title>
+    <link
+      href="{% static './assets/images/image_360(1).png' %}"
+      rel="icon"
+      sizes="16x16 32x32"
+      type="image/png"
+    />
+    <link
+      rel="stylesheet"
+      href="{% static './assets/css/verify-email.css' %}"
+=======
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -23,10 +41,33 @@
     <link
       href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700;800&display=swap"
       rel="stylesheet"
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
     />
   </head>
   <body>
     <header>
+<<<<<<< HEAD
+      <img
+        src="{% static './assets/images/image_360.png' %}"
+        alt="clovar logo"
+        class="clovar-logo"
+      />
+    </header>
+    <main>
+      <div class="container">
+        <h2>
+          Verify your email <br />
+          address
+        </h2>
+        <p>
+          Click the button below to confirm that <br />
+          [email protected] belongs to you
+        </p>
+        <a href="#">
+          <button type="submit">Verify</button>
+        </a>
+        <p class="contact">Have an issue?. <a href="">Contact us</a></p>
+=======
       <nav>
         <img src="./assets/images/logo.png" alt="Clovar Logo" />
       </nav>
@@ -44,6 +85,7 @@ <h1>Change Password</h1>
             <button type="submit">Confirm</button>
           </form>
         </div>
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
       </div>
     </main>
   </body>

diff --git a/frontend/implemented/confirm-sign-out.html b/frontend/implemented/confirm-sign-out.html
@@ -1,3 +1,4 @@
+{% load static %}
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -23,6 +24,36 @@
     <link
       href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
       rel="stylesheet"
+<<<<<<< HEAD
+      href="{% static './assets/css/confirm-sign-out.css' %}"
+      type="text/css"
+      media="all"
+    />
+  </head>
+  <body>
+    <br />
+
+<<<<<<< HEAD
+    <img
+      id="logo"
+      src="{% static './assets/images/logo.png' %}"
+      alt="Clovar Logo"
+    />
+=======
+    <img id="logo" src="./assets/images/logo.png" alt="Clovar Logo" />
+>>>>>>> 6c48b4aee873a5c091431021250716970583fc29
+
+    <div class="container">
+      <label for=""><i class="fa fa-exclamation-triangle"></i></label>
+
+      <h4 id="">Are you leaving?</h4>
+      <p><i>Chidi</i>, are you sure you want to sign out.</p>
+      <br />
+
+      <div>
+        <button id="cancel" type="submit">Cancel</button>
+        <button id="yes" type="submit">Yes</button>
+=======
     />
   </head>
   <body>
@@ -42,6 +73,7 @@ <h1>Are you leaving?</h1>
             <form action=""><button class="sign-out">Sign Out</button></form>
           </div>
         </div>
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
       </div>
     </main>
   </body>

diff --git a/frontend/implemented/index.html b/frontend/implemented/index.html
@@ -1,3 +1,4 @@
+{% load static %}
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -20,11 +21,19 @@
     />
     <link
       rel="shortcut icon"
+<<<<<<< HEAD
+      href="{% static './assets/images/favicon.ico' %}"
+      type="image/x-icon"
+    />
+    <!-- CSS -->
+    <link rel="stylesheet" href="{% static './assets/css/style.css' %}" />
+=======
       href="{% static 'assets/images/favicon.ico' %}"
       type="image/x-icon"
     />
     <!-- CSS -->
     <link rel="stylesheet" href="{% static 'assets/css/style.css' %}" />
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
     <!-- Font Awesome -->
     <script
       src="https://kit.fontawesome.com/d778668bce.js"
@@ -62,7 +71,14 @@
       <nav class="navbar navbar-expand-lg mx-xl-3 pt-sm-4">
         <div class="container-fluid">
           <a class="navbar-brand" href="#">
+<<<<<<< HEAD
+            <img
+              src="{% static './assets/images/logo.png' %}"
+              alt="Clovar logo"
+            />
+=======
             <img src="{% static 'assets/images/logo.png' %}" alt="Clovar logo" />
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
           </a>
 
           <button
@@ -80,7 +96,11 @@
             <ul class="navbar-nav mx-auto mb-2 mb-lg-0">
               <li class="nav-item">
                 <a
+<<<<<<< HEAD
+                  class="nav-link active text-uppercase me-md-4"
+=======
                   class="nav-link active text-uppercase me-lg-2"
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
                   aria-current="page"
                   href="#"
                   >Documentation <i class="fa-2xs fa-solid fa-chevron-down"></i
@@ -134,6 +154,37 @@ <h2 class="title2">
       </section>
     </header>
     <main>
+<<<<<<< HEAD
+      <!-- Checkmarks section -->
+      <section class="checkmarks-section">
+        <div class="left-side pe-md-5">
+          <p>
+            <i class="fa-solid fa-check px-2"></i>
+            <span>Get found on Google</span>
+          </p>
+          <p>
+            <i class="fa-solid fa-check px-2"></i>
+            <span>Publish blog posts on the go</span>
+          </p>
+          <p>
+            <i class="fa-solid fa-check px-2"></i>
+            <span> Add existing blog posts easily </span>
+          </p>
+        </div>
+        <div class="right-side">
+          <p>
+            <i class="fa-solid fa-check px-2"></i>
+            <span> Check your website's stat in realtime </span>
+          </p>
+          <p>
+            <i class="fa-solid fa-check px-2"></i>
+            <span> Stay Updated with your blog user's engagement </span>
+          </p>
+          <p>
+            <i class="fa-solid fa-check px-2"></i>
+            <span>Run multiple blog accounts</span>
+          </p>
+=======
       <!-- Checkmarks section | Mobile Login and Get Started -->
       <section class="features-section">
         <div class="checkmarks-section">
@@ -169,6 +220,7 @@ <h2 class="title2">
         <div class="auth-buttons pt-4 px-5">
           <button class="login pb-2" type="button">Login</button>
           <button class="get-started" type="button">Get Started</button>
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
         </div>
       </section>
 
@@ -300,10 +352,20 @@ <h5 class="title mb-4">Traffic Analysis</h5>
 
       <!-- Company Images Section -->
       <section class="company-images py-5 my-4">
+<<<<<<< HEAD
+        <img src="{% static './assets/images/fliqpay.png' %}" alt="boom logo" />
+        <img
+          src="{% static './assets/images/flutterwave.png' %}"
+          alt="boom logo"
+        />
+        <img src="{% static './assets/images/boom.png' %}" alt="boom logo" />
+        <img src="{% static './assets/images/amazon.png' %}" alt="boom logo" />
+=======
         <img src="{% static 'assets/images/fliqpay.png' %}" alt="boom logo" />
         <img src="{% static 'assets/images/flutterwave.png' %}" alt="boom logo" />
         <img src="{% static 'assets/images/boom.png' %}" alt="boom logo" />
         <img src="{% static 'assets/images/amazon.png' %}" alt="boom logo" />
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
       </section>
       <hr class="boundary-hr" />
 
@@ -365,7 +427,11 @@ <h4 class="text-center mb-4">FAQs</h4>
     >
       <p class="col-md-4 mb-0 text-muted">
         <img
+<<<<<<< HEAD
+          src="{% static './assets/images/logo.png' %}"
+=======
           src="{% static 'assets/images/logo.png' %}"
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
           alt="clovar logo"
           class="footer-logo"
         />
@@ -382,20 +448,51 @@ <h4 class="text-center mb-4">FAQs</h4>
         <li class="nav-item">
           <a href="https://facebook.com" class="nav-link px-2 text-muted"
             ><img
+<<<<<<< HEAD
+              src="{% static './assets/images/facebook-icon.png' %}"
+=======
               src="{% static 'assets/images/facebook-icon.png' %}"
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
               alt="Facebook Icon"
               class="me-1 facebook-icon"
           /></a>
         </li>
         <li class="nav-item">
           <a href="https://instagram.com" class="nav-link px-2 text-muted"
             ><img
+<<<<<<< HEAD
+              src="{% static './assets/images/instagram-icon.png' %}"
+=======
               src="{% static 'assets/images/instagram-icon.png' %}"
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
               alt="Instagram icon"
               class="instagram-icon"
           /></a>
         </li>
       </ul>
     </footer>
+<<<<<<< HEAD
+
+    <!-- Typing Animation -->
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
+    <script>
+      var typed = new Typed(".auto-type", {
+        strings: ["Contents", "Concepts", "Passion"],
+        typeSpeed: 125,
+        backSpeed: 150,
+        loop: true,
+        cursorChar: "",
+      });
+
+      var typed1 = new Typed(".auto-type1", {
+        strings: ["Contents", "Concepts", "Passion"],
+        typeSpeed: 125,
+        backSpeed: 150,
+        loop: true,
+        cursorChar: "",
+      });
+    </script>
+=======
+>>>>>>> 74696b89a0244a05d251eecd59fe533dea5a7287
   </body>
 </html>