diff --git a/.env b/.env deleted file mode 100644 index 139e156..0000000 --- a/.env +++ /dev/null @@ -1,2 +0,0 @@ -DOMAIN_URL=feelindev.ru -DOMAIN_EMAIL=valerfilatoff@gmail.com \ No newline at end of file diff --git a/.gitignore b/.gitignore index 70cf91d..b19c744 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc .idea/workspace.xml +.gitignore diff --git a/.idea/cinema.iml b/.idea/cinema.iml index dbd4e77..aa7f1d3 100644 --- a/.idea/cinema.iml +++ b/.idea/cinema.iml @@ -18,7 +18,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index bf7654b..090eb7b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3f0aca6..c46e8ed 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,8 +5,75 @@ + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - { - "keyToString": { - "DefaultHtmlFileTemplate": "HTML File", - "Django Server.cinema.executor": "Run", - "RunOnceActivity.OpenDjangoStructureViewOnStart": "true", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "django.template.preview.state": "SHOW_EDITOR", - "git-widget-placeholder": "master", - "last_opened_file_path": "D:/cinema/static/img", - "list.type.of.created.stylesheet": "CSS", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "configurable.group.project", - "vue.rearranger.settings.migration": "true" + +}]]> + + + + - - - + @@ -109,7 +178,7 @@ - @@ -146,6 +215,7 @@ + diff --git a/cinema/__pycache__/__init__.cpython-311.pyc b/cinema/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index c2bd1b0..0000000 Binary files a/cinema/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/cinema/__pycache__/__init__.cpython-38.pyc b/cinema/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 6fa75c2..0000000 Binary files a/cinema/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/cinema/__pycache__/settings.cpython-311.pyc b/cinema/__pycache__/settings.cpython-311.pyc deleted file mode 100644 index c4d2760..0000000 Binary files a/cinema/__pycache__/settings.cpython-311.pyc and /dev/null differ diff --git a/cinema/__pycache__/settings.cpython-38.pyc b/cinema/__pycache__/settings.cpython-38.pyc deleted file mode 100644 index 38538af..0000000 Binary files a/cinema/__pycache__/settings.cpython-38.pyc and /dev/null differ diff --git a/cinema/__pycache__/urls.cpython-311.pyc b/cinema/__pycache__/urls.cpython-311.pyc deleted file mode 100644 index d839317..0000000 Binary files a/cinema/__pycache__/urls.cpython-311.pyc and /dev/null differ diff --git a/cinema/__pycache__/urls.cpython-38.pyc b/cinema/__pycache__/urls.cpython-38.pyc deleted file mode 100644 index caee599..0000000 Binary files a/cinema/__pycache__/urls.cpython-38.pyc and /dev/null differ diff --git a/cinema/__pycache__/wsgi.cpython-311.pyc b/cinema/__pycache__/wsgi.cpython-311.pyc deleted file mode 100644 index 7ab0bc9..0000000 Binary files a/cinema/__pycache__/wsgi.cpython-311.pyc and /dev/null differ diff --git a/cinema/__pycache__/wsgi.cpython-38.pyc b/cinema/__pycache__/wsgi.cpython-38.pyc deleted file mode 100644 index 55b6601..0000000 Binary files a/cinema/__pycache__/wsgi.cpython-38.pyc and /dev/null differ diff --git a/cinema/asgi.py b/cinema/asgi.py index aee6d3d..9864af8 100644 --- a/cinema/asgi.py +++ b/cinema/asgi.py @@ -4,7 +4,7 @@ It exposes the ASGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/ +https://docs.djangoproject.com/en/5.0/howto/deployment/asgi/ """ import os diff --git a/cinema/settings.py b/cinema/settings.py index 8e38fe5..6acd963 100644 --- a/cinema/settings.py +++ b/cinema/settings.py @@ -1,31 +1,32 @@ """ Django settings for cinema project. -Generated by 'django-admin startproject' using Django 4.2.10. +Generated by 'django-admin startproject' using Django 5.0.3. For more information on this file, see -https://docs.djangoproject.com/en/4.2/topics/settings/ +https://docs.djangoproject.com/en/5.0/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/4.2/ref/settings/ +https://docs.djangoproject.com/en/5.0/ref/settings/ """ from pathlib import Path -import logging # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent + # Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/ +# See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-7-a@eb9$+hoho021q$euaq^ieoai@=070r-j&$lgnja^d2xu3&' +SECRET_KEY = 'django-insecure-#q%pz%^75961leq(4%4(c3t2r2-^b(oh458c_cdhhw^51rqefx' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ['localhost'] +ALLOWED_HOSTS = [] + # Application definition @@ -37,9 +38,9 @@ 'django.contrib.messages', 'django.contrib.staticfiles', 'users', - 'tickets', 'movies', - 'screenings' + 'screenings', + 'tickets' ] MIDDLEWARE = [ @@ -57,8 +58,7 @@ TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [BASE_DIR / 'templates'] - , + 'DIRS': ['templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -73,12 +73,13 @@ WSGI_APPLICATION = 'cinema.wsgi.application' + # Database -# https://docs.djangoproject.com/en/4.2/ref/settings/#databases +# https://docs.djangoproject.com/en/5.0/ref/settings/#databases DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'ENGINE': 'django.db.backends.postgresql', 'NAME': 'cinema', 'USER': 'admin', 'PASSWORD': 'admin', @@ -87,8 +88,9 @@ } } + # Password validation -# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators +# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { @@ -105,8 +107,9 @@ }, ] + # Internationalization -# https://docs.djangoproject.com/en/4.2/topics/i18n/ +# https://docs.djangoproject.com/en/5.0/topics/i18n/ LANGUAGE_CODE = 'ru' @@ -116,8 +119,9 @@ USE_TZ = True + # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/4.2/howto/static-files/ +# https://docs.djangoproject.com/en/5.0/howto/static-files/ STATIC_URL = 'static/' @@ -126,7 +130,7 @@ ] # Default primary key field type -# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field +# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/cinema/urls.py b/cinema/urls.py index bbf8f3f..d53e9b4 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -2,7 +2,7 @@ URL configuration for cinema project. The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/4.2/topics/http/urls/ + https://docs.djangoproject.com/en/5.0/topics/http/urls/ Examples: Function views 1. Add an import: from my_app import views @@ -16,7 +16,6 @@ """ from django.contrib import admin from django.urls import path, include - from django.conf import settings from django.conf.urls.static import static diff --git a/cinema/views.py b/cinema/views.py deleted file mode 100644 index e69de29..0000000 diff --git a/cinema/wsgi.py b/cinema/wsgi.py index 505821d..607203a 100644 --- a/cinema/wsgi.py +++ b/cinema/wsgi.py @@ -4,7 +4,7 @@ It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/5.0/howto/deployment/wsgi/ """ import os diff --git a/movies/__pycache__/__init__.cpython-311.pyc b/movies/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 694caf9..0000000 Binary files a/movies/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/movies/__pycache__/__init__.cpython-38.pyc b/movies/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 1089627..0000000 Binary files a/movies/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/movies/__pycache__/admin.cpython-311.pyc b/movies/__pycache__/admin.cpython-311.pyc deleted file mode 100644 index 179cfd1..0000000 Binary files a/movies/__pycache__/admin.cpython-311.pyc and /dev/null differ diff --git a/movies/__pycache__/admin.cpython-38.pyc b/movies/__pycache__/admin.cpython-38.pyc deleted file mode 100644 index c9aa473..0000000 Binary files a/movies/__pycache__/admin.cpython-38.pyc and /dev/null differ diff --git a/movies/__pycache__/apps.cpython-311.pyc b/movies/__pycache__/apps.cpython-311.pyc deleted file mode 100644 index ce0b004..0000000 Binary files a/movies/__pycache__/apps.cpython-311.pyc and /dev/null differ diff --git a/movies/__pycache__/apps.cpython-38.pyc b/movies/__pycache__/apps.cpython-38.pyc deleted file mode 100644 index 1e0f93c..0000000 Binary files a/movies/__pycache__/apps.cpython-38.pyc and /dev/null differ diff --git a/movies/__pycache__/models.cpython-311.pyc b/movies/__pycache__/models.cpython-311.pyc deleted file mode 100644 index 4285fe6..0000000 Binary files a/movies/__pycache__/models.cpython-311.pyc and /dev/null differ diff --git a/movies/__pycache__/models.cpython-38.pyc b/movies/__pycache__/models.cpython-38.pyc deleted file mode 100644 index bf10deb..0000000 Binary files a/movies/__pycache__/models.cpython-38.pyc and /dev/null differ diff --git a/movies/__pycache__/urls.cpython-311.pyc b/movies/__pycache__/urls.cpython-311.pyc deleted file mode 100644 index 98c9a77..0000000 Binary files a/movies/__pycache__/urls.cpython-311.pyc and /dev/null differ diff --git a/movies/__pycache__/urls.cpython-38.pyc b/movies/__pycache__/urls.cpython-38.pyc deleted file mode 100644 index 517bee5..0000000 Binary files a/movies/__pycache__/urls.cpython-38.pyc and /dev/null differ diff --git a/movies/__pycache__/views.cpython-311.pyc b/movies/__pycache__/views.cpython-311.pyc deleted file mode 100644 index ba8d4b4..0000000 Binary files a/movies/__pycache__/views.cpython-311.pyc and /dev/null differ diff --git a/movies/__pycache__/views.cpython-38.pyc b/movies/__pycache__/views.cpython-38.pyc deleted file mode 100644 index af3009f..0000000 Binary files a/movies/__pycache__/views.cpython-38.pyc and /dev/null differ diff --git a/movies/migrations/__pycache__/0001_initial.cpython-311.pyc b/movies/migrations/__pycache__/0001_initial.cpython-311.pyc deleted file mode 100644 index 537cf15..0000000 Binary files a/movies/migrations/__pycache__/0001_initial.cpython-311.pyc and /dev/null differ diff --git a/movies/migrations/__pycache__/0001_initial.cpython-38.pyc b/movies/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index 5deeda8..0000000 Binary files a/movies/migrations/__pycache__/0001_initial.cpython-38.pyc and /dev/null differ diff --git a/movies/migrations/__pycache__/0002_movie_end_of_rolling_date.cpython-311.pyc b/movies/migrations/__pycache__/0002_movie_end_of_rolling_date.cpython-311.pyc deleted file mode 100644 index c869ff7..0000000 Binary files a/movies/migrations/__pycache__/0002_movie_end_of_rolling_date.cpython-311.pyc and /dev/null differ diff --git a/movies/migrations/__pycache__/0002_movie_end_of_rolling_date.cpython-38.pyc b/movies/migrations/__pycache__/0002_movie_end_of_rolling_date.cpython-38.pyc deleted file mode 100644 index cf01210..0000000 Binary files a/movies/migrations/__pycache__/0002_movie_end_of_rolling_date.cpython-38.pyc and /dev/null differ diff --git a/movies/migrations/__pycache__/0003_alter_movie_end_of_rolling_date.cpython-311.pyc b/movies/migrations/__pycache__/0003_alter_movie_end_of_rolling_date.cpython-311.pyc deleted file mode 100644 index 5ef800f..0000000 Binary files a/movies/migrations/__pycache__/0003_alter_movie_end_of_rolling_date.cpython-311.pyc and /dev/null differ diff --git a/movies/migrations/__pycache__/0003_alter_movie_end_of_rolling_date.cpython-38.pyc b/movies/migrations/__pycache__/0003_alter_movie_end_of_rolling_date.cpython-38.pyc deleted file mode 100644 index 9f2ac16..0000000 Binary files a/movies/migrations/__pycache__/0003_alter_movie_end_of_rolling_date.cpython-38.pyc and /dev/null differ diff --git a/movies/migrations/__pycache__/0004_movie_start_of_rolling_date.cpython-311.pyc b/movies/migrations/__pycache__/0004_movie_start_of_rolling_date.cpython-311.pyc deleted file mode 100644 index 99c750f..0000000 Binary files a/movies/migrations/__pycache__/0004_movie_start_of_rolling_date.cpython-311.pyc and /dev/null differ diff --git a/movies/migrations/__pycache__/0004_movie_start_of_rolling_date.cpython-38.pyc b/movies/migrations/__pycache__/0004_movie_start_of_rolling_date.cpython-38.pyc deleted file mode 100644 index 1321aac..0000000 Binary files a/movies/migrations/__pycache__/0004_movie_start_of_rolling_date.cpython-38.pyc and /dev/null differ diff --git a/movies/migrations/__pycache__/__init__.cpython-311.pyc b/movies/migrations/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index bf69eab..0000000 Binary files a/movies/migrations/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/movies/migrations/__pycache__/__init__.cpython-38.pyc b/movies/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 1ff7785..0000000 Binary files a/movies/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/movies/services/__pycache__/get_current_and_next_movies.cpython-311.pyc b/movies/services/__pycache__/get_current_and_next_movies.cpython-311.pyc deleted file mode 100644 index 92cbd0e..0000000 Binary files a/movies/services/__pycache__/get_current_and_next_movies.cpython-311.pyc and /dev/null differ diff --git a/movies/services/__pycache__/get_current_and_next_movies.cpython-38.pyc b/movies/services/__pycache__/get_current_and_next_movies.cpython-38.pyc deleted file mode 100644 index 4c7bb3a..0000000 Binary files a/movies/services/__pycache__/get_current_and_next_movies.cpython-38.pyc and /dev/null differ diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index 9706679..0000000 --- a/nginx.conf +++ /dev/null @@ -1,60 +0,0 @@ -worker_processes auto; - -events { -} - -http { - error_log /etc/nginx/error_log.log warn; - client_max_body_size 20m; - - proxy_cache_path /etc/nginx/cache keys_zone=one:500m max_size=1000m; - - server{ - proxy_cache one; - proxy_cache_key $request_method$request_uri; - proxy_cache_min_uses 1; - proxy_cache_methods GET; - proxy_cache_valid 200 1y; - - - location / { - proxy_pass http://localhost:8080; - rewrite ^/(.*)$ $1 break; - } - - listen 8000; - server_name cinema.feelindev.ru; - } - - - server { - proxy_cache one; - proxy_cache_key $request_method$request_uri; - proxy_cache_min_uses 1; - proxy_cache_methods GET; - proxy_cache_valid 200 1y; - - location / { - proxy_pass http://localhost:1433; - rewrite ^/(.*)$ $1 break; - } - - location /static/ { - alias /home/web_django/static/ - } - - location /media/ { - alias /home/app/web/media/; - } - - listen 80; - listen 443; - server_name mssql.feelindev.ru; - } - - - server{ - server_name feelindev.ru; - } - -} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5dd4f8e..df9989e 100644 Binary files a/requirements.txt and b/requirements.txt differ diff --git a/screenings/migrations/0001_initial.py b/screenings/migrations/0001_initial.py index 08ec05d..26d18ba 100644 --- a/screenings/migrations/0001_initial.py +++ b/screenings/migrations/0001_initial.py @@ -1,8 +1,8 @@ -# Generated by Django 4.2.10 on 2024-03-02 17:08 +# Generated by Django 5.0.3 on 2024-03-14 15:36 -from django.db import migrations, models import django.db.models.deletion import django.utils.timezone +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/tickets/__pycache__/__init__.cpython-311.pyc b/tickets/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 4d7d73e..0000000 Binary files a/tickets/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/tickets/__pycache__/__init__.cpython-38.pyc b/tickets/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index a69b232..0000000 Binary files a/tickets/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/tickets/__pycache__/admin.cpython-311.pyc b/tickets/__pycache__/admin.cpython-311.pyc deleted file mode 100644 index c2c0481..0000000 Binary files a/tickets/__pycache__/admin.cpython-311.pyc and /dev/null differ diff --git a/tickets/__pycache__/admin.cpython-38.pyc b/tickets/__pycache__/admin.cpython-38.pyc deleted file mode 100644 index 9cea3ba..0000000 Binary files a/tickets/__pycache__/admin.cpython-38.pyc and /dev/null differ diff --git a/tickets/__pycache__/apps.cpython-311.pyc b/tickets/__pycache__/apps.cpython-311.pyc deleted file mode 100644 index b4a95b0..0000000 Binary files a/tickets/__pycache__/apps.cpython-311.pyc and /dev/null differ diff --git a/tickets/__pycache__/apps.cpython-38.pyc b/tickets/__pycache__/apps.cpython-38.pyc deleted file mode 100644 index 746281c..0000000 Binary files a/tickets/__pycache__/apps.cpython-38.pyc and /dev/null differ diff --git a/tickets/__pycache__/models.cpython-311.pyc b/tickets/__pycache__/models.cpython-311.pyc deleted file mode 100644 index 956c03e..0000000 Binary files a/tickets/__pycache__/models.cpython-311.pyc and /dev/null differ diff --git a/tickets/__pycache__/models.cpython-38.pyc b/tickets/__pycache__/models.cpython-38.pyc deleted file mode 100644 index 0c8b318..0000000 Binary files a/tickets/__pycache__/models.cpython-38.pyc and /dev/null differ diff --git a/tickets/__pycache__/urls.cpython-311.pyc b/tickets/__pycache__/urls.cpython-311.pyc deleted file mode 100644 index ab79d7d..0000000 Binary files a/tickets/__pycache__/urls.cpython-311.pyc and /dev/null differ diff --git a/tickets/__pycache__/urls.cpython-38.pyc b/tickets/__pycache__/urls.cpython-38.pyc deleted file mode 100644 index 2d854fa..0000000 Binary files a/tickets/__pycache__/urls.cpython-38.pyc and /dev/null differ diff --git a/tickets/migrations/0001_initial.py b/tickets/migrations/0001_initial.py index f9bd568..5c496e1 100644 --- a/tickets/migrations/0001_initial.py +++ b/tickets/migrations/0001_initial.py @@ -1,8 +1,7 @@ -# Generated by Django 4.2.10 on 2024-03-08 11:27 +# Generated by Django 5.0.3 on 2024-03-14 15:36 -from django.conf import settings -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): @@ -10,9 +9,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('movies', '0004_movie_start_of_rolling_date'), ('screenings', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -22,9 +19,7 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('row', models.IntegerField()), ('place', models.IntegerField()), - ('film', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='movies.movie')), ('screening', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='screenings.screening')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), ] diff --git a/tickets/migrations/0002_initial.py b/tickets/migrations/0002_initial.py new file mode 100644 index 0000000..2c18175 --- /dev/null +++ b/tickets/migrations/0002_initial.py @@ -0,0 +1,23 @@ +# Generated by Django 5.0.3 on 2024-03-14 15:36 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('tickets', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='ticket', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/tickets/migrations/0002_remove_ticket_film.py b/tickets/migrations/0002_remove_ticket_film.py deleted file mode 100644 index 88b36c3..0000000 --- a/tickets/migrations/0002_remove_ticket_film.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.2.10 on 2024-03-09 15:06 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('tickets', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='ticket', - name='film', - ), - ] diff --git a/tickets/migrations/0003_ticket_film.py b/tickets/migrations/0003_ticket_film.py deleted file mode 100644 index 36a1564..0000000 --- a/tickets/migrations/0003_ticket_film.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 4.2.10 on 2024-03-09 15:25 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('movies', '0004_movie_start_of_rolling_date'), - ('tickets', '0002_remove_ticket_film'), - ] - - operations = [ - migrations.AddField( - model_name='ticket', - name='film', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='movies.movie'), - preserve_default=False, - ), - ] diff --git a/tickets/migrations/0004_remove_ticket_film.py b/tickets/migrations/0004_remove_ticket_film.py deleted file mode 100644 index ee01da2..0000000 --- a/tickets/migrations/0004_remove_ticket_film.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.2.10 on 2024-03-09 15:27 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('tickets', '0003_ticket_film'), - ] - - operations = [ - migrations.RemoveField( - model_name='ticket', - name='film', - ), - ] diff --git a/tickets/migrations/__pycache__/__init__.cpython-311.pyc b/tickets/migrations/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 1c9e41f..0000000 Binary files a/tickets/migrations/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/tickets/migrations/__pycache__/__init__.cpython-38.pyc b/tickets/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 36b4c04..0000000 Binary files a/tickets/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/users/__pycache__/__init__.cpython-311.pyc b/users/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 0032d9a..0000000 Binary files a/users/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/users/__pycache__/__init__.cpython-38.pyc b/users/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index dcb95a9..0000000 Binary files a/users/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/users/__pycache__/admin.cpython-311.pyc b/users/__pycache__/admin.cpython-311.pyc deleted file mode 100644 index f462991..0000000 Binary files a/users/__pycache__/admin.cpython-311.pyc and /dev/null differ diff --git a/users/__pycache__/admin.cpython-38.pyc b/users/__pycache__/admin.cpython-38.pyc deleted file mode 100644 index 8f0b73a..0000000 Binary files a/users/__pycache__/admin.cpython-38.pyc and /dev/null differ diff --git a/users/__pycache__/apps.cpython-311.pyc b/users/__pycache__/apps.cpython-311.pyc deleted file mode 100644 index 49af78c..0000000 Binary files a/users/__pycache__/apps.cpython-311.pyc and /dev/null differ diff --git a/users/__pycache__/apps.cpython-38.pyc b/users/__pycache__/apps.cpython-38.pyc deleted file mode 100644 index 8999b7a..0000000 Binary files a/users/__pycache__/apps.cpython-38.pyc and /dev/null differ diff --git a/users/__pycache__/forms.cpython-311.pyc b/users/__pycache__/forms.cpython-311.pyc deleted file mode 100644 index 78ca1bd..0000000 Binary files a/users/__pycache__/forms.cpython-311.pyc and /dev/null differ diff --git a/users/__pycache__/forms.cpython-38.pyc b/users/__pycache__/forms.cpython-38.pyc deleted file mode 100644 index 0afd1e6..0000000 Binary files a/users/__pycache__/forms.cpython-38.pyc and /dev/null differ diff --git a/users/__pycache__/models.cpython-311.pyc b/users/__pycache__/models.cpython-311.pyc deleted file mode 100644 index f458b31..0000000 Binary files a/users/__pycache__/models.cpython-311.pyc and /dev/null differ diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc deleted file mode 100644 index b7209d5..0000000 Binary files a/users/__pycache__/models.cpython-38.pyc and /dev/null differ diff --git a/users/__pycache__/urls.cpython-311.pyc b/users/__pycache__/urls.cpython-311.pyc deleted file mode 100644 index f584665..0000000 Binary files a/users/__pycache__/urls.cpython-311.pyc and /dev/null differ diff --git a/users/__pycache__/urls.cpython-38.pyc b/users/__pycache__/urls.cpython-38.pyc deleted file mode 100644 index 5263d52..0000000 Binary files a/users/__pycache__/urls.cpython-38.pyc and /dev/null differ diff --git a/users/__pycache__/views.cpython-311.pyc b/users/__pycache__/views.cpython-311.pyc deleted file mode 100644 index c2cd8c1..0000000 Binary files a/users/__pycache__/views.cpython-311.pyc and /dev/null differ diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc deleted file mode 100644 index b44581c..0000000 Binary files a/users/__pycache__/views.cpython-38.pyc and /dev/null differ diff --git a/users/admin.py b/users/admin.py index 8c38f3f..31f7567 100644 --- a/users/admin.py +++ b/users/admin.py @@ -1,3 +1,6 @@ from django.contrib import admin +from users.models import User # Register your models here. + +admin.site.register(User) \ No newline at end of file diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py index 78ad91c..410a249 100644 --- a/users/migrations/0001_initial.py +++ b/users/migrations/0001_initial.py @@ -1,9 +1,9 @@ -# Generated by Django 4.2.10 on 2024-02-17 14:02 +# Generated by Django 5.0.3 on 2024-03-14 15:36 import django.contrib.auth.models import django.contrib.auth.validators -from django.db import migrations, models import django.utils.timezone +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/users/migrations/__pycache__/0001_initial.cpython-311.pyc b/users/migrations/__pycache__/0001_initial.cpython-311.pyc deleted file mode 100644 index 60d7b1c..0000000 Binary files a/users/migrations/__pycache__/0001_initial.cpython-311.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0001_initial.cpython-38.pyc b/users/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index 3fd9aa6..0000000 Binary files a/users/migrations/__pycache__/0001_initial.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/__init__.cpython-311.pyc b/users/migrations/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 1b33652..0000000 Binary files a/users/migrations/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/__init__.cpython-38.pyc b/users/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 83ae387..0000000 Binary files a/users/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/users/services/__pycache__/login_user.cpython-311.pyc b/users/services/__pycache__/login_user.cpython-311.pyc deleted file mode 100644 index 22da2d3..0000000 Binary files a/users/services/__pycache__/login_user.cpython-311.pyc and /dev/null differ diff --git a/users/services/__pycache__/login_user.cpython-38.pyc b/users/services/__pycache__/login_user.cpython-38.pyc deleted file mode 100644 index 9de0485..0000000 Binary files a/users/services/__pycache__/login_user.cpython-38.pyc and /dev/null differ diff --git a/users/services/__pycache__/logout_user.cpython-311.pyc b/users/services/__pycache__/logout_user.cpython-311.pyc deleted file mode 100644 index 0c4157e..0000000 Binary files a/users/services/__pycache__/logout_user.cpython-311.pyc and /dev/null differ diff --git a/users/services/__pycache__/logout_user.cpython-38.pyc b/users/services/__pycache__/logout_user.cpython-38.pyc deleted file mode 100644 index 773b508..0000000 Binary files a/users/services/__pycache__/logout_user.cpython-38.pyc and /dev/null differ diff --git a/users/services/__pycache__/register_new_user.cpython-311.pyc b/users/services/__pycache__/register_new_user.cpython-311.pyc deleted file mode 100644 index c54059d..0000000 Binary files a/users/services/__pycache__/register_new_user.cpython-311.pyc and /dev/null differ diff --git a/users/services/__pycache__/register_new_user.cpython-38.pyc b/users/services/__pycache__/register_new_user.cpython-38.pyc deleted file mode 100644 index b82e317..0000000 Binary files a/users/services/__pycache__/register_new_user.cpython-38.pyc and /dev/null differ diff --git a/users/services/__pycache__/update_user_profile.cpython-311.pyc b/users/services/__pycache__/update_user_profile.cpython-311.pyc deleted file mode 100644 index c0a6ed1..0000000 Binary files a/users/services/__pycache__/update_user_profile.cpython-311.pyc and /dev/null differ diff --git a/users/services/__pycache__/update_user_profile.cpython-38.pyc b/users/services/__pycache__/update_user_profile.cpython-38.pyc deleted file mode 100644 index 3ed346b..0000000 Binary files a/users/services/__pycache__/update_user_profile.cpython-38.pyc and /dev/null differ