diff --git a/VERSION.txt b/VERSION.txt
index a46d739..43b4937 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.0.3 (e79ffee)
\ No newline at end of file
+1.3.8 (7cf0496)
\ No newline at end of file
diff --git a/blog/__init__.py b/blog/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/blog/admin.py b/blog/admin.py
new file mode 100644
index 0000000..8eb9366
--- /dev/null
+++ b/blog/admin.py
@@ -0,0 +1,8 @@
+from django.contrib import admin
+from .models import Post
+
+@admin.register(Post)
+class PostAdmin(admin.ModelAdmin):
+ list_display = ('name', 'tags', 'slug', 'created_at')
+ search_fields = ('name', 'tags')
+ prepopulated_fields = {"slug": ("name",)}
\ No newline at end of file
diff --git a/blog/apps.py b/blog/apps.py
new file mode 100644
index 0000000..7930587
--- /dev/null
+++ b/blog/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class BlogConfig(AppConfig):
+ name = 'blog'
diff --git a/blog/context_processor.py b/blog/context_processor.py
new file mode 100644
index 0000000..d09e196
--- /dev/null
+++ b/blog/context_processor.py
@@ -0,0 +1,5 @@
+from .models import Post
+
+def posts_list(request):
+ posts = Post.objects.all().order_by('-created_at')
+ return {'posts': posts}
\ No newline at end of file
diff --git a/blog/migrations/0001_initial.py b/blog/migrations/0001_initial.py
new file mode 100644
index 0000000..9c7c01b
--- /dev/null
+++ b/blog/migrations/0001_initial.py
@@ -0,0 +1,30 @@
+# Generated by Django 6.0 on 2025-12-15 14:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Post',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=200)),
+ ('tags', models.CharField(max_length=200)),
+ ('slug', models.SlugField()),
+ ('content', models.TextField()),
+ ('created_at', models.DateTimeField(auto_now_add=True)),
+ ('updated_at', models.DateTimeField(auto_now=True)),
+ ],
+ options={
+ 'verbose_name': 'Article',
+ 'verbose_name_plural': 'Articles',
+ },
+ ),
+ ]
diff --git a/blog/migrations/0002_post_enable.py b/blog/migrations/0002_post_enable.py
new file mode 100644
index 0000000..bb99a9b
--- /dev/null
+++ b/blog/migrations/0002_post_enable.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0 on 2025-12-15 19:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('blog', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='post',
+ name='enable',
+ field=models.BooleanField(default=True),
+ ),
+ ]
diff --git a/blog/migrations/0003_post_description.py b/blog/migrations/0003_post_description.py
new file mode 100644
index 0000000..1d12e7e
--- /dev/null
+++ b/blog/migrations/0003_post_description.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0 on 2025-12-15 20:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('blog', '0002_post_enable'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='post',
+ name='description',
+ field=models.TextField(default='Courte description'),
+ ),
+ ]
diff --git a/blog/migrations/__init__.py b/blog/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/blog/models.py b/blog/models.py
new file mode 100644
index 0000000..387d847
--- /dev/null
+++ b/blog/models.py
@@ -0,0 +1,18 @@
+from django.db import models
+
+class Post(models.Model):
+ name = models.CharField(max_length=200)
+ tags = models.CharField(max_length=200)
+ slug = models.SlugField()
+ description = models.TextField(default="Courte description")
+ content = models.TextField()
+ created_at = models.DateTimeField(auto_now_add=True)
+ updated_at = models.DateTimeField(auto_now=True)
+ enable = models.BooleanField(default=True)
+
+ class Meta:
+ verbose_name = "Article"
+ verbose_name_plural = "Articles"
+
+ def __str__(self):
+ return self.name
\ No newline at end of file
diff --git a/blog/tests.py b/blog/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/blog/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/blog/urls.py b/blog/urls.py
new file mode 100644
index 0000000..ef6ad01
--- /dev/null
+++ b/blog/urls.py
@@ -0,0 +1,8 @@
+from django.urls import path
+from . import views
+
+app_name = 'blog'
+urlpatterns = [
+ path('', views.blog_home, name='blog'),
+ path('/', views.blog_view_post, name='post_detail'),
+]
\ No newline at end of file
diff --git a/blog/views.py b/blog/views.py
new file mode 100644
index 0000000..3db99b3
--- /dev/null
+++ b/blog/views.py
@@ -0,0 +1,11 @@
+from django.shortcuts import render
+
+from blog.models import Post
+
+
+def blog_home(request):
+ return render(request, 'blog/home.html')
+
+def blog_view_post(request, slug):
+ post = Post.objects.get(slug=slug)
+ return render(request, 'blog/details.html', {'post': post})
\ No newline at end of file
diff --git a/core/admin.py b/core/admin.py
index 7f53918..a9baff2 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -1,5 +1,5 @@
from django.contrib import admin
-from .models import SiteSettings
+from .models import SiteSettings, Visit
@admin.register(SiteSettings)
class SiteSettingsAdmin(admin.ModelAdmin):
@@ -23,4 +23,14 @@ class SiteSettingsAdmin(admin.ModelAdmin):
('Contact', {
'fields': ('contact_email',)
}),
- )
\ No newline at end of file
+ ('Blog', {
+ 'fields': ('blog_title', 'blog_description')
+ }),
+ )
+
+
+@admin.register(Visit)
+class VisitAdmin(admin.ModelAdmin):
+ list_display = ("date", "visitor_id", "user", "source", "country", "first_seen", "last_seen")
+ list_filter = ("date", "country", "source")
+ search_fields = ("visitor_id", "referrer", "utm_source", "utm_medium", "utm_campaign")
diff --git a/core/middleware.py b/core/middleware.py
new file mode 100644
index 0000000..3167553
--- /dev/null
+++ b/core/middleware.py
@@ -0,0 +1,121 @@
+import uuid
+from urllib.parse import urlparse
+from django.utils import timezone
+from .models import Visit
+
+
+class VisitTrackingMiddleware:
+ """Middleware très léger pour enregistrer des statistiques de visites.
+
+ - Assigne un cookie visiteur persistant (vid) si absent
+ - Enregistre/Met à jour une ligne Visit par visiteur et par jour
+ - Capture la source (UTM/referrer) et le pays si disponible via headers
+ """
+
+ COOKIE_NAME = 'vid'
+ COOKIE_MAX_AGE = 60 * 60 * 24 * 365 * 2 # 2 ans
+
+ def __init__(self, get_response):
+ self.get_response = get_response
+
+ def __call__(self, request):
+ vid = request.COOKIES.get(self.COOKIE_NAME)
+ if not vid:
+ vid = uuid.uuid4().hex
+
+ request.visitor_id = vid
+
+ # Enregistrer la visite (agrégée par jour)
+ try:
+ self._track(request, vid)
+ except Exception:
+ # On ne casse jamais la requête pour des stats
+ pass
+
+ response = self.get_response(request)
+ # S'assurer que le cookie est posé
+ if request.COOKIES.get(self.COOKIE_NAME) != vid:
+ response.set_cookie(
+ self.COOKIE_NAME,
+ vid,
+ max_age=self.COOKIE_MAX_AGE,
+ httponly=True,
+ samesite='Lax',
+ )
+ return response
+
+ def _track(self, request, vid):
+ # On ignore l'admin et les assets statiques
+ path = request.path
+ if path.startswith('/admin') or path.startswith('/static') or path.startswith('/staticfiles'):
+ return
+
+ now = timezone.now()
+ date = now.date()
+
+ ref = request.META.get('HTTP_REFERER', '')[:512]
+ utm_source = request.GET.get('utm_source', '')[:100]
+ utm_medium = request.GET.get('utm_medium', '')[:100]
+ utm_campaign = request.GET.get('utm_campaign', '')[:150]
+
+ # Déterminer source
+ source = ''
+ if utm_source:
+ source = utm_source
+ elif ref:
+ try:
+ netloc = urlparse(ref).netloc
+ source = netloc
+ except Exception:
+ source = ref[:150]
+
+ # Déterminer pays via en-têtes si fournis par proxy/CDN
+ country = (
+ request.META.get('HTTP_CF_IPCOUNTRY')
+ or request.META.get('HTTP_X_APPENGINE_COUNTRY')
+ or request.META.get('HTTP_X_COUNTRY')
+ or ''
+ )[:64]
+
+ became_user_at = now if request.user.is_authenticated else None
+ visit, created = Visit.objects.get_or_create(
+ visitor_id=vid,
+ date=date,
+ defaults={
+ 'path': path[:512],
+ 'referrer': ref,
+ 'utm_source': utm_source,
+ 'utm_medium': utm_medium,
+ 'utm_campaign': utm_campaign,
+ 'source': source,
+ 'country': country,
+ 'first_seen': now,
+ 'last_seen': now,
+ 'user': request.user if request.user.is_authenticated else None,
+ 'became_user_at': became_user_at,
+ }
+ )
+
+ if not created:
+ # Mise à jour basique
+ dirty = False
+ if not visit.source and source:
+ visit.source = source
+ dirty = True
+ if not visit.country and country:
+ visit.country = country
+ dirty = True
+ if request.user.is_authenticated and visit.user_id is None:
+ visit.user = request.user
+ dirty = True
+ # Marquer la conversion si pas encore définie
+ if visit.became_user_at is None:
+ visit.became_user_at = now
+ # Mettre à jour la page courante et l'horodatage
+ if visit.path != path:
+ visit.path = path[:512]
+ dirty = True
+ visit.last_seen = now
+ dirty = True
+ if dirty:
+ visit.save(update_fields=['source', 'country', 'user', 'became_user_at', 'path', 'last_seen'])
diff --git a/core/migrations/0002_sitesettings_blog_description_and_more.py b/core/migrations/0002_sitesettings_blog_description_and_more.py
new file mode 100644
index 0000000..7d669a8
--- /dev/null
+++ b/core/migrations/0002_sitesettings_blog_description_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 6.0 on 2025-12-15 19:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='sitesettings',
+ name='blog_description',
+ field=models.TextField(blank=True),
+ ),
+ migrations.AddField(
+ model_name='sitesettings',
+ name='blog_title',
+ field=models.CharField(default='Mon Blog', max_length=200),
+ ),
+ ]
diff --git a/core/migrations/0003_alter_sitesettings_blog_description_and_more.py b/core/migrations/0003_alter_sitesettings_blog_description_and_more.py
new file mode 100644
index 0000000..ccfc1e0
--- /dev/null
+++ b/core/migrations/0003_alter_sitesettings_blog_description_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 6.0 on 2025-12-15 19:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0002_sitesettings_blog_description_and_more'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='sitesettings',
+ name='blog_description',
+ field=models.TextField(blank=True, default='Je documente la construction de PartirDeZero.com : mes choix techniques, mes bugs résolus et mes conseils pour lancer tes propres projets web. Apprends en regardant faire.'),
+ ),
+ migrations.AlterField(
+ model_name='sitesettings',
+ name='blog_title',
+ field=models.CharField(default='Blog du développeur', max_length=200),
+ ),
+ ]
diff --git a/core/migrations/0004_visit.py b/core/migrations/0004_visit.py
new file mode 100644
index 0000000..6301e48
--- /dev/null
+++ b/core/migrations/0004_visit.py
@@ -0,0 +1,41 @@
+from django.db import migrations, models
+import django.db.models.deletion
+from django.conf import settings
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0003_alter_sitesettings_blog_description_and_more'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Visit',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('visitor_id', models.CharField(db_index=True, max_length=64)),
+ ('date', models.DateField(db_index=True)),
+ ('first_seen', models.DateTimeField(default=django.utils.timezone.now)),
+ ('last_seen', models.DateTimeField(default=django.utils.timezone.now)),
+ ('path', models.CharField(blank=True, max_length=512)),
+ ('referrer', models.CharField(blank=True, max_length=512)),
+ ('utm_source', models.CharField(blank=True, max_length=100)),
+ ('utm_medium', models.CharField(blank=True, max_length=100)),
+ ('utm_campaign', models.CharField(blank=True, max_length=150)),
+ ('source', models.CharField(blank=True, help_text='Domaine de provenance ou utm_source', max_length=150)),
+ ('country', models.CharField(blank=True, max_length=64)),
+ ('became_user_at', models.DateTimeField(blank=True, null=True)),
+ ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='visits', to=settings.AUTH_USER_MODEL)),
+ ],
+ options={
+ 'ordering': ['-date', '-last_seen'],
+ },
+ ),
+ migrations.AlterUniqueTogether(
+ name='visit',
+ unique_together={('visitor_id', 'date')},
+ ),
+ ]
diff --git a/core/models.py b/core/models.py
index de47391..63d9b18 100644
--- a/core/models.py
+++ b/core/models.py
@@ -1,4 +1,6 @@
from django.db import models
+from django.conf import settings
+from django.utils import timezone
class SiteSettings(models.Model):
site_name = models.CharField(max_length=200, default="Mon Super Site")
@@ -13,6 +15,10 @@ class SiteSettings(models.Model):
linkedin_url = models.URLField(blank=True)
github_url = models.URLField(blank=True)
+ # Blog
+ blog_title = models.CharField(max_length=200, default="Blog du développeur")
+ blog_description = models.TextField(blank=True, default="Je documente la construction de PartirDeZero.com : mes choix techniques, mes bugs résolus et mes conseils pour lancer tes propres projets web. Apprends en regardant faire.")
+
# L'astuce pour qu'il n'y ait qu'un seul réglage
def save(self, *args, **kwargs):
self.pk = 1 # On force l'ID à 1. Si tu sauvegardes, ça écrase l'existant.
@@ -26,4 +32,36 @@ class SiteSettings(models.Model):
class Meta:
verbose_name = "Réglages du site"
- verbose_name_plural = "Réglages du site"
\ No newline at end of file
+ verbose_name_plural = "Réglages du site"
+
+
+class Visit(models.Model):
+ """Enregistrement simplifié des visites (agrégées par jour et visiteur).
+
+ Objectif: fournir des stats de base sans dépendances externes.
+ """
+ visitor_id = models.CharField(max_length=64, db_index=True)
+ user = models.ForeignKey(
+ settings.AUTH_USER_MODEL, null=True, blank=True, on_delete=models.SET_NULL, related_name='visits'
+ )
+ date = models.DateField(db_index=True)
+ first_seen = models.DateTimeField(default=timezone.now)
+ last_seen = models.DateTimeField(default=timezone.now)
+
+ path = models.CharField(max_length=512, blank=True)
+ referrer = models.CharField(max_length=512, blank=True)
+ utm_source = models.CharField(max_length=100, blank=True)
+ utm_medium = models.CharField(max_length=100, blank=True)
+ utm_campaign = models.CharField(max_length=150, blank=True)
+ source = models.CharField(max_length=150, blank=True, help_text="Domaine de provenance ou utm_source")
+ country = models.CharField(max_length=64, blank=True)
+
+ # Conversion: première fois où un visiteur devient utilisateur authentifié
+ became_user_at = models.DateTimeField(null=True, blank=True)
+
+ class Meta:
+ unique_together = ('visitor_id', 'date')
+ ordering = ['-date', '-last_seen']
+
+ def __str__(self):
+ return f"{self.visitor_id} @ {self.date}"
\ No newline at end of file
diff --git a/courses/migrations/0004_alter_course_options_alter_lesson_options.py b/courses/migrations/0004_alter_course_options_alter_lesson_options.py
new file mode 100644
index 0000000..ff801fb
--- /dev/null
+++ b/courses/migrations/0004_alter_course_options_alter_lesson_options.py
@@ -0,0 +1,21 @@
+# Generated by Django 6.0 on 2025-12-15 14:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('courses', '0003_comment_parent'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='course',
+ options={'verbose_name': 'Cours', 'verbose_name_plural': 'Cours'},
+ ),
+ migrations.AlterModelOptions(
+ name='lesson',
+ options={'verbose_name': 'Leçon', 'verbose_name_plural': 'Leçons'},
+ ),
+ ]
diff --git a/courses/models.py b/courses/models.py
index 3001eb5..3cc46d1 100644
--- a/courses/models.py
+++ b/courses/models.py
@@ -12,6 +12,10 @@ class Course(models.Model):
updated_at = models.DateTimeField(auto_now=True)
enable = models.BooleanField(default=True)
+ class Meta:
+ verbose_name = "Cours"
+ verbose_name_plural = "Cours"
+
def __str__(self):
return self.name
@@ -40,6 +44,10 @@ class Lesson(models.Model):
is_premium = models.BooleanField(default=False)
order = models.PositiveIntegerField()
+ class Meta:
+ verbose_name = "Leçon"
+ verbose_name_plural = "Leçons"
+
def clean(self):
# Remplacer les chevrons par leurs équivalents HTML
if self.content:
diff --git a/courses/templatetags/comment_format.py b/courses/templatetags/comment_format.py
index 2fbfd7e..64ea248 100644
--- a/courses/templatetags/comment_format.py
+++ b/courses/templatetags/comment_format.py
@@ -27,6 +27,19 @@ def _format_inline(text: str) -> str:
lambda m: f"",
text,
)
+ # H1
+ text = re.sub(r"^# (.+)$", r"\1
", text, flags=re.MULTILINE)
+ # H2
+ text = re.sub(r"^## (.+)$", r"\1
", text, flags=re.MULTILINE)
+ # H3
+ text = re.sub(r"^### (.+)$", r"\1
", text, flags=re.MULTILINE)
+ # H4
+ text = re.sub(r"^#### (.+)$", r"\1
", text, flags=re.MULTILINE)
+ # H5
+ text = re.sub(r"^##### (.+)$", r"\1
", text, flags=re.MULTILINE)
+ # H6
+ text = re.sub(r"^###### (.+)$", r"\1
", text, flags=re.MULTILINE)
+
# bold **text**
text = re.sub(
r"\*\*([^*]+)\*\*",
diff --git a/courses/views.py b/courses/views.py
index b51bce0..ca9fb22 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -3,13 +3,14 @@ from django.urls import reverse
from django.views import generic
from django.db.models import Prefetch
from .models import Course, Lesson, Module, Comment
+from progression.models import Progression
from .forms import CommentForm
def list_courses(request):
courses = Course.objects.all()
return render(request, 'courses/list.html', {'courses': courses})
-def show(request, course_id):
+def show(request, course_name, course_id):
# Optimized course fetch with related author and profile (if present)
course = get_object_or_404(
Course.objects.select_related('author', 'author__profile'),
@@ -23,9 +24,23 @@ def show(request, course_id):
.order_by('order')
)
+ # Récupération de la progression de l'utilisateur sur le cours
+ user_progress = None
+ completed_lesson_ids = [] # On prépare une liste vide par défaut
+
+ if request.user.is_authenticated:
+ user_progress = Progression.objects.filter(user=request.user, course=course).first()
+
+ # 2. S'il y a une progression, on extrait juste les IDs des leçons finies
+ if user_progress:
+ # values_list renvoie une liste simple : [1, 5, 12] au lieu d'objets lourds
+ completed_lesson_ids = user_progress.completed_lessons.values_list('id', flat=True)
+
context = {
'course': course,
'lessons': lessons,
+ 'user_progress': user_progress,
+ 'completed_lesson_ids': completed_lesson_ids,
}
return render(request, 'courses/show.html', context)
@@ -105,6 +120,18 @@ def lesson_detail(request, course_slug, module_slug, lesson_slug):
.order_by('created_at')
)
+ # Récupération de la progression de l'utilisateur sur le cours
+ user_progress = None
+ completed_lesson_ids = [] # On prépare une liste vide par défaut
+
+ if request.user.is_authenticated:
+ user_progress = Progression.objects.filter(user=request.user, course=course).first()
+
+ # 2. S'il y a une progression, on extrait juste les IDs des leçons finies
+ if user_progress:
+ # values_list renvoie une liste simple : [1, 5, 12] au lieu d'objets lourds
+ completed_lesson_ids = user_progress.completed_lessons.values_list('id', flat=True)
+
context = {
'course': course,
'module': module,
@@ -114,5 +141,7 @@ def lesson_detail(request, course_slug, module_slug, lesson_slug):
'comment_form': form,
'prev_lesson': prev_lesson,
'next_lesson': next_lesson,
+ 'user_progress': user_progress,
+ 'completed_lesson_ids': completed_lesson_ids,
}
return render(request, 'courses/lesson.html', context)
\ No newline at end of file
diff --git a/devart/settings.py b/devart/settings.py
index fa7d2d5..f846daa 100644
--- a/devart/settings.py
+++ b/devart/settings.py
@@ -12,6 +12,8 @@ https://docs.djangoproject.com/en/5.0/ref/settings/
from pathlib import Path
import os
+
+import dotenv
from dotenv import load_dotenv
import devart.context_processor
@@ -51,6 +53,8 @@ INSTALLED_APPS = [
'core',
'courses',
'users',
+ 'progression',
+ 'blog',
]
MIDDLEWARE = [
@@ -62,7 +66,7 @@ MIDDLEWARE = [
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
-
+ 'core.middleware.VisitTrackingMiddleware',
]
ROOT_URLCONF = 'devart.urls'
@@ -81,6 +85,7 @@ TEMPLATES = [
'devart.context_processor.app_version',
'core.context_processor.site_settings',
'courses.context_processors.course_list',
+ 'blog.context_processor.posts_list',
],
},
},
@@ -199,4 +204,12 @@ def get_git_version():
else:
return "Version inconnue (Fichier manquant)"
-GIT_VERSION = get_git_version()
\ No newline at end of file
+GIT_VERSION = get_git_version()
+
+EMAIL_BACKEND = dotenv.get_key('.env', 'EMAIL_BACKEND')
+EMAIL_HOST = dotenv.get_key('.env', 'EMAIL_HOST')
+EMAIL_PORT = dotenv.get_key('.env', 'EMAIL_PORT')
+EMAIL_USE_TLS = dotenv.get_key('.env', 'EMAIL_USE_TLS') == 'True'
+EMAIL_HOST_USER = dotenv.get_key('.env', 'EMAIL_HOST_USER')
+EMAIL_HOST_PASSWORD = dotenv.get_key('.env', 'EMAIL_HOST_PASSWORD')
+DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
\ No newline at end of file
diff --git a/devart/sitemap.py b/devart/sitemap.py
index 05f4a77..c675d9d 100644
--- a/devart/sitemap.py
+++ b/devart/sitemap.py
@@ -1,9 +1,10 @@
from django.contrib import sitemaps
from django.urls import reverse
-# --- IMPORTS DEPUIS TES DIFFÉRENTES FEATURES ---
+# --- FEATURES ---
from courses.models import Course
from users.models import Profile
+from blog.models import Post
# --- SITEMAP : LES Cours ---
class CourseSitemap(sitemaps.Sitemap):
@@ -11,12 +12,20 @@ class CourseSitemap(sitemaps.Sitemap):
priority = 0.9
def items(self):
- return Course.objects.filter(enable=True) # Exemple de filtre
+ return Course.objects.filter(enable=True).order_by('id')
def location(self, item):
# Assure-toi que ton modèle Course a bien une méthode get_absolute_url
return item.get_absolute_url()
+# --- SITEMAP : BLOG ---
+class BlogSitemap(sitemaps.Sitemap):
+ changefreq = "weekly"
+ priority = 0.8
+
+ def location(self, item):
+ return item.get_absolute_url()
+
# --- SITEMAP : PAGES STATIQUES ---
class StaticViewSitemap(sitemaps.Sitemap):
priority = 0.5
@@ -26,4 +35,4 @@ class StaticViewSitemap(sitemaps.Sitemap):
return ["home"] # Les noms de tes URLs
def location(self, item):
- return "https://partirdezero.com"
\ No newline at end of file
+ return ""
\ No newline at end of file
diff --git a/devart/urls.py b/devart/urls.py
index e198bae..17cb4e7 100644
--- a/devart/urls.py
+++ b/devart/urls.py
@@ -43,6 +43,8 @@ urlpatterns = [
path('', include('home.urls')),
path('courses/', include('courses.urls')),
path('users/', include('users.urls')),
+ path('progression/', include('progression.urls')),
+ path('blog/', include('blog.urls')),
path('sitemap.xml', sitemap, {'sitemaps': sitemaps_dict}, name='django.contrib.sitemaps.views.sitemap'),
path('robots.txt', robots_txt),
diff --git a/home/urls.py b/home/urls.py
index a1ea3c1..52e2435 100644
--- a/home/urls.py
+++ b/home/urls.py
@@ -5,4 +5,8 @@ app_name = 'home'
urlpatterns = [
path('', views.home, name='home'),
path('premium/', views.premium, name='premium'),
+ # Tableau de bord statistiques (réservé superadministrateurs)
+ path('dashboard/stats/', views.stats_dashboard, name='stats_dashboard'),
+ path('dashboard/stats/charts/', views.stats_charts, name='stats_charts'),
+ path('dashboard/stats/live-activity/', views.live_activity, name='live_activity'),
]
\ No newline at end of file
diff --git a/home/views.py b/home/views.py
index 5bd3838..76fba86 100644
--- a/home/views.py
+++ b/home/views.py
@@ -1,5 +1,15 @@
from django.shortcuts import render, get_object_or_404
-from courses.models import Course
+from django.contrib.auth.decorators import user_passes_test
+from django.utils import timezone
+from django.db.models import Count
+from core.models import Visit
+from django.views.decorators.cache import cache_page
+from django.contrib.auth.models import User
+from courses.models import Course, Lesson
+from blog.models import Post
+from progression.models import Progression
+import json
+from django.http import JsonResponse
def home(request):
courses = Course.objects.order_by('-created_at')[:6]
@@ -9,3 +19,319 @@ def premium(request, course_id):
"""Landing page présentant les avantages du Premium."""
course = get_object_or_404(Course, pk=course_id)
return render(request, 'premium.html', {'course': course})
+
+
+# 15 minutes de cache sur la page complète (sauf si décochée plus tard pour des blocs en direct)
+@user_passes_test(lambda u: u.is_superuser)
+@cache_page(60 * 15)
+def stats_dashboard(request):
+ """ Tableau de bord statistiques réservé aux superadministrateurs.
+ Périodes supportées: 7, 30, 90, 180 jours (GET param 'p'). """
+
+ # Période
+ period_options = [7, 30, 90, 180]
+ try:
+ p = int(request.GET.get('p', 30))
+ except ValueError:
+ p = 30
+ if p not in period_options:
+ p = 30
+
+ now = timezone.now()
+ start_dt = now - timezone.timedelta(days=p-1) # inclut aujourd'hui
+
+ # Utilisateurs
+ total_users = User.objects.count()
+ new_users_qs = User.objects.filter(date_joined__date__gte=start_dt.date(), date_joined__date__lte=now.date())
+ # Séries quotidiennes nouveaux utilisateurs
+ new_users_by_day = (
+ new_users_qs
+ .extra(select={'day': "date(date_joined)"})
+ .values('day')
+ .annotate(c=Count('id'))
+ )
+
+ # Activité approximée via Progression mise à jour
+ active_users_qs = (
+ Progression.objects.filter(updated_at__date__gte=start_dt.date(), updated_at__date__lte=now.date())
+ .values('user').distinct()
+ )
+ active_users_count = active_users_qs.count()
+
+ # Cours
+ total_courses = Course.objects.count()
+ total_courses_enabled = Course.objects.filter(enable=True).count()
+ new_courses_by_day = (
+ Course.objects.filter(created_at__date__gte=start_dt.date(), created_at__date__lte=now.date())
+ .extra(select={'day': "date(created_at)"})
+ .values('day').annotate(c=Count('id'))
+ )
+
+ # Leçons
+ total_lessons = Lesson.objects.count()
+
+ # Achèvements de leçons (via table de liaison M2M)
+ through = Progression.completed_lessons.through
+ lesson_completions_by_day = (
+ through.objects.filter(
+ progression__updated_at__date__gte=start_dt.date(),
+ progression__updated_at__date__lte=now.date(),
+ )
+ .extra(select={'day': "date(progression_updated_at)"}) if 'progression_updated_at' in [f.name for f in through._meta.fields]
+ else through.objects.extra(select={'day': "date(created_at)"}) # fallback si champs créé n'existe pas
+ )
+ # Si la table M2M n'a pas de timestamps, on utilisera updated_at de Progression pour l'activité par jour
+ # donc on refait une série quotidienne d'activité progression
+ progress_activity_by_day = (
+ Progression.objects.filter(updated_at__date__gte=start_dt.date(), updated_at__date__lte=now.date())
+ .extra(select={'day': "date(updated_at)"})
+ .values('day').annotate(c=Count('id'))
+ )
+
+ # Blog
+ total_posts = Post.objects.count()
+ new_posts_by_day = (
+ Post.objects.filter(created_at__date__gte=start_dt.date(), created_at__date__lte=now.date())
+ .extra(select={'day': "date(created_at)"})
+ .values('day').annotate(c=Count('id'))
+ )
+
+ # Revenus/Paiements & Technique (placeholders faute de sources)
+ revenus_disponibles = False
+ technique_disponible = False
+
+ # Visites / Trafic
+ period_start_date = start_dt.date()
+ period_end_date = now.date()
+ period_visits = Visit.objects.filter(date__gte=period_start_date, date__lte=period_end_date)
+
+ unique_visitors = period_visits.values('visitor_id').distinct().count()
+
+ earlier_visitors_qs = Visit.objects.filter(date__lt=period_start_date).values('visitor_id').distinct()
+ returning_visitors = period_visits.filter(visitor_id__in=earlier_visitors_qs).values('visitor_id').distinct().count()
+
+ converted_visitors = (
+ period_visits
+ .filter(became_user_at__isnull=False, became_user_at__date__gte=period_start_date, became_user_at__date__lte=period_end_date)
+ .values('visitor_id').distinct().count()
+ )
+
+ top_sources_qs = (
+ period_visits
+ .values('source')
+ .annotate(c=Count('visitor_id', distinct=True))
+ .order_by('-c')
+ )
+ top_countries_qs = (
+ period_visits
+ .exclude(country='')
+ .values('country')
+ .annotate(c=Count('visitor_id', distinct=True))
+ .order_by('-c')
+ )
+
+ top_sources_table = [(row['source'] or 'Direct/Unknown', row['c']) for row in top_sources_qs[:10]]
+ top_countries_table = [(row['country'], row['c']) for row in top_countries_qs[:10]]
+
+ # Helper pour avoir toutes les dates de la période et remplir les trous
+ def build_series_dict(qs, date_key='day', count_key='c'):
+ counts = {str(item[date_key]): item[count_key] for item in qs}
+ days = []
+ values = []
+ d = start_dt.date()
+ while d <= now.date():
+ key = str(d)
+ days.append(key)
+ values.append(counts.get(key, 0))
+ d += timezone.timedelta(days=1)
+ return days, values
+
+ days_users, values_new_users = build_series_dict(new_users_by_day)
+ days_courses, values_new_courses = build_series_dict(new_courses_by_day)
+ days_posts, values_new_posts = build_series_dict(new_posts_by_day)
+ days_activity, values_activity = build_series_dict(progress_activity_by_day)
+
+ # Tables simples (jour, valeur)
+ new_users_table = list(zip(days_users, values_new_users))
+ new_courses_table = list(zip(days_courses, values_new_courses))
+
+ context = {
+ 'period_options': period_options,
+ 'p': p,
+ 'start_date': start_dt.date(),
+ 'end_date': now.date(),
+
+ # KPI
+ 'kpi': {
+ 'total_users': total_users,
+ 'new_users_period': sum(values_new_users),
+ 'active_users_period': active_users_count,
+ 'unique_visitors': unique_visitors,
+ 'returning_visitors': returning_visitors,
+ 'converted_visitors': converted_visitors,
+ 'total_courses': total_courses,
+ 'courses_enabled': total_courses_enabled,
+ 'total_lessons': total_lessons,
+ 'total_posts': total_posts,
+ },
+
+ # Séries pour graphiques
+ 'series': {
+ 'days': days_users, # mêmes intervalles pour tous
+ 'new_users': values_new_users,
+ 'new_courses': values_new_courses,
+ 'new_posts': values_new_posts,
+ 'activity_progress': values_activity,
+ },
+
+ # Disponibilité des sections
+ 'revenus_disponibles': revenus_disponibles,
+ 'technique_disponible': technique_disponible,
+
+ # Tables
+ 'new_users_table': new_users_table,
+ 'new_courses_table': new_courses_table,
+ 'top_sources_table': top_sources_table,
+ 'top_countries_table': top_countries_table,
+ }
+
+ # Sérialisation JSON pour Chart.js
+ context['series_json'] = json.dumps(context['series'])
+ context['labels_json'] = json.dumps(context['series']['days'])
+
+ return render(request, 'home/stats_dashboard.html', context)
+
+
+@user_passes_test(lambda u: u.is_superuser)
+@cache_page(60 * 15)
+def stats_charts(request):
+ """Page dédiée aux graphiques (réservée superadmins)."""
+ # Période
+ period_options = [7, 30, 90, 180]
+ try:
+ p = int(request.GET.get('p', 30))
+ except ValueError:
+ p = 30
+ if p not in period_options:
+ p = 30
+
+ now = timezone.now()
+ start_dt = now - timezone.timedelta(days=p-1)
+ period_start_date = start_dt.date()
+ period_end_date = now.date()
+
+ # Trafic par jour (visiteurs uniques)
+ visits_qs = (
+ Visit.objects
+ .filter(date__gte=period_start_date, date__lte=period_end_date)
+ .values('date')
+ .annotate(c=Count('visitor_id', distinct=True))
+ .order_by('date')
+ )
+
+ # Conversions par jour (visiteurs devenus utilisateurs)
+ conversions_qs = (
+ Visit.objects
+ .filter(
+ became_user_at__isnull=False,
+ became_user_at__date__gte=period_start_date,
+ became_user_at__date__lte=period_end_date,
+ )
+ .extra(select={'day': "date(became_user_at)"})
+ .values('day')
+ .annotate(c=Count('visitor_id', distinct=True))
+ .order_by('day')
+ )
+
+ def build_series_dict(qs, date_key='date', count_key='c'):
+ counts = {str(item[date_key]): item[count_key] for item in qs}
+ days = []
+ values = []
+ d = period_start_date
+ while d <= period_end_date:
+ key = str(d)
+ days.append(key)
+ values.append(counts.get(key, 0))
+ d += timezone.timedelta(days=1)
+ return days, values
+
+ labels, visitors_series = build_series_dict(visits_qs, date_key='date')
+ _, conversions_series = build_series_dict(conversions_qs, date_key='day')
+
+ # Sources & Pays (sur la période)
+ period_visits = Visit.objects.filter(date__gte=period_start_date, date__lte=period_end_date)
+ top_sources_qs = (
+ period_visits
+ .values('source')
+ .annotate(c=Count('visitor_id', distinct=True))
+ .order_by('-c')[:10]
+ )
+ top_countries_qs = (
+ period_visits
+ .exclude(country='')
+ .values('country')
+ .annotate(c=Count('visitor_id', distinct=True))
+ .order_by('-c')[:10]
+ )
+
+ sources_labels = [(row['source'] or 'Direct/Unknown') for row in top_sources_qs]
+ sources_values = [row['c'] for row in top_sources_qs]
+ countries_labels = [row['country'] for row in top_countries_qs]
+ countries_values = [row['c'] for row in top_countries_qs]
+
+ context = {
+ 'period_options': period_options,
+ 'p': p,
+ 'start_date': period_start_date,
+ 'end_date': period_end_date,
+ 'labels_json': json.dumps(labels),
+ 'visitors_series_json': json.dumps(visitors_series),
+ 'conversions_series_json': json.dumps(conversions_series),
+ 'sources_labels_json': json.dumps(sources_labels),
+ 'sources_values_json': json.dumps(sources_values),
+ 'countries_labels_json': json.dumps(countries_labels),
+ 'countries_values_json': json.dumps(countries_values),
+ }
+
+ return render(request, 'home/stats_charts.html', context)
+
+
+@user_passes_test(lambda u: u.is_superuser)
+def live_activity(request):
+ """Retourne en JSON l'activité récente (5 dernières minutes):
+ visiteurs et utilisateurs et leur page actuelle.
+ """
+ now = timezone.now()
+ since = now - timezone.timedelta(minutes=5)
+ qs = (
+ Visit.objects
+ .filter(last_seen__gte=since)
+ .order_by('-last_seen')
+ )
+
+ data = []
+ for v in qs[:200]:
+ username = None
+ is_user = False
+ if v.user_id:
+ is_user = True
+ # safe access if user deleted
+ try:
+ username = v.user.username
+ except Exception:
+ username = 'Utilisateur'
+ visitor_label = v.visitor_id[:8]
+ seconds_ago = int((now - v.last_seen).total_seconds())
+ data.append({
+ 'visitor': visitor_label,
+ 'is_user': is_user,
+ 'username': username,
+ 'path': v.path,
+ 'last_seen': v.last_seen.isoformat(),
+ 'seconds_ago': seconds_ago,
+ 'date': str(v.date),
+ 'country': v.country,
+ 'source': v.source,
+ })
+
+ return JsonResponse({'now': now.isoformat(), 'items': data})
diff --git a/progression/__init__.py b/progression/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/progression/admin.py b/progression/admin.py
new file mode 100644
index 0000000..6dd7924
--- /dev/null
+++ b/progression/admin.py
@@ -0,0 +1,15 @@
+from django.contrib import admin
+from .models import Progression
+from courses.models import Course, Lesson
+
+@admin.register(Progression)
+class ProgressionAdmin(admin.ModelAdmin):
+ list_display = ('user', 'course', 'get_percent', 'updated_at')
+ list_filter = ('course', 'updated_at')
+ search_fields = ('user__username', 'course__name')
+
+ autocomplete_fields = ['course', 'completed_lessons']
+
+ def get_percent(self, obj):
+ return f"{obj.percent_completed}"
+ get_percent.short_description = 'Progression'
\ No newline at end of file
diff --git a/progression/apps.py b/progression/apps.py
new file mode 100644
index 0000000..7bf7a21
--- /dev/null
+++ b/progression/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ProgressionConfig(AppConfig):
+ name = 'progression'
diff --git a/progression/migrations/0001_initial.py b/progression/migrations/0001_initial.py
new file mode 100644
index 0000000..f2023ef
--- /dev/null
+++ b/progression/migrations/0001_initial.py
@@ -0,0 +1,34 @@
+# Generated by Django 6.0 on 2025-12-15 14:25
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ('courses', '0003_comment_parent'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Progression',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('created_at', models.DateTimeField(auto_now_add=True)),
+ ('updated_at', models.DateTimeField(auto_now=True)),
+ ('completed_lessons', models.ManyToManyField(blank=True, related_name='completed_by', to='courses.lesson')),
+ ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_progress', to='courses.course')),
+ ('last_viewed_lesson', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='last_viewed_by', to='courses.lesson')),
+ ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='progress', to=settings.AUTH_USER_MODEL)),
+ ],
+ options={
+ 'verbose_name': 'Progression du cours',
+ 'unique_together': {('user', 'course')},
+ },
+ ),
+ ]
diff --git a/progression/migrations/__init__.py b/progression/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/progression/models.py b/progression/models.py
new file mode 100644
index 0000000..d8002a8
--- /dev/null
+++ b/progression/models.py
@@ -0,0 +1,28 @@
+from django.db import models
+from django.conf import settings
+
+class Progression(models.Model):
+ user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='progress')
+ course = models.ForeignKey('courses.Course', on_delete=models.CASCADE, related_name='user_progress')
+ completed_lessons = models.ManyToManyField('courses.Lesson', blank=True, related_name='completed_by')
+ last_viewed_lesson = models.ForeignKey('courses.Lesson', on_delete=models.SET_NULL, null=True, blank=True, related_name='last_viewed_by')
+ created_at = models.DateTimeField(auto_now_add=True)
+ updated_at = models.DateTimeField(auto_now=True)
+
+ class Meta:
+ unique_together = ('user', 'course')
+ verbose_name = "Progression du cours"
+
+ def __str__(self):
+ return f"{self.user} - {self.course.name}"
+
+ @property
+ def percent_completed(self):
+ from courses.models import Lesson
+ total_lessons = Lesson.objects.filter(module__course=self.course).count()
+ if total_lessons == 0:
+ return 0
+
+ completed_lessons = self.completed_lessons.count()
+
+ return int((completed_lessons / total_lessons) * 100)
\ No newline at end of file
diff --git a/progression/tests.py b/progression/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/progression/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/progression/urls.py b/progression/urls.py
new file mode 100644
index 0000000..cef076c
--- /dev/null
+++ b/progression/urls.py
@@ -0,0 +1,10 @@
+from django.urls import path
+from . import views
+
+app_name = 'progression'
+
+urlpatterns = [
+ # On ne garde QUE la route AJAX ici.
+ # Les routes 'list', 'detail', etc. doivent rester dans courses/urls.py
+ path('ajax/toggle-lesson/', views.toggle_lesson_completion, name='toggle_lesson'),
+]
\ No newline at end of file
diff --git a/progression/views.py b/progression/views.py
new file mode 100644
index 0000000..1cee11c
--- /dev/null
+++ b/progression/views.py
@@ -0,0 +1,41 @@
+from django.shortcuts import render, get_object_or_404
+import json
+from django.http import JsonResponse
+from django.views.decorators.http import require_POST
+from django.contrib.auth.decorators import login_required
+from progression.models import Progression
+from courses.models import Lesson
+
+@login_required
+@require_POST
+def toggle_lesson_completion(request):
+ data = json.loads(request.body)
+ lesson_id = data.get('lesson_id')
+
+ lesson = get_object_or_404(Lesson, id=lesson_id)
+ # On remonte au cours via le module (Lesson -> Module -> Course)
+ course = lesson.module.course
+
+ # On récupère ou crée la progression
+ progression, created = Progression.objects.get_or_create(
+ user=request.user,
+ course=course
+ )
+
+ # La logique du Toggle
+ if lesson in progression.completed_lessons.all():
+ progression.completed_lessons.remove(lesson)
+ is_completed = False
+ else:
+ progression.completed_lessons.add(lesson)
+ is_completed = True
+
+ # Mise à jour de la dernière leçon vue
+ progression.last_viewed_lesson = lesson
+ progression.save()
+
+ return JsonResponse({
+ 'status': 'success',
+ 'is_completed': is_completed,
+ 'new_percent': progression.percent_completed
+ })
\ No newline at end of file
diff --git a/static/css/app.css b/static/css/app.css
index 508c4be..a4ddad5 100644
--- a/static/css/app.css
+++ b/static/css/app.css
@@ -247,9 +247,9 @@ html { box-sizing: border-box; }
gap: 6px;
padding: 2px 8px;
margin-left: 8px;
- border-radius: 999px;
+ border-radius: 2px;
background: var(--accent);
- color: var(--warning-contrast);
+ color: var(--text);
font-size: 11px;
font-weight: 800;
letter-spacing: .3px;
@@ -259,6 +259,40 @@ html { box-sizing: border-box; }
white-space: nowrap;
}
+.current-tag {
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ padding: 2px 8px;
+ border-radius: 2px;
+ background: var(--primary);
+ color: var(--primary-contrast);
+ font-size: 11px;
+ font-weight: 800;
+ letter-spacing: .3px;
+ line-height: 1.2;
+ vertical-align: middle;
+ text-transform: uppercase;
+ white-space: nowrap;
+}
+
+.completed-tag {
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ padding: 2px 8px;
+ border-radius: 2px;
+ background: var(--success);
+ color: var(--success-contrast);
+ font-size: 11px;
+ font-weight: 800;
+ letter-spacing: .3px;
+ line-height: 1.2;
+ vertical-align: middle;
+ text-transform: uppercase;
+ white-space: nowrap;
+}
+
.courseToc .tocLink.disabled {
color: var(--text-muted);
background: transparent;
@@ -269,6 +303,70 @@ html { box-sizing: border-box; }
font-weight: 500;
}
+/* Progression des cours */
+
+.progress-container {
+ display: flex;
+ flex-direction: row;
+}
+
+.progress-bar {
+ display: flex;
+ border-radius: var(--r-2);
+ border: 1px solid var(--border);
+ height: 20px;
+ background: var(--neutral-900);
+}
+
+.progress-text {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 4px;
+ color: var(--text);
+ font-size: 12px;
+ margin-left: 10px;
+}
+
+.progress-bar-fill {
+ background: var(--success);
+ height: 100%;
+ border-radius: var(--r-2) 0 0 var(--r-2);
+}
+
+.course-completed {
+ display: flex;
+ flex-direction: row;
+ border-radius: var(--r-2);
+ border: 1px solid var(--border);
+ margin: var(--space-2) 0;
+ background: var(--success);
+}
+
+.course-completed .container {
+ display: flex;
+ flex-direction: column;
+ padding: var(--space-2);
+ height: 100%;
+ vertical-align: middle;
+}
+
+.course-completed .container .icon {
+ color: var(--success-contrast);
+ font-size: 50px;
+}
+
+.course-completed .container .title {
+ color: var(--success-contrast);
+ font-size: 28px;
+ font-weight: 600;
+}
+
+.course-completed .container .content {
+ color: var(--success-contrast);
+ font-size: 14px;
+}
+
[data-theme='light'] {
/* Palette: plus nuancé, moins "blanc" */
--bg: #eef3f7; /* fond légèrement teinté bleu-gris */
@@ -751,6 +849,100 @@ img {
height: auto;
}
+/* ======================================
+ Blog components
+ ====================================== */
+
+/* Accessibilité: élément visuellement masqué mais accessible aux lecteurs d'écran */
+.sr-only {
+ position: absolute !important;
+ width: 1px !important;
+ height: 1px !important;
+ padding: 0 !important;
+ margin: -1px !important;
+ overflow: hidden !important;
+ clip: rect(0,0,0,0) !important;
+ white-space: nowrap !important;
+ border: 0 !important;
+}
+
+/* Blog layout wrappers */
+.blog.blog-home .blog-header {
+ display: grid;
+ gap: var(--space-3);
+ margin-bottom: var(--space-6);
+}
+.blog-title {
+ margin: 0;
+}
+.blog-description {
+ color: var(--text-muted);
+ font-size: 1.05rem;
+}
+
+/* Post list grid */
+.post-list {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
+ gap: var(--space-5);
+}
+
+.post-card {
+ background: var(--surface);
+ border: 1px solid var(--border-subtle);
+ border-radius: var(--r-3);
+ box-shadow: var(--shadow-1);
+ padding: var(--space-5);
+ display: grid;
+ gap: var(--space-3);
+ transition: transform var(--transition-1), box-shadow var(--transition-1), border-color var(--transition-1);
+}
+.post-card:hover {
+ transform: translateY(-2px);
+ box-shadow: var(--shadow-2);
+ border-color: var(--border-strong);
+}
+.post-card-title {
+ margin: 0;
+}
+.post-card-title a { color: var(--fg); text-decoration: none; }
+.post-card-title a:hover { color: var(--link-hover); text-decoration: underline; }
+.post-excerpt { color: var(--text); opacity: 0.95; }
+.post-actions { margin-top: 2px; }
+
+/* Post meta (date, tags) */
+.post-meta { color: var(--text-muted); font-size: 0.95rem; display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
+.post-meta i { color: var(--muted); margin-right: 6px; }
+.post-meta .sep { color: var(--muted); }
+
+/* Post detail */
+.post-detail .post-header { margin-bottom: var(--space-5); }
+.post-detail .post-title { margin-bottom: var(--space-2); }
+
+/* Prose content: typographic rhythm inside articles */
+.prose {
+ line-height: 1.75;
+ color: var(--text);
+}
+.prose :where(p, ul, ol, blockquote, pre, table, img) { margin: 0 0 var(--space-4); }
+.prose a { color: var(--link); }
+.prose a:hover { color: var(--link-hover); text-decoration: underline; }
+.prose blockquote {
+ margin-left: 0;
+ padding-left: var(--space-4);
+ border-left: 3px solid var(--border-strong);
+ color: var(--text-muted);
+ font-style: italic;
+}
+.prose code { font-family: var(--font-mono); background: var(--neutral-300); padding: 0 4px; border-radius: var(--r-1); }
+.prose pre {
+ background: var(--code-bg);
+ color: var(--code-text);
+ padding: var(--space-4);
+ border-radius: var(--r-2);
+ overflow: auto;
+}
+
/* Make embedded media responsive */
iframe, video { max-width: 100%; height: auto; }
@@ -2138,6 +2330,16 @@ input[type="text"], input[type="email"], input[type="password"], textarea {
filter: brightness(1.05);
}
+.btn-warning, .button-warning {
+ background-color: var(--warning);
+ border-color: var(--warning);
+ color: var(--warning-contrast);
+}
+
+.btn-warning:hover, .button-warning:hover {
+ filter: brightness(1.05);
+}
+
/* Tailles */
.btn-sm, .button-sm { padding: 6px 10px; font-size: 0.9rem; }
.btn-lg, .button-lg { padding: 12px 20px; font-size: 1.05rem; }
diff --git a/static/css/christmas.css b/static/css/christmas.css
new file mode 100644
index 0000000..19cf591
--- /dev/null
+++ b/static/css/christmas.css
@@ -0,0 +1,99 @@
+/* PartirDeZero — Décos de Noël (chargées uniquement en décembre) */
+
+/* Barre festive discrète sous la navbar */
+.site-nav { position: relative; }
+.site-nav::after {
+ content: "";
+ position: absolute;
+ left: 0; right: 0; bottom: -1px;
+ height: 4px;
+ background: repeating-linear-gradient(45deg,
+ #d61c4e 0 12px,
+ #1b8f3a 12px 24px,
+ #ffffff 24px 36px);
+ opacity: .55;
+ pointer-events: none;
+}
+
+/* Emoji sapin à côté du titre */
+.pdz-festive-emoji {
+ margin-left: .35rem;
+ filter: drop-shadow(0 1px 0 rgba(0,0,0,.2));
+}
+
+/* Overlay neige — ultra léger, non bloquant */
+.pdz-snow {
+ position: fixed;
+ inset: 0;
+ pointer-events: none;
+ z-index: 5; /* au-dessus du fond, sous les modales si existantes */
+ background-image:
+ radial-gradient(2px 2px at 20px 30px, rgba(255,255,255,.9) 50%, rgba(255,255,255,0) 51%),
+ radial-gradient(3px 3px at 80px 120px, rgba(255,255,255,.8) 50%, rgba(255,255,255,0) 51%),
+ radial-gradient(2px 2px at 150px 80px, rgba(255,255,255,.85) 50%, rgba(255,255,255,0) 51%),
+ radial-gradient(3px 3px at 250px 20px, rgba(255,255,255,.8) 50%, rgba(255,255,255,0) 51%);
+ background-repeat: repeat;
+ background-size: 300px 200px, 400px 300px, 350px 250px, 500px 400px;
+ animation: pdzSnowFall 18s linear infinite;
+}
+
+/* Plusieurs couches pour un effet de profondeur via parallax */
+.pdz-snow::before,
+.pdz-snow::after {
+ content: "";
+ position: absolute; inset: 0;
+ background-image:
+ radial-gradient(2px 2px at 40px 60px, rgba(255,255,255,.8) 50%, rgba(255,255,255,0) 51%),
+ radial-gradient(3px 3px at 120px 200px, rgba(255,255,255,.75) 50%, rgba(255,255,255,0) 51%),
+ radial-gradient(2px 2px at 220px 160px, rgba(255,255,255,.8) 50%, rgba(255,255,255,0) 51%);
+ background-repeat: repeat;
+}
+.pdz-snow::before {
+ background-size: 260px 180px, 380px 280px, 320px 220px;
+ animation: pdzSnowFallSlow 28s linear infinite;
+}
+.pdz-snow::after {
+ background-size: 200px 140px, 300px 220px, 260px 200px;
+ animation: pdzSnowFallFast 12s linear infinite;
+}
+
+@keyframes pdzSnowFall {
+ from { transform: translateY(-10%); }
+ to { transform: translateY(100%); }
+}
+@keyframes pdzSnowFallSlow {
+ from { transform: translateY(-10%); }
+ to { transform: translateY(100%); }
+}
+@keyframes pdzSnowFallFast {
+ from { transform: translateY(-10%); }
+ to { transform: translateY(100%); }
+}
+
+/* Respect des préférences d'accessibilité */
+@media (prefers-reduced-motion: reduce) {
+ .pdz-snow, .pdz-snow::before, .pdz-snow::after { animation: none; }
+}
+
+/* ——— Footer: petite touche festive discrète ——— */
+footer.pdz-xmas { position: relative; }
+footer.pdz-xmas::before {
+ content: "";
+ position: absolute;
+ left: 0; right: 0; top: 0;
+ height: 4px;
+ background: repeating-linear-gradient(45deg,
+ #d61c4e 0 12px,
+ #1b8f3a 12px 24px,
+ #ffffff 24px 36px);
+ opacity: .55;
+ pointer-events: none;
+}
+
+.footer-legal .pdz-holiday-greeting {
+ display: inline-flex;
+ align-items: center;
+ gap: .35rem;
+ color: var(--fg);
+ font-weight: 500;
+}
diff --git a/static/js/functions.js b/static/js/functions.js
index db8ff92..500562a 100644
--- a/static/js/functions.js
+++ b/static/js/functions.js
@@ -94,28 +94,4 @@ document.addEventListener('DOMContentLoaded', function() {
});
}
} catch(e) {}
-});
-
-// Fonction pour générer des flocons de neige
-function createSnowflake() {
- const snowflake = document.createElement('div');
- snowflake.classList.add('snowflake');
- snowflake.textContent = '•';
-
- snowflake.style.left = `${Math.random() * 100}vw`;
-
- const size = Math.random() * 1.5 + 0.5;
- snowflake.style.fontSize = `${size}em`;
-
- const duration = Math.random() * 5 + 5;
- snowflake.style.animationDuration = `${duration}s`;
-
- document.body.appendChild(snowflake);
-
- setTimeout(() => {
- snowflake.remove();
- }, duration * 1000);
-}
-
-// On génère les flocons toutes les 300ms
-setInterval(createSnowflake, 300);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/templates/blog/details.html b/templates/blog/details.html
new file mode 100644
index 0000000..0cf8ef9
--- /dev/null
+++ b/templates/blog/details.html
@@ -0,0 +1,25 @@
+{% extends 'layout.html' %}
+{% load comment_format %}
+{% block title %} | Blog : {{ post.name }}{% endblock %}
+{% block og_title %}Blog de Partir De Zéro : {{ post.name }}{% endblock %}
+{% block description %}{{ post.content|striptags|truncatewords:20 }}{% endblock %}
+{% block og_description %}{{ post.content|striptags|truncatewords:20 }}{% endblock %}
+
+{% block content %}
+
+
+
+
+ {{ post.content|comment_markdown }}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/blog/home.html b/templates/blog/home.html
new file mode 100644
index 0000000..b89265d
--- /dev/null
+++ b/templates/blog/home.html
@@ -0,0 +1,17 @@
+{% extends 'layout.html' %}
+{% block title %} | Blog{% endblock %}
+{% block og_title %}Blog de Partir De Zéro{% endblock %}
+{% block description %}{{ settings.blog_description }}{% endblock %}
+{% block og_description %}{{ settings.blog_description }}{% endblock %}
+
+{% block content %}
+
+
+
+ Liste des articles
+ {% include 'blog/partials/_posts_list.html' %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/blog/partials/_posts_list.html b/templates/blog/partials/_posts_list.html
new file mode 100644
index 0000000..c1b05e8
--- /dev/null
+++ b/templates/blog/partials/_posts_list.html
@@ -0,0 +1,21 @@
+{% load comment_format %}
+
+ {% for post in posts %}
+
+
+
+ {{ post.created_at|date:"d F Y" }}
+ {% if post.tags %}
+ •
+ {{ post.tags }}
+ {% endif %}
+
+ {{ post.description|comment_markdown|truncatewords:26 }}
+
+
+ {% empty %}
+
Aucun article pour le moment.
+ {% endfor %}
+
diff --git a/templates/courses/partials/_course_header.html b/templates/courses/partials/_course_header.html
index bff069f..33fbd36 100644
--- a/templates/courses/partials/_course_header.html
+++ b/templates/courses/partials/_course_header.html
@@ -4,3 +4,22 @@
Un cours proposé par {{ course.author }}
{{ course.content }}
+Progression pour ce cours
+{% if user_progress.percent_completed == 100 %}
+
+
+
+
Félicitation
+
Tu as terminé(e) ce cours ! Tu peux réellement être fier(e) de toi !!
+
+
+{% else %}
+
+
+
{{ user_progress.percent_completed }}%
+
+{% endif %}
diff --git a/templates/courses/partials/_course_toc.html b/templates/courses/partials/_course_toc.html
index 9039157..1389e55 100644
--- a/templates/courses/partials/_course_toc.html
+++ b/templates/courses/partials/_course_toc.html
@@ -13,7 +13,8 @@
{{ item.name }} {% if item.is_premium %}PREMIUM{% endif %}
- {% if lesson and lesson.id == item.id %}(cours actuel){% endif %}
+ {% if lesson and lesson.id == item.id %}(cours actuel){% endif %}
+ {% if item.id in completed_lesson_ids %}Terminé{% endif %}
{% if lesson and lesson.id == item.id %}
@@ -69,6 +70,12 @@
Ce que l'on voit durant ce cours :
{{ lesson.content|comment_markdown }}
+
+ {% if lesson.id in completed_lesson_ids %}
+
+ {% else %}
+
+ {% endif %}
diff --git a/templates/home/stats_charts.html b/templates/home/stats_charts.html
new file mode 100644
index 0000000..159bdcd
--- /dev/null
+++ b/templates/home/stats_charts.html
@@ -0,0 +1,96 @@
+{% extends "layout.html" %}
+{% load static %}
+
+{% block title %}- Stats · Graphiques{% endblock %}
+
+{% block extra_head %}
+
+
+{% endblock %}
+
+{% block content %}
+
+
Graphiques statistiques
+
+
+
+
+
+
Visiteurs uniques par jour
+
+
+
+
Conversions (visiteurs devenus utilisateurs) par jour
+
+
+
+
+
+
+
Top sources (visiteurs uniques)
+
+
+
+
Top pays (visiteurs uniques)
+
+
+
+
+
← Retour au tableau de bord
+
+
+
+{% endblock %}
diff --git a/templates/home/stats_dashboard.html b/templates/home/stats_dashboard.html
new file mode 100644
index 0000000..704ada6
--- /dev/null
+++ b/templates/home/stats_dashboard.html
@@ -0,0 +1,231 @@
+{% extends "layout.html" %}
+{% load static %}
+
+{% block title %}- Tableau de bord{% endblock %}
+
+{% block extra_head %}
+
+
+{% endblock %}
+
+{% block content %}
+
+
Tableau de bord statistiques
+
+ → Voir la page de graphiques
+
+
+
+
+
+
+
Visiteurs uniques (période)
+
{{ kpi.unique_visitors }}
+
+
+
Visiteurs revenants (période)
+
{{ kpi.returning_visitors }}
+
+
+
Conversions en utilisateurs (période)
+
{{ kpi.converted_visitors }}
+
+
+
Utilisateurs (total)
+
{{ kpi.total_users }}
+
+
+
Nouveaux utilisateurs (période)
+
{{ kpi.new_users_period }}
+
+
+
Utilisateurs actifs (période)
+
{{ kpi.active_users_period }}
+
+
+
Cours (publiés / total)
+
{{ kpi.courses_enabled }} / {{ kpi.total_courses }}
+
+
+
Leçons (total)
+
{{ kpi.total_lessons }}
+
+
+
Articles de blog (total)
+
{{ kpi.total_posts }}
+
+
+
Revenus
+ {% if revenus_disponibles %}
+
—
+ {% else %}
+
N/A
+ {% endif %}
+
+
+
Technique
+ {% if technique_disponible %}
+
—
+ {% else %}
+
N/A
+ {% endif %}
+
+
+
+
+
+
Activité en direct (5 dernières minutes)
+
+
+ | Type | Identité | Page | Il y a | Source | Pays |
+
+
+ | Chargement… |
+
+
+
+
+
+
+
+
Évolution quotidienne
+
+
+
+
+
+
+
Nouveaux utilisateurs par jour
+
+ | Jour | Nb |
+
+ {% for row in new_users_table %}
+ | {{ row.0 }} | {{ row.1 }} |
+ {% endfor %}
+
+
+
+
+
Nouveaux cours par jour
+
+ | Jour | Nb |
+
+ {% for row in new_courses_table %}
+ | {{ row.0 }} | {{ row.1 }} |
+ {% endfor %}
+
+
+
+
+
+
+
+
Top sources (visiteurs uniques)
+
+ | Source | Visiteurs |
+
+ {% for row in top_sources_table %}
+ | {{ row.0 }} | {{ row.1 }} |
+ {% empty %}
+ | Aucune donnée |
+ {% endfor %}
+
+
+
+
+
Top pays (visiteurs uniques)
+
+ | Pays | Visiteurs |
+
+ {% for row in top_countries_table %}
+ | {{ row.0 }} | {{ row.1 }} |
+ {% empty %}
+ | Aucune donnée |
+ {% endfor %}
+
+
+
+
+
+
+
+{% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
index 2c3189d..2a39086 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -31,6 +31,37 @@
+ {% now "n" as month %}
+ {% if month == '12' %}
+
+
+
+ {% endif %}
+
{% block extra_head %}{% endblock %}
@@ -39,8 +70,8 @@
(function() {
try {
var stored = localStorage.getItem('pdz-theme');
- var prefersLight = window.matchMedia && window.matchMedia('(prefers-color-scheme: light)').matches;
- var theme = stored || (prefersLight ? 'light' : 'dark');
+ var prefersLight = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+ var theme = stored || (prefersLight ? 'dark' : 'light');
document.documentElement.setAttribute('data-theme', theme);
if (theme === 'light') {
var link = document.getElementById('theme-css');
@@ -53,6 +84,11 @@
+ {% now "n" as month %}
+ {% if month == '12' %}
+
+
+ {% endif %}
{% block header %}
{% include "partials/_header.html" %}
{% endblock %}
diff --git a/templates/partials/_footer.html b/templates/partials/_footer.html
index 29b2d41..934a5e3 100644
--- a/templates/partials/_footer.html
+++ b/templates/partials/_footer.html
@@ -1,4 +1,5 @@
-