Добавил черновой вариант пагинации и переделал шаблоны

This commit is contained in:
Viner Abubakirov
2026-01-03 13:11:34 +05:00
parent 96a9f47d9d
commit 765e8b46ec
8 changed files with 105 additions and 73 deletions

View File

@@ -1,4 +1,5 @@
from django import views as django_views
from django.views.generic import ListView
from django.shortcuts import render
from django.http.request import HttpRequest
from django.shortcuts import get_object_or_404
@@ -8,16 +9,27 @@ from music.models import Artist
from music.models import Album
class TrackListView(django_views.View):
def get(self, request: HttpRequest, *args, **kwargs):
tracks = Track.objects.all().select_related("album__artist",).order_by("id")
return render(request, "music/track_list.html", {"tracks": tracks})
class TrackListView(ListView):
model = Track
template_name = "music/track_list.html"
context_object_name = "tracks"
paginate_by = 25
def get_queryset(self):
return (
super().get_queryset()
.select_related("album", "album__artist")
.order_by("id")
)
class ArtistListView(django_views.View):
def get(self, request: HttpRequest, *args, **kwargs):
artists = Artist.objects.all()
return render(request, "music/artist_list.html", {"artists": artists})
class ArtistListView(ListView):
model = Artist
template_name = "music/artist_list.html"
context_object_name = "artists"
paginate_by = 25
def get_queryset(self):
return super().get_queryset().order_by("id")
class ArtistDetailView(django_views.View):
@@ -26,10 +38,14 @@ class ArtistDetailView(django_views.View):
return render(request, "music/artist_detail.html", {"artist": artist})
class AlbumListView(django_views.View):
def get(self, request: HttpRequest, *args, **kwargs):
albums = Album.objects.all().order_by("id")
return render(request, "music/album_list.html", {"albums": albums})
class AlbumListView(ListView):
model = Album
template_name = "music/album_list.html"
context_object_name = "albums"
paginate_by = 25
def get_queryset(self):
return super().get_queryset().order_by("id")
class AlbumDetailView(django_views.View):

View File

@@ -2,8 +2,7 @@
<link rel="stylesheet" href="{% static 'css/album_list.css' %}">
<div class="container">
<div class="album-container">
<div class="album-container">
{% for album in albums %}
<div class="album-card">
<a href="{% url 'music:album_detail' album.id %}" class="album-link">
@@ -22,5 +21,4 @@
{% empty %}
<p>No albums available.</p>
{% endfor %}
</div>
</div>

View File

@@ -2,8 +2,7 @@
<link rel="stylesheet" href="{% static 'css/artist_list.css' %}">
<div class="container">
<div class="artist-container">
<div class="artist-container">
{% for artist in artists %}
<div class="artist-card">
<a href="{% url 'music:artist_detail' artist.id %}" class="artist-link">
@@ -23,5 +22,4 @@
{% empty %}
<p>No artists available.</p>
{% endfor %}
</div>
</div>

View File

@@ -0,0 +1,11 @@
{% if page_obj.has_previous %}
<a href="?page={{ page_obj.previous_page_number }}">← Назад</a>
{% endif %}
<span>
Страница {{ page_obj.number }} из {{ page_obj.paginator.num_pages }}
</span>
{% if page_obj.has_next %}
<a href="?page={{ page_obj.next_page_number }}">Вперёд →</a>
{% endif %}

View File

@@ -1,8 +1,8 @@
{% load static %}
<link rel="stylesheet" href="{% static 'css/track_list.css' %}">
<div class="container">
<ul class="track-list">
<ul class="track-list">
{% if tracks %}
{% for track in tracks %}
<li class="track-item" data-track-id="{{ track.id }}" data-track-src="{{ track.file.url }}">
@@ -18,6 +18,5 @@
<p>Нет добавленных треков</p>
</div>
{% endif %}
</ul>
</div>
{% include 'components/player.html' %}
</ul>

View File

@@ -3,5 +3,8 @@
{% block content %}
<h1>Album List</h1>
{% include 'components/album_list.html' with albums=albums %}
<div class="container">
{% include 'components/album_list.html' %}
{% include 'components/pagination.html' %}
</div>
{% endblock %}

View File

@@ -3,5 +3,8 @@
{% block title %}Artist List{% endblock %}
{% block content %}
<h1>Artist List</h1>
{% include 'components/artist_list.html' with artists=artists %}
<div class="container">
{% include 'components/artist_list.html' with artists=artists %}
{% include 'components/pagination.html' with page_obj=page_obj %}
</div>
{% endblock %}

View File

@@ -1,5 +1,9 @@
{% extends 'base.html' %}
{% block content %}
{% include 'components/track_list.html' %}
<div class="container">
{% include 'components/track_list.html' %}
{% include 'components/pagination.html' %}
{% include 'components/player.html' %}
</div>
{% endblock %}