Кажется, вы еще не оформили ни одного заказа 🤔
+ {% endif %}Информации о расписании не найдена :(
+ {% endif %} {% endblock %} \ No newline at end of file diff --git a/CineSync/templates/users/profile.html b/CineSync/templates/users/profile.html index 960e093..43afd62 100644 --- a/CineSync/templates/users/profile.html +++ b/CineSync/templates/users/profile.html @@ -38,6 +38,9 @@
+ {% endif %}
{% if messages %}
{% for message in messages %}
{{ message }}
diff --git a/CineSync/tickets/migrations/0008_alter_order_options_alter_ticket_options.py b/CineSync/tickets/migrations/0008_alter_order_options_alter_ticket_options.py new file mode 100644 index 0000000..e2f7717 --- /dev/null +++ b/CineSync/tickets/migrations/0008_alter_order_options_alter_ticket_options.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2 on 2024-04-26 04:15 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('tickets', '0002_initial_squashed_0007_alter_order_datetime_order'), + ] + + operations = [ + migrations.AlterModelOptions( + name='order', + options={'verbose_name': 'заказ', 'verbose_name_plural': 'Заказы'}, + ), + migrations.AlterModelOptions( + name='ticket', + options={'verbose_name': 'билет', 'verbose_name_plural': 'Билеты'}, + ), + ] diff --git a/CineSync/tickets/models.py b/CineSync/tickets/models.py index 61e2857..cb391a0 100644 --- a/CineSync/tickets/models.py +++ b/CineSync/tickets/models.py @@ -42,7 +42,7 @@ class Order(Model): class Meta: db_table = 'tickets_orders' - verbose_name = 'Заказ' + verbose_name = 'заказ' verbose_name_plural = 'Заказы' @@ -72,5 +72,5 @@ class Ticket(Model): class Meta: db_table = 'tickets_tickets' - verbose_name = 'Билет' + verbose_name = 'билет' verbose_name_plural = 'Билеты' diff --git a/CineSync/timetable/migrations/0007_alter_auditorium_options_alter_filmsession_options_and_more.py b/CineSync/timetable/migrations/0007_alter_auditorium_options_alter_filmsession_options_and_more.py new file mode 100644 index 0000000..83397c6 --- /dev/null +++ b/CineSync/timetable/migrations/0007_alter_auditorium_options_alter_filmsession_options_and_more.py @@ -0,0 +1,37 @@ +# Generated by Django 4.2 on 2024-04-26 04:15 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ( + 'timetable', + '0002_rename_rows_row_filmsession_squashed_0006_remove_auditorium_row_count', + ), + ] + + operations = [ + migrations.AlterModelOptions( + name='auditorium', + options={'verbose_name': 'зал', 'verbose_name_plural': 'Залы'}, + ), + migrations.AlterModelOptions( + name='filmsession', + options={'verbose_name': 'сеанс', 'verbose_name_plural': 'Сеансы'}, + ), + migrations.AlterModelOptions( + name='row', + options={'verbose_name': 'место', 'verbose_name_plural': 'Места'}, + ), + migrations.AlterField( + model_name='filmsession', + name='end_datetime', + field=models.DateTimeField( + blank=True, + null=True, + verbose_name='Дата и время окончания сеанса', + ), + ), + ] diff --git a/CineSync/timetable/models.py b/CineSync/timetable/models.py index ffacdc9..f84f2d9 100644 --- a/CineSync/timetable/models.py +++ b/CineSync/timetable/models.py @@ -50,7 +50,7 @@ class Auditorium(Model): class Meta: db_table = 'timetable_auditoriums' - verbose_name = 'Зал' + verbose_name = 'зал' verbose_name_plural = 'Залы' @@ -79,7 +79,7 @@ class Row(Model): class Meta: db_table = 'timetable_rows' - verbose_name = 'Место' + verbose_name = 'место' verbose_name_plural = 'Места' @@ -134,5 +134,5 @@ class FilmSession(Model): class Meta: db_table = 'timetable_film_sessions' - verbose_name = 'Сеанс' + verbose_name = 'сеанс' verbose_name_plural = 'Сеансы' diff --git a/CineSync/timetable/views.py b/CineSync/timetable/views.py index 7072d6c..1e89c9e 100644 --- a/CineSync/timetable/views.py +++ b/CineSync/timetable/views.py @@ -15,23 +15,20 @@ from timetable.models import FilmSession def timetable_view(request): film_sessions = FilmSession.objects.all_timetable() + sessions_by_date_and_film = {} for session in film_sessions: session_date = session.start_datetime.date() - if session_date not in sessions_by_date_and_film: - sessions_by_date_and_film[session_date] = {} + session_film = session.film + sessions_by_date_and_film.setdefault(session_date, {}).setdefault( + session_film, [] + ).append(session) - film_sessions_for_date = sessions_by_date_and_film[session_date] - if session.film not in film_sessions_for_date: - film_sessions_for_date[session.film] = [] - - film_sessions_for_date[session.film].append(session) - - for session_date, session_films in sessions_by_date_and_film.items(): - for session_film in session_films: + for session_date in sessions_by_date_and_film: + for session_film in sessions_by_date_and_film[session_date]: sessions_by_date_and_film[session_date][session_film].sort( - key=lambda sorted_session: sorted_session.start_datetime, + key=lambda x: x.start_datetime ) template = render( diff --git a/CineSync/users/forms.py b/CineSync/users/forms.py index 485f5d0..967411e 100644 --- a/CineSync/users/forms.py +++ b/CineSync/users/forms.py @@ -53,6 +53,17 @@ class SignUpForm(UserCreationForm): class Meta(UserCreationForm.Meta): fields = ('username', 'email') + def clean_username(self): + username = self.cleaned_data['username'] + if len(username) > 150: + raise forms.ValidationError('Максимальная длина 150 символов.') + if not all(char.isalnum() or char in '@/./+/-/_' for char in username): + raise forms.ValidationError( + 'Можно использовать только буквы, цифры и символы @/./+/-/_.' + ) + + return username + class ProfileForm(ModelForm): def __init__(self, *args, **kwargs) -> None: @@ -99,3 +110,14 @@ class UserForm(forms.ModelForm): model.first_name.field.name, model.last_name.field.name, ] + + def clean_username(self): + username = self.cleaned_data['username'] + if len(username) > 150: + raise forms.ValidationError('Максимальная длина 150 символов.') + if not all(char.isalnum() or char in '@/./+/-/_' for char in username): + raise forms.ValidationError( + 'Можно использовать только буквы, цифры и символы @/./+/-/_.' + ) + + return username diff --git a/CineSync/users/migrations/0004_alter_profile_options.py b/CineSync/users/migrations/0004_alter_profile_options.py new file mode 100644 index 0000000..76ad28c --- /dev/null +++ b/CineSync/users/migrations/0004_alter_profile_options.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2 on 2024-04-26 04:15 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0003_remove_profile_genres_profile_genres'), + ] + + operations = [ + migrations.AlterModelOptions( + name='profile', + options={ + 'verbose_name': 'данные пользователя', + 'verbose_name_plural': 'Данные пользователей', + }, + ), + ] diff --git a/CineSync/users/models.py b/CineSync/users/models.py index 6d0a662..9cdbc02 100644 --- a/CineSync/users/models.py +++ b/CineSync/users/models.py @@ -74,6 +74,6 @@ class Profile(Model): list_display = ['image_tmb'] class Meta: - verbose_name = 'Данные пользователя' + verbose_name = 'данные пользователя' verbose_name_plural = 'Данные пользователей' db_table = 'users_profiles' diff --git a/ER.png b/ER.png index 4538a08..04b69b6 100644 Binary files a/ER.png and b/ER.png differ diff --git a/README.md b/README.md index ac6228f..4a780ba 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,16 @@ авторизации, редактирования профиля. Сайт расположен по адресу: https://cinesync.numerum.site/ +## Перед запуском + +Необходимо также задать переменные окружения, для этого нужно создать файл `.env`, и указать там необходимые переменны, +ознакомится с ними можно в [примере файла](.example_env). + +## Обратите внимание + +Проект предусматривает возможность запуска проекта, как на sqlite, так и на postgres. В зависимости от этого нужно +устанавливать разные зависимости (ниже описаны какие) и задавать разные переменные окружения. + ## Инструкция к локальному запуску 1) Скачать проект или склонировать репозиторий: @@ -44,16 +54,21 @@ pip3 install -r requirements/test.txt ``` - - Для продакшена: + - Для продакшена на sqlite: ```bash - pip3 install -r requirements/prod.txt + pip3 install -r requirements/base.txt ``` + - Для продакшена на postgres: + + ```bash + pip3 install -r requirements/prod.txt + ``` + 5) Применить миграции: ```bash - python3 manage.py makemigrations python3 manage.py migrate ``` diff --git a/requirements/base.txt b/requirements/base.txt new file mode 100644 index 0000000..ec20c50 --- /dev/null +++ b/requirements/base.txt @@ -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 \ No newline at end of file diff --git a/requirements/dev.txt b/requirements/dev.txt index 41da87c..b92ab51 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,3 +1,3 @@ --r prod.txt +-r base.txt black==24.1.1 django-debug-toolbar==4.3.0 \ No newline at end of file diff --git a/requirements/prod.txt b/requirements/prod.txt index 5e312ff..66a81ca 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -1,7 +1,2 @@ -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 +-r base.txt psycopg2-binary==2.9.1 \ No newline at end of file diff --git a/requirements/test.txt b/requirements/test.txt index 81e20aa..866468d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,4 +1,4 @@ --r prod.txt +-r base.txt flake8==7.0.0 flake8-bugbear==24.2.6 flake8-clean-block==0.1.2 diff --git a/Документы/Текст к презентации.docx b/Документы/Текст к презентации.docx new file mode 100644 index 0000000..1ea13b5 Binary files /dev/null and b/Документы/Текст к презентации.docx differ