From 791203c2dcc5ca4c27066cf626795f2e9c40adc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Mon, 30 Jan 2023 22:16:28 +0100
Subject: [PATCH] Show only last 30 days on homepage

Fixes #47
---
 CHANGELOG.md                       |  1 +
 games/templates/base.html          |  2 +-
 games/templates/list_sessions.html |  2 +-
 games/urls.py                      |  2 +-
 games/views.py                     | 15 +++++++--------
 timetracker/urls.py                |  4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6caa765..b073e1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Make it possible to edit sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/46)
 * Show markers on smaller graphs to make it clearer which dates the session belong to
+* Show only last 30 days on the homepage (https://git.kucharczyk.xyz/lukas/timetracker/issues/47)
 
 ## 1.0.0 / 2023-01-20 19:54+01:00
 
diff --git a/games/templates/base.html b/games/templates/base.html
index 6b25108..c65cdc5 100644
--- a/games/templates/base.html
+++ b/games/templates/base.html
@@ -17,7 +17,7 @@
         <div class="dark:bg-gray-800 min-h-screen">
             <nav class="mb-4 bg-white dark:bg-gray-900 border-gray-200 rounded">
                 <div class="container flex flex-wrap items-center justify-between mx-auto">
-                    <a href="{% url 'index' %}" class="flex items-center">
+                    <a href="{% url 'list_sessions_recent' %}" class="flex items-center">
                         <span class="text-4xl">⌚</span>
                         <span class="self-center text-xl font-semibold whitespace-nowrap text-white">Timetracker</span>
                     </a>
diff --git a/games/templates/list_sessions.html b/games/templates/list_sessions.html
index 0d67637..c552511 100644
--- a/games/templates/list_sessions.html
+++ b/games/templates/list_sessions.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 
-{% block title %}Sessions{% endblock title %}
+{% block title %}{{ title }}{% endblock title %}
 
 {% block content %}
         <div class="text-center text-xl mb-4 dark:text-slate-400">
diff --git a/games/urls.py b/games/urls.py
index 88ddee0..6f1f785 100644
--- a/games/urls.py
+++ b/games/urls.py
@@ -3,7 +3,7 @@ from django.urls import path
 from games import views
 
 urlpatterns = [
-    path("", views.index, name="index"),
+    path("", views.list_sessions, {"filter": "recent"}, name="list_sessions_recent"),
     path("add-game/", views.add_game, name="add_game"),
     path("add-platform/", views.add_platform, name="add_platform"),
     path("add-session/", views.add_session, name="add_session"),
diff --git a/games/views.py b/games/views.py
index 0c272e0..4ed4a12 100644
--- a/games/views.py
+++ b/games/views.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from zoneinfo import ZoneInfo
 
 from common.plots import playtime_over_time_chart
@@ -73,6 +73,7 @@ def delete_session(request, session_id=None):
 
 def list_sessions(request, filter="", purchase_id="", platform_id="", game_id=""):
     context = {}
+    context["title"] = "Sessions"
 
     if filter == "purchase":
         dataset = Session.objects.filter(purchase=purchase_id)
@@ -83,6 +84,11 @@ def list_sessions(request, filter="", purchase_id="", platform_id="", game_id=""
     elif filter == "game":
         dataset = Session.objects.filter(purchase__game=game_id)
         context["game"] = Game.objects.get(id=game_id)
+    elif filter == "recent":
+        dataset = Session.objects.filter(
+            timestamp_start__gte=datetime.now() - timedelta(days=30)
+        )
+        context["title"] = "Last 30 days"
     else:
         # by default, sort from newest to oldest
         dataset = Session.objects.all().order_by("-timestamp_start")
@@ -139,10 +145,3 @@ def add_platform(request):
     context["form"] = form
     context["title"] = "Add New Platform"
     return render(request, "add.html", context)
-
-
-def index(request):
-    context = {}
-    context["total_duration"] = Session().duration_sum
-    context["title"] = "Index"
-    return render(request, "index.html", context)
diff --git a/timetracker/urls.py b/timetracker/urls.py
index f056a77..834ef5b 100644
--- a/timetracker/urls.py
+++ b/timetracker/urls.py
@@ -73,8 +73,8 @@ router.register(r"sessions", SessionViewSet)
 
 
 urlpatterns = [
-    path("api/", include(router.urls)),
-    path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
+    path("", RedirectView.as_view(url="/tracker")),
+    path("tracker/", include("games.urls")),
 ]
 
 if settings.DEBUG: