chore: fixing landing page

bcgov · Sep 18, 2024 · 61d843d · 61d843d
1 parent cd4a16c
commit 61d843d
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 33 deletions.
diff --git a/estimation/app/templates/base.html b/estimation/app/templates/base.html
@@ -1,43 +1,62 @@
 <!DOCTYPE html>
 <html>
-{% load static %}
-<head>
+  {% load static %}
+  <head>
     <!-- <link rel="icon" href="{% static 'img/favicon.ico' %}"> -->
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="stylesheet" href="{% static 'styles/w3.css' %}" type="text/css" />
+    <link
+      rel="stylesheet"
+      href="{% static 'styles/w3.css' %}"
+      type="text/css"
+    />
     <link
       rel="stylesheet"
       href="{% static 'styles/w3-bcgov-theme.css' %}"
       type="text/css"
     />
-    <link rel="stylesheet" href="{% static 'styles/BCSans.css' %}" type="text/css" />
-    <link rel="stylesheet" href="{% static 'styles/style.css' %}" type="text/css" />
+    <link
+      rel="stylesheet"
+      href="{% static 'styles/BCSans.css' %}"
+      type="text/css"
+    />
+    <link
+      rel="stylesheet"
+      href="{% static 'styles/style.css' %}"
+      type="text/css"
+    />
     <title>{% block title %} {{ title }} {% endblock title %}</title>
-</head>
-<body>
-<!-- Top Navigation -->
-<div class="w3-top">
-    <div class="w3-bar w3-theme-light w3-border">
-        {% if user.is_authenticated %}
-            <a
-                    href="{% url 'logout' %}"
-                    class="w3-bar-item w3-border-right w3-button"
-            >Logout
-            </a>
-            <button class="w3-button">Welcome, {{ user.username }}!</button>
-        {% else %}
-            <a
-                    href="{% url 'github_login' %}"
-                    class="w3-bar-item w3-border-right w3-button"
-            >Login with GitHub</a>
+  </head>
+  <body>
+    <!-- Top Navigation -->
+    <div class="w3-top">
+      <div class="w3-bar w3-row" style="height: 50px">
+        <img src={% static 'img/bc_logo.png' %} style="height: 48px" class="w3-left"/>
+        <div class="w3-left w3-margin-left"><h4 style="font-weight: bold">GitHub Async Estimation Tool</h4></div>
+        {% if user.handle %}
+        <a
+          href="{% url 'logout' %}"
+          class="w3-bar-item w3-border-right w3-button w3-right"
+          >Logout
+        </a>
+        <span>{{ user.handle }}@github<span>
         {% endif %}
+      </div>
+      <div class="w3-bar w3-theme w3-border" style="height: 5px">
+    </div>
+    <div class="w3-main">
+      <!-- Body -->
+      <div class="w3-container w3-responsive w3-text-theme">
+        {% block content %} 
+        {% endblock content %}
+      </div>
     </div>
-</div>
-<div class="w3-main">
-    <!-- Body -->
-    <div class="w3-container w3-responsive w3-text-theme">
-        {% block content %} {% endblock content %}
+    <div class="w3-bottom">
+      <div
+        class="w3-bar w3-row w3-theme w3-border w3-white"
+        style="height: 55px"
+      >
+        <div class="w3-left">DDS Hackathon 2024</div>
+      </div>
     </div>
-</div>
-</body>
+  </body>
 </html>
diff --git a/estimation/app/templates/index.html b/estimation/app/templates/index.html
@@ -7,10 +7,10 @@
 
 {% block content %}
 <div class="w3-display-container" style="min-height: 400px">
-  <button class="w3-display-middle">
+  <a class="w3-button w3-display-middle" href="{% url 'github_login' %}">
     <img src={% static 'img/github-mark.png' %} style="height: 15px; margin-bottom: 2px" /> 
     Login with Github
-  </button>
+  </a>
 </div>
 {% endblock %}
 
diff --git a/estimation/app/views.py b/estimation/app/views.py
@@ -5,8 +5,8 @@
 from estimation import settings
 
 
-from estimation.app.view_models.dashboard_view_model import DashboardViewModel
-from estimation.app.view_models.index_view_model import IndexViewModel
+from .view_models.dashboard_view_model import DashboardViewModel
+from .view_models.index_view_model import IndexViewModel
 
 
 def index(request: HttpRequest):