From afa18abdd97433cef52d5ea51cd8610f588b9e6a Mon Sep 17 00:00:00 2001 From: Gentility01 Date: Fri, 5 Jan 2024 17:11:19 +0100 Subject: [PATCH] updtaed video app --- blog/views.py | 2 +- equestlms/templates/_partials/_navbar.html | 2 +- equestlms/templates/base.html | 118 +++--- .../templates/videos/video_category.html | 207 ++++++++++ equestlms/templates/videos/video_list.html | 368 ++++++++---------- videos/admin.py | 14 +- .../0002_category_video_category.py | 39 ++ ..._tags_alter_category_options_video_tags.py | 41 ++ videos/migrations/0004_alter_video_tags.py | 18 + videos/models.py | 30 +- videos/urls.py | 7 +- videos/views.py | 45 ++- 12 files changed, 627 insertions(+), 264 deletions(-) create mode 100644 equestlms/templates/videos/video_category.html create mode 100644 videos/migrations/0002_category_video_category.py create mode 100644 videos/migrations/0003_tags_alter_category_options_video_tags.py create mode 100644 videos/migrations/0004_alter_video_tags.py diff --git a/blog/views.py b/blog/views.py index 73064fe..252b0c2 100644 --- a/blog/views.py +++ b/blog/views.py @@ -9,7 +9,7 @@ class BlogListView(ListView): model = Blog template_name = "blog/blog_list.html" context_object_name = "blog" - paginate_by = 2 + paginate_by = 5 def get_queryset(self): context_object_name = Blog.objects.all().order_by("-id") diff --git a/equestlms/templates/_partials/_navbar.html b/equestlms/templates/_partials/_navbar.html index b78fd40..e7368d1 100644 --- a/equestlms/templates/_partials/_navbar.html +++ b/equestlms/templates/_partials/_navbar.html @@ -37,7 +37,7 @@ Blog
  • - Videos + Videos
  • diff --git a/equestlms/templates/base.html b/equestlms/templates/base.html index 2029c7f..76d1de0 100644 --- a/equestlms/templates/base.html +++ b/equestlms/templates/base.html @@ -1,84 +1,88 @@ -{% load static i18n %} +{% load static i18n %} + {% get_current_language as LANGUAGE_CODE %} - - - - - Equest Tech - - - - {% block css %} - {% include './_partials/_stylesheets.html' %} - {% endblock css %} - + + {% block css %} + {% include './_partials/_stylesheets.html' %} + {% endblock css %} + - {# Placed at the top of the document so pages load faster with defer #} - {% block top_js %} - {% include './_partials/_javascripts.html' %} - {% endblock top_js %} + {# Placed at the top of the document so pages load faster with defer #} + {% block top_js %} + {% include './_partials/_javascripts.html' %} + {% endblock top_js %} + + - - + - -
    + +
    - {% block navbar %} - {% if not request.path == "/accounts/signup/" and not request.path == "/accounts/login/" and not request.path == "/accounts/confirm-email/" %} - {% include './_partials/_navbar.html' %} - {% endif %} - {% endblock navbar %} -
    + {% block navbar %} + {% if not request.path == "/accounts/signup/" and not request.path == "/accounts/login/" and not request.path == "/accounts/confirm-email/" %} + {% include './_partials/_navbar.html' %} + {% endif %} + {% endblock navbar %} +
    {% include '_partials/_messages.html' %} -
    - {% block body %} +
    + {% block body %} + + {% endblock body %} - {% endblock body %} + {% block footer %} + {% if not request.path == "/accounts/signup/" and not request.path == "/accounts/login/" and not request.path == "/accounts/confirm-email/" %} + {% include './_partials/_footer.html' %} + {% endif %} + {% endblock footer %} - {% block footer %} - {% if not request.path == "/accounts/signup/" and not request.path == "/accounts/login/" and not request.path == "/accounts/confirm-email/" %} - {% include './_partials/_footer.html' %} - {% endif %} - {% endblock footer %} +
    + -
    - + {% block bottom_js %} + + -{% block bottom_js %} - - + + - - + + + - - - + + - - + + - - + + - - + + - - + + + {% endblock bottom_js %} - - -{% endblock bottom_js %} + - diff --git a/equestlms/templates/videos/video_category.html b/equestlms/templates/videos/video_category.html new file mode 100644 index 0000000..ebcfcb2 --- /dev/null +++ b/equestlms/templates/videos/video_category.html @@ -0,0 +1,207 @@ +{% extends "base.html" %} +{% load static %} +{% block body %} +{% include '_partials/_breadcrumbs.html' %} + +
    +
    +
    +
    + + + {% for video in search_video %} +
    +
    + + +
    +
    +
    +

    {{ video.title }}

    +
    +
    +
      + +
    • {{video.created_at}}
      • + {% for tag in video.tags.all %} +
    • {{ tag.name }}
      • + {% endfor %} + +
    +
    +
    + +
    + {% endfor %} + + + + +
    +
    +
      + {% if page_obj.has_previous %} + + {% endif %} + {% for i in paginator.page_range %} + + {% if page_obj.number == i %} +
    • + {% else %} +
    • + {% endif %} + {{ i }} +
      • + {% endfor %} + {% if page_obj.has_previous %} + + {% endif %} +
    +
    +
    + + + +
    + +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + + +
    +
    +

    Recent Videos

    +
    +
    +
      + {% for video in latest_videos %} +
    • +
      + + + +
      +
      +

      + {{ video.title }} +

      +

      {{ video.created_at }}

      +
      +
      • + {% endfor %} + +
    +
    +
    + + + +
    +
    +

    Categories

    +
    +
    + +
    +
    + + + + {% comment %}
    +
    +

    Archives

    +
    +
    + +
    +
    {% endcomment %} + + + +
    +
    +

    Latest Tags

    +
    +
    +
      + {% for video in video_list %} + {% for tag in video.tags.all %} +
    • {{ tag.name }}
      • + {% endfor %} + {% endfor %} + + +
    +
    +
    + + +
    + +
    +
    +
    + +{% endblock body %} + +{% block bottom_js %} + + + + + + + + + + + + + + + + + + + + + + +{% endblock bottom_js %} diff --git a/equestlms/templates/videos/video_list.html b/equestlms/templates/videos/video_list.html index ab6809e..2f57236 100644 --- a/equestlms/templates/videos/video_list.html +++ b/equestlms/templates/videos/video_list.html @@ -4,212 +4,183 @@ {% include '_partials/_breadcrumbs.html' %}
    -
    -
    -
    - - - {% for video in video_list %} -
    -
    - - -
    -
    -
    -

    {{ video.title }}

    -
    -
    -
      - -
    • {{video.created_at}}
      • -
    • Tutorial
      • -
    -
    -
    - -
    - {% endfor %} - - - - -
    -
    -
      - {% if page_obj.has_previous %} - - {% endif %} - {% for i in paginator.page_range %} - - {% if page_obj.number == i %} -
    • - {% else %} -
    • - {% endif %} - {{ i }} -
      • - {% endfor %} - {% if page_obj.has_previous %} - - {% endif %} -
    -
    -
    - - - -
    - -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - - -
    -
    -

    Recent Videos

    -
    -
    -
      - {% for video in latest_videos %} -
    • -
      - - - -
      -
      -

      - {{ video.title }} -

      -

      {{ video.created_at }}

      -
      -
      • - {% endfor %} - -
    -
    -
    - - - -
    -
    -

    Categories

    -
    -
    - -
    -
    - - - -
    -
    -

    Archives

    -
    -
    - -
    -
    - - - -
    -
    -

    Latest Tags

    -
    -
    - -
    -
    - - -
    - -
    -
    +
  • {{video.created_at}}
    • + {% for tag in video.tags.all %} +
  • {{ tag.name }}
    • + {% endfor %} + + + + + + + {% endfor %} + + + + +
    +
    +
      + {% if page_obj.has_previous %} + + {% else %} + + {%endif %} + + {% for i in page_obj.paginator.page_range %} + +
    • + {{ i }} +
      • + {% endfor %} + {% if page_obj.has_next %} + + {% else %} + + {% endif %} +
    +
    +
    + + + + + +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + + +
    +
    +

    Recent Videos

    +
    +
    +
      + {% for video in latest_videos %} +
    • +
      + + + +
      +
      +

      + {{ video.title }} +

      +

      {{ video.created_at }}

      +
      +
      • + {% endfor %} + +
    +
    +
    + + + +
    +
    +

    Categories

    +
    +
    + +
    +
    + + + + {% comment %}
    +
    +

    Archives

    +
    +
    + +
    +
    {% endcomment %} + + + +
    +
    +

    Latest Tags

    +
    +
    +
      + {% for video in video_list %} + {% for tag in video.tags.all %} +
    • {{ tag.name }}
      • + {% endfor %} + {% endfor %} + + +
    +
    +
    + + +
    + + +
    {% endblock body %} @@ -233,8 +204,7 @@

    Latest Tags

    - + diff --git a/videos/admin.py b/videos/admin.py index ba204c9..89fadc1 100644 --- a/videos/admin.py +++ b/videos/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from videos.models import Video +from videos.models import Video, Category, Tags @admin.register(Video) @@ -13,3 +13,15 @@ class VideoAdmin(admin.ModelAdmin): ] ordering = ["-created_at", "-updated_at", "title"] search_fields = ["title"] + +@admin.register(Category) +class CategoryAdmin(admin.ModelAdmin): + list_display = ["name", "slug", "created_at"] + ordering = ["created_at", "name"] + search_fields = ["name"] + + +@admin.register(Tags) +class TagAdmin(admin.ModelAdmin): + list_display = ["name", "created_at"] + search_fields = ["name"] diff --git a/videos/migrations/0002_category_video_category.py b/videos/migrations/0002_category_video_category.py new file mode 100644 index 0000000..d07dc1e --- /dev/null +++ b/videos/migrations/0002_category_video_category.py @@ -0,0 +1,39 @@ +# Generated by Django 4.0.8 on 2024-01-04 07:01 + +from django.db import migrations, models +import django.db.models.deletion +import django.db.models.manager + + +class Migration(migrations.Migration): + + dependencies = [ + ('videos', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Category', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('visible', models.BooleanField(default=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('name', models.CharField(max_length=255)), + ('slug', models.SlugField(blank=True, max_length=125, null=True)), + ], + options={ + 'abstract': False, + 'base_manager_name': 'prefetch_manager', + }, + managers=[ + ('objects', django.db.models.manager.Manager()), + ('prefetch_manager', django.db.models.manager.Manager()), + ], + ), + migrations.AddField( + model_name='video', + name='category', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='videos.category'), + ), + ] diff --git a/videos/migrations/0003_tags_alter_category_options_video_tags.py b/videos/migrations/0003_tags_alter_category_options_video_tags.py new file mode 100644 index 0000000..5fe28b6 --- /dev/null +++ b/videos/migrations/0003_tags_alter_category_options_video_tags.py @@ -0,0 +1,41 @@ +# Generated by Django 4.0.8 on 2024-01-04 16:19 + +from django.db import migrations, models +import django.db.models.manager + + +class Migration(migrations.Migration): + + dependencies = [ + ('videos', '0002_category_video_category'), + ] + + operations = [ + migrations.CreateModel( + name='Tags', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('visible', models.BooleanField(default=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('name', models.CharField(max_length=255)), + ], + options={ + 'verbose_name': 'Tag', + 'verbose_name_plural': 'Tags', + }, + managers=[ + ('objects', django.db.models.manager.Manager()), + ('prefetch_manager', django.db.models.manager.Manager()), + ], + ), + migrations.AlterModelOptions( + name='category', + options={'verbose_name': 'category', 'verbose_name_plural': 'categories'}, + ), + migrations.AddField( + model_name='video', + name='tags', + field=models.ManyToManyField(blank=True, default=None, null=True, to='videos.tags'), + ), + ] diff --git a/videos/migrations/0004_alter_video_tags.py b/videos/migrations/0004_alter_video_tags.py new file mode 100644 index 0000000..e7b0b78 --- /dev/null +++ b/videos/migrations/0004_alter_video_tags.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0.8 on 2024-01-04 16:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('videos', '0003_tags_alter_category_options_video_tags'), + ] + + operations = [ + migrations.AlterField( + model_name='video', + name='tags', + field=models.ManyToManyField(blank=True, default=None, to='videos.tags'), + ), + ] diff --git a/videos/models.py b/videos/models.py index a18b21f..c085164 100644 --- a/videos/models.py +++ b/videos/models.py @@ -1,7 +1,32 @@ from django.db import models - +from django.utils.text import slugify from equestlms.utils.models import TimeBasedModel +class Category(TimeBasedModel): + name = models.CharField(max_length=255) + slug = models.SlugField(max_length=125, blank=True, null=True) + + def save(self, *args, **kwargs): + self.slug = slugify(self.name) + super().save(*args, **kwargs) + + class Meta: + verbose_name = "category" + verbose_name_plural = "categories" + + def __str__(self): + return self.name + + +class Tags(TimeBasedModel): + name = models.CharField(max_length=255) + + def __str__(self): + return self.name + + class Meta: + verbose_name = "Tag" + verbose_name_plural = "Tags" class Video(TimeBasedModel): title = models.CharField(max_length=500) @@ -13,5 +38,8 @@ class Video(TimeBasedModel): ) url = models.CharField(max_length=500) + category = models.ForeignKey(Category, on_delete=models.CASCADE, blank=True, null=True) + tags = models.ManyToManyField(Tags, default=None, blank=True) + def __str__(self) -> str: return self.title diff --git a/videos/urls.py b/videos/urls.py index 2e6e3a3..1838ee1 100644 --- a/videos/urls.py +++ b/videos/urls.py @@ -4,4 +4,9 @@ app_name = "videos" -urlpatterns = [path("", view=views.VideoListView.as_view(), name="video_list")] +urlpatterns = [ + path("", view=views.VideoListView.as_view(), name="video_list"), + path("category//", view=views.VideoCategoryListView.as_view(), name="video_category"), + path("search", view=views.VideoSearchListView.as_view(), name="video_search"), + ] + diff --git a/videos/views.py b/videos/views.py index 39e7ca2..bf38adb 100644 --- a/videos/views.py +++ b/videos/views.py @@ -1,16 +1,55 @@ +from django.db.models import Q from django.views.generic import ListView - -from videos.models import Video +from django.shortcuts import get_object_or_404 +from videos.models import Video, Category, Tags class VideoListView(ListView): model = Video context_object_name: str = "video_list" template_name: str = "videos/video_list.html" - paginate_by = 1 + paginate_by = 5 queryset = Video.objects.all() def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context["latest_videos"] = Video.objects.all().order_by("-created_at")[:3] + context["categories"] = Category.objects.all().order_by("-id")[:5] + context["tags"] = Tags.objects.all().order_by("-id") + + return context + + +class VideoCategoryListView(ListView): + model = Video + context_object_name: str = "video_category" + template_name: str = "videos/video_category.html" + + def get_queryset(self): + category = get_object_or_404(Category, slug=self.kwargs["slug"]) + return super().get_queryset().filter(category=category) + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["latest_videos"] = Video.objects.all().order_by("-created_at")[:3] + context["categories"] = Category.objects.all().order_by("-id")[:5] + context["tags"] = Tags.objects.all().order_by("-id") return context + + +class VideoSearchListView(ListView): + model = Video + template_name: str = "videos/video_search.html" + + def get_queryset(self): + query = self.request.GET.get("q") + search_video = Video.objects.filter(Q(title__icontains=query)) + return search_video + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["latest_videos"] = Video.objects.all().order_by("-created_at")[:3] + context["categories"] = Category.objects.all().order_by("-id")[:5] + context["tags"] = Tags.objects.all().order_by("-id") + return context +