обновил фикстуры, вынес коннектор к postgres в отдельную зависимость, добавил надписи на пустые страницы

This commit is contained in:
Андрей Дувакин 2024-04-26 09:02:02 +05:00
parent a8878692bc
commit 71b8cec646
13 changed files with 40 additions and 11 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -24,5 +24,5 @@
.film_card_column::-webkit-scrollbar-thumb { .film_card_column::-webkit-scrollbar-thumb {
background-color: #0d1d3a; background-color: #0d1d3a;
border-radius: 5vw; border-radius: 5vw;
border: 1px solid #ffffff; border: 1px solid #eaeaea;
} }

View File

@ -95,4 +95,11 @@ body::-webkit-scrollbar-thumb {
flex-wrap: nowrap; flex-wrap: nowrap;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
}
.not_found_label {
width: 100%;
color: #eaeaea;
text-align: center;
font-size: 2vw;
margin-top: 10vw;
} }

View File

@ -8,10 +8,11 @@
<link href="{% static 'css/films/films_list.css' %}" rel="stylesheet"> <link href="{% static 'css/films/films_list.css' %}" rel="stylesheet">
<div class="films_block"> <div class="films_block">
<h1 class="header_title carousel_title">Смотрите в прокате</h1> <h1 class="header_title carousel_title">Смотрите в прокате</h1>
{% if films %}
<div class="films_list row row-cols-3"> <div class="films_list row row-cols-3">
{% for film in films %} {% for film in films %}
<a class="film_preview_card col" href="{% url 'films:film_details' film_id=film.id %}" <a class="film_preview_card col" href="{% url 'films:film_details' film_id=film.id %}"
style="{% if film.image %}background-image: url('{{ film.image.url }}'){% else %}background-color: #eaeaea{% endif %};"> style="{% if film.image %}background-image: url('{{ film.image.url }}'){% else %}background-color: #eaeaea{% endif %};">
<div class="film_preview_card_text_block"> <div class="film_preview_card_text_block">
<h3>{{ film.name }}</h3> <h3>{{ film.name }}</h3>
<p>{{ film.description|truncatewords_html:10 }}</p> <p>{{ film.description|truncatewords_html:10 }}</p>
@ -19,5 +20,8 @@
</a> </a>
{% endfor %} {% endfor %}
</div> </div>
{% else %}
<p class="not_found_label">Информации о фильмах в прокате не найдена :(</p>
{% endif %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -8,6 +8,7 @@
<link href="{% static 'css/home/homepage.css' %}" rel="stylesheet"> <link href="{% static 'css/home/homepage.css' %}" rel="stylesheet">
<h1 class="header_title carousel_title">Сейчас в прокате</h1> <h1 class="header_title carousel_title">Сейчас в прокате</h1>
<div id="carouselWhite" class="carousel carousel slide carousel_films" data-bs-ride="carousel"> <div id="carouselWhite" class="carousel carousel slide carousel_films" data-bs-ride="carousel">
{% if films_preview %}
<div class="carousel-indicators"> <div class="carousel-indicators">
{% for film in films_preview %} {% for film in films_preview %}
<button type="button" data-bs-target="#carouselWhite" data-bs-slide-to="{{ forloop.counter0 }}" <button type="button" data-bs-target="#carouselWhite" data-bs-slide-to="{{ forloop.counter0 }}"
@ -35,10 +36,14 @@
<span class="carousel-control-next-icon" aria-hidden="true"></span> <span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="visually-hidden">Next</span> <span class="visually-hidden">Next</span>
</button> </button>
{% else %}
<p class="not_found_label">Информации о фильмах в прокате не найдена :(</p>
{% endif %}
</div> </div>
<div class="timetable_block"> <div class="timetable_block">
<h1 class="header_title">Расписание</h1> <h1 class="header_title">Расписание</h1>
<div class="container"> <div class="container">
{% if films_sessions %}
<ul class="nav nav-tabs" id="myTab" role="tablist"> <ul class="nav nav-tabs" id="myTab" role="tablist">
{% for date in films_sessions %} {% for date in films_sessions %}
{% include "includes/date_timetable_button.html" %} {% include "includes/date_timetable_button.html" %}
@ -56,6 +61,9 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
{% else %}
<p class="not_found_label">Информации о расписании не найдена :(</p>
{% endif %}
</div> </div>
</div> </div>

View File

@ -9,10 +9,14 @@
<link href="{% static 'css/tickets/my_orders.css' %}" rel="stylesheet"> <link href="{% static 'css/tickets/my_orders.css' %}" rel="stylesheet">
<div class="container"> <div class="container">
<h1 class="header_title">Мои заказы</h1> <h1 class="header_title">Мои заказы</h1>
{% if my_orders %}
<div class="my_orders_block"> <div class="my_orders_block">
{% for order in my_orders %} {% for order in my_orders %}
{% include "includes/my_order_card.html" %} {% include "includes/my_order_card.html" %}
{% endfor %} {% endfor %}
</div> </div>
{% else %}
<p class="not_found_label">Кажется, вы еще не оформили ни одного заказа 🤔</p>
{% endif %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -9,6 +9,7 @@
<div class="timetable_block"> <div class="timetable_block">
<h1 class="header_title">Расписание</h1> <h1 class="header_title">Расписание</h1>
<div class="container"> <div class="container">
{% if films_sessions %}
<ul class="nav nav-tabs" id="myTab" role="tablist"> <ul class="nav nav-tabs" id="myTab" role="tablist">
{% for date in films_sessions %} {% for date in films_sessions %}
{% include "includes/date_timetable_button.html" %} {% include "includes/date_timetable_button.html" %}
@ -26,6 +27,9 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
{% else %}
<p class="not_found_label">Информации о расписании не найдена :(</p>
{% endif %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

6
requirements/base.txt Normal file
View File

@ -0,0 +1,6 @@
Django==4.2
django-ckeditor==6.7.0
django-cleanup==8.1.0
pillow==10.2.0
python-dotenv~=1.0.1
sorl-thumbnail==12.10.0

View File

@ -1,3 +1,3 @@
-r prod.txt -r base.txt
black==24.1.1 black==24.1.1
django-debug-toolbar==4.3.0 django-debug-toolbar==4.3.0

View File

@ -1,7 +1,2 @@
Django==4.2 -r base.txt
django-ckeditor==6.7.0
django-cleanup==8.1.0
pillow==10.2.0
python-dotenv~=1.0.1
sorl-thumbnail==12.10.0
psycopg2-binary==2.9.1 psycopg2-binary==2.9.1

View File

@ -1,4 +1,4 @@
-r prod.txt -r base.txt
flake8==7.0.0 flake8==7.0.0
flake8-bugbear==24.2.6 flake8-bugbear==24.2.6
flake8-clean-block==0.1.2 flake8-clean-block==0.1.2