diff --git a/Dockerfile b/Dockerfile index fc90a17..9c83c80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,9 +29,10 @@ ENV MEDIA_ROOT=/app/data/media WORKDIR /app -# Install cron and other system dependencies +# Install cron, gettext and other system dependencies RUN apt-get update && apt-get install -y --no-install-recommends \ cron \ + gettext \ && rm -rf /var/lib/apt/lists/* # Install uv @@ -68,6 +69,9 @@ RUN echo "PATH=/usr/local/bin:/usr/bin:/bin" > /etc/cron.d/datakult-backup && \ COPY scripts/entrypoint.sh /app/entrypoint.sh RUN chmod +x /app/entrypoint.sh +# Compile translation messages +RUN uv run ./src/manage.py compilemessages + # Collect static files with production settings # Set DEBUG=false to use CompressedManifestStaticFilesStorage during collectstatic # This ensures the manifest file is created for production use diff --git a/src/core/views.py b/src/core/views.py index 5951f67..eb28f3d 100644 --- a/src/core/views.py +++ b/src/core/views.py @@ -19,7 +19,7 @@ def _resolve_sorting(request): """Return validated sorting info: selected field, sort string (with sign), and ordering.""" - default_field = "created_at" + default_field = "review_date" sort = request.GET.get("sort") or request.GET.get("order_by") or f"-{default_field}" raw_field = sort.lstrip("-") @@ -51,6 +51,15 @@ def _extract_filters(request): filters["review_to"], ] ) + + # Add display names for active filters + if filters["type"]: + filters["type_display"] = dict(Media.media_type.field.choices).get(filters["type"], filters["type"]) + if filters["status"]: + filters["status_display"] = dict(Media.status.field.choices).get(filters["status"], filters["status"]) + if filters["score"] and filters["score"] != "none": + filters["score_display"] = dict(Media.score.field.choices).get(int(filters["score"]), filters["score"]) + return filters @@ -100,7 +109,7 @@ def _apply_filters(queryset, filters): def index(request): """Main view for displaying media list.""" # Get query parameters - view_mode = request.GET.get("view_mode", "list") # 'list' or 'grid' + view_mode = request.GET.get("view_mode", "grid") # 'list' or 'grid' sort_field, sort, ordering = _resolve_sorting(request) filters = _extract_filters(request) @@ -193,7 +202,7 @@ def media_delete(request, pk): @login_required def load_more_media(request): """HTMX view: load next page of media items for infinite scrolling.""" - view_mode = request.GET.get("view_mode", "list") + view_mode = request.GET.get("view_mode", "grid") sort_field, sort, ordering = _resolve_sorting(request) filters = _extract_filters(request) query = request.GET.get("search", "") @@ -228,7 +237,7 @@ def load_more_media(request): @login_required def search_media(request): query = request.GET.get("search", "") - view_mode = request.GET.get("view_mode", "list") + view_mode = request.GET.get("view_mode", "grid") sort_field, sort, ordering = _resolve_sorting(request) filters = _extract_filters(request) diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index 9ef62bf..1015e27 100644 --- a/src/locale/fr/LC_MESSAGES/django.po +++ b/src/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-01-04 14:32+0100\n" +"POT-Creation-Date: 2026-01-04 15:45+0100\n" "PO-Revision-Date: 2026-01-04 10:45+0100\n" "Last-Translator: Pascal Repond \n" "Language-Team: LANGUAGE \n" @@ -124,23 +124,23 @@ msgstr "" msgid "Status" msgstr "Statut" -#: src/core/models.py:152 +#: src/core/models.py:152 src/templates/partials/sidebar-nav.html:23 msgid "Planned" msgstr "Prévu" -#: src/core/models.py:153 +#: src/core/models.py:153 src/templates/partials/sidebar-nav.html:31 msgid "In progress" msgstr "En cours" -#: src/core/models.py:154 +#: src/core/models.py:154 src/templates/partials/sidebar-nav.html:39 msgid "Completed" msgstr "Terminé" -#: src/core/models.py:155 +#: src/core/models.py:155 src/templates/partials/sidebar-nav.html:47 msgid "Paused" msgstr "En pause" -#: src/core/models.py:156 +#: src/core/models.py:156 src/templates/partials/sidebar-nav.html:55 msgid "Did not finish" msgstr "Pas fini" @@ -267,7 +267,7 @@ msgid "Backup import failed: %(error)s" msgstr "Échec de l'importation du backup : %(error)s" #: src/templates/accounts/profile_edit.html:4 -#: src/templates/accounts/profile_edit.html:8 src/templates/base.html:78 +#: src/templates/accounts/profile_edit.html:8 msgid "Edit Profile" msgstr "Modifier le profil" @@ -461,9 +461,8 @@ msgid "" "This action will DELETE ALL your current data and replace it with the backup " "data. Are you absolutely sure you want to continue?" msgstr "" -"Cette action va SUPPRIMER TOUTES vos données actuelles et les " -"remplacer par les données de la sauvegarde. Êtes-vous absolument sûr de " -"vouloir continuer ?" +"Cette action va SUPPRIMER TOUTES vos données actuelles et les remplacer par " +"les données de la sauvegarde. Êtes-vous absolument sûr de vouloir continuer ?" #: src/templates/backup_manage.html:155 msgid "Yes, import backup" @@ -477,27 +476,7 @@ msgstr "Échec de la création de la sauvegarde. Veuillez réessayer." msgid "Unknown error" msgstr "Erreur inconnue" -#: src/templates/base.html:40 -msgid "System" -msgstr "Système" - -#: src/templates/base.html:47 -msgid "Light" -msgstr "Clair" - -#: src/templates/base.html:54 -msgid "Dark" -msgstr "Sombre" - -#: src/templates/base.html:84 -msgid "Backups" -msgstr "Sauvegardes" - -#: src/templates/base.html:93 -msgid "Log Out" -msgstr "Se déconnecter" - -#: src/templates/media.html:3 src/templates/media.html:54 +#: src/templates/media.html:3 src/templates/media.html:55 msgid "Search" msgstr "Recherche" @@ -514,7 +493,7 @@ msgstr "Date de création" msgid "Score" msgstr "Note" -#: src/templates/media.html:65 +#: src/templates/media.html:66 msgid "Add" msgstr "Ajouter" @@ -655,18 +634,65 @@ msgstr "Note :" msgid "out of 10" msgstr "sur 10" +#: src/templates/partials/sidebar-nav.html:11 +msgid "All" +msgstr "Tout" + +#: src/templates/partials/sidebar-nav.html:16 +msgid "By status" +msgstr "Par statut" + +#: src/templates/partials/sidebar-nav.html:60 +msgid "Settings" +msgstr "Paramètres" + +#: src/templates/partials/sidebar-nav.html:66 +msgid "Profile" +msgstr "Profil" + +#: src/templates/partials/sidebar-nav.html:72 +msgid "Backups" +msgstr "Sauvegardes" + +#: src/templates/partials/sidebar-nav.html:80 +msgid "Theme" +msgstr "Thème" + +#: src/templates/partials/sidebar-nav.html:89 +#: src/templates/partials/sidebar-nav.html:91 +msgid "System" +msgstr "Système" + +#: src/templates/partials/sidebar-nav.html:99 +#: src/templates/partials/sidebar-nav.html:101 +msgid "Light" +msgstr "Clair" + +#: src/templates/partials/sidebar-nav.html:109 +#: src/templates/partials/sidebar-nav.html:111 +msgid "Dark" +msgstr "Sombre" + +#: src/templates/partials/sidebar-nav.html:123 +msgid "Logout" +msgstr "Déconnexion" + +#: src/templates/partials/sidebar-nav.html:129 +msgid "Login" +msgstr "Se connecter" + #: src/templates/partials/spinner.html:17 msgid "Loading..." msgstr "Chargement..." -#: src/templates/partials/view-mode-toggle.html:15 -msgid "List" -msgstr "Liste" - -#: src/templates/partials/view-mode-toggle.html:24 +#: src/templates/partials/view-mode-toggle.html:14 msgid "Grid" msgstr "Grille" +#: src/templates/partials/view-mode-toggle.html:21 +msgid "List" +msgstr "Liste" + #: src/templates/registration/login.html:4 #: src/templates/registration/login.html:11 #: src/templates/registration/login.html:24 @@ -676,3 +702,6 @@ msgstr "Se connecter" #: src/templates/registration/login.html:21 msgid "Password" msgstr "Mot de passe" + +#~ msgid "Log Out" +#~ msgstr "Se déconnecter" diff --git a/src/static/images/bookshelf.png b/src/static/images/bookshelf.png new file mode 100644 index 0000000..5950769 Binary files /dev/null and b/src/static/images/bookshelf.png differ diff --git a/src/static/js/base.js b/src/static/js/base.js index ed38ee3..4eb025d 100644 --- a/src/static/js/base.js +++ b/src/static/js/base.js @@ -1,7 +1,7 @@ // THEME SWITCHER document.addEventListener("DOMContentLoaded", () => { const htmlElement = document.documentElement; - const themeRadios = document.querySelectorAll('input[name="theme-dropdown"]'); + const themeRadios = document.querySelectorAll('input[name="theme-sidebar"]'); const applyTheme = (theme) => { if (theme === "default") { @@ -13,21 +13,21 @@ document.addEventListener("DOMContentLoaded", () => { } }; - // initialise theme + // Initialize theme const currentTheme = localStorage.getItem("theme") || "default"; applyTheme(currentTheme); - // activate the menu item of the current theme - const currentRadio = document.querySelector(`input[value="${currentTheme}"]`); + // Activate the radio button of the current theme + const currentRadio = document.querySelector(`input[name="theme-sidebar"][value="${currentTheme}"]`); if (currentRadio) { currentRadio.checked = true; } - // add an event listener to each menu item + // Add event listener to each radio button themeRadios.forEach((radio) => { radio.addEventListener("change", (event) => { - const selectedTheme = event.target.value; - applyTheme(selectedTheme); + const selectedTheme = event.target.value; + applyTheme(selectedTheme); }); }); }); @@ -35,8 +35,8 @@ document.addEventListener("DOMContentLoaded", () => { // CLEAN URL - Remove default/empty parameters from URL // Default values that should not appear in URL const DEFAULT_PARAMS = { - 'view_mode': 'list', - 'sort': '-created_at', + 'view_mode': 'grid', + 'sort': '-review_date', }; // Remove empty and default parameters before HTMX sends the request diff --git a/src/templates/accounts/profile_edit.html b/src/templates/accounts/profile_edit.html index 534764f..bb231af 100644 --- a/src/templates/accounts/profile_edit.html +++ b/src/templates/accounts/profile_edit.html @@ -37,7 +37,9 @@

{% translate "Profile Information" %}

{{ profile_form.email }}
@@ -72,7 +74,9 @@

{% translate "Profile Information" %}

{% translate "Language Preference" %}

-
+ {% csrf_token %}
diff --git a/src/templates/backup_manage.html b/src/templates/backup_manage.html index 8b5b041..bb3fe0e 100644 --- a/src/templates/backup_manage.html +++ b/src/templates/backup_manage.html @@ -12,7 +12,7 @@

{% translate "Backup Management" %}

{% for message in messages %} {% endfor %} diff --git a/src/templates/base.html b/src/templates/base.html index b2ce5ad..099b146 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -1,7 +1,6 @@ {% load static tailwind_tags %} {% load django_htmx %} {% load i18n %} -{% load static %} @@ -16,96 +15,58 @@ + {% tailwind_css %} {% htmx_script %} - {% block extra_css %}{% endblock extra_css %} + {% block extra_css %} + {% endblock extra_css %} - -
- {% block navbar %} -
-
- Datakult -
+ + +
+ + + +
+ +
+
- + +
+ +
+ +
+ Datakult logo +
+ Datakult +
- {% endblock navbar %} -
- {% block content %} - {% endblock content %} + +
+ {% block content %} + {% endblock content %} +
+
+ +
+ + {% include 'partials/sidebar-nav.html' %}
+ {% block extra_js %} + {% endblock extra_js %} diff --git a/src/templates/base_auth.html b/src/templates/base_auth.html new file mode 100644 index 0000000..b3f7236 --- /dev/null +++ b/src/templates/base_auth.html @@ -0,0 +1,33 @@ +{% load static tailwind_tags %} +{% load django_htmx %} +{% load i18n %} + + + + + {% block title %} + Datakult + {% endblock title %} + + + + + + + {% tailwind_css %} + {% htmx_script %} + {% block extra_css %} + {% endblock extra_css %} + + + +
+ {% block content %} + {% endblock content %} +
+ + {% block extra_js %} + {% endblock extra_js %} + + diff --git a/src/templates/media.html b/src/templates/media.html index aab2acb..232cc50 100644 --- a/src/templates/media.html +++ b/src/templates/media.html @@ -2,7 +2,7 @@ {% load i18n %} {% translate "Search" %} {% block title %} - Media + Datakult {% endblock title %} {% block content %}

{% translate "My media" %}

@@ -14,32 +14,32 @@

{% translate "My media" %}

-
+ {# Search and add button #}