diff --git a/server/proj/api/migrations/0001_initial.py b/server/proj/api/migrations/0001_initial.py deleted file mode 100644 index 352843c..0000000 --- a/server/proj/api/migrations/0001_initial.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-21 17:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='NowPlayingSong', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=255)), - ('artist', models.CharField(max_length=255)), - ('album', models.CharField(blank=True, max_length=255, null=True)), - ('genre', models.CharField(blank=True, max_length=100, null=True)), - ('art_url', models.URLField(blank=True, null=True)), - ('duration', models.IntegerField()), - ], - ), - ] diff --git a/server/proj/api/migrations/0002_remove_nowplayingsong_duration.py b/server/proj/api/migrations/0002_remove_nowplayingsong_duration.py deleted file mode 100644 index 4c45f25..0000000 --- a/server/proj/api/migrations/0002_remove_nowplayingsong_duration.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-21 18:13 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('api', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='nowplayingsong', - name='duration', - ), - ] diff --git a/server/proj/api/migrations/0003_rename_art_url_nowplayingsong_art.py b/server/proj/api/migrations/0003_rename_art_url_nowplayingsong_art.py deleted file mode 100644 index 9482299..0000000 --- a/server/proj/api/migrations/0003_rename_art_url_nowplayingsong_art.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-21 18:51 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('api', '0002_remove_nowplayingsong_duration'), - ] - - operations = [ - migrations.RenameField( - model_name='nowplayingsong', - old_name='art_url', - new_name='art', - ), - ] diff --git a/server/proj/api/migrations/0004_delete_nowplayingsong.py b/server/proj/api/migrations/0004_delete_nowplayingsong.py deleted file mode 100644 index 9a81636..0000000 --- a/server/proj/api/migrations/0004_delete_nowplayingsong.py +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-24 14:17 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('api', '0003_rename_art_url_nowplayingsong_art'), - ] - - operations = [ - migrations.DeleteModel( - name='NowPlayingSong', - ), - ] diff --git a/server/proj/conf/__pycache__/__init__.cpython-310.pyc b/server/proj/conf/__pycache__/__init__.cpython-310.pyc index d53f354..dd307ba 100644 Binary files a/server/proj/conf/__pycache__/__init__.cpython-310.pyc and b/server/proj/conf/__pycache__/__init__.cpython-310.pyc differ diff --git a/server/proj/conf/__pycache__/urls.cpython-310.pyc b/server/proj/conf/__pycache__/urls.cpython-310.pyc index ff18f9c..d25e608 100644 Binary files a/server/proj/conf/__pycache__/urls.cpython-310.pyc and b/server/proj/conf/__pycache__/urls.cpython-310.pyc differ diff --git a/server/proj/conf/__pycache__/wsgi.cpython-310.pyc b/server/proj/conf/__pycache__/wsgi.cpython-310.pyc index c38fff5..db88859 100644 Binary files a/server/proj/conf/__pycache__/wsgi.cpython-310.pyc and b/server/proj/conf/__pycache__/wsgi.cpython-310.pyc differ diff --git a/server/proj/conf/settings/__init__.py b/server/proj/conf/settings/__init__.py index e0a19b2..298e070 100644 --- a/server/proj/conf/settings/__init__.py +++ b/server/proj/conf/settings/__init__.py @@ -1,5 +1,5 @@ -from .development import * +from .production import * diff --git a/server/proj/conf/settings/__pycache__/__init__.cpython-310.pyc b/server/proj/conf/settings/__pycache__/__init__.cpython-310.pyc index 158dd64..3ba39e6 100644 Binary files a/server/proj/conf/settings/__pycache__/__init__.cpython-310.pyc and b/server/proj/conf/settings/__pycache__/__init__.cpython-310.pyc differ diff --git a/server/proj/conf/settings/__pycache__/base.cpython-310.pyc b/server/proj/conf/settings/__pycache__/base.cpython-310.pyc index b012966..d21da59 100644 Binary files a/server/proj/conf/settings/__pycache__/base.cpython-310.pyc and b/server/proj/conf/settings/__pycache__/base.cpython-310.pyc differ diff --git a/server/proj/conf/settings/__pycache__/development.cpython-310.pyc b/server/proj/conf/settings/__pycache__/development.cpython-310.pyc index a7b4e8e..6dd63af 100644 Binary files a/server/proj/conf/settings/__pycache__/development.cpython-310.pyc and b/server/proj/conf/settings/__pycache__/development.cpython-310.pyc differ diff --git a/server/proj/conf/settings/base.py b/server/proj/conf/settings/base.py index e8e6cfe..79d2cd7 100644 --- a/server/proj/conf/settings/base.py +++ b/server/proj/conf/settings/base.py @@ -33,12 +33,12 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - + 'rest_framework', 'corsheaders', 'rest_framework_simplejwt', 'rest_framework.authtoken', - + 'news', 'rubricks', 'loginApi', @@ -47,7 +47,7 @@ INSTALLED_APPS = [ 'api', 'account', 'config_site' - + ] MIDDLEWARE = [ @@ -132,38 +132,7 @@ LOGGING = { 'style': '{', }, }, - 'handlers': { - 'update_history': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': LOG_ROOT / 'update_history.log', - 'formatter': 'extended', - 'maxBytes': ROTATE_LOG_SIZE, - 'backupCount': ROTATE_LOG_COUNT, - }, - 'upload_media': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': LOG_ROOT / 'upload_media.log', - 'formatter': 'extended', - 'maxBytes': ROTATE_LOG_SIZE, - 'backupCount': ROTATE_LOG_COUNT, - }, - }, - 'loggers': { - 'update_history': { - 'handlers': ['update_history', ], - 'level': 'INFO', - 'propagate': False, - }, - 'upload_media': { - 'handlers': ['upload_media', ], - 'level': 'INFO', - 'propagate': False, - }, - }, } - REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': [ 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly' diff --git a/server/proj/conf/settings/development.py b/server/proj/conf/settings/development.py index 9dc9cf2..9088409 100644 --- a/server/proj/conf/settings/development.py +++ b/server/proj/conf/settings/development.py @@ -6,7 +6,7 @@ ALLOWED_HOSTS = ['*'] # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases -""" DATABASES = { +DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'NAME': 'it_radio', @@ -15,12 +15,6 @@ ALLOWED_HOSTS = ['*'] 'HOST': 'localhost', 'PORT': '5433', }, -} """ -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } } REST_FRAMEWORK['DEFAULT_PERMISSION_CLASSES'] = ('rest_framework.permissions.AllowAny',) diff --git a/server/proj/conf/settings/production.py b/server/proj/conf/settings/production.py index e7c3dd3..a17a09c 100644 --- a/server/proj/conf/settings/production.py +++ b/server/proj/conf/settings/production.py @@ -2,19 +2,20 @@ import sys from .base import * DEBUG = False -ALLOWED_HOSTS = ['*'] +ALLOWED_HOSTS = ['82.97.242.49'] # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases -""" DATABASES = { +DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'ldirect', - 'USER': 'flexites', - 'PASSWORD': 'flexites', + 'NAME': 'itradio', + 'USER': 'postgres', + 'PASSWORD': '55667788Vxod', 'HOST': 'localhost', + 'PORT': '5432', }, -} """ +} if len(sys.argv) >= 2 and sys.argv[1] != 'runserver': from conf.sentry import sentry_start, SENTRY_CONFIG diff --git a/server/proj/loginApi/__pycache__/__init__.cpython-310.pyc b/server/proj/loginApi/__pycache__/__init__.cpython-310.pyc index 3d30807..5da63d0 100644 Binary files a/server/proj/loginApi/__pycache__/__init__.cpython-310.pyc and b/server/proj/loginApi/__pycache__/__init__.cpython-310.pyc differ diff --git a/server/proj/loginApi/__pycache__/admin.cpython-310.pyc b/server/proj/loginApi/__pycache__/admin.cpython-310.pyc index 32e226a..0784dd2 100644 Binary files a/server/proj/loginApi/__pycache__/admin.cpython-310.pyc and b/server/proj/loginApi/__pycache__/admin.cpython-310.pyc differ diff --git a/server/proj/loginApi/__pycache__/apps.cpython-310.pyc b/server/proj/loginApi/__pycache__/apps.cpython-310.pyc index d47564d..052a141 100644 Binary files a/server/proj/loginApi/__pycache__/apps.cpython-310.pyc and b/server/proj/loginApi/__pycache__/apps.cpython-310.pyc differ diff --git a/server/proj/loginApi/__pycache__/models.cpython-310.pyc b/server/proj/loginApi/__pycache__/models.cpython-310.pyc index 247b231..bc05eb1 100644 Binary files a/server/proj/loginApi/__pycache__/models.cpython-310.pyc and b/server/proj/loginApi/__pycache__/models.cpython-310.pyc differ diff --git a/server/proj/loginApi/migrations/__pycache__/__init__.cpython-310.pyc b/server/proj/loginApi/migrations/__pycache__/__init__.cpython-310.pyc index 6dae44d..d72607b 100644 Binary files a/server/proj/loginApi/migrations/__pycache__/__init__.cpython-310.pyc and b/server/proj/loginApi/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/server/proj/news/__pycache__/__init__.cpython-310.pyc b/server/proj/news/__pycache__/__init__.cpython-310.pyc index 2df7509..c158afd 100644 Binary files a/server/proj/news/__pycache__/__init__.cpython-310.pyc and b/server/proj/news/__pycache__/__init__.cpython-310.pyc differ diff --git a/server/proj/news/__pycache__/admin.cpython-310.pyc b/server/proj/news/__pycache__/admin.cpython-310.pyc index b50d265..68134d6 100644 Binary files a/server/proj/news/__pycache__/admin.cpython-310.pyc and b/server/proj/news/__pycache__/admin.cpython-310.pyc differ diff --git a/server/proj/news/__pycache__/apps.cpython-310.pyc b/server/proj/news/__pycache__/apps.cpython-310.pyc index b5a95af..f3907b4 100644 Binary files a/server/proj/news/__pycache__/apps.cpython-310.pyc and b/server/proj/news/__pycache__/apps.cpython-310.pyc differ diff --git a/server/proj/news/__pycache__/models.cpython-310.pyc b/server/proj/news/__pycache__/models.cpython-310.pyc index 8a3968e..01a2360 100644 Binary files a/server/proj/news/__pycache__/models.cpython-310.pyc and b/server/proj/news/__pycache__/models.cpython-310.pyc differ diff --git a/server/proj/news/migrations/0001_initial.py b/server/proj/news/migrations/0001_initial.py index dac12a9..76d0977 100644 --- a/server/proj/news/migrations/0001_initial.py +++ b/server/proj/news/migrations/0001_initial.py @@ -1,5 +1,6 @@ -# Generated by Django 5.0.4 on 2024-04-16 15:16 +# Generated by Django 5.0.6 on 2024-06-19 12:09 +import django.utils.timezone from django.db import migrations, models @@ -12,13 +13,11 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='News', + name='HistoryRadio', fields=[ - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=255)), - ('description', models.TextField()), - ('date', models.DateTimeField()), - ('author', models.CharField(max_length=255)), + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('description', models.CharField(max_length=50, verbose_name='Описание события кратко')), + ('date', models.DateField(default=django.utils.timezone.now, null=True, verbose_name='Дата события')), ], ), ] diff --git a/server/proj/news/migrations/0002_alter_news_author_alter_news_date.py b/server/proj/news/migrations/0002_alter_news_author_alter_news_date.py deleted file mode 100644 index 85ef135..0000000 --- a/server/proj/news/migrations/0002_alter_news_author_alter_news_date.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-16 15:47 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('news', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='news', - name='author', - field=models.CharField(blank=True, max_length=255), - ), - migrations.AlterField( - model_name='news', - name='date', - field=models.DateTimeField(blank=True), - ), - ] diff --git a/server/proj/news/migrations/__pycache__/0001_initial.cpython-310.pyc b/server/proj/news/migrations/__pycache__/0001_initial.cpython-310.pyc index 6e4bf6d..eeca414 100644 Binary files a/server/proj/news/migrations/__pycache__/0001_initial.cpython-310.pyc and b/server/proj/news/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/server/proj/news/migrations/__pycache__/0002_alter_news_author_alter_news_date.cpython-310.pyc b/server/proj/news/migrations/__pycache__/0002_alter_news_author_alter_news_date.cpython-310.pyc index f925faa..5d04926 100644 Binary files a/server/proj/news/migrations/__pycache__/0002_alter_news_author_alter_news_date.cpython-310.pyc and b/server/proj/news/migrations/__pycache__/0002_alter_news_author_alter_news_date.cpython-310.pyc differ diff --git a/server/proj/news/migrations/__pycache__/__init__.cpython-310.pyc b/server/proj/news/migrations/__pycache__/__init__.cpython-310.pyc index 4f346bb..e63e6f9 100644 Binary files a/server/proj/news/migrations/__pycache__/__init__.cpython-310.pyc and b/server/proj/news/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/server/proj/rubricks/__pycache__/__init__.cpython-310.pyc b/server/proj/rubricks/__pycache__/__init__.cpython-310.pyc index 7af52fd..07dccd4 100644 Binary files a/server/proj/rubricks/__pycache__/__init__.cpython-310.pyc and b/server/proj/rubricks/__pycache__/__init__.cpython-310.pyc differ diff --git a/server/proj/rubricks/__pycache__/admin.cpython-310.pyc b/server/proj/rubricks/__pycache__/admin.cpython-310.pyc index 69d33a2..7c5b308 100644 Binary files a/server/proj/rubricks/__pycache__/admin.cpython-310.pyc and b/server/proj/rubricks/__pycache__/admin.cpython-310.pyc differ diff --git a/server/proj/rubricks/__pycache__/apps.cpython-310.pyc b/server/proj/rubricks/__pycache__/apps.cpython-310.pyc index ed74ba4..26f32e5 100644 Binary files a/server/proj/rubricks/__pycache__/apps.cpython-310.pyc and b/server/proj/rubricks/__pycache__/apps.cpython-310.pyc differ diff --git a/server/proj/rubricks/__pycache__/models.cpython-310.pyc b/server/proj/rubricks/__pycache__/models.cpython-310.pyc index afd0449..01e946a 100644 Binary files a/server/proj/rubricks/__pycache__/models.cpython-310.pyc and b/server/proj/rubricks/__pycache__/models.cpython-310.pyc differ diff --git a/server/proj/rubricks/migrations/0001_initial.py b/server/proj/rubricks/migrations/0001_initial.py index 591699c..fce9c1f 100644 --- a/server/proj/rubricks/migrations/0001_initial.py +++ b/server/proj/rubricks/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.4 on 2024-04-16 15:16 +# Generated by Django 5.0.6 on 2024-06-19 12:09 from django.db import migrations, models @@ -14,10 +14,15 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Rubric', fields=[ - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=255)), - ('description', models.TextField()), - ('time', models.DateTimeField()), + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, verbose_name='Название рубрики')), + ('title', models.TextField(default='Null', max_length=1000, null=True, verbose_name='Заголовок рубрики')), + ('description', models.TextField(max_length=1000, verbose_name='Описание рубрики')), + ('img', models.ImageField(blank=True, null=True, upload_to='images/', verbose_name='Изображение рубрики')), ], + options={ + 'verbose_name': 'Рубрики', + 'verbose_name_plural': 'Рубрики', + }, ), ] diff --git a/server/proj/rubricks/migrations/0002_alter_rubric_time.py b/server/proj/rubricks/migrations/0002_alter_rubric_time.py deleted file mode 100644 index 9be64ae..0000000 --- a/server/proj/rubricks/migrations/0002_alter_rubric_time.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-16 16:10 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rubricks', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='rubric', - name='time', - field=models.DateTimeField(blank=True), - ), - ] diff --git a/server/proj/rubricks/migrations/0003_remove_rubric_time.py b/server/proj/rubricks/migrations/0003_remove_rubric_time.py deleted file mode 100644 index be34255..0000000 --- a/server/proj/rubricks/migrations/0003_remove_rubric_time.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 5.0.4 on 2024-05-06 19:19 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('rubricks', '0002_alter_rubric_time'), - ] - - operations = [ - migrations.RemoveField( - model_name='rubric', - name='time', - ), - ] diff --git a/server/proj/rubricks/migrations/__pycache__/0001_initial.cpython-310.pyc b/server/proj/rubricks/migrations/__pycache__/0001_initial.cpython-310.pyc index f35ca27..86535ce 100644 Binary files a/server/proj/rubricks/migrations/__pycache__/0001_initial.cpython-310.pyc and b/server/proj/rubricks/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/server/proj/rubricks/migrations/__pycache__/0002_alter_rubric_time.cpython-310.pyc b/server/proj/rubricks/migrations/__pycache__/0002_alter_rubric_time.cpython-310.pyc index 3d2a31a..36ffb17 100644 Binary files a/server/proj/rubricks/migrations/__pycache__/0002_alter_rubric_time.cpython-310.pyc and b/server/proj/rubricks/migrations/__pycache__/0002_alter_rubric_time.cpython-310.pyc differ diff --git a/server/proj/rubricks/migrations/__pycache__/0003_remove_rubric_time.cpython-310.pyc b/server/proj/rubricks/migrations/__pycache__/0003_remove_rubric_time.cpython-310.pyc index bc0e1e4..41afd3a 100644 Binary files a/server/proj/rubricks/migrations/__pycache__/0003_remove_rubric_time.cpython-310.pyc and b/server/proj/rubricks/migrations/__pycache__/0003_remove_rubric_time.cpython-310.pyc differ diff --git a/server/proj/rubricks/migrations/__pycache__/__init__.cpython-310.pyc b/server/proj/rubricks/migrations/__pycache__/__init__.cpython-310.pyc index 818ee0c..50875f3 100644 Binary files a/server/proj/rubricks/migrations/__pycache__/__init__.cpython-310.pyc and b/server/proj/rubricks/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/server/proj/userProfile/__pycache__/__init__.cpython-310.pyc b/server/proj/userProfile/__pycache__/__init__.cpython-310.pyc index 115d566..7914c4d 100644 Binary files a/server/proj/userProfile/__pycache__/__init__.cpython-310.pyc and b/server/proj/userProfile/__pycache__/__init__.cpython-310.pyc differ diff --git a/server/proj/userProfile/__pycache__/admin.cpython-310.pyc b/server/proj/userProfile/__pycache__/admin.cpython-310.pyc index 5c71264..01a5a71 100644 Binary files a/server/proj/userProfile/__pycache__/admin.cpython-310.pyc and b/server/proj/userProfile/__pycache__/admin.cpython-310.pyc differ diff --git a/server/proj/userProfile/__pycache__/apps.cpython-310.pyc b/server/proj/userProfile/__pycache__/apps.cpython-310.pyc index cbf7dbe..b65ddb5 100644 Binary files a/server/proj/userProfile/__pycache__/apps.cpython-310.pyc and b/server/proj/userProfile/__pycache__/apps.cpython-310.pyc differ diff --git a/server/proj/userProfile/__pycache__/models.cpython-310.pyc b/server/proj/userProfile/__pycache__/models.cpython-310.pyc index 9369b5d..3bac73e 100644 Binary files a/server/proj/userProfile/__pycache__/models.cpython-310.pyc and b/server/proj/userProfile/__pycache__/models.cpython-310.pyc differ diff --git a/server/proj/userProfile/__pycache__/serializers.cpython-310.pyc b/server/proj/userProfile/__pycache__/serializers.cpython-310.pyc index 5776f84..a222c8e 100644 Binary files a/server/proj/userProfile/__pycache__/serializers.cpython-310.pyc and b/server/proj/userProfile/__pycache__/serializers.cpython-310.pyc differ diff --git a/server/proj/userProfile/__pycache__/views.cpython-310.pyc b/server/proj/userProfile/__pycache__/views.cpython-310.pyc index 8aee8d4..2217fab 100644 Binary files a/server/proj/userProfile/__pycache__/views.cpython-310.pyc and b/server/proj/userProfile/__pycache__/views.cpython-310.pyc differ diff --git a/server/proj/userProfile/migrations/0001_initial.py b/server/proj/userProfile/migrations/0001_initial.py index 9237e7f..de79f13 100644 --- a/server/proj/userProfile/migrations/0001_initial.py +++ b/server/proj/userProfile/migrations/0001_initial.py @@ -1,7 +1,5 @@ -# Generated by Django 5.0.4 on 2024-04-25 14:58 +# Generated by Django 5.0.6 on 2024-06-19 12:09 -import django.db.models.deletion -from django.conf import settings from django.db import migrations, models @@ -10,16 +8,21 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ migrations.CreateModel( - name='Profile', + name='Team', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('likedSongs', models.JSONField(default=list)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('name', models.CharField(max_length=50, verbose_name='Имя участника')), + ('last_name', models.CharField(max_length=50, verbose_name='Фамилия участника')), + ('position', models.CharField(max_length=50, verbose_name='Должность участинка')), + ('img_person', models.ImageField(blank=True, null=True, upload_to='team_images/', verbose_name='Изображение участника')), ], + options={ + 'verbose_name': 'Команда', + 'verbose_name_plural': 'Команда', + }, ), ] diff --git a/server/proj/userProfile/migrations/0002_alter_profile_likedsongs.py b/server/proj/userProfile/migrations/0002_alter_profile_likedsongs.py deleted file mode 100644 index dad5ae5..0000000 --- a/server/proj/userProfile/migrations/0002_alter_profile_likedsongs.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.4 on 2024-05-06 19:19 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('userProfile', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='likedSongs', - field=models.JSONField(blank=True, null=True), - ), - ] diff --git a/server/proj/userProfile/migrations/__pycache__/0001_initial.cpython-310.pyc b/server/proj/userProfile/migrations/__pycache__/0001_initial.cpython-310.pyc index 2da3b86..0a6ca17 100644 Binary files a/server/proj/userProfile/migrations/__pycache__/0001_initial.cpython-310.pyc and b/server/proj/userProfile/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/server/proj/userProfile/migrations/__pycache__/0002_alter_profile_likedsongs.cpython-310.pyc b/server/proj/userProfile/migrations/__pycache__/0002_alter_profile_likedsongs.cpython-310.pyc index 4ba943f..6bb9b3e 100644 Binary files a/server/proj/userProfile/migrations/__pycache__/0002_alter_profile_likedsongs.cpython-310.pyc and b/server/proj/userProfile/migrations/__pycache__/0002_alter_profile_likedsongs.cpython-310.pyc differ diff --git a/server/proj/userProfile/migrations/__pycache__/__init__.cpython-310.pyc b/server/proj/userProfile/migrations/__pycache__/__init__.cpython-310.pyc index c5de2f2..9c2bcc5 100644 Binary files a/server/proj/userProfile/migrations/__pycache__/__init__.cpython-310.pyc and b/server/proj/userProfile/migrations/__pycache__/__init__.cpython-310.pyc differ