3 files changed, 46 insertions, 0 deletions
diff --git a/pydis_site/templates/base/base.html b/pydis_site/templates/base/base.html
index 6a0da0ae..d5f6f602 100644
--- a/pydis_site/templates/base/base.html
+++ b/pydis_site/templates/base/base.html
@@ -32,6 +32,7 @@
   <script src="https://kit.fontawesome.com/ae6a3152d8.js"></script>
 
   <link rel="stylesheet" href="{% static "css/base/base.css" %}">
+  <link rel="stylesheet" href="{% static "css/base/notification.css" %}">
   {% block head %}{% endblock %}
 
   {% render_block "css" %}
@@ -39,6 +40,18 @@
 <body class="site">
 
 <main class="site-content">
+  {% if messages %}
+    <div class="messages">
+      {% for message in messages %}
+        <div class="notification {% if message.tags %}is-{{ message.tags }}{% endif %}">
+          <button class="delete"></button>
+
+          {{ message }}
+        </div>
+      {% endfor %}
+    </div>
+  {% endif %}
+
   {% block content %}
     {{ block.super }}
   {% endblock %}
diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html
index ee68852a..1d30b8f0 100644
--- a/pydis_site/templates/base/navbar.html
+++ b/pydis_site/templates/base/navbar.html
@@ -1,3 +1,4 @@
+{% load socialaccount %}
 {% load static %}
 
 <nav class="navbar is-primary" role="navigation" aria-label="main navigation">
@@ -83,6 +84,25 @@
           <a class="navbar-item" href="{% url 'wiki:get' path="code-jams/" %}">
             Code Jams
           </a>
+          <hr class="navbar-divider">
+
+          {% if not user.is_authenticated %}
+            {% get_providers as socialaccount_providers %}
+
+            {% for provider in socialaccount_providers %}
+              {% if provider.id == "discord" %}
+                  <a class="navbar-item"
+                     href="{% provider_login_url provider.id process="login" scope=scope auth_params=auth_params %}"
+                  >Login with {{ provider.name }}</a>
+              {% endif %}
+            {% endfor %}
+          {% else %}
+            <form method="post" action="{% url 'logout' %}">
+              {% csrf_token %}
+              <button type="submit" class="navbar-item button is-white is-inline is-fullwidth has-text-left is-size-navbar-menu has-text-grey-dark">Logout</button>
+            </form>
+          {% endif %}
+
         </div>
       </div>
     </div>
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index da4d5de1..2f92d83b 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -15,6 +15,7 @@
   <link rel="stylesheet" href="{% static "css/wiki/simplemde-fixes.css" %}">
   <link rel="stylesheet" href="{% static "css/wiki/style.css" %}">
   <link rel="stylesheet" href="{% static "css/pygments/darcula.css" %}">
+  <link rel="stylesheet" href="{% static "css/base/notification.css" %}">
 {% endblock %}
 
 {% block content %}
@@ -24,6 +25,18 @@
 
   {% block wiki_navbar %}{% endblock %}
 
+  {% if messages %}
+    <div class="messages">
+      {% for message in messages %}
+        <div class="notification {% if message.tags %}is-{{ message.tags }}{% endif %}">
+          <button class="delete"></button>
+
+          {{ message }}
+        </div>
+      {% endfor %}
+    </div>
+  {% endif %}
+
   {% block wiki_breadcrumbs %}
     {% include "wiki/includes/breadcrumbs.html" %}
   {% endblock %}