Merge pull request #20 from urmatovnaa/Altynai

Altynai

account_app/migrations/0001_initial.py

@@ -0,0 +1,40 @@
+# Generated by Django 4.1.3 on 2022-11-27 03:54
+
+import account_app.managers
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Account',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ('fullname', models.CharField(max_length=100, verbose_name='ФИО')),
+                ('email', models.EmailField(max_length=254, unique=True)),
+                ('position', models.CharField(max_length=100, verbose_name='Должность')),
+                ('organisation', models.CharField(max_length=100, verbose_name='Организация')),
+                ('profile_image', models.ImageField(blank=True, default=account_app.managers.get_default_profile_image, null=True, upload_to='avatar', verbose_name='Аватар')),
+                ('date_joined', models.DateField(default=django.utils.timezone.now, verbose_name='Дата регистрации')),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
+            ],
+            options={
+                'verbose_name': 'Пользователь',
+                'verbose_name_plural': 'Пользователи',
+            },
+        ),
+    ]

article_app/migrations/0001_initial.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.1.3 on 2022-11-27 03:54
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('event_app', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Article',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, verbose_name='Название')),
+                ('data', models.DateTimeField(auto_now_add=True, verbose_name='Дата')),
+                ('photo', models.ImageField(upload_to='article_photo', verbose_name='Фото')),
+                ('description', models.TextField(verbose_name='Описание')),
+                ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='event_app.category', verbose_name='Категория')),
+                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Владелец')),
+            ],
+            options={
+                'verbose_name': 'Статья',
+                'verbose_name_plural': 'Статьи',
+            },
+        ),
+    ]

course_app/migrations/0001_initial.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.1.3 on 2022-11-27 03:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('event_app', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Course',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, unique=True, verbose_name='Название')),
+                ('photo', models.ImageField(upload_to='course_photo', verbose_name='Фото')),
+                ('time_study', models.CharField(choices=[(1, 'оффлайн'), (2, 'онлайн')], default=1, max_length=255, verbose_name='Формат обучения')),
+                ('duration', models.CharField(max_length=255, verbose_name='Продолжительность курса')),
+                ('certificate', models.CharField(choices=[(1, 'есть'), (2, 'нет')], default=1, max_length=255, verbose_name='Сертификат по окончании')),
+                ('overview', models.TextField(verbose_name='Описание курса')),
+                ('category', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='event_app.category', verbose_name='Категория')),
+                ('contributors', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='event_app.speaker', verbose_name='Преподаватели')),
+            ],
+            options={
+                'verbose_name': 'Курс',
+                'verbose_name_plural': 'Курсы',
+            },
+        ),
+    ]

event_app/migrations/0001_initial.py

@@ -0,0 +1,81 @@
+# Generated by Django 4.1.3 on 2022-11-27 03:54
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Category',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+            ],
+            options={
+                'verbose_name': 'Категория',
+                'verbose_name_plural': 'Категории',
+            },
+        ),
+        migrations.CreateModel(
+            name='Event',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, unique=True, verbose_name='Название')),
+                ('data', models.DateTimeField(auto_now_add=True, verbose_name='Дата')),
+                ('photo', models.ImageField(upload_to='event_photo', verbose_name='Фото')),
+                ('time', models.CharField(max_length=255, verbose_name='Время')),
+                ('description', models.TextField(verbose_name='Чему вы научитесь?')),
+                ('about', models.TextField(verbose_name='О программе')),
+                ('number_for_seats', models.IntegerField(verbose_name='Количество мест')),
+                ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='event_app.category', verbose_name='Категория')),
+            ],
+            options={
+                'verbose_name': 'Мероприятие',
+                'verbose_name_plural': 'Мероприятия',
+            },
+        ),
+        migrations.CreateModel(
+            name='Speaker',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('fullname', models.CharField(max_length=255, verbose_name='ФИО')),
+                ('position', models.CharField(max_length=255, verbose_name='Должность')),
+                ('country', models.CharField(max_length=150, verbose_name='Страна')),
+            ],
+            options={
+                'verbose_name': 'Спикер',
+                'verbose_name_plural': 'Спикеры',
+            },
+        ),
+        migrations.CreateModel(
+            name='Registered',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('event', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='people_count', to='event_app.event', verbose_name='Мероприятие')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Участник')),
+            ],
+            options={
+                'verbose_name': 'Участник',
+                'verbose_name_plural': 'Участники',
+            },
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='speakers_detail',
+            field=models.ManyToManyField(blank=True, related_name='speakers_detail', to='event_app.speaker', verbose_name='Спикеры'),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Владелец'),
+        ),
+    ]

question_app/migrations/0001_initial.py

@@ -0,0 +1,45 @@
+# Generated by Django 4.1.3 on 2022-11-27 03:54
+
+import account_app.managers
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Question',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('owner', models.CharField(max_length=120, null=True, verbose_name='Владелец вопроса')),
+                ('profile', models.ImageField(default=account_app.managers.get_default_profile_image, upload_to='avatar', verbose_name='Aватар')),
+                ('text', models.CharField(max_length=500, verbose_name='Текст')),
+                ('data_creating', models.DateTimeField(auto_now_add=True, verbose_name='Дата')),
+            ],
+            options={
+                'verbose_name': 'Вопрос',
+                'verbose_name_plural': 'Вопросы',
+            },
+        ),
+        migrations.CreateModel(
+            name='Answer',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('owner', models.CharField(max_length=120, null=True, verbose_name='Владелец ответа')),
+                ('profile', models.ImageField(default=account_app.managers.get_default_profile_image, upload_to='avatar', verbose_name='Aватар')),
+                ('text', models.CharField(max_length=500, verbose_name='Текст')),
+                ('data_creating', models.DateTimeField(auto_now_add=True, verbose_name='Дата')),
+                ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='question_app.question', verbose_name='Вопрос')),
+            ],
+            options={
+                'verbose_name': 'Ответ',
+                'verbose_name_plural': 'Ответы',
+            },
+        ),
+    ]

requirements.txt

@@ -6,6 +6,7 @@ django-filter==22.1
 django-jazzmin==2.6.0
 django-on-heroku==1.1.2
 djangorestframework==3.14.0
+gunicorn==20.1.0
 Markdown==3.4.1
 Pillow==9.3.0
 psycopg2-binary==2.9.5