Merge remote-tracking branch 'origin/dev-benno' into dev-benno

SmoFlaDru · Jan 28, 2024 · a77391a · a77391a
2 parents 634ec22 + 74c52a6
commit a77391a
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 20 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@tabler/core": "^1.0.0-beta19",
+    "@tabler/core": "^1.0.0-beta20",
     "apexcharts": "^3.36.3",
     "htmx.org": "^1.9.2"
   },

diff --git a/spybot/templates/spybot/base/navbar.html b/spybot/templates/spybot/base/navbar.html
@@ -32,13 +32,13 @@ <h1 class="navbar-brand d-none-navbar-horizontal pe-0 pe-md-3">
                     {% tabler_icon 'sun' %}
                 </a>
             </div>
-            {% if user != None %}
+            {% if logged_in_user != None %}
             <div class="nav-item dropdown">
                 <a href="#" class="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown" aria-label="Open user menu">
 <!--                    <span class="avatar avatar-sm" style="background-image: url(./static/avatars/000m.jpg)"></span>-->
                     <div class="d-none d-xl-block ps-2">
                         <div class="mb-1 small text-secondary">Logged in as</div>
-                        <div>{{user.name}}</div>
+                        <div>{{logged_in_user.name}}</div>
                     </div>
                 </a>
                 <div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow">

diff --git a/spybot/templates/spybot/profile.html b/spybot/templates/spybot/profile.html
@@ -8,7 +8,7 @@
         <div class="col-md-8">
             <div class="card">
                 <div class="card-header row g-0">
-                    <h3 class="card-title">Logged in as {{user.name}}</h3>
+                    <h3 class="card-title">Logged in as {{logged_in_user.name}}</h3>
                 </div>
             </div>
         </div>

diff --git a/spybot/templates/spybot/user.html b/spybot/templates/spybot/user.html
@@ -83,6 +83,15 @@ <h3 class="card-title ">{{ user.user_name }}</h3>
                                         <span>{{ user.afk_time|floatformat:0 }}h</span>
                                     </div>
                                 </div>
+
+                                <div class="datagrid-item">
+                                    <div class="datagrid-title">
+                                        Longest streak
+                                    </div>
+                                    <div class="datagrid-content">
+                                        <span>{{ streak.length }} days</span>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>

diff --git a/spybot/views.py b/spybot/views.py
@@ -22,8 +22,12 @@ def get_user(request):
     return request.user if isinstance(request.user, MergedUser) else None
 
 
+def get_context(request):
+    return {"logged_in_user": get_user(request)}
+
+
 def home(request):
-    context = {}
+    context = get_context(request)
 
     # logged in user
     user = get_user(request)
@@ -182,6 +186,7 @@ def convert_to_jstime(dt: datetime.datetime):
         first_user_object["data"] = new_first_user_series
 
     return render(request, 'spybot/timeline.html', {
+        **get_context(request),
         'activity_by_user': list(users.values()),
         'min': convert_to_jstime(cutoff),
         'max': convert_to_jstime(now_time),
@@ -209,7 +214,7 @@ def halloffame(request):
         merged_user['num_silver_awards'] = len(awards_silver)
         merged_user['num_bronze_awards'] = len(awards_bronze)
 
-    context = {'top_users': users}
+    context = {**get_context(request), 'top_users': users}
     return render(request, 'spybot/halloffame.html', context)
 
 
@@ -222,20 +227,21 @@ def user(request, user_id: int):
 
     streak = visualization.user_longest_streak(user_id)[0]
 
-
     game_name = ""
     game_id = 0
 
     if u.get('online') == 1:
         game_id, game_name = get_steam_game(MergedUser.objects.get(id=user_id))
 
     return render(request, 'spybot/user.html', {
+        **get_context(request),
         'user': u,
         'total_time': afk_time + online_time,
         'data': [afk_time, online_time],
         'names': str(u.get('names')).split(","),
         'game_id': game_id,
-        'game_name': game_name
+        'game_name': game_name,
+        'streak': streak,
     })
 
 
@@ -293,4 +299,4 @@ def recent_events_fragment(request):
 
 def profile(request):
     user = get_user(request)
-    return render(request, 'spybot/profile.html', {'user': user})
+    return render(request, 'spybot/profile.html', {**get_context(request), 'user': user})
diff --git a/spybot/visualization.py b/spybot/visualization.py
@@ -296,7 +296,7 @@ def user_longest_streak(merged_user_id: int):
             SELECT
             start_day,
             DATE_ADD(start_day, INTERVAL (totalStreakLength - 1) DAY) AS end_day,
-            totalStreakLength AS streak_length
+            totalStreakLength AS length
             FROM result
             WHERE runningStreakLength = 1
             ORDER BY totalStreakLength DESC, start_day DESC