Compare commits
56 Commits
1.0.1
...
29bf3b1946
Author | SHA1 | Date | |
---|---|---|---|
29bf3b1946 | |||
3f7ccea2e2 | |||
b5ffb3586b | |||
26d57a238e | |||
2d5ad3182c | |||
49cc3ea0cc | |||
440e1cfb71 | |||
1cbd8c5c55 | |||
bc81a0ee8e | |||
c5653977ff | |||
f151730ab6 | |||
f469a67d94 | |||
104ffc9d03 | |||
a4b13eb247 | |||
2307fac83a | |||
6b52c0d4c4 | |||
ff5d8c215d | |||
cdb3b89b08 | |||
ffa8198540 | |||
0b7da3550c | |||
e1655d6cfa | |||
29c41865d0 | |||
d21b461726 | |||
95489cfb78 | |||
fa4f1c4810 | |||
366c25a1ff | |||
a3042caa20 | |||
7997f9bbb2 | |||
b78c4ba9c5
|
|||
1df889c45d
|
|||
468d05a9e2
|
|||
2640a49734
|
|||
65c175afb2
|
|||
0814071a26
|
|||
5f845f866e
|
|||
c3d4697470
|
|||
77293f03e9 | |||
1fa364e2ec | |||
4a6f4a2f9a | |||
9590988b6a | |||
938c82a395 | |||
33939f631c | |||
ac8cd6534a | |||
51d8e953c0 | |||
2eec677f41 | |||
f2eb14d3ef | |||
c337d2200f | |||
8a8b05b0bd | |||
9446065271 | |||
755093845d | |||
d4ab0596da | |||
8dcbe2f0ad | |||
25bc74eff1 | |||
8a7d083fb2 | |||
8296ebcf31
|
|||
04a4f2e0be |
17
.editorconfig
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = true
|
||||||
|
|
||||||
|
[*.{js,py}]
|
||||||
|
charset = utf-8
|
||||||
|
|
||||||
|
# 4 space indentation
|
||||||
|
[*.py]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 4
|
||||||
|
|
||||||
|
[**/*.js]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
2
.gitignore
vendored
@ -5,5 +5,5 @@ __pycache__
|
|||||||
node_modules
|
node_modules
|
||||||
package-lock.json
|
package-lock.json
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
static
|
/static/
|
||||||
dist/
|
dist/
|
5
.vscode/settings.json
vendored
@ -4,5 +4,8 @@
|
|||||||
],
|
],
|
||||||
"python.testing.unittestEnabled": false,
|
"python.testing.unittestEnabled": false,
|
||||||
"python.testing.pytestEnabled": true,
|
"python.testing.pytestEnabled": true,
|
||||||
"python.analysis.typeCheckingMode": "basic"
|
"python.analysis.typeCheckingMode": "basic",
|
||||||
|
"[python]": {
|
||||||
|
"editor.defaultFormatter": "ms-python.black-formatter"
|
||||||
|
},
|
||||||
}
|
}
|
28
CHANGELOG.md
@ -1,3 +1,31 @@
|
|||||||
|
## Unreleased
|
||||||
|
|
||||||
|
* Improve form appearance
|
||||||
|
* Add helper buttons next to datime fields
|
||||||
|
* Change recent session view to current year instead of last 30 days
|
||||||
|
* Fix bug when filtering only manual sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/51)
|
||||||
|
* Add copy button on Add session page to copy times between fields
|
||||||
|
* Use the same form when editing a session as when adding a session
|
||||||
|
* Add a hacky way not to reload a page when starting or ending a session (https://git.kucharczyk.xyz/lukas/timetracker/issues/52)
|
||||||
|
* Focus important fields on forms
|
||||||
|
* Improve session list (https://git.kucharczyk.xyz/lukas/timetracker/issues/53)
|
||||||
|
* Change fonts to IBM Plex
|
||||||
|
* Only use local font files
|
||||||
|
|
||||||
|
## 1.0.3 / 2023-02-20 17:16+01:00
|
||||||
|
|
||||||
|
* Add wikidata ID and year for editions
|
||||||
|
* Add icons for game, edition, purchase filters
|
||||||
|
* Allow filtering by game, edition, purchase from the session list
|
||||||
|
* Allow editing filtered entities from session list
|
||||||
|
|
||||||
|
## 1.0.2 / 2023-02-18 21:48+01:00
|
||||||
|
|
||||||
|
* Add support for device info (https://git.kucharczyk.xyz/lukas/timetracker/issues/49)
|
||||||
|
* Add support for purchase ownership information (https://git.kucharczyk.xyz/lukas/timetracker/issues/48)
|
||||||
|
* Add support for purchase prices
|
||||||
|
* Add support for game editions (https://git.kucharczyk.xyz/lukas/timetracker/issues/28)
|
||||||
|
|
||||||
## 1.0.1 / 2023-01-30 22:17+01:00
|
## 1.0.1 / 2023-01-30 22:17+01:00
|
||||||
|
|
||||||
* Make it possible to edit sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/46)
|
* Make it possible to edit sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/46)
|
||||||
|
@ -6,7 +6,7 @@ RUN npm install && \
|
|||||||
|
|
||||||
FROM python:3.10.9-slim-bullseye
|
FROM python:3.10.9-slim-bullseye
|
||||||
|
|
||||||
ENV VERSION_NUMBER 1.0.0
|
ENV VERSION_NUMBER 1.0.3
|
||||||
ENV PROD 1
|
ENV PROD 1
|
||||||
ENV PYTHONUNBUFFERED=1
|
ENV PYTHONUNBUFFERED=1
|
||||||
|
|
||||||
@ -28,7 +28,7 @@ RUN chmod +x /entrypoint.sh
|
|||||||
USER timetracker
|
USER timetracker
|
||||||
ENV PATH="$PATH:/home/timetracker/.local/bin"
|
ENV PATH="$PATH:/home/timetracker/.local/bin"
|
||||||
RUN pip install --no-cache-dir poetry
|
RUN pip install --no-cache-dir poetry
|
||||||
RUN poetry install --without dev
|
RUN poetry install
|
||||||
|
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
CMD [ "/entrypoint.sh" ]
|
CMD [ "/entrypoint.sh" ]
|
6
Makefile
@ -7,11 +7,11 @@ HTMLFILES := $(shell find games/templates -type f)
|
|||||||
npm:
|
npm:
|
||||||
npm install
|
npm install
|
||||||
|
|
||||||
css: input.css
|
css: common/input.css
|
||||||
npx tailwindcss -i ./input.css -o ./games/static/base.css
|
npx tailwindcss -i ./common/input.css -o ./games/static/base.css
|
||||||
|
|
||||||
css-dev: css
|
css-dev: css
|
||||||
npx tailwindcss -i ./input.css -o ./games/static/base.css --watch
|
npx tailwindcss -i ./common/input.css -o ./games/static/base.css --watch
|
||||||
|
|
||||||
makemigrations:
|
makemigrations:
|
||||||
poetry run python manage.py makemigrations
|
poetry run python manage.py makemigrations
|
||||||
|
@ -2,21 +2,95 @@
|
|||||||
@tailwind components;
|
@tailwind components;
|
||||||
@tailwind utilities;
|
@tailwind utilities;
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: "IBM Plex Mono";
|
||||||
|
src: url("fonts/IBMPlexMono-regular.ttf") format("truetype");
|
||||||
|
font-weight: 400;
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: "IBM Plex Sans";
|
||||||
|
src: url("fonts/IBMPlexSans-Regular.ttf") format("truetype");
|
||||||
|
font-weight: 400;
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
|
||||||
form label {
|
form label {
|
||||||
@apply dark:text-slate-400;
|
@apply dark:text-slate-400;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.responsive-table {
|
||||||
|
@apply dark:text-white mx-auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.responsive-table tr:nth-child(even) {
|
||||||
|
@apply bg-slate-800
|
||||||
|
}
|
||||||
|
|
||||||
|
.responsive-table tbody tr:nth-child(odd) {
|
||||||
|
@apply bg-slate-900
|
||||||
|
}
|
||||||
|
|
||||||
|
.responsive-table thead th {
|
||||||
|
@apply text-left border-b-2 border-b-slate-500 text-xl;
|
||||||
|
}
|
||||||
|
|
||||||
|
.responsive-table thead th:not(:first-child),
|
||||||
|
.responsive-table td:not(:first-child) {
|
||||||
|
@apply border-l border-l-slate-500;
|
||||||
|
}
|
||||||
|
|
||||||
|
@layer utilities {
|
||||||
|
.max-w-20char {
|
||||||
|
max-width: 20ch;
|
||||||
|
}
|
||||||
|
.max-w-35char {
|
||||||
|
max-width: 40ch;
|
||||||
|
}
|
||||||
|
.max-w-40char {
|
||||||
|
max-width: 40ch;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
form input,
|
form input,
|
||||||
select,
|
select,
|
||||||
textarea {
|
textarea {
|
||||||
@apply dark:border dark:border-slate-900 dark:bg-slate-500 dark:text-slate-100;
|
@apply dark:border dark:border-slate-900 dark:bg-slate-500 dark:text-slate-100;
|
||||||
}
|
}
|
||||||
|
|
||||||
#session-table {
|
@media screen and (min-width: 768px) {
|
||||||
display: grid;
|
form input,
|
||||||
grid-template-columns: 3fr 1fr repeat(2, 2fr) 0.5fr 1fr;
|
select,
|
||||||
|
textarea {
|
||||||
|
width: 300px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: 768px) {
|
||||||
|
form input,
|
||||||
|
select,
|
||||||
|
textarea {
|
||||||
|
width: 150px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#button-container button {
|
#button-container button {
|
||||||
@apply mx-1;
|
@apply mx-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
th {
|
||||||
|
@apply text-right;
|
||||||
|
}
|
||||||
|
|
||||||
|
th label {
|
||||||
|
@apply mr-4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.basic-button-container {
|
||||||
|
@apply flex space-x-2 justify-center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.basic-button {
|
||||||
|
@apply inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight uppercase rounded shadow-md hover:bg-blue-700 hover:shadow-lg focus:bg-blue-700 focus:shadow-lg focus:outline-none focus:ring-0 active:bg-blue-800 active:shadow-lg transition duration-150 ease-in-out;
|
||||||
|
}
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
from games.models import Game, Platform, Purchase, Session
|
from games.models import Game, Platform, Purchase, Session, Edition, Device
|
||||||
|
|
||||||
# Register your models here.
|
# Register your models here.
|
||||||
admin.site.register(Game)
|
admin.site.register(Game)
|
||||||
admin.site.register(Purchase)
|
admin.site.register(Purchase)
|
||||||
admin.site.register(Platform)
|
admin.site.register(Platform)
|
||||||
admin.site.register(Session)
|
admin.site.register(Session)
|
||||||
|
admin.site.register(Edition)
|
||||||
|
admin.site.register(Device)
|
||||||
|
@ -1,38 +1,95 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
|
|
||||||
from games.models import Game, Platform, Purchase, Session
|
from games.models import Game, Platform, Purchase, Session, Edition, Device
|
||||||
|
|
||||||
|
custom_date_widget = forms.DateInput(attrs={"type": "date"})
|
||||||
|
custom_datetime_widget = forms.DateTimeInput(
|
||||||
|
attrs={"type": "datetime-local"}, format="%Y-%m-%d %H:%M"
|
||||||
|
)
|
||||||
|
autofocus_select_widget = forms.Select(attrs={"autofocus": "autofocus"})
|
||||||
|
autofocus_input_widget = forms.TextInput(attrs={"autofocus": "autofocus"})
|
||||||
|
|
||||||
|
|
||||||
class SessionForm(forms.ModelForm):
|
class SessionForm(forms.ModelForm):
|
||||||
purchase = forms.ModelChoiceField(queryset=Purchase.objects.order_by("game__name"))
|
# purchase = forms.ModelChoiceField(
|
||||||
|
# queryset=Purchase.objects.filter(date_refunded=None).order_by("edition__name")
|
||||||
|
# )
|
||||||
|
purchase = forms.ModelChoiceField(
|
||||||
|
queryset=Purchase.objects.order_by("edition__name"),
|
||||||
|
widget=autofocus_select_widget,
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
widgets = {
|
||||||
|
"timestamp_start": custom_datetime_widget,
|
||||||
|
"timestamp_end": custom_datetime_widget,
|
||||||
|
}
|
||||||
model = Session
|
model = Session
|
||||||
fields = [
|
fields = [
|
||||||
"purchase",
|
"purchase",
|
||||||
"timestamp_start",
|
"timestamp_start",
|
||||||
"timestamp_end",
|
"timestamp_end",
|
||||||
"duration_manual",
|
"duration_manual",
|
||||||
|
"device",
|
||||||
"note",
|
"note",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
class EditionChoiceField(forms.ModelChoiceField):
|
||||||
|
def label_from_instance(self, obj) -> str:
|
||||||
|
return f"{obj.name} ({obj.platform}, {obj.year_released})"
|
||||||
|
|
||||||
|
|
||||||
class PurchaseForm(forms.ModelForm):
|
class PurchaseForm(forms.ModelForm):
|
||||||
game = forms.ModelChoiceField(queryset=Game.objects.order_by("name"))
|
edition = EditionChoiceField(
|
||||||
|
queryset=Edition.objects.order_by("name"), widget=autofocus_select_widget
|
||||||
|
)
|
||||||
platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
|
platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
widgets = {
|
||||||
|
"date_purchased": custom_date_widget,
|
||||||
|
"date_refunded": custom_date_widget,
|
||||||
|
}
|
||||||
model = Purchase
|
model = Purchase
|
||||||
fields = ["game", "platform", "date_purchased", "date_refunded"]
|
fields = [
|
||||||
|
"edition",
|
||||||
|
"platform",
|
||||||
|
"date_purchased",
|
||||||
|
"date_refunded",
|
||||||
|
"price",
|
||||||
|
"price_currency",
|
||||||
|
"ownership_type",
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
class EditionForm(forms.ModelForm):
|
||||||
|
game = forms.ModelChoiceField(
|
||||||
|
queryset=Game.objects.order_by("name"), widget=autofocus_select_widget
|
||||||
|
)
|
||||||
|
platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = Edition
|
||||||
|
fields = ["game", "name", "platform", "year_released", "wikidata"]
|
||||||
|
|
||||||
|
|
||||||
class GameForm(forms.ModelForm):
|
class GameForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Game
|
model = Game
|
||||||
fields = ["name", "wikidata"]
|
fields = ["name", "wikidata"]
|
||||||
|
widgets = {"name": autofocus_input_widget}
|
||||||
|
|
||||||
|
|
||||||
class PlatformForm(forms.ModelForm):
|
class PlatformForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Platform
|
model = Platform
|
||||||
fields = ["name", "group"]
|
fields = ["name", "group"]
|
||||||
|
widgets = {"name": autofocus_input_widget}
|
||||||
|
|
||||||
|
|
||||||
|
class DeviceForm(forms.ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = Device
|
||||||
|
fields = ["name", "type"]
|
||||||
|
widgets = {"name": autofocus_input_widget}
|
||||||
|
41
games/migrations/0008_edition.py
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-02-18 16:29
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0007_alter_purchase_game_alter_purchase_platform_and_more"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name="Edition",
|
||||||
|
fields=[
|
||||||
|
(
|
||||||
|
"id",
|
||||||
|
models.BigAutoField(
|
||||||
|
auto_created=True,
|
||||||
|
primary_key=True,
|
||||||
|
serialize=False,
|
||||||
|
verbose_name="ID",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
("name", models.CharField(max_length=255)),
|
||||||
|
(
|
||||||
|
"game",
|
||||||
|
models.ForeignKey(
|
||||||
|
on_delete=django.db.models.deletion.CASCADE, to="games.game"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"platform",
|
||||||
|
models.ForeignKey(
|
||||||
|
on_delete=django.db.models.deletion.CASCADE, to="games.platform"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
]
|
34
games/migrations/0009_create_editions.py
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-02-18 18:51
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
def create_edition_of_game(apps, schema_editor):
|
||||||
|
Game = apps.get_model("games", "Game")
|
||||||
|
Edition = apps.get_model("games", "Edition")
|
||||||
|
Platform = apps.get_model("games", "Platform")
|
||||||
|
first_platform = Platform.objects.first()
|
||||||
|
all_games = Game.objects.all()
|
||||||
|
all_editions = Edition.objects.all()
|
||||||
|
for game in all_games:
|
||||||
|
existing_edition = None
|
||||||
|
try:
|
||||||
|
existing_edition = all_editions.objects.get(game=game.id)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
if existing_edition == None:
|
||||||
|
edition = Edition()
|
||||||
|
edition.id = game.id
|
||||||
|
edition.game = game
|
||||||
|
edition.name = game.name
|
||||||
|
edition.platform = first_platform
|
||||||
|
edition.save()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0008_edition"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [migrations.RunPython(create_edition_of_game)]
|
21
games/migrations/0010_alter_purchase_game.py
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-02-18 19:06
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0009_create_editions"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="game",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
on_delete=django.db.models.deletion.CASCADE, to="games.edition"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
18
games/migrations/0011_rename_game_purchase_edition.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-02-18 19:18
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0010_alter_purchase_game"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RenameField(
|
||||||
|
model_name="purchase",
|
||||||
|
old_name="game",
|
||||||
|
new_name="edition",
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,23 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-02-18 19:53
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0011_rename_game_purchase_edition"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="price",
|
||||||
|
field=models.IntegerField(default=0),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="price_currency",
|
||||||
|
field=models.CharField(default="USD", max_length=3),
|
||||||
|
),
|
||||||
|
]
|
31
games/migrations/0013_purchase_ownership_type.py
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-02-18 19:54
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0012_purchase_price_purchase_price_currency"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="ownership_type",
|
||||||
|
field=models.CharField(
|
||||||
|
choices=[
|
||||||
|
("ph", "Physical"),
|
||||||
|
("di", "Digital"),
|
||||||
|
("du", "Digital Upgrade"),
|
||||||
|
("re", "Rented"),
|
||||||
|
("bo", "Borrowed"),
|
||||||
|
("tr", "Trial"),
|
||||||
|
("de", "Demo"),
|
||||||
|
("pi", "Pirated"),
|
||||||
|
],
|
||||||
|
default="di",
|
||||||
|
max_length=2,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
52
games/migrations/0014_device_session_device.py
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-02-18 19:59
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0013_purchase_ownership_type"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name="Device",
|
||||||
|
fields=[
|
||||||
|
(
|
||||||
|
"id",
|
||||||
|
models.BigAutoField(
|
||||||
|
auto_created=True,
|
||||||
|
primary_key=True,
|
||||||
|
serialize=False,
|
||||||
|
verbose_name="ID",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
("name", models.CharField(max_length=255)),
|
||||||
|
(
|
||||||
|
"type",
|
||||||
|
models.CharField(
|
||||||
|
choices=[
|
||||||
|
("pc", "PC"),
|
||||||
|
("co", "Console"),
|
||||||
|
("ha", "Handheld"),
|
||||||
|
("mo", "Mobile"),
|
||||||
|
("sbc", "Single-board computer"),
|
||||||
|
],
|
||||||
|
default="pc",
|
||||||
|
max_length=3,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="session",
|
||||||
|
name="device",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.device",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,23 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-02-20 14:55
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0014_device_session_device"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="edition",
|
||||||
|
name="wikidata",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=50, null=True),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="edition",
|
||||||
|
name="year_released",
|
||||||
|
field=models.IntegerField(default=2023),
|
||||||
|
),
|
||||||
|
]
|
@ -16,14 +16,52 @@ class Game(models.Model):
|
|||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
|
||||||
class Purchase(models.Model):
|
class Edition(models.Model):
|
||||||
game = models.ForeignKey("Game", on_delete=models.CASCADE)
|
game = models.ForeignKey("Game", on_delete=models.CASCADE)
|
||||||
|
name = models.CharField(max_length=255)
|
||||||
|
platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
|
||||||
|
year_released = models.IntegerField(default=datetime.today().year)
|
||||||
|
wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.name
|
||||||
|
|
||||||
|
|
||||||
|
class Purchase(models.Model):
|
||||||
|
PHYSICAL = "ph"
|
||||||
|
DIGITAL = "di"
|
||||||
|
DIGITALUPGRADE = "du"
|
||||||
|
RENTED = "re"
|
||||||
|
BORROWED = "bo"
|
||||||
|
TRIAL = "tr"
|
||||||
|
DEMO = "de"
|
||||||
|
PIRATED = "pi"
|
||||||
|
OWNERSHIP_TYPES = [
|
||||||
|
(PHYSICAL, "Physical"),
|
||||||
|
(DIGITAL, "Digital"),
|
||||||
|
(DIGITALUPGRADE, "Digital Upgrade"),
|
||||||
|
(RENTED, "Rented"),
|
||||||
|
(BORROWED, "Borrowed"),
|
||||||
|
(TRIAL, "Trial"),
|
||||||
|
(DEMO, "Demo"),
|
||||||
|
(PIRATED, "Pirated"),
|
||||||
|
]
|
||||||
|
|
||||||
|
edition = models.ForeignKey("Edition", on_delete=models.CASCADE)
|
||||||
platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
|
platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
|
||||||
date_purchased = models.DateField()
|
date_purchased = models.DateField()
|
||||||
date_refunded = models.DateField(blank=True, null=True)
|
date_refunded = models.DateField(blank=True, null=True)
|
||||||
|
price = models.IntegerField(default=0)
|
||||||
|
price_currency = models.CharField(max_length=3, default="USD")
|
||||||
|
ownership_type = models.CharField(
|
||||||
|
max_length=2, choices=OWNERSHIP_TYPES, default=DIGITAL
|
||||||
|
)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"{self.game} ({self.platform})"
|
platform_info = self.platform
|
||||||
|
if self.platform != self.edition.platform:
|
||||||
|
platform_info = f"{self.edition.platform} version on {self.platform}"
|
||||||
|
return f"{self.edition} ({platform_info}, {self.edition.year_released}, {self.get_ownership_type_display()})"
|
||||||
|
|
||||||
|
|
||||||
class Platform(models.Model):
|
class Platform(models.Model):
|
||||||
@ -48,6 +86,7 @@ class Session(models.Model):
|
|||||||
timestamp_end = models.DateTimeField(blank=True, null=True)
|
timestamp_end = models.DateTimeField(blank=True, null=True)
|
||||||
duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
|
duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
|
||||||
duration_calculated = models.DurationField(blank=True, null=True)
|
duration_calculated = models.DurationField(blank=True, null=True)
|
||||||
|
device = models.ForeignKey("Device", on_delete=models.CASCADE, null=True)
|
||||||
note = models.TextField(blank=True, null=True)
|
note = models.TextField(blank=True, null=True)
|
||||||
|
|
||||||
objects = SessionQuerySet.as_manager()
|
objects = SessionQuerySet.as_manager()
|
||||||
@ -85,3 +124,23 @@ class Session(models.Model):
|
|||||||
else:
|
else:
|
||||||
self.duration_calculated = timedelta(0)
|
self.duration_calculated = timedelta(0)
|
||||||
super(Session, self).save(*args, **kwargs)
|
super(Session, self).save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
class Device(models.Model):
|
||||||
|
PC = "pc"
|
||||||
|
CONSOLE = "co"
|
||||||
|
HANDHELD = "ha"
|
||||||
|
MOBILE = "mo"
|
||||||
|
SBC = "sbc"
|
||||||
|
DEVICE_TYPES = [
|
||||||
|
(PC, "PC"),
|
||||||
|
(CONSOLE, "Console"),
|
||||||
|
(HANDHELD, "Handheld"),
|
||||||
|
(MOBILE, "Mobile"),
|
||||||
|
(SBC, "Single-board computer"),
|
||||||
|
]
|
||||||
|
name = models.CharField(max_length=255)
|
||||||
|
type = models.CharField(max_length=3, choices=DEVICE_TYPES, default=PC)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return f"{self.name} ({self.get_type_display()})"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com
|
! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -31,6 +31,7 @@
|
|||||||
3. Use a more readable tab size.
|
3. Use a more readable tab size.
|
||||||
4. Use the user's configured `sans` font-family by default.
|
4. Use the user's configured `sans` font-family by default.
|
||||||
5. Use the user's configured `sans` font-feature-settings by default.
|
5. Use the user's configured `sans` font-feature-settings by default.
|
||||||
|
6. Use the user's configured `sans` font-variation-settings by default.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
html {
|
html {
|
||||||
@ -43,10 +44,12 @@ html {
|
|||||||
-o-tab-size: 4;
|
-o-tab-size: 4;
|
||||||
tab-size: 4;
|
tab-size: 4;
|
||||||
/* 3 */
|
/* 3 */
|
||||||
font-family: Inter, sans-serif;
|
font-family: IBM Plex Sans, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
|
||||||
/* 4 */
|
/* 4 */
|
||||||
font-feature-settings: normal;
|
font-feature-settings: normal;
|
||||||
/* 5 */
|
/* 5 */
|
||||||
|
font-variation-settings: normal;
|
||||||
|
/* 6 */
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -126,7 +129,7 @@ code,
|
|||||||
kbd,
|
kbd,
|
||||||
samp,
|
samp,
|
||||||
pre {
|
pre {
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
font-family: IBM Plex Mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
||||||
/* 1 */
|
/* 1 */
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
/* 2 */
|
/* 2 */
|
||||||
@ -188,6 +191,10 @@ select,
|
|||||||
textarea {
|
textarea {
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
/* 1 */
|
/* 1 */
|
||||||
|
font-feature-settings: inherit;
|
||||||
|
/* 1 */
|
||||||
|
font-variation-settings: inherit;
|
||||||
|
/* 1 */
|
||||||
font-size: 100%;
|
font-size: 100%;
|
||||||
/* 1 */
|
/* 1 */
|
||||||
font-weight: inherit;
|
font-weight: inherit;
|
||||||
@ -338,6 +345,14 @@ menu {
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Reset default styling for dialogs.
|
||||||
|
*/
|
||||||
|
|
||||||
|
dialog {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Prevent resizing textareas horizontally by default.
|
Prevent resizing textareas horizontally by default.
|
||||||
*/
|
*/
|
||||||
@ -419,7 +434,7 @@ video {
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
[type='text'],[type='email'],[type='url'],[type='password'],[type='number'],[type='date'],[type='datetime-local'],[type='month'],[type='search'],[type='tel'],[type='time'],[type='week'],[multiple],textarea,select {
|
[type='text'],input:where(:not([type])),[type='email'],[type='url'],[type='password'],[type='number'],[type='date'],[type='datetime-local'],[type='month'],[type='search'],[type='tel'],[type='time'],[type='week'],[multiple],textarea,select {
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
-moz-appearance: none;
|
-moz-appearance: none;
|
||||||
appearance: none;
|
appearance: none;
|
||||||
@ -436,7 +451,7 @@ video {
|
|||||||
--tw-shadow: 0 0 #0000;
|
--tw-shadow: 0 0 #0000;
|
||||||
}
|
}
|
||||||
|
|
||||||
[type='text']:focus, [type='email']:focus, [type='url']:focus, [type='password']:focus, [type='number']:focus, [type='date']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='week']:focus, [multiple]:focus, textarea:focus, select:focus {
|
[type='text']:focus, input:where(:not([type])):focus, [type='email']:focus, [type='url']:focus, [type='password']:focus, [type='number']:focus, [type='date']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='week']:focus, [multiple]:focus, textarea:focus, select:focus {
|
||||||
outline: 2px solid transparent;
|
outline: 2px solid transparent;
|
||||||
outline-offset: 2px;
|
outline-offset: 2px;
|
||||||
--tw-ring-inset: var(--tw-empty,/*!*/ /*!*/);
|
--tw-ring-inset: var(--tw-empty,/*!*/ /*!*/);
|
||||||
@ -465,6 +480,11 @@ input::placeholder,textarea::placeholder {
|
|||||||
|
|
||||||
::-webkit-date-and-time-value {
|
::-webkit-date-and-time-value {
|
||||||
min-height: 1.5em;
|
min-height: 1.5em;
|
||||||
|
text-align: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-datetime-edit {
|
||||||
|
display: inline-flex;
|
||||||
}
|
}
|
||||||
|
|
||||||
::-webkit-datetime-edit,::-webkit-datetime-edit-year-field,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute-field,::-webkit-datetime-edit-second-field,::-webkit-datetime-edit-millisecond-field,::-webkit-datetime-edit-meridiem-field {
|
::-webkit-datetime-edit,::-webkit-datetime-edit-year-field,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute-field,::-webkit-datetime-edit-second-field,::-webkit-datetime-edit-millisecond-field,::-webkit-datetime-edit-meridiem-field {
|
||||||
@ -482,7 +502,7 @@ select {
|
|||||||
print-color-adjust: exact;
|
print-color-adjust: exact;
|
||||||
}
|
}
|
||||||
|
|
||||||
[multiple] {
|
[multiple],[size]:where(select:not([size="1"])) {
|
||||||
background-image: initial;
|
background-image: initial;
|
||||||
background-position: initial;
|
background-position: initial;
|
||||||
background-repeat: unset;
|
background-repeat: unset;
|
||||||
@ -599,6 +619,9 @@ select {
|
|||||||
--tw-pan-y: ;
|
--tw-pan-y: ;
|
||||||
--tw-pinch-zoom: ;
|
--tw-pinch-zoom: ;
|
||||||
--tw-scroll-snap-strictness: proximity;
|
--tw-scroll-snap-strictness: proximity;
|
||||||
|
--tw-gradient-from-position: ;
|
||||||
|
--tw-gradient-via-position: ;
|
||||||
|
--tw-gradient-to-position: ;
|
||||||
--tw-ordinal: ;
|
--tw-ordinal: ;
|
||||||
--tw-slashed-zero: ;
|
--tw-slashed-zero: ;
|
||||||
--tw-numeric-figure: ;
|
--tw-numeric-figure: ;
|
||||||
@ -646,6 +669,9 @@ select {
|
|||||||
--tw-pan-y: ;
|
--tw-pan-y: ;
|
||||||
--tw-pinch-zoom: ;
|
--tw-pinch-zoom: ;
|
||||||
--tw-scroll-snap-strictness: proximity;
|
--tw-scroll-snap-strictness: proximity;
|
||||||
|
--tw-gradient-from-position: ;
|
||||||
|
--tw-gradient-via-position: ;
|
||||||
|
--tw-gradient-to-position: ;
|
||||||
--tw-ordinal: ;
|
--tw-ordinal: ;
|
||||||
--tw-slashed-zero: ;
|
--tw-slashed-zero: ;
|
||||||
--tw-numeric-figure: ;
|
--tw-numeric-figure: ;
|
||||||
@ -713,6 +739,10 @@ select {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.invisible {
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
.static {
|
.static {
|
||||||
position: static;
|
position: static;
|
||||||
}
|
}
|
||||||
@ -721,16 +751,24 @@ select {
|
|||||||
position: fixed;
|
position: fixed;
|
||||||
}
|
}
|
||||||
|
|
||||||
.left-2 {
|
.absolute {
|
||||||
left: 0.5rem;
|
position: absolute;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bottom-2 {
|
.bottom-2 {
|
||||||
bottom: 0.5rem;
|
bottom: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.clear-both {
|
.left-2 {
|
||||||
clear: both;
|
left: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.right-3 {
|
||||||
|
right: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.top-3 {
|
||||||
|
top: 0.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx-auto {
|
.mx-auto {
|
||||||
@ -738,26 +776,27 @@ select {
|
|||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.my-4 {
|
||||||
|
margin-top: 1rem;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
.mb-4 {
|
.mb-4 {
|
||||||
margin-bottom: 1rem;
|
margin-bottom: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mt-4 {
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mb-3 {
|
|
||||||
margin-bottom: 0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mt-10 {
|
|
||||||
margin-top: 2.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ml-1 {
|
.ml-1 {
|
||||||
margin-left: 0.25rem;
|
margin-left: 0.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mr-4 {
|
||||||
|
margin-right: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mt-4 {
|
||||||
|
margin-top: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
.block {
|
.block {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
@ -770,46 +809,68 @@ select {
|
|||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|
||||||
.h-6 {
|
.table {
|
||||||
height: 1.5rem;
|
display: table;
|
||||||
}
|
}
|
||||||
|
|
||||||
.h-5 {
|
.hidden {
|
||||||
height: 1.25rem;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.h-4 {
|
.h-4 {
|
||||||
height: 1rem;
|
height: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.h-5 {
|
||||||
|
height: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.h-6 {
|
||||||
|
height: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
.min-h-screen {
|
.min-h-screen {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
.w-full {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.w-6 {
|
|
||||||
width: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.w-5 {
|
|
||||||
width: 1.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.w-7 {
|
|
||||||
width: 1.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.w-4 {
|
.w-4 {
|
||||||
width: 1rem;
|
width: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.w-5 {
|
||||||
|
width: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.w-6 {
|
||||||
|
width: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.w-7 {
|
||||||
|
width: 1.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.w-full {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.max-w-screen-lg {
|
.max-w-screen-lg {
|
||||||
max-width: 1024px;
|
max-width: 1024px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.max-w-xs {
|
||||||
|
max-width: 20rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin {
|
||||||
|
to {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.animate-spin {
|
||||||
|
animation: spin 1s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
.flex-col {
|
.flex-col {
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
@ -834,10 +895,6 @@ select {
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gap-4 {
|
|
||||||
gap: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.self-center {
|
.self-center {
|
||||||
align-self: center;
|
align-self: center;
|
||||||
}
|
}
|
||||||
@ -846,6 +903,12 @@ select {
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.truncate {
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
.text-ellipsis {
|
.text-ellipsis {
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
@ -862,46 +925,38 @@ select {
|
|||||||
border-radius: 0.5rem;
|
border-radius: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.rounded-xl {
|
|
||||||
border-radius: 0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.border-gray-200 {
|
.border-gray-200 {
|
||||||
--tw-border-opacity: 1;
|
--tw-border-opacity: 1;
|
||||||
border-color: rgb(229 231 235 / var(--tw-border-opacity));
|
border-color: rgb(229 231 235 / var(--tw-border-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.bg-white {
|
|
||||||
--tw-bg-opacity: 1;
|
|
||||||
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.bg-green-600 {
|
|
||||||
--tw-bg-opacity: 1;
|
|
||||||
background-color: rgb(22 163 74 / var(--tw-bg-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.bg-blue-600 {
|
.bg-blue-600 {
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(37 99 235 / var(--tw-bg-opacity));
|
background-color: rgb(37 99 235 / var(--tw-bg-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bg-green-600 {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(22 163 74 / var(--tw-bg-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
.bg-red-600 {
|
.bg-red-600 {
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(220 38 38 / var(--tw-bg-opacity));
|
background-color: rgb(220 38 38 / var(--tw-bg-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bg-white {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
.p-4 {
|
.p-4 {
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.p-2 {
|
.px-2 {
|
||||||
padding: 0.5rem;
|
padding-left: 0.5rem;
|
||||||
}
|
padding-right: 0.5rem;
|
||||||
|
|
||||||
.py-2 {
|
|
||||||
padding-top: 0.5rem;
|
|
||||||
padding-bottom: 0.5rem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.py-1 {
|
.py-1 {
|
||||||
@ -909,9 +964,9 @@ select {
|
|||||||
padding-bottom: 0.25rem;
|
padding-bottom: 0.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.px-2 {
|
.py-2 {
|
||||||
padding-left: 0.5rem;
|
padding-top: 0.5rem;
|
||||||
padding-right: 0.5rem;
|
padding-bottom: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pl-3 {
|
.pl-3 {
|
||||||
@ -926,8 +981,8 @@ select {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-right {
|
.font-mono {
|
||||||
text-align: right;
|
font-family: IBM Plex Mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-4xl {
|
.text-4xl {
|
||||||
@ -935,6 +990,11 @@ select {
|
|||||||
line-height: 2.5rem;
|
line-height: 2.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.text-base {
|
||||||
|
font-size: 1rem;
|
||||||
|
line-height: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
.text-xl {
|
.text-xl {
|
||||||
font-size: 1.25rem;
|
font-size: 1.25rem;
|
||||||
line-height: 1.75rem;
|
line-height: 1.75rem;
|
||||||
@ -945,23 +1005,13 @@ select {
|
|||||||
line-height: 1rem;
|
line-height: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-base {
|
|
||||||
font-size: 1rem;
|
|
||||||
line-height: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.text-lg {
|
|
||||||
font-size: 1.125rem;
|
|
||||||
line-height: 1.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.font-semibold {
|
.font-semibold {
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-white {
|
.text-red-400 {
|
||||||
--tw-text-opacity: 1;
|
--tw-text-opacity: 1;
|
||||||
color: rgb(255 255 255 / var(--tw-text-opacity));
|
color: rgb(248 113 113 / var(--tw-text-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-slate-300 {
|
.text-slate-300 {
|
||||||
@ -969,9 +1019,14 @@ select {
|
|||||||
color: rgb(203 213 225 / var(--tw-text-opacity));
|
color: rgb(203 213 225 / var(--tw-text-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-red-400 {
|
.text-white {
|
||||||
--tw-text-opacity: 1;
|
--tw-text-opacity: 1;
|
||||||
color: rgb(248 113 113 / var(--tw-text-opacity));
|
color: rgb(255 255 255 / var(--tw-text-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
|
.text-yellow-300 {
|
||||||
|
--tw-text-opacity: 1;
|
||||||
|
color: rgb(253 224 71 / var(--tw-text-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.shadow-md {
|
.shadow-md {
|
||||||
@ -980,10 +1035,8 @@ select {
|
|||||||
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
|
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
.shadow {
|
.filter {
|
||||||
--tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
|
filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
|
||||||
--tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
|
|
||||||
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.transition {
|
.transition {
|
||||||
@ -994,6 +1047,12 @@ select {
|
|||||||
transition-duration: 150ms;
|
transition-duration: 150ms;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.transition-all {
|
||||||
|
transition-property: all;
|
||||||
|
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
|
transition-duration: 150ms;
|
||||||
|
}
|
||||||
|
|
||||||
.duration-200 {
|
.duration-200 {
|
||||||
transition-duration: 200ms;
|
transition-duration: 200ms;
|
||||||
}
|
}
|
||||||
@ -1002,14 +1061,78 @@ select {
|
|||||||
transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
|
transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark form label {
|
.max-w-20char {
|
||||||
|
max-width: 20ch;
|
||||||
|
}
|
||||||
|
|
||||||
|
.\[a-zA-Z\:\\-\] {
|
||||||
|
a-z-a--z: \-;
|
||||||
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: "IBM Plex Mono";
|
||||||
|
|
||||||
|
src: url("fonts/IBMPlexMono-regular.ttf") format("truetype");
|
||||||
|
|
||||||
|
font-weight: 400;
|
||||||
|
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: "IBM Plex Sans";
|
||||||
|
|
||||||
|
src: url("fonts/IBMPlexSans-Regular.ttf") format("truetype");
|
||||||
|
|
||||||
|
font-weight: 400;
|
||||||
|
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
:is(.dark form label) {
|
||||||
--tw-text-opacity: 1;
|
--tw-text-opacity: 1;
|
||||||
color: rgb(148 163 184 / var(--tw-text-opacity));
|
color: rgb(148 163 184 / var(--tw-text-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark form input,.dark
|
.responsive-table {
|
||||||
select,.dark
|
margin-left: auto;
|
||||||
textarea {
|
margin-right: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
:is(.dark .responsive-table) {
|
||||||
|
--tw-text-opacity: 1;
|
||||||
|
color: rgb(255 255 255 / var(--tw-text-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
|
.responsive-table tr:nth-child(even) {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(30 41 59 / var(--tw-bg-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
|
.responsive-table tbody tr:nth-child(odd) {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(15 23 42 / var(--tw-bg-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
|
.responsive-table thead th {
|
||||||
|
border-bottom-width: 2px;
|
||||||
|
--tw-border-opacity: 1;
|
||||||
|
border-bottom-color: rgb(100 116 139 / var(--tw-border-opacity));
|
||||||
|
text-align: left;
|
||||||
|
font-size: 1.25rem;
|
||||||
|
line-height: 1.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.responsive-table thead th:not(:first-child),
|
||||||
|
.responsive-table td:not(:first-child) {
|
||||||
|
border-left-width: 1px;
|
||||||
|
--tw-border-opacity: 1;
|
||||||
|
border-left-color: rgb(100 116 139 / var(--tw-border-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
|
:is(.dark form input),:is(.dark
|
||||||
|
select),:is(.dark
|
||||||
|
textarea) {
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
--tw-border-opacity: 1;
|
--tw-border-opacity: 1;
|
||||||
border-color: rgb(15 23 42 / var(--tw-border-opacity));
|
border-color: rgb(15 23 42 / var(--tw-border-opacity));
|
||||||
@ -1019,9 +1142,20 @@ textarea {
|
|||||||
color: rgb(241 245 249 / var(--tw-text-opacity));
|
color: rgb(241 245 249 / var(--tw-text-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
#session-table {
|
@media screen and (min-width: 768px) {
|
||||||
display: grid;
|
form input,
|
||||||
grid-template-columns: 3fr 1fr repeat(2, 2fr) 0.5fr 1fr;
|
select,
|
||||||
|
textarea {
|
||||||
|
width: 300px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: 768px) {
|
||||||
|
form input,
|
||||||
|
select,
|
||||||
|
textarea {
|
||||||
|
width: 150px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#button-container button {
|
#button-container button {
|
||||||
@ -1029,9 +1163,78 @@ textarea {
|
|||||||
margin-right: 0.25rem;
|
margin-right: 0.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.hover\:bg-green-700:hover {
|
th {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
th label {
|
||||||
|
margin-right: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.basic-button-container {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.basic-button-container > :not([hidden]) ~ :not([hidden]) {
|
||||||
|
--tw-space-x-reverse: 0;
|
||||||
|
margin-right: calc(0.5rem * var(--tw-space-x-reverse));
|
||||||
|
margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse)));
|
||||||
|
}
|
||||||
|
|
||||||
|
.basic-button {
|
||||||
|
display: inline-block;
|
||||||
|
border-radius: 0.25rem;
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(21 128 61 / var(--tw-bg-opacity));
|
background-color: rgb(37 99 235 / var(--tw-bg-opacity));
|
||||||
|
padding-left: 1.5rem;
|
||||||
|
padding-right: 1.5rem;
|
||||||
|
padding-top: 0.625rem;
|
||||||
|
padding-bottom: 0.625rem;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
line-height: 1rem;
|
||||||
|
font-weight: 500;
|
||||||
|
text-transform: uppercase;
|
||||||
|
line-height: 1.25;
|
||||||
|
--tw-text-opacity: 1;
|
||||||
|
color: rgb(255 255 255 / var(--tw-text-opacity));
|
||||||
|
--tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
|
||||||
|
--tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
|
||||||
|
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
|
||||||
|
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
|
||||||
|
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
|
||||||
|
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
|
||||||
|
transition-duration: 150ms;
|
||||||
|
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.basic-button:hover {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(29 78 216 / var(--tw-bg-opacity));
|
||||||
|
--tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
|
||||||
|
--tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);
|
||||||
|
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.basic-button:focus {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(29 78 216 / var(--tw-bg-opacity));
|
||||||
|
--tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
|
||||||
|
--tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);
|
||||||
|
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
|
||||||
|
outline: 2px solid transparent;
|
||||||
|
outline-offset: 2px;
|
||||||
|
--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
|
||||||
|
--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color);
|
||||||
|
box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
|
||||||
|
}
|
||||||
|
|
||||||
|
.basic-button:active {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(30 64 175 / var(--tw-bg-opacity));
|
||||||
|
--tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
|
||||||
|
--tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);
|
||||||
|
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
.hover\:bg-blue-700:hover {
|
.hover\:bg-blue-700:hover {
|
||||||
@ -1039,6 +1242,11 @@ textarea {
|
|||||||
background-color: rgb(29 78 216 / var(--tw-bg-opacity));
|
background-color: rgb(29 78 216 / var(--tw-bg-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hover\:bg-green-700:hover {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(21 128 61 / var(--tw-bg-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
.hover\:bg-red-700:hover {
|
.hover\:bg-red-700:hover {
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(185 28 28 / var(--tw-bg-opacity));
|
background-color: rgb(185 28 28 / var(--tw-bg-opacity));
|
||||||
@ -1059,16 +1267,16 @@ textarea {
|
|||||||
box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
|
box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
|
||||||
}
|
}
|
||||||
|
|
||||||
.focus\:ring-green-500:focus {
|
|
||||||
--tw-ring-opacity: 1;
|
|
||||||
--tw-ring-color: rgb(34 197 94 / var(--tw-ring-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.focus\:ring-blue-500:focus {
|
.focus\:ring-blue-500:focus {
|
||||||
--tw-ring-opacity: 1;
|
--tw-ring-opacity: 1;
|
||||||
--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
|
--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.focus\:ring-green-500:focus {
|
||||||
|
--tw-ring-opacity: 1;
|
||||||
|
--tw-ring-color: rgb(34 197 94 / var(--tw-ring-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
.focus\:ring-red-500:focus {
|
.focus\:ring-red-500:focus {
|
||||||
--tw-ring-opacity: 1;
|
--tw-ring-opacity: 1;
|
||||||
--tw-ring-color: rgb(239 68 68 / var(--tw-ring-opacity));
|
--tw-ring-color: rgb(239 68 68 / var(--tw-ring-opacity));
|
||||||
@ -1082,44 +1290,44 @@ textarea {
|
|||||||
--tw-ring-offset-color: #bfdbfe;
|
--tw-ring-offset-color: #bfdbfe;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark .dark\:border-white {
|
:is(.dark .dark\:bg-gray-800) {
|
||||||
--tw-border-opacity: 1;
|
|
||||||
border-color: rgb(255 255 255 / var(--tw-border-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.dark .dark\:bg-gray-800 {
|
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
|
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark .dark\:bg-gray-900 {
|
:is(.dark .dark\:bg-gray-900) {
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(17 24 39 / var(--tw-bg-opacity));
|
background-color: rgb(17 24 39 / var(--tw-bg-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark .dark\:bg-slate-700 {
|
:is(.dark .dark\:text-slate-400) {
|
||||||
--tw-bg-opacity: 1;
|
|
||||||
background-color: rgb(51 65 85 / var(--tw-bg-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.dark .dark\:text-white {
|
|
||||||
--tw-text-opacity: 1;
|
|
||||||
color: rgb(255 255 255 / var(--tw-text-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.dark .dark\:text-slate-600 {
|
|
||||||
--tw-text-opacity: 1;
|
|
||||||
color: rgb(71 85 105 / var(--tw-text-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.dark .dark\:text-slate-400 {
|
|
||||||
--tw-text-opacity: 1;
|
--tw-text-opacity: 1;
|
||||||
color: rgb(148 163 184 / var(--tw-text-opacity));
|
color: rgb(148 163 184 / var(--tw-text-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark .dark\:text-slate-300 {
|
:is(.dark .dark\:text-slate-600) {
|
||||||
--tw-text-opacity: 1;
|
--tw-text-opacity: 1;
|
||||||
color: rgb(203 213 225 / var(--tw-text-opacity));
|
color: rgb(71 85 105 / var(--tw-text-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
|
:is(.dark .dark\:text-white) {
|
||||||
|
--tw-text-opacity: 1;
|
||||||
|
color: rgb(255 255 255 / var(--tw-text-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 640px) {
|
||||||
|
.sm\:table-cell {
|
||||||
|
display: table-cell;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sm\:max-w-md {
|
||||||
|
max-width: 28rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sm\:px-4 {
|
||||||
|
padding-left: 1rem;
|
||||||
|
padding-right: 1rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
@ -1134,4 +1342,28 @@ textarea {
|
|||||||
.md\:flex-row {
|
.md\:flex-row {
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.md\:px-6 {
|
||||||
|
padding-left: 1.5rem;
|
||||||
|
padding-right: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.md\:py-2 {
|
||||||
|
padding-top: 0.5rem;
|
||||||
|
padding-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.md\:max-w-40char {
|
||||||
|
max-width: 40ch;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 1024px) {
|
||||||
|
.lg\:table-cell {
|
||||||
|
display: table-cell;
|
||||||
|
}
|
||||||
|
|
||||||
|
.lg\:max-w-lg {
|
||||||
|
max-width: 32rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
BIN
games/static/fonts/IBMPlexMono-Regular.ttf
Normal file
BIN
games/static/fonts/IBMPlexSans-Regular.ttf
Normal file
BIN
games/static/icons/edition_black.png
Normal file
After Width: | Height: | Size: 292 KiB |
BIN
games/static/icons/edition_white.png
Normal file
After Width: | Height: | Size: 321 KiB |
BIN
games/static/icons/game_black.png
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
games/static/icons/game_white.png
Normal file
After Width: | Height: | Size: 306 KiB |
BIN
games/static/icons/loading.png
Normal file
After Width: | Height: | Size: 787 B |
BIN
games/static/icons/purchase_black.png
Normal file
After Width: | Height: | Size: 312 KiB |
BIN
games/static/icons/purchase_white.png
Normal file
After Width: | Height: | Size: 364 KiB |
BIN
games/static/icons/schedule.png
Normal file
After Width: | Height: | Size: 42 KiB |
29
games/static/js/add_edition.js
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
/**
|
||||||
|
* @description Sync select field with input field until user focuses it.
|
||||||
|
* @param {HTMLSelectElement} sourceElementSelector
|
||||||
|
* @param {HTMLInputElement} targetElementSelector
|
||||||
|
*/
|
||||||
|
function syncSelectInputUntilChanged(
|
||||||
|
sourceElementSelector,
|
||||||
|
targetElementSelector
|
||||||
|
) {
|
||||||
|
const sourceElement = document.querySelector(sourceElementSelector);
|
||||||
|
const targetElement = document.querySelector(targetElementSelector);
|
||||||
|
function sourceElementHandler(event) {
|
||||||
|
let selected = event.target.value;
|
||||||
|
let selectedValue = document.querySelector(
|
||||||
|
`#id_game option[value='${selected}']`
|
||||||
|
).textContent;
|
||||||
|
targetElement.value = selectedValue;
|
||||||
|
}
|
||||||
|
function targetElementHandler(event) {
|
||||||
|
sourceElement.removeEventListener("change", sourceElementHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceElement.addEventListener("change", sourceElementHandler);
|
||||||
|
targetElement.addEventListener("focus", targetElementHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
window.addEventListener("load", () => {
|
||||||
|
syncSelectInputUntilChanged("#id_game", "#id_name");
|
||||||
|
});
|
19
games/static/js/add_session.js
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
import { toISOUTCString } from "./utils.js";
|
||||||
|
|
||||||
|
for (let button of document.querySelectorAll("[data-target]")) {
|
||||||
|
let target = button.getAttribute("data-target");
|
||||||
|
let type = button.getAttribute("data-type");
|
||||||
|
let targetElement = document.querySelector(`#id_${target}`);
|
||||||
|
button.addEventListener("click", (event) => {
|
||||||
|
event.preventDefault();
|
||||||
|
if (type == "now") {
|
||||||
|
targetElement.value = toISOUTCString(new Date);
|
||||||
|
} else if (type == "copy") {
|
||||||
|
const oppositeName = targetElement.name == "timestamp_start" ? "timestamp_end" : "timestamp_start";
|
||||||
|
document.querySelector(`[name='${oppositeName}']`).value = targetElement.value;
|
||||||
|
} else if (type == "toggle") {
|
||||||
|
if (targetElement.type == "datetime-local") targetElement.type = "text";
|
||||||
|
else targetElement.type = "datetime-local";
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
1
games/static/js/htmx.min.js
vendored
Normal file
16
games/static/js/utils.js
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
/**
|
||||||
|
* @description Formats Date to a UTC string accepted by the datetime-local input field.
|
||||||
|
* @param {Date} date
|
||||||
|
* @returns {string}
|
||||||
|
*/
|
||||||
|
export function toISOUTCString(date) {
|
||||||
|
function stringAndPad(number) {
|
||||||
|
return number.toString().padStart(2, 0);
|
||||||
|
}
|
||||||
|
const year = date.getFullYear();
|
||||||
|
const month = stringAndPad(date.getMonth() + 1);
|
||||||
|
const day = stringAndPad(date.getDate());
|
||||||
|
const hours = stringAndPad(date.getHours());
|
||||||
|
const minutes = stringAndPad(date.getMinutes());
|
||||||
|
return `${year}-${month}-${day}T${hours}:${minutes}`;
|
||||||
|
}
|
43
games/static/main.js
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
function elt(type, props, ...children) {
|
||||||
|
let dom = document.createElement(type);
|
||||||
|
if (props) Object.assign(dom, props);
|
||||||
|
for (let child of children) {
|
||||||
|
if (typeof child != "string") dom.appendChild(child);
|
||||||
|
else dom.appendChild(document.createTextNode(child));
|
||||||
|
}
|
||||||
|
return dom;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {Node} targetNode
|
||||||
|
*/
|
||||||
|
function addToggleButton(targetNode) {
|
||||||
|
let manualToggleButton = elt(
|
||||||
|
"td",
|
||||||
|
{},
|
||||||
|
elt(
|
||||||
|
"div",
|
||||||
|
{ className: "basic-button" },
|
||||||
|
elt(
|
||||||
|
"button",
|
||||||
|
{
|
||||||
|
onclick: (event) => {
|
||||||
|
let textInputField = elt("input", { type: "text", id: targetNode.id });
|
||||||
|
targetNode.replaceWith(textInputField);
|
||||||
|
event.target.addEventListener("click", (event) => {
|
||||||
|
textInputField.replaceWith(targetNode);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"Toggle manual"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
targetNode.parentElement.appendChild(manualToggleButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
const toggleableFields = ["#id_game", "#id_edition", "#id_platform"];
|
||||||
|
|
||||||
|
toggleableFields.map((selector) => {
|
||||||
|
addToggleButton(document.querySelector(selector));
|
||||||
|
});
|
2
games/static/robots.txt
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
User-agent: *
|
||||||
|
Disallow: /
|
@ -3,11 +3,15 @@
|
|||||||
{% block title %}{{ title }}{% endblock title %}
|
{% block title %}{{ title }}{% endblock title %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<form method="post" enctype="multipart/form-data" class="mx-auto">
|
<form method="post" enctype="multipart/form-data">
|
||||||
|
<table class="mx-auto">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
|
||||||
{{ form.as_p }}
|
{{ form.as_table }}
|
||||||
|
<tr>
|
||||||
<input type="submit" value="Submit"/>
|
<td></td>
|
||||||
|
<td><input type="submit" value="Submit"/></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
</form>
|
</form>
|
||||||
{% endblock content %}
|
{% endblock content %}
|
22
games/templates/add_edition.html
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}{{ title }}{% endblock title %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<form method="post" enctype="multipart/form-data">
|
||||||
|
<table class="mx-auto">
|
||||||
|
{% csrf_token %}
|
||||||
|
|
||||||
|
{{ form.as_table }}
|
||||||
|
<tr>
|
||||||
|
<td></td>
|
||||||
|
<td><input type="submit" value="Submit"/></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</form>
|
||||||
|
{% endblock content %}
|
||||||
|
|
||||||
|
{% block scripts %}
|
||||||
|
{% load static %}
|
||||||
|
<script type="module" src="{% static 'js/add_edition.js' %}"></script>
|
||||||
|
{% endblock scripts %}
|
37
games/templates/add_session.html
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}{{ title }}{% endblock title %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<form method="post" enctype="multipart/form-data">
|
||||||
|
<table class="mx-auto">
|
||||||
|
{% csrf_token %}
|
||||||
|
|
||||||
|
{% for field in form %}
|
||||||
|
<tr>
|
||||||
|
<th>{{ field.label_tag }}</th>
|
||||||
|
{% if field.name == "note" %}
|
||||||
|
<td>{{ field }}</td>
|
||||||
|
{% else %}
|
||||||
|
<td>{{ field }}</td>
|
||||||
|
{% endif %}
|
||||||
|
{% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
|
||||||
|
<td>
|
||||||
|
<div class="basic-button-container">
|
||||||
|
<button class="basic-button" data-target="{{field.name}}" data-type="now">Set to now</button>
|
||||||
|
<button class="basic-button" data-target="{{field.name}}" data-type="toggle">Toggle text</button>
|
||||||
|
<button class="basic-button" data-target="{{field.name}}" data-type="copy">Copy</button>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
{% endif %}
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
<tr>
|
||||||
|
<td></td>
|
||||||
|
<td><input type="submit" value="Submit"/></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</form>
|
||||||
|
{% load static %}
|
||||||
|
<script type="module" src="{% static 'js/add_session.js' %}"></script>
|
||||||
|
{% endblock content %}
|
@ -9,16 +9,17 @@
|
|||||||
<meta name="keywords" content="time, tracking, video games, self-hosted"/>
|
<meta name="keywords" content="time, tracking, video games, self-hosted"/>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||||
<title>Timetracker - {% block title %}Untitled{% endblock title %}</title>
|
<title>Timetracker - {% block title %}Untitled{% endblock title %}</title>
|
||||||
<link rel="stylesheet" href="https://rsms.me/inter/inter.css"/>
|
<script src="{% static 'js/htmx.min.js' %}"></script>
|
||||||
<link rel="stylesheet" href="{% static 'base.css' %}" />
|
<link rel="stylesheet" href="{% static 'base.css' %}" />
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body class="dark">
|
<body class="dark">
|
||||||
|
<img id="indicator" src="{% static 'icons/loading.png' %}" class="absolute right-3 top-3 animate-spin htmx-indicator" />
|
||||||
<div class="dark:bg-gray-800 min-h-screen">
|
<div class="dark:bg-gray-800 min-h-screen">
|
||||||
<nav class="mb-4 bg-white dark:bg-gray-900 border-gray-200 rounded">
|
<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">
|
<div class="container flex flex-wrap items-center justify-between mx-auto">
|
||||||
<a href="{% url 'list_sessions_recent' %}" class="flex items-center">
|
<a href="{% url 'list_sessions_recent' %}" class="flex items-center">
|
||||||
<span class="text-4xl">⌚</span>
|
<span class="text-4xl"><img src="{% static 'icons/schedule.png' %}" width="48" class="mr-4" /></span>
|
||||||
<span class="self-center text-xl font-semibold whitespace-nowrap text-white">Timetracker</span>
|
<span class="self-center text-xl font-semibold whitespace-nowrap text-white">Timetracker</span>
|
||||||
</a>
|
</a>
|
||||||
<div class="w-full md:block md:w-auto">
|
<div class="w-full md:block md:w-auto">
|
||||||
@ -27,10 +28,14 @@
|
|||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New Game</a></li>
|
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New Game</a></li>
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_platform' %}">New Platform</a></li>
|
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_platform' %}">New Platform</a></li>
|
||||||
{% if game_available and platform_available %}
|
{% if game_available and platform_available %}
|
||||||
|
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_edition' %}">New Edition</a></li>
|
||||||
|
{% endif %}
|
||||||
|
{% if edition_available %}
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_purchase' %}">New Purchase</a></li>
|
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_purchase' %}">New Purchase</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if purchase_available %}
|
{% if purchase_available %}
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_session' %}">New Session</a></li>
|
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_session' %}">New Session</a></li>
|
||||||
|
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_device' %}">New Device</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if session_count > 0 %}
|
{% if session_count > 0 %}
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
|
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
|
||||||
@ -43,6 +48,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{% load version %}
|
{% load version %}
|
||||||
<span class="fixed left-2 bottom-2 text-xs text-slate-300 dark:text-slate-600">{% version %} ({% version_date %})</span>
|
<span class="fixed left-2 bottom-2 text-xs text-slate-300 dark:text-slate-600">{% version %} ({% version_date %})</span>
|
||||||
|
{% block scripts %}{% endblock scripts %}
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
22
games/templates/components/button.html
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
title="{{ title }}"
|
||||||
|
autofocus
|
||||||
|
class="truncate max-w-xs sm:max-w-md lg:max-w-lg 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"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{{ text }}
|
||||||
|
</button>
|
@ -1,83 +1,73 @@
|
|||||||
{% extends 'base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% load static %}
|
||||||
|
|
||||||
{% block title %}{{ title }}{% endblock title %}
|
{% block title %}{{ title }}{% endblock title %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="text-center text-xl mb-4 dark:text-slate-400">
|
|
||||||
{% if dataset.count >= 2 %}
|
{% if dataset.count >= 1 %}
|
||||||
<img src="data:image/svg+xml;base64,{{ chart|safe }}" class="mx-auto mb-3" />
|
<div class="mx-auto text-center my-4">
|
||||||
{% endif %}
|
<a
|
||||||
{% if dataset.count >= 1 %}
|
id="last-session-start"
|
||||||
<div class="mb-4">Total playtime: {{ total_duration }} over {{ dataset.count }} sessions.</div>
|
href="{% url 'start_session' last.id %}"
|
||||||
{% endif %}
|
hx-get="{% url 'start_session' last.id %}"
|
||||||
{% if purchase or platform or game %}
|
hx-indicator="#indicator"
|
||||||
<a class="text-red-400 inline" href="{% url 'list_sessions' %}"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 inline">
|
hx-swap="afterbegin"
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M9.75 9.75l4.5 4.5m0-4.5l-4.5 4.5M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
hx-target=".responsive-table tbody"
|
||||||
</svg>
|
hx-select=".responsive-table tbody tr:first-child"
|
||||||
</a><span>Filtering by "{% firstof purchase platform game %}"</span>
|
onClick="document.querySelector('#last-session-start').classList.add('invisible')"
|
||||||
{% if purchase %}<a class="dark:text-white hover:underline block" href="{% url 'list_sessions_by_game' purchase.game.id %}">See all platforms</a>{% endif %}
|
class="{% if last.timestamp_end == null %}invisible{% endif %}"
|
||||||
{% endif %}
|
>
|
||||||
{% if dataset.count >= 1 %}
|
{% include 'components/button.html' with text=last.purchase title="Start session of last played game" only %}
|
||||||
<a class="clear-both" href="{% url 'start_session' last.purchase.id %}">
|
</a>
|
||||||
<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 ">
|
</div>
|
||||||
<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">
|
{% endif %}
|
||||||
<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" />
|
|
||||||
</svg>
|
<table class="responsive-table">
|
||||||
{{ last.purchase }}
|
<thead>
|
||||||
</button>
|
<tr>
|
||||||
</a>
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Name</th>
|
||||||
{% endif %}
|
<th class="hidden sm:table-cell px-2 sm:px-4 md:px-6 md:py-2">Start</th>
|
||||||
</div>
|
<th class="hidden lg:table-cell px-2 sm:px-4 md:px-6 md:py-2">End</th>
|
||||||
<div id="session-table" class="gap-4 shadow rounded-xl max-w-screen-lg mx-auto dark:bg-slate-700 p-2 justify-center">
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Duration</th>
|
||||||
<div class="dark:border-white dark:text-slate-300 text-lg">Name</div>
|
</tr>
|
||||||
<div class="dark:border-white dark:text-slate-300 text-lg">Platform</div>
|
</thead>
|
||||||
<div class="dark:border-white dark:text-slate-300 text-lg text-center">Start</div>
|
<tbody>
|
||||||
<div class="dark:border-white dark:text-slate-300 text-lg text-center">End</div>
|
{% for data in dataset %}
|
||||||
<div class="dark:border-white dark:text-slate-300 text-lg">Duration</div>
|
<tr>
|
||||||
<div class="dark:border-white dark:text-slate-300 text-lg text-right">Manage</div>
|
<td
|
||||||
{% for data in dataset %}
|
class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char md:max-w-40char"
|
||||||
<div class="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap"><a class="hover:underline" href="{% url 'list_sessions_by_purchase' data.purchase.id %}">{{ data.purchase.game }}</a></div>
|
>
|
||||||
<div class="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap"><a class="hover:underline" href="{% url 'list_sessions_by_platform' data.purchase.platform.id %}">{{ data.purchase.platform }}</a></div>
|
{{ data.purchase.edition }}
|
||||||
<div class="dark:text-slate-400 text-center">{{ data.timestamp_start | date:"d/m/Y H:i" }}</div>
|
</td>
|
||||||
<div class="dark:text-slate-400 text-center">
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden sm:table-cell">
|
||||||
{% if data.unfinished %}
|
{{ data.timestamp_start | date:"d/m/Y H:i" }}
|
||||||
<span class="text-red-400">Not finished yet.</span>
|
</td>
|
||||||
{% elif data.duration_manual %}
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden lg:table-cell">
|
||||||
--
|
{% if data.unfinished %}
|
||||||
{% else %}
|
<a
|
||||||
{{ data.timestamp_end | date:"d/m/Y H:i" }}
|
href="{% url 'update_session' data.id %}"
|
||||||
{% endif %}
|
hx-get="{% url 'update_session' data.id %}"
|
||||||
</div>
|
hx-swap="outerHTML"
|
||||||
<div class="dark:text-slate-400 flex">{{ data.duration_formatted }}{% if data.duration_manual %} <svg title="Added manually" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5 ml-1 self-center">
|
hx-target=".responsive-table tbody tr:first-child"
|
||||||
<path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a.75.75 0 000 1.5h.253a.25.25 0 01.244.304l-.459 2.066A1.75 1.75 0 0010.747 15H11a.75.75 0 000-1.5h-.253a.25.25 0 01-.244-.304l.459-2.066A1.75 1.75 0 009.253 9H9z" clip-rule="evenodd" />
|
hx-select=".responsive-table tbody tr:first-child"
|
||||||
</svg>
|
hx-indicator="#indicator"
|
||||||
{% endif %}</div>
|
onClick="document.querySelector('#last-session-start').classList.remove('invisible')"
|
||||||
<div id="button-container" class="flex justify-end">
|
>
|
||||||
{% if data.unfinished %}
|
<span class="text-yellow-300">Finish now?</span>
|
||||||
<a href="{% url 'update_session' data.id %}">
|
</a>
|
||||||
<button type="button" title="Set to finished" class="py-1 px-2 flex justify-center items-center 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 w-7 h-4 rounded-lg ">
|
{% elif data.duration_manual %}
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-4 h-4">
|
--
|
||||||
<path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z" clip-rule="evenodd" />
|
{% else %}
|
||||||
</svg>
|
{{ data.timestamp_end | date:"d/m/Y H:i" }}
|
||||||
</button>
|
{% endif %}
|
||||||
</a>
|
</td>
|
||||||
{% endif %}
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
|
||||||
<a href="{% url 'edit_session' data.id %}">
|
{{ data.duration_formatted }}
|
||||||
<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 ">
|
</td>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
|
</tr>
|
||||||
<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" />
|
{% endfor %}
|
||||||
<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" />
|
</tbody>
|
||||||
</svg>
|
</table>
|
||||||
</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">
|
|
||||||
<path fill-rule="evenodd" d="M8.75 1A2.75 2.75 0 006 3.75v.443c-.795.077-1.584.176-2.365.298a.75.75 0 10.23 1.482l.149-.022.841 10.518A2.75 2.75 0 007.596 19h4.807a2.75 2.75 0 002.742-2.53l.841-10.52.149.023a.75.75 0 00.23-1.482A41.03 41.03 0 0014 4.193V3.75A2.75 2.75 0 0011.25 1h-2.5zM10 4c.84 0 1.673.025 2.5.075V3.75c0-.69-.56-1.25-1.25-1.25h-2.5c-.69 0-1.25.56-1.25 1.25v.325C8.327 4.025 9.16 4 10 4zM8.58 7.72a.75.75 0 00-1.5.06l.3 7.5a.75.75 0 101.5-.06l-.3-7.5zm4.34.06a.75.75 0 10-1.5-.06l-.3 7.5a.75.75 0 101.5.06l.3-7.5z" clip-rule="evenodd" />
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
{% endblock content %}
|
{% endblock content %}
|
@ -3,7 +3,13 @@ from django.urls import path
|
|||||||
from games import views
|
from games import views
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("", views.list_sessions, {"filter": "recent"}, name="list_sessions_recent"),
|
path("", views.index, name="index"),
|
||||||
|
path(
|
||||||
|
"list-sessions/recent",
|
||||||
|
views.list_sessions,
|
||||||
|
{"filter": "recent"},
|
||||||
|
name="list_sessions_recent",
|
||||||
|
),
|
||||||
path("add-game/", views.add_game, name="add_game"),
|
path("add-game/", views.add_game, name="add_game"),
|
||||||
path("add-platform/", views.add_platform, name="add_platform"),
|
path("add-platform/", views.add_platform, name="add_platform"),
|
||||||
path("add-session/", views.add_session, name="add_session"),
|
path("add-session/", views.add_session, name="add_session"),
|
||||||
@ -13,17 +19,23 @@ urlpatterns = [
|
|||||||
name="update_session",
|
name="update_session",
|
||||||
),
|
),
|
||||||
path(
|
path(
|
||||||
"start-session/<int:purchase_id>",
|
"start-session/<int:last_session_id>",
|
||||||
views.start_session,
|
views.start_session,
|
||||||
name="start_session",
|
name="start_session",
|
||||||
),
|
),
|
||||||
path(
|
# path(
|
||||||
"delete_session/by-id/<int:session_id>",
|
# "delete_session/by-id/<int:session_id>",
|
||||||
views.delete_session,
|
# views.delete_session,
|
||||||
name="delete_session",
|
# name="delete_session",
|
||||||
),
|
# ),
|
||||||
path("add-purchase/", views.add_purchase, name="add_purchase"),
|
path("add-purchase/", views.add_purchase, name="add_purchase"),
|
||||||
|
path("add-edition/", views.add_edition, name="add_edition"),
|
||||||
|
path("edit-edition/<int:edition_id>", views.edit_edition, name="edit_edition"),
|
||||||
|
path("edit-game/<int:game_id>", views.edit_game, name="edit_game"),
|
||||||
|
path("edit-platform/<int:platform_id>", views.edit_platform, name="edit_platform"),
|
||||||
|
path("add-device/", views.add_device, name="add_device"),
|
||||||
path("edit-session/<int:session_id>", views.edit_session, name="edit_session"),
|
path("edit-session/<int:session_id>", views.edit_session, name="edit_session"),
|
||||||
|
path("edit-purchase/<int:purchase_id>", views.edit_purchase, name="edit_purchase"),
|
||||||
path("list-sessions/", views.list_sessions, name="list_sessions"),
|
path("list-sessions/", views.list_sessions, name="list_sessions"),
|
||||||
path(
|
path(
|
||||||
"list-sessions/by-purchase/<int:purchase_id>",
|
"list-sessions/by-purchase/<int:purchase_id>",
|
||||||
@ -43,4 +55,16 @@ urlpatterns = [
|
|||||||
{"filter": "game"},
|
{"filter": "game"},
|
||||||
name="list_sessions_by_game",
|
name="list_sessions_by_game",
|
||||||
),
|
),
|
||||||
|
path(
|
||||||
|
"list-sessions/by-edition/<int:edition_id>",
|
||||||
|
views.list_sessions,
|
||||||
|
{"filter": "edition"},
|
||||||
|
name="list_sessions_by_edition",
|
||||||
|
),
|
||||||
|
path(
|
||||||
|
"list-sessions/by-ownership/<str:ownership_type>",
|
||||||
|
views.list_sessions,
|
||||||
|
{"filter": "ownership_type"},
|
||||||
|
name="list_sessions_by_ownership_type",
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
140
games/views.py
@ -6,13 +6,21 @@ from common.time import now as now_with_tz
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.shortcuts import redirect, render
|
from django.shortcuts import redirect, render
|
||||||
|
|
||||||
from .forms import GameForm, PlatformForm, PurchaseForm, SessionForm
|
from .forms import (
|
||||||
from .models import Game, Platform, Purchase, Session
|
GameForm,
|
||||||
|
PlatformForm,
|
||||||
|
PurchaseForm,
|
||||||
|
SessionForm,
|
||||||
|
EditionForm,
|
||||||
|
DeviceForm,
|
||||||
|
)
|
||||||
|
from .models import Game, Platform, Purchase, Session, Edition
|
||||||
|
|
||||||
|
|
||||||
def model_counts(request):
|
def model_counts(request):
|
||||||
return {
|
return {
|
||||||
"game_available": Game.objects.count() != 0,
|
"game_available": Game.objects.count() != 0,
|
||||||
|
"edition_available": Edition.objects.count() != 0,
|
||||||
"platform_available": Platform.objects.count() != 0,
|
"platform_available": Platform.objects.count() != 0,
|
||||||
"purchase_available": Purchase.objects.count() != 0,
|
"purchase_available": Purchase.objects.count() != 0,
|
||||||
"session_count": Session.objects.count(),
|
"session_count": Session.objects.count(),
|
||||||
@ -37,7 +45,7 @@ def add_session(request):
|
|||||||
|
|
||||||
context["title"] = "Add New Session"
|
context["title"] = "Add New Session"
|
||||||
context["form"] = form
|
context["form"] = form
|
||||||
return render(request, "add.html", context)
|
return render(request, "add_session.html", context)
|
||||||
|
|
||||||
|
|
||||||
def update_session(request, session_id=None):
|
def update_session(request, session_id=None):
|
||||||
@ -56,22 +64,85 @@ def edit_session(request, session_id=None):
|
|||||||
return redirect("list_sessions")
|
return redirect("list_sessions")
|
||||||
context["title"] = "Edit Session"
|
context["title"] = "Edit Session"
|
||||||
context["form"] = form
|
context["form"] = form
|
||||||
|
return render(request, "add_session.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
def edit_purchase(request, purchase_id=None):
|
||||||
|
context = {}
|
||||||
|
purchase = Purchase.objects.get(id=purchase_id)
|
||||||
|
form = PurchaseForm(request.POST or None, instance=purchase)
|
||||||
|
if form.is_valid():
|
||||||
|
form.save()
|
||||||
|
return redirect("list_sessions")
|
||||||
|
context["title"] = "Edit Purchase"
|
||||||
|
context["form"] = form
|
||||||
return render(request, "add.html", context)
|
return render(request, "add.html", context)
|
||||||
|
|
||||||
|
|
||||||
def start_session(request, purchase_id=None):
|
def edit_game(request, game_id=None):
|
||||||
session = SessionForm({"purchase": purchase_id, "timestamp_start": now_with_tz()})
|
context = {}
|
||||||
|
purchase = Game.objects.get(id=game_id)
|
||||||
|
form = GameForm(request.POST or None, instance=purchase)
|
||||||
|
if form.is_valid():
|
||||||
|
form.save()
|
||||||
|
return redirect("list_sessions")
|
||||||
|
context["title"] = "Edit Game"
|
||||||
|
context["form"] = form
|
||||||
|
return render(request, "add.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
def edit_platform(request, platform_id=None):
|
||||||
|
context = {}
|
||||||
|
purchase = Platform.objects.get(id=platform_id)
|
||||||
|
form = PlatformForm(request.POST or None, instance=purchase)
|
||||||
|
if form.is_valid():
|
||||||
|
form.save()
|
||||||
|
return redirect("list_sessions")
|
||||||
|
context["title"] = "Edit Platform"
|
||||||
|
context["form"] = form
|
||||||
|
return render(request, "add.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
def edit_edition(request, edition_id=None):
|
||||||
|
context = {}
|
||||||
|
edition = Edition.objects.get(id=edition_id)
|
||||||
|
form = EditionForm(request.POST or None, instance=edition)
|
||||||
|
if form.is_valid():
|
||||||
|
form.save()
|
||||||
|
return redirect("list_sessions")
|
||||||
|
context["title"] = "Edit Edition"
|
||||||
|
context["form"] = form
|
||||||
|
return render(request, "add.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
def start_session(request, last_session_id: int):
|
||||||
|
last_session = Session.objects.get(id=last_session_id)
|
||||||
|
session = SessionForm(
|
||||||
|
{
|
||||||
|
"purchase": last_session.purchase.id,
|
||||||
|
"timestamp_start": now_with_tz(),
|
||||||
|
"device": last_session.device,
|
||||||
|
}
|
||||||
|
)
|
||||||
session.save()
|
session.save()
|
||||||
return redirect("list_sessions")
|
return redirect("list_sessions")
|
||||||
|
|
||||||
|
|
||||||
def delete_session(request, session_id=None):
|
# def delete_session(request, session_id=None):
|
||||||
session = Session.objects.get(id=session_id)
|
# session = Session.objects.get(id=session_id)
|
||||||
session.delete()
|
# session.delete()
|
||||||
return redirect("list_sessions")
|
# return redirect("list_sessions")
|
||||||
|
|
||||||
|
|
||||||
def list_sessions(request, filter="", purchase_id="", platform_id="", game_id=""):
|
def list_sessions(
|
||||||
|
request,
|
||||||
|
filter="",
|
||||||
|
purchase_id="",
|
||||||
|
platform_id="",
|
||||||
|
game_id="",
|
||||||
|
edition_id="",
|
||||||
|
ownership_type: str = "",
|
||||||
|
):
|
||||||
context = {}
|
context = {}
|
||||||
context["title"] = "Sessions"
|
context["title"] = "Sessions"
|
||||||
|
|
||||||
@ -81,14 +152,22 @@ def list_sessions(request, filter="", purchase_id="", platform_id="", game_id=""
|
|||||||
elif filter == "platform":
|
elif filter == "platform":
|
||||||
dataset = Session.objects.filter(purchase__platform=platform_id)
|
dataset = Session.objects.filter(purchase__platform=platform_id)
|
||||||
context["platform"] = Platform.objects.get(id=platform_id)
|
context["platform"] = Platform.objects.get(id=platform_id)
|
||||||
|
elif filter == "edition":
|
||||||
|
dataset = Session.objects.filter(purchase__edition=edition_id)
|
||||||
|
context["edition"] = Edition.objects.get(id=edition_id)
|
||||||
elif filter == "game":
|
elif filter == "game":
|
||||||
dataset = Session.objects.filter(purchase__game=game_id)
|
dataset = Session.objects.filter(purchase__edition__game=game_id)
|
||||||
context["game"] = Game.objects.get(id=game_id)
|
context["game"] = Game.objects.get(id=game_id)
|
||||||
|
elif filter == "ownership_type":
|
||||||
|
dataset = Session.objects.filter(purchase__ownership_type=ownership_type)
|
||||||
|
context["ownership_type"] = dict(Purchase.OWNERSHIP_TYPES)[ownership_type]
|
||||||
elif filter == "recent":
|
elif filter == "recent":
|
||||||
|
current_year = datetime.now().year
|
||||||
|
first_day_of_year = datetime(current_year, 1, 1)
|
||||||
dataset = Session.objects.filter(
|
dataset = Session.objects.filter(
|
||||||
timestamp_start__gte=datetime.now() - timedelta(days=30)
|
timestamp_start__gte=first_day_of_year
|
||||||
)
|
).order_by("-timestamp_start")
|
||||||
context["title"] = "Last 30 days"
|
context["title"] = "This year"
|
||||||
else:
|
else:
|
||||||
# by default, sort from newest to oldest
|
# by default, sort from newest to oldest
|
||||||
dataset = Session.objects.all().order_by("-timestamp_start")
|
dataset = Session.objects.all().order_by("-timestamp_start")
|
||||||
@ -102,8 +181,9 @@ def list_sessions(request, filter="", purchase_id="", platform_id="", game_id=""
|
|||||||
context["dataset"] = dataset
|
context["dataset"] = dataset
|
||||||
# cannot use dataset[0] here because that might be only partial QuerySet
|
# cannot use dataset[0] here because that might be only partial QuerySet
|
||||||
context["last"] = Session.objects.all().order_by("timestamp_start").last()
|
context["last"] = Session.objects.all().order_by("timestamp_start").last()
|
||||||
# charts are always oldest->newest
|
# only if 2 or more non-manual sessions exist
|
||||||
if Session.objects.count() >= 2:
|
if dataset.filter(timestamp_end__isnull=False).count() >= 2:
|
||||||
|
# charts are always oldest->newest
|
||||||
context["chart"] = playtime_over_time_chart(dataset.order_by("timestamp_start"))
|
context["chart"] = playtime_over_time_chart(dataset.order_by("timestamp_start"))
|
||||||
|
|
||||||
return render(request, "list_sessions.html", context)
|
return render(request, "list_sessions.html", context)
|
||||||
@ -135,6 +215,18 @@ def add_game(request):
|
|||||||
return render(request, "add.html", context)
|
return render(request, "add.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
def add_edition(request):
|
||||||
|
context = {}
|
||||||
|
form = EditionForm(request.POST or None)
|
||||||
|
if form.is_valid():
|
||||||
|
form.save()
|
||||||
|
return redirect("index")
|
||||||
|
|
||||||
|
context["form"] = form
|
||||||
|
context["title"] = "Add New Edition"
|
||||||
|
return render(request, "add_edition.html", context)
|
||||||
|
|
||||||
|
|
||||||
def add_platform(request):
|
def add_platform(request):
|
||||||
context = {}
|
context = {}
|
||||||
form = PlatformForm(request.POST or None)
|
form = PlatformForm(request.POST or None)
|
||||||
@ -145,3 +237,19 @@ def add_platform(request):
|
|||||||
context["form"] = form
|
context["form"] = form
|
||||||
context["title"] = "Add New Platform"
|
context["title"] = "Add New Platform"
|
||||||
return render(request, "add.html", context)
|
return render(request, "add.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
def add_device(request):
|
||||||
|
context = {}
|
||||||
|
form = DeviceForm(request.POST or None)
|
||||||
|
if form.is_valid():
|
||||||
|
form.save()
|
||||||
|
return redirect("index")
|
||||||
|
|
||||||
|
context["form"] = form
|
||||||
|
context["title"] = "Add New Device"
|
||||||
|
return render(request, "add.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
def index(request):
|
||||||
|
return redirect("list_sessions_recent")
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tailwindcss/forms": "^0.5.3",
|
"@tailwindcss/forms": "^0.5.6",
|
||||||
"@tailwindcss/typography": "^0.5.8",
|
"@tailwindcss/typography": "^0.5.10",
|
||||||
"tailwindcss": "^3.2.4"
|
"tailwindcss": "^3.3.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "timetracker"
|
name = "timetracker"
|
||||||
version = "1.0.1"
|
version = "1.0.3"
|
||||||
description = "A simple time tracker."
|
description = "A simple time tracker."
|
||||||
authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
|
authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
|
||||||
license = "GPL"
|
license = "GPL"
|
||||||
|
@ -1,11 +1,15 @@
|
|||||||
|
const defaultTheme = require('tailwindcss/defaultTheme')
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
darkMode: 'class',
|
darkMode: 'class',
|
||||||
content: ["./**/*.{html,js}"],
|
content: ["./games/**/*.{html,js}"],
|
||||||
theme: {
|
theme: {
|
||||||
fontFamily: {
|
extend: {
|
||||||
sans: ['Inter', 'sans-serif'],
|
fontFamily: {
|
||||||
|
'sans': ['IBM Plex Sans', ...defaultTheme.fontFamily.sans],
|
||||||
|
'mono': ['IBM Plex Mono', ...defaultTheme.fontFamily.mono],
|
||||||
|
}
|
||||||
},
|
},
|
||||||
extend: {},
|
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
require('@tailwindcss/typography'),
|
require('@tailwindcss/typography'),
|
||||||
|
@ -40,9 +40,9 @@ INSTALLED_APPS = [
|
|||||||
"django.contrib.staticfiles",
|
"django.contrib.staticfiles",
|
||||||
]
|
]
|
||||||
|
|
||||||
if DEBUG:
|
# if DEBUG:
|
||||||
INSTALLED_APPS.append("django_extensions")
|
INSTALLED_APPS.append("django_extensions")
|
||||||
INSTALLED_APPS.append("django.contrib.admin")
|
INSTALLED_APPS.append("django.contrib.admin")
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
"django.middleware.security.SecurityMiddleware",
|
"django.middleware.security.SecurityMiddleware",
|
||||||
@ -149,3 +149,5 @@ if _csrf_trusted_origins:
|
|||||||
CSRF_TRUSTED_ORIGINS = _csrf_trusted_origins.split(",")
|
CSRF_TRUSTED_ORIGINS = _csrf_trusted_origins.split(",")
|
||||||
else:
|
else:
|
||||||
CSRF_TRUSTED_ORIGINS = []
|
CSRF_TRUSTED_ORIGINS = []
|
||||||
|
|
||||||
|
USE_L10N = False
|
||||||
|
@ -23,5 +23,6 @@ urlpatterns = [
|
|||||||
path("tracker/", include("games.urls")),
|
path("tracker/", include("games.urls")),
|
||||||
]
|
]
|
||||||
|
|
||||||
if settings.DEBUG:
|
# if settings.DEBUG:
|
||||||
urlpatterns.append(path("admin/", admin.site.urls))
|
# urlpatterns.append(path("admin/", admin.site.urls))
|
||||||
|
urlpatterns.append(path("admin/", admin.site.urls))
|
||||||
|