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

.gitignore

@@ -5,4 +5,5 @@ __pycache__
 node_modules
 package-lock.json
 db.sqlite3
-src/timetracker/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

@@ -2,49 +2,52 @@ all: css migrate
 
 initialize: npm css migrate sethookdir loadplatforms
 
-HTMLFILES := $(shell find src/timetracker/games/templates -type f)
+HTMLFILES := $(shell find games/templates -type f)
 
 npm:
 	npm install
 
-css: src/input.css
+css: input.css
-	npx tailwindcss -i ./src/input.css -o  ./src/timetracker/games/static/base.css
+	npx tailwindcss -i ./input.css -o  ./games/static/base.css
 
 css-dev: css
-	npx tailwindcss -i ./src/input.css -o  ./src/timetracker/games/static/base.css --watch
+	npx tailwindcss -i ./input.css -o  ./games/static/base.css --watch
 
 makemigrations:
-	poetry run python src/timetracker/manage.py makemigrations
+	poetry run python manage.py makemigrations
 
 migrate: makemigrations
-	poetry run python src/timetracker/manage.py migrate
+	poetry run python manage.py migrate
 
 dev: migrate
-	poetry run python src/timetracker/manage.py runserver
+	poetry run python manage.py runserver
 
 caddy:
 	caddy run --watch
 
 dev-prod: migrate collectstatic
-	cd src/timetracker/; PROD=1 poetry run python -m gunicorn --bind 0.0.0.0:8001 root.asgi:application -k uvicorn.workers.UvicornWorker
+	PROD=1 poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker
 
 dumpgames:
-	poetry run python src/timetracker/manage.py dumpdata --format yaml games --output tracker_fixture.yaml
+	poetry run python manage.py dumpdata --format yaml games --output tracker_fixture.yaml
 
 loadplatforms:
-	poetry run python src/timetracker/manage.py loaddata platforms.yaml
+	poetry run python manage.py loaddata platforms.yaml
+
+loadall:
+	poetry run python manage.py loaddata data.yaml
 
 loadsample:
-	poetry run python src/timetracker/manage.py loaddata sample.yaml
+	poetry run python manage.py loaddata sample.yaml
 
 createsuperuser:
-	poetry run python src/timetracker/manage.py createsuperuser
+	poetry run python manage.py createsuperuser
 
 shell:
-	poetry run python src/timetracker/manage.py shell
+	poetry run python manage.py shell
 
 collectstatic:
-	poetry run python src/timetracker/manage.py collectstatic --clear --no-input
+	poetry run python manage.py collectstatic --clear --no-input
 
 poetry.lock: pyproject.toml
 	poetry install
@@ -56,6 +59,6 @@ date:
 	poetry run python -c 'import datetime; from zoneinfo import ZoneInfo; print(datetime.datetime.isoformat(datetime.datetime.now(ZoneInfo("Europe/Prague")), timespec="minutes", sep=" "))'
 
 cleanstatic:
-	rm -r src/timetracker/static/*
+	rm -r static/*
 
 clean: cleanstatic

common/import_data.py

@@ -0,0 +1,30 @@
+import csv
+from typing import TypeAlias
+
+from games.models import Game
+
+DataList: TypeAlias = list[dict[str, str]] | None
+
+
+def read_csv(filename: str) -> DataList:
+    with open(filename, "r") as csvfile:
+        writer = csv.DictReader(csvfile)
+        return writer
+
+
+def import_data(data: DataList):
+    matching_names = {}
+    for line in data:
+        name = line["name"]
+        if name not in matching_names:
+            # try exact match first
+            try:
+                game_id = Game.objects.get(name__iexact=name)
+            except:
+                pass
+            matching_names[name] = game_id
+    print(f"Exact matched {len(matching_names)} games.")
+
+
+def import_from_file(filename: str):
+    import_data(read_csv(filename))

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:
+    volumes:
-    #   - "db:/home/timetracker/app/src/timetracker/db.sqlite3"
+      - "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,12 +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"
+echo "Starting app"
-caddy start
+poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile -
-cd src/timetracker || exit
-poetry run python -m gunicorn --bind 0.0.0.0:8001 root.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile -

games/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import Game, Platform, Purchase, Session
+from games.models import Game, Platform, Purchase, Session
 
 # Register your models here.
 admin.site.register(Game)

games/fixtures/ps-tracker.csv

@@ -0,0 +1,225 @@
+name,platform,start,end
+Nioh 2,PS5,2022-12-17 19:34,2022-12-17 22:53
+Nioh 2,PS5,2022-12-15 02:25,2022-12-15 03:57
+Nioh 2,PS5,2022-12-13 02:41,2022-12-13 04:34
+Nioh 2,PS5,2022-12-11 21:01,2022-12-11 23:21
+VALKYRIE ELYSIUM,PS5,2022-12-11 06:07,2022-12-11 06:20
+Metal: Hellsinger,PS5,2022-12-11 05:50,2022-12-11 06:07
+Nioh 2,PS5,2022-12-11 04:31,2022-12-11 05:50
+Nioh 2,PS5,2022-12-11 04:11,2022-12-11 04:26
+Forspoken,PS5,2022-12-10 22:29,2022-12-10 23:10
+Nioh 2,PS5,2022-12-10 19:44,2022-12-10 22:29
+Nioh 2,PS5,2022-12-09 02:14,2022-12-09 04:16
+Nioh 2,PS5,2022-12-08 01:03,2022-12-08 01:57
+Nioh 2,PS5,2022-12-07 00:43,2022-12-07 04:16
+Nioh 2,PS5,2022-12-04 20:48,2022-12-04 23:31
+Nioh 2,PS5,2022-12-04 04:26,2022-12-04 07:01
+Nioh 2,PS5,2022-12-04 04:20,2022-12-04 04:22
+Nioh 2,PS5,2022-11-26 19:18,2022-11-26 21:28
+Nioh 2,PS5,2022-11-26 19:16,2022-11-26 19:18
+Nioh 2,PS5,2022-11-26 02:46,2022-11-26 03:56
+Nioh 2,PS5,2022-11-26 02:01,2022-11-26 02:43
+God of War Ragnarök,PS5,2022-11-24 23:03,2022-11-25 01:32
+God of War Ragnarök,PS5,2022-11-23 00:41,2022-11-23 07:52
+God of War Ragnarök,PS5,2022-11-21 22:52,2022-11-22 04:51
+God of War Ragnarök,PS5,2022-11-21 02:11,2022-11-21 05:13
+God of War Ragnarök,PS5,2022-11-20 21:34,2022-11-20 22:50
+God of War Ragnarök,PS5,2022-11-20 03:46,2022-11-20 05:52
+God of War Ragnarök,PS5,2022-11-19 14:30,2022-11-19 16:14
+God of War Ragnarök,PS5,2022-11-18 23:15,2022-11-19 04:16
+God of War Ragnarök,PS5,2022-11-18 19:58,2022-11-18 20:40
+God of War Ragnarök,PS5,2022-11-18 03:50,2022-11-18 06:25
+God of War Ragnarök,PS5,2022-11-17 19:36,2022-11-18 00:26
+God of War Ragnarök,PS5,2022-11-17 13:16,2022-11-17 16:13
+God of War Ragnarök,PS5,2022-11-16 21:45,2022-11-16 22:38
+God of War Ragnarök,PS5,2022-11-16 00:14,2022-11-16 04:28
+God of War Ragnarök,PS5,2022-11-15 01:33,2022-11-15 05:06
+God of War Ragnarök,PS5,2022-11-14 00:37,2022-11-14 04:43
+God of War Ragnarök,PS5,2022-11-12 23:32,2022-11-13 03:45
+God of War Ragnarök,PS5,2022-11-12 03:17,2022-11-12 05:00
+Grand Theft Auto V (PlayStation®5),PS5,2022-10-03 02:01,2022-10-03 02:23
+Grand Theft Auto V (PlayStation®5),PS5,2022-10-02 13:59,2022-10-02 15:54
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-30 22:40,2022-10-01 02:50
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-27 22:38,2022-09-28 00:16
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-27 19:27,2022-09-27 21:09
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-26 20:58,2022-09-26 23:38
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-25 23:56,2022-09-26 02:36
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-25 14:57,2022-09-25 16:38
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-25 02:04,2022-09-25 02:12
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-23 20:33,2022-09-23 23:38
+Wo Long: Fallen Dynasty,PS5,2022-09-18 15:26,2022-09-18 16:58
+Grand Theft Auto V (PlayStation®5),PS5,2022-08-31 00:42,2022-08-31 01:15
+Grand Theft Auto V (PlayStation®5),PS5,2022-08-18 13:43,2022-08-18 15:12
+Grand Theft Auto V (PlayStation®5),PS5,2022-08-18 00:42,2022-08-18 01:58
+Tony Hawk's™ Pro Skater™ 1 + 2,PS5,2022-08-18 00:40,2022-08-18 00:42
+Tony Hawk's™ Pro Skater™ 1 + 2,PS5,2022-08-14 15:46,2022-08-14 16:10
+FINAL FANTASY VII,PS5,2022-07-26 18:56,2022-07-26 20:22
+FINAL FANTASY VII REMAKE,PS5,2022-07-26 17:39,2022-07-26 18:53
+FINAL FANTASY VII REMAKE,PS5,2022-07-25 22:12,2022-07-26 04:37
+FINAL FANTASY VII REMAKE,PS5,2022-07-24 00:09,2022-07-24 05:33
+FINAL FANTASY VII REMAKE,PS5,2022-07-23 23:34,2022-07-23 23:48
+FINAL FANTASY VII REMAKE,PS5,2022-07-23 18:05,2022-07-23 19:44
+FINAL FANTASY VII REMAKE,PS5,2022-07-22 17:07,2022-07-23 01:48
+FINAL FANTASY VII REMAKE,PS5,2022-07-22 15:26,2022-07-22 15:59
+FINAL FANTASY VII REMAKE,PS5,2022-07-21 21:27,2022-07-21 22:43
+FINAL FANTASY VII REMAKE,PS5,2022-07-21 20:48,2022-07-21 20:58
+FINAL FANTASY VII REMAKE,PS5,2022-07-21 18:35,2022-07-21 18:36
+Stray,PS5,2022-07-21 01:24,2022-07-21 02:34
+Stray,PS5,2022-07-19 23:49,2022-07-20 03:24
+Atelier Ayesha ~The Alchemist of Dusk~,PS3,2022-07-04 03:26,2022-07-04 03:34
+Red Dead Redemption,PS3,2022-07-04 02:36,2022-07-04 03:14
+Ghost of Tsushima,PS5,2022-07-04 01:38,2022-07-04 02:34
+Dark Cloud™,PS4,2022-07-01 23:48,2022-07-02 00:04
+Atelier Ayesha ~The Alchemist of Dusk~,PS3,2022-07-01 23:20,2022-07-01 23:46
+Resident Evil Director’s Cut,PS5,2022-07-01 23:14,2022-07-01 23:20
+ELEX II,PS5,2022-07-01 22:48,2022-07-01 23:13
+OlliOlli World,PS5,2022-07-01 21:30,2022-07-01 22:30
+Deep Rock Galactic,PS5,2022-06-16 05:30,2022-06-16 06:14
+Curse of the Dead Gods,PS5,2022-06-16 05:00,2022-06-16 05:22
+Persona 5: Dancing in Starlight,PS5,2022-04-29 20:14,2022-04-29 20:15
+Persona 5: Dancing in Starlight,PS5,2022-04-29 00:18,2022-04-29 00:44
+Dying Light 2,PS5,2022-04-14 01:26,2022-04-14 01:27
+Grand Theft Auto V (PlayStation®5),PS5,2022-03-24 16:26,2022-03-24 16:27
+Grand Theft Auto V (PlayStation®5),PS5,2022-03-21 15:52,2022-03-21 15:59
+Horizon Forbidden West,PS5,2022-02-23 19:37,2022-02-24 00:24
+Horizon Forbidden West,PS5,2022-02-23 13:57,2022-02-23 17:44
+Horizon Forbidden West,PS5,2022-02-22 18:05,2022-02-23 05:26
+Horizon Forbidden West,PS5,2022-02-22 15:39,2022-02-22 17:02
+Horizon Forbidden West,PS5,2022-02-22 00:05,2022-02-22 04:08
+Horizon Forbidden West,PS5,2022-02-20 15:39,2022-02-20 23:08
+Horizon Forbidden West,PS5,2022-02-20 14:54,2022-02-20 15:09
+Horizon Forbidden West,PS5,2022-02-19 23:37,2022-02-20 04:45
+Horizon Forbidden West,PS5,2022-02-18 23:15,2022-02-19 03:27
+Assassin's Creed® Origins,PS5,2022-02-18 21:49,2022-02-18 23:15
+Assassin's Creed® Origins,PS5,2022-01-17 02:38,2022-01-17 02:50
+Deep Rock Galactic,PS5,2022-01-17 00:57,2022-01-17 02:35
+HITMAN 3,PS5,2021-11-17 00:35,2021-11-17 01:17
+HITMAN 3,PS5,2021-11-08 01:59,2021-11-08 06:17
+HITMAN 3,PS5,2021-11-07 03:10,2021-11-07 05:23
+HITMAN 3,PS5,2021-11-06 04:23,2021-11-06 08:49
+HITMAN 3,PS5,2021-11-06 02:17,2021-11-06 03:31
+HITMAN 3,PS5,2021-11-05 21:33,2021-11-05 23:24
+HITMAN 3,PS5,2021-11-05 03:09,2021-11-05 03:34
+HITMAN 3,PS5,2021-11-05 00:47,2021-11-05 02:26
+HITMAN 3,PS5,2021-11-04 20:27,2021-11-04 23:32
+HITMAN 3,PS5,2021-11-04 01:34,2021-11-04 05:33
+RESIDENT EVIL 3,PS5,2021-11-03 23:14,2021-11-03 23:56
+RESIDENT EVIL 3,PS5,2021-11-02 23:56,2021-11-03 05:10
+RESIDENT EVIL 3,PS5,2021-11-02 21:22,2021-11-02 23:23
+RESIDENT EVIL 3,PS5,2021-11-02 05:36,2021-11-02 06:56
+HITMAN 3,PS5,2021-11-02 03:00,2021-11-02 05:36
+HITMAN 3,PS5,2021-11-02 01:19,2021-11-02 01:25
+HITMAN™ 2,PS5,2021-11-02 01:09,2021-11-02 01:19
+HITMAN 3,PS5,2021-11-01 23:45,2021-11-02 01:09
+RESIDENT EVIL 3,PS5,2021-11-01 19:32,2021-11-01 19:47
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-17 01:06,2021-10-17 03:27
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-16 20:58,2021-10-16 22:00
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-05 02:30,2021-10-05 03:27
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-03 23:12,2021-10-04 01:21
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-03 03:02,2021-10-03 04:42
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-02 20:12,2021-10-02 21:10
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-02 01:40,2021-10-02 03:36
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-01 04:34,2021-10-01 05:30
+DEATHLOOP,PS5,2021-10-01 01:12,2021-10-01 04:27
+DEATHLOOP,PS5,2021-09-30 03:04,2021-09-30 06:30
+DEATHLOOP,PS5,2021-09-29 00:28,2021-09-29 05:08
+Persona 5 Royal,PS5,2021-09-28 00:36,2021-09-28 03:08
+Persona 5 Royal,PS5,2021-09-27 02:16,2021-09-27 05:56
+Persona 5 Royal,PS5,2021-09-26 14:54,2021-09-26 16:32
+Persona 5 Royal,PS5,2021-09-25 18:43,2021-09-25 23:26
+Persona 5 Royal,PS5,2021-09-24 21:41,2021-09-25 03:40
+Persona 5 Royal,PS5,2021-09-23 00:18,2021-09-23 06:26
+Persona 5 Royal,PS5,2021-09-21 20:27,2021-09-22 05:43
+Persona 5 Royal,PS5,2021-09-21 01:07,2021-09-21 06:06
+Borderlands: The Handsome Collection,PS5,2021-09-20 23:59,2021-09-21 01:07
+Persona 5 Royal,PS5,2021-09-20 23:53,2021-09-20 23:59
+DEATHLOOP,PS5,2021-09-20 02:03,2021-09-20 06:29
+DEATHLOOP,PS5,2021-09-19 19:49,2021-09-20 01:16
+Borderlands: The Handsome Collection,PS5,2021-09-19 00:51,2021-09-19 03:41
+Borderlands: The Handsome Collection,PS5,2021-09-17 23:45,2021-09-18 01:48
+Borderlands: The Handsome Collection,PS5,2021-09-17 23:40,2021-09-17 23:41
+DEATHLOOP,PS5,2021-09-17 16:48,2021-09-17 18:56
+DEATHLOOP,PS5,2021-09-17 03:02,2021-09-17 04:39
+DEATHLOOP,PS5,2021-09-17 00:03,2021-09-17 02:53
+DEATHLOOP,PS5,2021-09-16 18:39,2021-09-16 21:12
+Persona 5 Royal,PS5,2021-09-16 18:29,2021-09-16 18:30
+Persona 5 Royal,PS5,2021-09-16 02:26,2021-09-16 06:13
+Persona 5 Royal,PS5,2021-09-16 02:20,2021-09-16 02:21
+Persona 5 Royal,PS5,2021-09-15 01:48,2021-09-15 06:07
+Persona 5 Royal,PS5,2021-09-14 22:21,2021-09-15 01:22
+Persona 5 Royal,PS5,2021-09-14 02:01,2021-09-14 05:48
+Persona 5 Royal,PS5,2021-09-14 00:24,2021-09-14 01:46
+Persona 5 Royal,PS5,2021-08-12 05:04,2021-08-12 07:05
+Persona 5 Royal,PS5,2021-08-11 05:02,2021-08-11 06:48
+Persona 5 Royal,PS5,2021-08-09 00:37,2021-08-09 06:15
+Persona 5 Royal,PS5,2021-08-08 00:31,2021-08-08 08:01
+Persona 5 Royal,PS5,2021-08-07 19:51,2021-08-07 22:50
+Persona 5 Royal,PS5,2021-08-06 23:51,2021-08-07 01:35
+Persona 5 Royal,PS5,2021-08-06 19:26,2021-08-06 22:26
+Persona 5 Royal,PS5,2021-08-06 02:42,2021-08-06 06:51
+Persona 5 Royal,PS5,2021-08-06 00:37,2021-08-06 01:54
+Far Cry® 5,PS5,2021-08-01 23:27,2021-08-02 02:09
+Far Cry® 5,PS5,2021-08-01 18:10,2021-08-01 19:40
+STAR WARS™: Squadrons,PS5,2021-08-01 18:02,2021-08-01 18:10
+STAR WARS™: Squadrons,PS5,2021-08-01 00:24,2021-08-01 00:30
+STEEP,PS5,2021-08-01 00:15,2021-08-01 00:24
+Red Dead Redemption 2,PS5,2021-07-31 23:48,2021-08-01 00:13
+Persona 5 Royal,PS5,2021-07-30 19:09,2021-07-30 19:10
+Persona 5 Royal,PS5,2021-07-29 03:41,2021-07-29 04:59
+Persona 5 Royal,PS5,2021-07-28 02:32,2021-07-28 03:07
+Demon's Souls,PS5,2021-07-28 00:12,2021-07-28 02:32
+Red Dead Redemption 2,PS5,2021-07-27 23:20,2021-07-27 23:23
+Red Dead Redemption 2,PS5,2021-07-26 00:42,2021-07-26 01:13
+Ghost of Tsushima,PS5,2021-07-25 19:03,2021-07-25 22:12
+Ghost of Tsushima,PS5,2021-07-25 18:52,2021-07-25 18:55
+Rez Infinite,PS5,2021-07-25 18:32,2021-07-25 18:52
+Returnal,PS5,2021-07-25 05:24,2021-07-25 05:26
+Tom Clancy's The Division® 2,PS5,2021-07-25 02:12,2021-07-25 05:24
+Returnal,PS5,2021-07-25 00:00,2021-07-25 02:12
+Returnal,PS5,2021-07-24 16:13,2021-07-24 17:39
+Returnal,PS5,2021-07-24 03:02,2021-07-24 07:02
+Returnal,PS5,2021-07-23 18:08,2021-07-23 20:39
+Returnal,PS5,2021-07-23 14:36,2021-07-23 15:38
+Titanfall™ 2,PS5,2021-07-22 02:42,2021-07-22 03:20
+Returnal,PS5,2021-07-20 02:12,2021-07-20 05:40
+Returnal,PS5,2021-07-19 03:37,2021-07-19 05:24
+Concrete Genie,PS5,2021-07-19 03:35,2021-07-19 03:37
+Concrete Genie,PS5,2021-07-18 05:04,2021-07-18 05:30
+Stranded Deep,PS5,2021-07-18 04:32,2021-07-18 04:58
+Sniper Elite 4,PS5,2021-07-18 04:16,2021-07-18 04:32
+Oddworld: Soulstorm,PS5,2021-07-18 04:00,2021-07-18 04:14
+Zombie Army 4: Dead War,PS5,2021-07-18 03:48,2021-07-18 03:58
+Sekiro™: Shadows Die Twice,PS5,2021-07-18 03:00,2021-07-18 03:48
+Returnal,PS5,2021-07-17 17:41,2021-07-17 23:32
+Returnal,PS5,2021-07-17 01:35,2021-07-17 06:07
+Returnal,PS5,2021-07-17 00:23,2021-07-17 01:21
+Another World - 20th Anniversary Edition,PS5,2021-07-15 22:09,2021-07-15 23:33
+Sekiro™: Shadows Die Twice,PS5,2021-07-15 21:52,2021-07-15 22:09
+Sekiro™: Shadows Die Twice,PS5,2021-07-15 19:07,2021-07-15 20:13
+Sekiro™: Shadows Die Twice,PS5,2021-07-15 01:50,2021-07-15 03:31
+Sekiro™: Shadows Die Twice,PS5,2021-07-15 00:12,2021-07-15 01:14
+Sekiro™: Shadows Die Twice,PS5,2021-07-14 03:19,2021-07-14 05:13
+Persona 5,PS5,2021-07-13 21:56,2021-07-13 21:58
+Persona 5,PS5,2021-07-13 01:32,2021-07-13 02:59
+Maquette,PS5,2021-07-13 01:30,2021-07-13 01:32
+Maquette,PS5,2021-07-12 23:59,2021-07-13 00:34
+ASTRO's PLAYROOM,PS5,2021-07-12 23:06,2021-07-12 23:59
+Crash Bandicoot N. Sane Trilogy,PS5,2021-07-12 23:01,2021-07-12 23:06
+Virtua Fighter 5 Ultimate Showdown,PS4,2021-07-02 19:46,2021-07-02 20:57
+Bloodborne™,PS4,2021-04-03 19:50,2021-04-03 23:52
+Tom Clancy's The Division® 2,PS4,2021-04-03 02:10,2021-04-03 05:22
+Bloodborne™,PS4,2021-04-02 21:34,2021-04-03 02:10
+Bloodborne™,PS4,2021-04-02 06:01,2021-04-02 08:11
+Tom Clancy's The Division® 2,PS4,2021-04-02 04:24,2021-04-02 06:01
+Tom Clancy's The Division® 2,PS4,2021-03-31 02:55,2021-03-31 05:50
+Tom Clancy's The Division® 2,PS4,2021-03-29 02:00,2021-03-29 02:02
+Tom Clancy's The Division® 2,PS4,2021-03-27 03:31,2021-03-27 06:29
+Tom Clancy's The Division® 2,PS4,2021-03-26 05:10,2021-03-26 06:03
+Remnant: From the Ashes,PS4,2021-03-23 03:20,2021-03-23 05:58
+DARK SOULS™ II: Scholar of the First Sin,PS4,2021-03-20 01:31,2021-03-20 01:34
+Remnant: From the Ashes,PS4,2021-03-12 01:29,2021-03-12 01:30
+Remnant: From the Ashes,PS4,2021-03-08 02:41,2021-03-08 05:38
+Remnant: From the Ashes,PS4,2021-03-07 03:21,2021-03-07 06:49
+13 Sentinels: Aegis Rim,PS4,2021-03-07 03:20,2021-03-07 03:21
+DARK SOULS™ II: Scholar of the First Sin,PS4,2020-10-24 23:43,2020-10-25 01:18
+Ghost of Tsushima,PS4,2020-10-24 23:14,2020-10-24 23:22

games/forms.py

@@ -1,9 +1,11 @@
 from django import forms
 
-from .models import Game, Platform, Purchase, Session
+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/models.py

@@ -2,7 +2,7 @@ from datetime import datetime, timedelta
 from typing import Any
 from zoneinfo import ZoneInfo
 
-from timetracker.common.util.time import format_duration
+from common.time import format_duration
 from django.conf import settings
 from django.db import models
 from django.db.models import F, Manager, Sum

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 %}
+                <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/templatetags/version.py

@@ -13,9 +13,7 @@ def version_date():
         "%d-%b-%Y %H:%m",
         time.gmtime(
             os.path.getmtime(
-                os.path.abspath(
+                os.path.abspath(os.path.join(settings.BASE_DIR, "pyproject.toml"))
-                    os.path.join(settings.BASE_DIR, "..", "..", "pyproject.toml")
-                )
             )
         ),
     )

games/urls.py

@@ -1,9 +1,9 @@
 from django.urls import path
 
-from . import views
+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,8 +1,8 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from zoneinfo import ZoneInfo
 
-from common.util.plots import playtime_over_time_chart
+from common.plots import playtime_over_time_chart
-from common.util.time import now as now_with_tz
+from common.time import now as now_with_tz
 from django.conf import settings
 from django.shortcuts import redirect, render
 
@@ -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,6 +103,7 @@ 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
+    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)

manage.py

@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "root.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

pyproject.toml

@@ -1,11 +1,11 @@
 [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"
 readme = "README.md"
-packages = [{include = "timetracker", from = "src"}]
+packages = [{include = "timetracker"}]
 
 [tool.poetry.dependencies]
 python = "^3.10"
@@ -30,7 +30,5 @@ isort = "^5.11.4"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.pytest.ini_options]
+[tool.poetry.scripts]
-pythonpath = [
+timetracker-import = "common.import_data:import_from_file"
-  "src"
-]

tailwind.config.js

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

tests/test_time.py

@@ -1,7 +1,7 @@
 import unittest
 from datetime import timedelta
 
-from timetracker.common.util.time import format_duration
+from common.time import format_duration
 
 
 class FormatDurationTest(unittest.TestCase):

timetracker/asgi.py

@@ -1,5 +1,5 @@
 """
-ASGI config for root project.
+ASGI config for timetracker project.
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@ import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "root.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
 
 application = get_asgi_application()

timetracker/settings.py

@@ -54,7 +54,7 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = "root.urls"
+ROOT_URLCONF = "timetracker.urls"
 
 TEMPLATES = [
     {
@@ -73,7 +73,7 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = "root.wsgi.application"
+WSGI_APPLICATION = "timetracker.wsgi.application"
 
 
 # Database

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")),
 ]
 

timetracker/wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "root.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
 
 application = get_wsgi_application()