Version 1.0.1

Fixes #47

.drone.yml

@@ -11,15 +11,30 @@ steps:
     - poetry install
     - poetry env info
     - poetry run pytest
-- name: build container
+- name: build container (prod)
   image: plugins/docker
   settings:
     repo: registry.kucharczyk.xyz/timetracker
     tags:
       - latest
+  when:
+    branch:
+      - main
+
+- name: build container (non-prod)
+  image: plugins/docker
+  settings:
+    repo: registry.kucharczyk.xyz/timetracker
+    tags:
+      - ${DRONE_COMMIT_REF}
+      - ${DRONE_COMMIT_BRANCH}
+  when:
+    branch:
+      exclude:
+        - main
+    
+    
 trigger:
   event:
   - push
-  - cron
-  exclude:
-    - pull_request
+  - cron

.gitignore

@@ -5,4 +5,5 @@ __pycache__
 node_modules
 package-lock.json
 db.sqlite3
-static
+static
+dist/

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.0.1 / 2023-01-30 22:17+01:00
+
+* 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
+
+* Breaking
+  * Due to major re-arranging and re-naming of the folder structure, tables also had to be renamed.
+* Fixed
+  * Sort form fields alphabetically (https://git.kucharczyk.xyz/lukas/timetracker/issues/39, https://git.kucharczyk.xyz/lukas/timetracker/issues/40)
+  * Start session button starts different game than it says (#44)
+
 ## 0.2.5 / 2023-01-18 17:01+01:00
 
 * New

Caddyfile

@@ -5,10 +5,10 @@
 
 :8000 {
     handle_path /static/* {
-        root * src/timetracker/static/
+        root * /usr/share/caddy
         file_server
     }
     handle {
-        reverse_proxy :8001
+        reverse_proxy backend:8001
     }
 }

Dockerfile

@@ -2,11 +2,11 @@ FROM node as css
 WORKDIR /app
 COPY . /app
 RUN npm install && \
-    npx tailwindcss -i ./src/input.css -o ./src/timetracker/games/static/base.css --minify
+    npx tailwindcss -i ./common/input.css -o ./static/base.css --minify
 
 FROM python:3.10.9-slim-bullseye
 
-ENV VERSION_NUMBER 0.2.5
+ENV VERSION_NUMBER 1.0.0
 ENV PROD 1
 ENV PYTHONUNBUFFERED=1
 
@@ -15,18 +15,13 @@ RUN apt update && \
     bash \
     vim \
     curl && \
-    apt install -y debian-keyring debian-archive-keyring apt-transport-https && \
-    curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg && \
-    curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list && \
-    apt update && \
-    apt install caddy && \
     rm -rf /var/lib/apt/lists/*
 
 RUN useradd -m --uid 1000 timetracker
 WORKDIR /home/timetracker/app
 COPY . /home/timetracker/app/
 RUN chown -R timetracker:timetracker /home/timetracker/app
-COPY --from=css /app/src/timetracker/games/static/base.css /home/timetracker/app/src/timetracker/games/static/base.css
+COPY --from=css ./app/static/base.css /home/timetracker/app/static/base.css
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
@@ -36,4 +31,4 @@ RUN pip install --no-cache-dir poetry
 RUN poetry install --without dev
 
 EXPOSE 8000
-ENTRYPOINT [ "/entrypoint.sh" ]
+CMD [ "/entrypoint.sh" ]

Makefile

@@ -34,6 +34,9 @@ dumpgames:
 loadplatforms:
 	poetry run python manage.py loaddata platforms.yaml
 
+loadall:
+	poetry run python manage.py loaddata data.yaml
+
 loadsample:
 	poetry run python manage.py loaddata sample.yaml
 

common/plots.py

@@ -64,7 +64,7 @@ def get_chart(data, title="", xlabel="", ylabel=""):
     plt.switch_backend("SVG")
     fig, ax = plt.subplots()
     fig.set_size_inches(10, 4)
-    ax.plot(x, y)
+    lines = ax.plot(x, y, "-o")
     first = x[0]
     last = x[-1]
     difference = last - first
@@ -76,7 +76,11 @@ def get_chart(data, title="", xlabel="", ylabel=""):
     elif difference.days < 720:
         ax.xaxis.set_major_locator(mdates.MonthLocator())
         ax.xaxis.set_minor_locator(mdates.WeekdayLocator())
+        for line in lines:
+            line.set_marker("")
     else:
+        for line in lines:
+            line.set_marker("")
         ax.xaxis.set_major_locator(mdates.YearLocator())
         ax.xaxis.set_minor_locator(mdates.MonthLocator())
 

docker-compose.no-caddy.yml

@@ -0,0 +1,17 @@
+---
+services:
+  timetracker:
+    image: registry.kucharczyk.xyz/timetracker
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: timetracker
+    environment:
+      - TZ=Europe/Prague
+      - CSRF_TRUSTED_ORIGINS="https://tracker.kucharczyk.xyz"
+    user: "1000"
+    # volumes:
+    #   - "db:/home/timetracker/app/src/timetracker/db.sqlite3"
+    ports:
+      - "8000:8000"
+    restart: unless-stopped

docker-compose.yml

@@ -1,17 +1,28 @@
 ---
 services:
-  timetracker:
+  backend:
     image: registry.kucharczyk.xyz/timetracker
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: timetracker
     environment:
       - TZ=Europe/Prague
       - CSRF_TRUSTED_ORIGINS="https://tracker.kucharczyk.xyz"
     user: "1000"
-    # volumes:
-    #   - "db:/home/timetracker/app/src/timetracker/db.sqlite3"
+    volumes:
+      - "static-files:/home/timetracker/app/static"
+    restart: unless-stopped
+
+  frontend:
+    image: caddy
+    volumes:
+      - "static-files:/usr/share/caddy"
+      - "$PWD/Caddyfile:/etc/caddy/Caddyfile"
     ports:
       - "8000:8000"
-    restart: unless-stopped
+    depends_on:
+      - backend
+
+volumes:
+  static-files:
+    

entrypoint.sh

@@ -2,11 +2,10 @@
 # Apply database migrations
 set -euo pipefail
 echo "Apply database migrations"
-poetry run python src/timetracker/manage.py migrate
+poetry run python manage.py migrate
 
 echo "Collect static files"
-poetry run python src/timetracker/manage.py collectstatic --clear --no-input
+poetry run python manage.py collectstatic --clear --no-input
 
-echo "Starting server"
-caddy start
+echo "Starting app"
 poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile -

games/forms.py

@@ -4,6 +4,8 @@ from games.models import Game, Platform, Purchase, Session
 
 
 class SessionForm(forms.ModelForm):
+    purchase = forms.ModelChoiceField(queryset=Purchase.objects.order_by("game__name"))
+
     class Meta:
         model = Session
         fields = [
@@ -16,6 +18,9 @@ class SessionForm(forms.ModelForm):
 
 
 class PurchaseForm(forms.ModelForm):
+    game = forms.ModelChoiceField(queryset=Game.objects.order_by("name"))
+    platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
+
     class Meta:
         model = Purchase
         fields = ["game", "platform", "date_purchased", "date_refunded"]

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>

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">
@@ -18,7 +18,7 @@
             {% if purchase %}<a class="dark:text-white hover:underline block" href="{% url 'list_sessions_by_game' purchase.game.id %}">See all platforms</a>{% endif %}
             {% endif %}
             {% if dataset.count >= 1 %}
-            <a class="clear-both" href="{% url 'start_session' dataset.last.purchase.id %}">
+            <a class="clear-both" href="{% url 'start_session' last.purchase.id %}">
                 <button type="button" title="Track last tracked" class="mt-10 py-1 px-2 bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg ">
                     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="self-center w-6 h-6 inline">
                         <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
@@ -62,12 +62,14 @@
                         </button>
                     </a>
                 {% endif %}
-                <button type="button" title="Edit" class="py-1 px-2 flex justify-center items-center  bg-blue-600 hover:bg-blue-700 focus:ring-blue-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 w-7 h-4 rounded-lg ">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
-                        <path d="M5.433 13.917l1.262-3.155A4 4 0 017.58 9.42l6.92-6.918a2.121 2.121 0 013 3l-6.92 6.918c-.383.383-.84.685-1.343.886l-3.154 1.262a.5.5 0 01-.65-.65z" />
-                        <path d="M3.5 5.75c0-.69.56-1.25 1.25-1.25H10A.75.75 0 0010 3H4.75A2.75 2.75 0 002 5.75v9.5A2.75 2.75 0 004.75 18h9.5A2.75 2.75 0 0017 15.25V10a.75.75 0 00-1.5 0v5.25c0 .69-.56 1.25-1.25 1.25h-9.5c-.69 0-1.25-.56-1.25-1.25v-9.5z" />
-                    </svg>
-                </button>
+                <a href="{% url 'edit_session' data.id %}">
+                    <button type="button" title="Edit" class="py-1 px-2 flex justify-center items-center  bg-blue-600 hover:bg-blue-700 focus:ring-blue-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 w-7 h-4 rounded-lg ">
+                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
+                            <path d="M5.433 13.917l1.262-3.155A4 4 0 017.58 9.42l6.92-6.918a2.121 2.121 0 013 3l-6.92 6.918c-.383.383-.84.685-1.343.886l-3.154 1.262a.5.5 0 01-.65-.65z" />
+                            <path d="M3.5 5.75c0-.69.56-1.25 1.25-1.25H10A.75.75 0 0010 3H4.75A2.75 2.75 0 002 5.75v9.5A2.75 2.75 0 004.75 18h9.5A2.75 2.75 0 0017 15.25V10a.75.75 0 00-1.5 0v5.25c0 .69-.56 1.25-1.25 1.25h-9.5c-.69 0-1.25-.56-1.25-1.25v-9.5z" />
+                        </svg>
+                    </button>
+                </a>
                 <a href="{% url 'delete_session' data.id %}">
                     <button type="button" edit="Delete" class="py-1 px-2 flex justify-center items-center  bg-red-600 hover:bg-red-700 focus:ring-red-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 w-7 h-4 rounded-lg ">
                         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">

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"),
@@ -23,6 +23,7 @@ urlpatterns = [
         name="delete_session",
     ),
     path("add-purchase/", views.add_purchase, name="add_purchase"),
+    path("edit-session/<int:session_id>", views.edit_session, name="edit_session"),
     path("list-sessions/", views.list_sessions, name="list_sessions"),
     path(
         "list-sessions/by-purchase/<int:purchase_id>",

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
@@ -47,6 +47,18 @@ def update_session(request, session_id=None):
     return redirect("list_sessions")
 
 
+def edit_session(request, session_id=None):
+    context = {}
+    session = Session.objects.get(id=session_id)
+    form = SessionForm(request.POST or None, instance=session)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Session"
+    context["form"] = form
+    return render(request, "add.html", context)
+
+
 def start_session(request, purchase_id=None):
     session = SessionForm({"purchase": purchase_id, "timestamp_start": now_with_tz()})
     session.save()
@@ -61,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)
@@ -71,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")
@@ -85,7 +103,8 @@ def list_sessions(request, filter="", purchase_id="", platform_id="", game_id=""
     # cannot use dataset[0] here because that might be only partial QuerySet
     context["last"] = Session.objects.all().order_by("timestamp_start").last()
     # charts are always oldest->newest
-    context["chart"] = playtime_over_time_chart(dataset.order_by("timestamp_start"))
+    if Session.objects.count() >= 2:
+        context["chart"] = playtime_over_time_chart(dataset.order_by("timestamp_start"))
 
     return render(request, "list_sessions.html", context)
 
@@ -126,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)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "timetracker"
-version = "0.2.5"
+version = "1.0.1"
 description = "A simple time tracker."
 authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 license = "GPL"

tailwind.config.js

@@ -1,6 +1,6 @@
 module.exports = {
     darkMode: 'class',
-    content: ["./src/**/*.{html,js}"],
+    content: ["./**/*.{html,js}"],
     theme: {
         fontFamily: {
             sans: ['Inter', 'sans-serif'],

timetracker/urls.py

@@ -19,7 +19,7 @@ from django.urls import include, path
 from django.views.generic import RedirectView
 
 urlpatterns = [
-    path("", RedirectView.as_view(url="/tracker/list-sessions")),
+    path("", RedirectView.as_view(url="/tracker")),
     path("tracker/", include("games.urls")),
 ]