From 5a10b06e119dbee402023da5594b6c7ce2353220 Mon Sep 17 00:00:00 2001
From: realaravinth <realaravinth@batsense.net>
Date: Fri, 17 Jun 2022 16:59:20 +0530
Subject: [PATCH] feat & chore: list logged in user in nav & linting

---
 Makefile                                           |  2 ++
 dash/apps.py                                       |  4 ++--
 .../dash/common/components/secondary-nav.html      |  2 +-
 dash/tests.py                                      |  9 ++++++---
 dash/urls.py                                       |  4 +---
 dash/views.py                                      | 14 +++++++++++---
 6 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 764a38c..1055e7a 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,8 @@ help: ## Prints help for targets with comments
 lint: ## Run linter
 	@./venv/bin/black ./dashboard/*
 	@./venv/bin/black ./accounts/*
+	@./venv/bin/black ./dash/*
+	@./venv/bin/black ./support/*
 
 migrate: ## Run migrations
 	$(call run_migrations)
diff --git a/dash/apps.py b/dash/apps.py
index 51fd062..efbebea 100644
--- a/dash/apps.py
+++ b/dash/apps.py
@@ -2,5 +2,5 @@ from django.apps import AppConfig
 
 
 class DashConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'dash'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "dash"
diff --git a/dash/templates/dash/common/components/secondary-nav.html b/dash/templates/dash/common/components/secondary-nav.html
index 274868a..e3310c5 100644
--- a/dash/templates/dash/common/components/secondary-nav.html
+++ b/dash/templates/dash/common/components/secondary-nav.html
@@ -1,7 +1,7 @@
 <aside class="secondary-nav__container">
   <nav class="secondary-nav">
     <div class="secondary-nav__options">
-      <p class="secondary-nav__option-link">realaravinth</p>
+      <p class="secondary-nav__option-link">Hello, {{ username }}!</p>
     </div>
     <div class="secondary-nav__options">
       <a href="/foo" class="secondary-nav__option-link">Instances</a>
diff --git a/dash/tests.py b/dash/tests.py
index ab7e5ef..542aa6c 100644
--- a/dash/tests.py
+++ b/dash/tests.py
@@ -19,6 +19,7 @@ from django.test import TestCase, Client, override_settings
 from django.contrib.auth import authenticate
 from django.conf import settings
 
+
 class DashHome(TestCase):
     """
     Tests create new app view
@@ -42,10 +43,12 @@ class DashHome(TestCase):
         resp = self.client.get(reverse("dash.home"))
         self.assertEqual(resp.status_code, 302)
 
-        # default LOGIN redirect URI that is used by @login_required decorator is 
+        # default LOGIN redirect URI that is used by @login_required decorator is
         # /accounts/login. There's a redirection endpoint at /accounts/login/ that
         # will redirect user to /login. Hence the /accounts prefix
-        redirect_login_uri = f"/accounts{reverse('accounts.login')}?next={reverse('dash.home')}"
+        redirect_login_uri = (
+            f"/accounts{reverse('accounts.login')}?next={reverse('dash.home')}"
+        )
         self.assertEqual(resp.headers["location"], redirect_login_uri)
 
     def test_dash_home_renders(self):
@@ -64,7 +67,7 @@ class DashHome(TestCase):
         self.assertEqual(resp.headers["location"], reverse("accounts.home"))
 
         #  email login works
-        resp = c.get(reverse('dash.home'))
+        resp = c.get(reverse("dash.home"))
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(b"Billing" in resp.content, True)
         self.assertEqual(b"Support" in resp.content, True)
diff --git a/dash/urls.py b/dash/urls.py
index 80bcfa8..437c358 100644
--- a/dash/urls.py
+++ b/dash/urls.py
@@ -15,9 +15,7 @@
 from django.contrib import admin
 from django.urls import path, include
 
-from .views import (
-        home
-)
+from .views import home
 
 urlpatterns = [
     path("", home, name="dash.home"),
diff --git a/dash/views.py b/dash/views.py
index 9f7c17c..a5e17c6 100644
--- a/dash/views.py
+++ b/dash/views.py
@@ -21,16 +21,24 @@ from django.http import HttpResponse
 from django.views.decorators.csrf import csrf_protect
 from django.urls import reverse
 
-def default_ctx(title: str):
+
+def default_ctx(title: str, username: str):
+    """
+    Default context for all dashboard pages
+    """
     return {
         "title": title,
+        "username": username,
     }
 
 
-
 @login_required
 def home(request):
+    """
+    Dashboard homepage view
+    """
     PAGE_TITLE = "Home"
-    ctx = default_ctx(title=PAGE_TITLE)
+    username = request.user
+    ctx = default_ctx(title=PAGE_TITLE, username=username.username)
 
     return render(request, "dash/home/index.html", context=ctx)