Ajout des applications blog et progression avec modèles, vues, URLs et intégration dans le sitemap et les configurations du projet.
This commit is contained in:
parent
45d2cb66f0
commit
3e44013132
23 changed files with 215 additions and 0 deletions
0
blog/__init__.py
Normal file
0
blog/__init__.py
Normal file
9
blog/admin.py
Normal file
9
blog/admin.py
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
from django.contrib import admin
|
||||||
|
from .models import Post
|
||||||
|
|
||||||
|
@admin.register(Post)
|
||||||
|
class PostAdmin(admin.ModelAdmin):
|
||||||
|
list_display = ('name', 'tags', 'slug', 'created_at')
|
||||||
|
list_filter = ('created_at',)
|
||||||
|
search_fields = ('name', 'tags')
|
||||||
|
prepopulated_fields = {"slug": ("name",)}
|
||||||
5
blog/apps.py
Normal file
5
blog/apps.py
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class BlogConfig(AppConfig):
|
||||||
|
name = 'blog'
|
||||||
30
blog/migrations/0001_initial.py
Normal file
30
blog/migrations/0001_initial.py
Normal file
|
|
@ -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',
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
||||||
0
blog/migrations/__init__.py
Normal file
0
blog/migrations/__init__.py
Normal file
16
blog/models.py
Normal file
16
blog/models.py
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
class Post(models.Model):
|
||||||
|
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)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = "Article"
|
||||||
|
verbose_name_plural = "Articles"
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.name
|
||||||
3
blog/tests.py
Normal file
3
blog/tests.py
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
||||||
8
blog/urls.py
Normal file
8
blog/urls.py
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
from django.urls import path
|
||||||
|
from . import views
|
||||||
|
|
||||||
|
app_name = 'blog'
|
||||||
|
urlpatterns = [
|
||||||
|
path('', views.blog_home, name='blog'),
|
||||||
|
path('<int:slug>/', views.blog_view_post, name='post_detail'),
|
||||||
|
]
|
||||||
7
blog/views.py
Normal file
7
blog/views.py
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
from django.shortcuts import render
|
||||||
|
|
||||||
|
def blog_home(request):
|
||||||
|
return ""
|
||||||
|
|
||||||
|
def blog_view_post(request):
|
||||||
|
return ""
|
||||||
|
|
@ -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'},
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -12,6 +12,10 @@ class Course(models.Model):
|
||||||
updated_at = models.DateTimeField(auto_now=True)
|
updated_at = models.DateTimeField(auto_now=True)
|
||||||
enable = models.BooleanField(default=True)
|
enable = models.BooleanField(default=True)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = "Cours"
|
||||||
|
verbose_name_plural = "Cours"
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
|
@ -40,6 +44,10 @@ class Lesson(models.Model):
|
||||||
is_premium = models.BooleanField(default=False)
|
is_premium = models.BooleanField(default=False)
|
||||||
order = models.PositiveIntegerField()
|
order = models.PositiveIntegerField()
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = "Leçon"
|
||||||
|
verbose_name_plural = "Leçons"
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
# Remplacer les chevrons <?php et ?> par leurs équivalents HTML
|
# Remplacer les chevrons <?php et ?> par leurs équivalents HTML
|
||||||
if self.content:
|
if self.content:
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,8 @@ INSTALLED_APPS = [
|
||||||
'core',
|
'core',
|
||||||
'courses',
|
'courses',
|
||||||
'users',
|
'users',
|
||||||
|
'progression',
|
||||||
|
'blog',
|
||||||
]
|
]
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ from django.urls import reverse
|
||||||
# --- IMPORTS DEPUIS TES DIFFÉRENTES FEATURES ---
|
# --- IMPORTS DEPUIS TES DIFFÉRENTES FEATURES ---
|
||||||
from courses.models import Course
|
from courses.models import Course
|
||||||
from users.models import Profile
|
from users.models import Profile
|
||||||
|
from blog.models import Post
|
||||||
|
|
||||||
# --- SITEMAP : LES Cours ---
|
# --- SITEMAP : LES Cours ---
|
||||||
class CourseSitemap(sitemaps.Sitemap):
|
class CourseSitemap(sitemaps.Sitemap):
|
||||||
|
|
@ -17,6 +18,14 @@ class CourseSitemap(sitemaps.Sitemap):
|
||||||
# Assure-toi que ton modèle Course a bien une méthode get_absolute_url
|
# Assure-toi que ton modèle Course a bien une méthode get_absolute_url
|
||||||
return item.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 ---
|
# --- SITEMAP : PAGES STATIQUES ---
|
||||||
class StaticViewSitemap(sitemaps.Sitemap):
|
class StaticViewSitemap(sitemaps.Sitemap):
|
||||||
priority = 0.5
|
priority = 0.5
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,8 @@ urlpatterns = [
|
||||||
path('courses/', include('courses.urls')),
|
path('courses/', include('courses.urls')),
|
||||||
path('users/', include('users.urls')),
|
path('users/', include('users.urls')),
|
||||||
|
|
||||||
|
path('blog/', include('blog.urls')),
|
||||||
|
|
||||||
path('sitemap.xml', sitemap, {'sitemaps': sitemaps_dict}, name='django.contrib.sitemaps.views.sitemap'),
|
path('sitemap.xml', sitemap, {'sitemaps': sitemaps_dict}, name='django.contrib.sitemaps.views.sitemap'),
|
||||||
path('robots.txt', robots_txt),
|
path('robots.txt', robots_txt),
|
||||||
]
|
]
|
||||||
|
|
|
||||||
0
progression/__init__.py
Normal file
0
progression/__init__.py
Normal file
15
progression/admin.py
Normal file
15
progression/admin.py
Normal file
|
|
@ -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'
|
||||||
5
progression/apps.py
Normal file
5
progression/apps.py
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class ProgressionConfig(AppConfig):
|
||||||
|
name = 'progression'
|
||||||
34
progression/migrations/0001_initial.py
Normal file
34
progression/migrations/0001_initial.py
Normal file
|
|
@ -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')},
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
||||||
0
progression/migrations/__init__.py
Normal file
0
progression/migrations/__init__.py
Normal file
28
progression/models.py
Normal file
28
progression/models.py
Normal file
|
|
@ -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)
|
||||||
3
progression/tests.py
Normal file
3
progression/tests.py
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
||||||
7
progression/urls.py
Normal file
7
progression/urls.py
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
from django.urls import path
|
||||||
|
from . import views
|
||||||
|
|
||||||
|
app_name = 'progression'
|
||||||
|
urlpatterns = [
|
||||||
|
|
||||||
|
]
|
||||||
3
progression/views.py
Normal file
3
progression/views.py
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
from django.shortcuts import render
|
||||||
|
|
||||||
|
# Create your views here.
|
||||||
Loading…
Add table
Add a link
Reference in a new issue