diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py index 34b7470..a225150 100644 --- a/accounts/migrations/0001_initial.py +++ b/accounts/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2 on 2021-05-06 07:02 +# Generated by Django 3.2 on 2021-06-18 13:10 from django.conf import settings from django.db import migrations, models @@ -19,6 +19,10 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('phone', models.CharField(max_length=12, null=True, unique=True)), + ('status', models.CharField(max_length=32, null=True)), + ('company', models.CharField(max_length=32, null=True)), + ('bio', models.TextField(null=True)), + ('image', models.ImageField(default='default.jpg', upload_to='profile_pics')), ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), diff --git a/accounts/migrations/0002_auto_20210506_2016.py b/accounts/migrations/0002_auto_20210506_2016.py deleted file mode 100644 index 2fecf01..0000000 --- a/accounts/migrations/0002_auto_20210506_2016.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 3.2 on 2021-05-06 20:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='profile', - name='bio', - field=models.TextField(null=True), - ), - migrations.AddField( - model_name='profile', - name='company', - field=models.CharField(max_length=32, null=True), - ), - migrations.AddField( - model_name='profile', - name='image', - field=models.ImageField(default='default.jpg', upload_to='profile_pics'), - ), - migrations.AddField( - model_name='profile', - name='status', - field=models.CharField(max_length=32, null=True), - ), - ] diff --git a/accounts/migrations/__pycache__/0001_initial.cpython-38.pyc b/accounts/migrations/__pycache__/0001_initial.cpython-38.pyc index ecac2f1..130eee6 100644 Binary files a/accounts/migrations/__pycache__/0001_initial.cpython-38.pyc and b/accounts/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/announcements/migrations/0001_initial.py b/announcements/migrations/0001_initial.py index 64ad51a..6ae45e6 100644 --- a/announcements/migrations/0001_initial.py +++ b/announcements/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2 on 2021-05-25 07:46 +# Generated by Django 3.2 on 2021-06-18 13:10 from django.conf import settings from django.db import migrations, models @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('classrooms', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('classrooms', '0012_classroom_is_active'), ] operations = [ @@ -25,6 +25,15 @@ class Migration(migrations.Migration): ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), ], ), + migrations.CreateModel( + name='MessageAdmin', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('content', models.CharField(max_length=2048)), + ('date_posted', models.DateTimeField(auto_now_add=True)), + ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), + ], + ), migrations.CreateModel( name='AnnouncementUser', fields=[ @@ -34,4 +43,14 @@ class Migration(migrations.Migration): ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), + migrations.CreateModel( + name='AnnouncementAdmin', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('headline', models.CharField(max_length=64)), + ('content', models.CharField(max_length=512)), + ('date_posted', models.DateTimeField(auto_now_add=True)), + ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), + ], + ), ] diff --git a/announcements/migrations/0002_announcementadmin_messageadmin.py b/announcements/migrations/0002_announcementadmin_messageadmin.py deleted file mode 100644 index 57ea76a..0000000 --- a/announcements/migrations/0002_announcementadmin_messageadmin.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 3.2 on 2021-06-01 17:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0013_day_publishing_day'), - ('announcements', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='MessageAdmin', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('subject', models.CharField(max_length=64)), - ('content', models.CharField(max_length=512)), - ('date_posted', models.DateTimeField(auto_now_add=True)), - ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), - ], - ), - migrations.CreateModel( - name='AnnouncementAdmin', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('headline', models.CharField(max_length=64)), - ('content', models.CharField(max_length=512)), - ('date_posted', models.DateTimeField(auto_now_add=True)), - ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), - ], - ), - ] diff --git a/announcements/migrations/0003_remove_messageadmin_subject.py b/announcements/migrations/0003_remove_messageadmin_subject.py deleted file mode 100644 index 6a6bdb5..0000000 --- a/announcements/migrations/0003_remove_messageadmin_subject.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2 on 2021-06-02 09:31 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('announcements', '0002_announcementadmin_messageadmin'), - ] - - operations = [ - migrations.RemoveField( - model_name='messageadmin', - name='subject', - ), - ] diff --git a/announcements/migrations/0004_alter_messageadmin_content.py b/announcements/migrations/0004_alter_messageadmin_content.py deleted file mode 100644 index 7116b70..0000000 --- a/announcements/migrations/0004_alter_messageadmin_content.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2 on 2021-06-02 10:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('announcements', '0003_remove_messageadmin_subject'), - ] - - operations = [ - migrations.AlterField( - model_name='messageadmin', - name='content', - field=models.CharField(max_length=2048), - ), - ] diff --git a/announcements/migrations/__pycache__/0001_initial.cpython-38.pyc b/announcements/migrations/__pycache__/0001_initial.cpython-38.pyc index 60c0656..effa08d 100644 Binary files a/announcements/migrations/__pycache__/0001_initial.cpython-38.pyc and b/announcements/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/classroom/__pycache__/asgi.cpython-38.pyc b/classroom/__pycache__/asgi.cpython-38.pyc index eaf2a6d..5c8dc25 100644 Binary files a/classroom/__pycache__/asgi.cpython-38.pyc and b/classroom/__pycache__/asgi.cpython-38.pyc differ diff --git a/classroom/__pycache__/routing.cpython-38.pyc b/classroom/__pycache__/routing.cpython-38.pyc new file mode 100644 index 0000000..fdce8c3 Binary files /dev/null and b/classroom/__pycache__/routing.cpython-38.pyc differ diff --git a/classroom/__pycache__/secret.cpython-38.pyc b/classroom/__pycache__/secret.cpython-38.pyc index 15a9a70..7991047 100644 Binary files a/classroom/__pycache__/secret.cpython-38.pyc and b/classroom/__pycache__/secret.cpython-38.pyc differ diff --git a/classroom/__pycache__/settings.cpython-38.pyc b/classroom/__pycache__/settings.cpython-38.pyc index 1c832cc..2932e84 100644 Binary files a/classroom/__pycache__/settings.cpython-38.pyc and b/classroom/__pycache__/settings.cpython-38.pyc differ diff --git a/classroom/asgi.py b/classroom/asgi.py index acf2ded..7d4502f 100644 --- a/classroom/asgi.py +++ b/classroom/asgi.py @@ -6,21 +6,17 @@ For more information on this file, see https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/ """ -import os -from channels.routing import ProtocolTypeRouter, URLRouter -from django.core.asgi import get_asgi_application -from channels.auth import AuthMiddlewareStack -import chat.routing +""" +ASGI entrypoint. Configures Django and then runs the application +defined in the ASGI_APPLICATION setting. +""" + +import os +import django +from channels.routing import get_default_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings') +os.environ.setdefault("DJANGO_SETTINGS_MODULE", 'classroom.settings') +django.setup() +application = get_default_application() -application = ProtocolTypeRouter({ - "http": get_asgi_application(), - # Just HTTP for now. (We can add other protocols later.) - "websocket": AuthMiddlewareStack( - URLRouter( - chat.routing.websocket_urlpatterns - ) - ), -}) diff --git a/classroom/routing.py b/classroom/routing.py new file mode 100644 index 0000000..b761bee --- /dev/null +++ b/classroom/routing.py @@ -0,0 +1,18 @@ +import os + +from channels.routing import ProtocolTypeRouter, URLRouter +from django.core.asgi import get_asgi_application +from channels.auth import AuthMiddlewareStack +import chat.routing + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'classroom.settings') + +application = ProtocolTypeRouter({ + "http": get_asgi_application(), + # Just HTTP for now. (We can add other protocols later.) + "websocket": AuthMiddlewareStack( + URLRouter( + chat.routing.websocket_urlpatterns + ) + ), +}) \ No newline at end of file diff --git a/classroom/settings.py b/classroom/settings.py index 4eedb8e..be2d484 100644 --- a/classroom/settings.py +++ b/classroom/settings.py @@ -13,6 +13,7 @@ from pathlib import Path import os from . import secret +from decouple import config # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -21,13 +22,16 @@ # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = secret.sec +SECRET_KEY = config('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! + +# DEBUG = config('DEBUG', default=False, cast=bool) DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ["143.110.246.81",'*'] + +ROOT_URLCONF = f'{config("PROJECT_NAME")}.urls' # Application definition @@ -73,8 +77,6 @@ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'classroom.urls' - TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', @@ -92,8 +94,9 @@ }, ] -WSGI_APPLICATION = 'classroom.wsgi.application' +WSGI_APPLICATION = 'classroom.wsgi.application' +ASGI_APPLICATION = 'classroom.routing.application' # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases @@ -148,19 +151,44 @@ USE_TZ = False +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/3.2/howto/static-files/ -MEDIA_ROOT = os.path.join(BASE_DIR, 'media') -MEDIA_URL = '/media/' +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': config("DB_NAME"), + 'USER': config("DB_USER"), + 'PASSWORD': config("DB_PASSWORD"), + 'HOST': 'localhost', + 'PORT': '', + } +} -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.2/howto/static-files/ +AWS_ACCESS_KEY_ID = config('AWS_ACCESS_KEY_ID') +AWS_SECRET_ACCESS_KEY = config('AWS_SECRET_ACCESS_KEY') +AWS_STORAGE_BUCKET_NAME = config('AWS_STORAGE_BUCKET_NAME') +AWS_S3_ENDPOINT_URL = config('AWS_S3_ENDPOINT_URL') +AWS_S3_OBJECT_PARAMETERS = { + 'CacheControl': 'max-age=86400', +} +AWS_LOCATION = config('AWS_LOCATION') -STATIC_URL = '/static/' STATICFILES_DIRS = [ - os.path.join(BASE_DIR, 'static') + os.path.join(BASE_DIR, 'static'), ] +#STATIC_ROOT = os.path.join(BASE_DIR, 'static/') +STATIC_URL = 'https://%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_LOCATION) +TEMP = os.path.join(BASE_DIR, 'temp') +STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage' +DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage' + + + +BASE_URL = "http://143.110.246.81" + # Default primary key field type # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field @@ -174,7 +202,6 @@ # Channels -ASGI_APPLICATION = 'classroom.asgi.application' CHANNEL_LAYERS = { "default": { diff --git a/classrooms/migrations/0001_initial.py b/classrooms/migrations/0001_initial.py index 79e7196..4cb165f 100644 --- a/classrooms/migrations/0001_initial.py +++ b/classrooms/migrations/0001_initial.py @@ -1,5 +1,7 @@ -# Generated by Django 3.2 on 2021-05-07 11:14 +# Generated by Django 3.2 on 2021-06-18 13:10 +import datetime +from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -9,6 +11,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -19,6 +22,31 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=36, unique=True)), ], ), + migrations.CreateModel( + name='Classroom', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=64)), + ('students', models.IntegerField()), + ('language', models.CharField(max_length=64)), + ('start_date', models.DateField()), + ('duration', models.IntegerField()), + ('description', models.CharField(max_length=2048)), + ('video', models.FileField(upload_to='preview_videos')), + ('started', models.BooleanField(default=False)), + ('is_active', models.BooleanField(default=True)), + ], + ), + migrations.CreateModel( + name='QuestionsQandA', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('question', models.CharField(max_length=512)), + ('date_posted', models.DateTimeField(auto_now_add=True)), + ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), migrations.CreateModel( name='secCategory', fields=[ @@ -27,4 +55,46 @@ class Migration(migrations.Migration): ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.category')), ], ), + migrations.CreateModel( + name='ReplyQandA', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('answer', models.CharField(max_length=512)), + ('correct', models.BooleanField(default=False)), + ('date_posted', models.DateTimeField(auto_now_add=True)), + ('classroom', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), + ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.questionsqanda')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='Day', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('video', models.FileField(upload_to='course_content')), + ('video_title', models.CharField(max_length=64)), + ('description', models.CharField(max_length=2048)), + ('publish', models.BooleanField(default=False)), + ('publishing_day', models.DateTimeField(default=datetime.datetime.now)), + ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), + ], + ), + migrations.CreateModel( + name='ClassroomEnrolled', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.AddField( + model_name='classroom', + name='sec_category', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.seccategory'), + ), + migrations.AddField( + model_name='classroom', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), ] diff --git a/classrooms/migrations/0002_answer_questions.py b/classrooms/migrations/0002_answer_questions.py deleted file mode 100644 index b59b30e..0000000 --- a/classrooms/migrations/0002_answer_questions.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 3.2 on 2021-05-10 19:14 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Questions', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('question', models.CharField(max_length=256)), - ('sec_category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.seccategory')), - ], - ), - migrations.CreateModel( - name='Answer', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('correct', models.BooleanField()), - ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.questions')), - ], - ), - ] diff --git a/classrooms/migrations/0003_answer_answer.py b/classrooms/migrations/0003_answer_answer.py deleted file mode 100644 index 379d5b4..0000000 --- a/classrooms/migrations/0003_answer_answer.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2 on 2021-05-10 20:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0002_answer_questions'), - ] - - operations = [ - migrations.AddField( - model_name='answer', - name='answer', - field=models.CharField(max_length=256, null=True), - ), - ] diff --git a/classrooms/migrations/0004_alter_answer_correct.py b/classrooms/migrations/0004_alter_answer_correct.py deleted file mode 100644 index c268249..0000000 --- a/classrooms/migrations/0004_alter_answer_correct.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2 on 2021-05-11 06:34 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0003_answer_answer'), - ] - - operations = [ - migrations.AlterField( - model_name='answer', - name='correct', - field=models.CharField(max_length=12), - ), - ] diff --git a/classrooms/migrations/0005_testpassed.py b/classrooms/migrations/0005_testpassed.py deleted file mode 100644 index 5736b40..0000000 --- a/classrooms/migrations/0005_testpassed.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.2 on 2021-05-11 09:00 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('classrooms', '0004_alter_answer_correct'), - ] - - operations = [ - migrations.CreateModel( - name='TestPassed', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sec_category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.seccategory')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/classrooms/migrations/0006_classroom.py b/classrooms/migrations/0006_classroom.py deleted file mode 100644 index dd2417a..0000000 --- a/classrooms/migrations/0006_classroom.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 3.2 on 2021-05-11 09:21 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('classrooms', '0005_testpassed'), - ] - - operations = [ - migrations.CreateModel( - name='Classroom', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=64)), - ('students', models.IntegerField()), - ('language', models.CharField(max_length=64)), - ('start_date', models.DateField()), - ('duration', models.IntegerField()), - ('description', models.CharField(max_length=256)), - ('video', models.FileField(upload_to='preview_videos')), - ('sec_category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.seccategory')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/classrooms/migrations/0007_auto_20210511_2054.py b/classrooms/migrations/0007_auto_20210511_2054.py deleted file mode 100644 index a8f4a9b..0000000 --- a/classrooms/migrations/0007_auto_20210511_2054.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 3.2 on 2021-05-11 20:54 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0006_classroom'), - ] - - operations = [ - migrations.AlterField( - model_name='classroom', - name='description', - field=models.CharField(max_length=512), - ), - migrations.CreateModel( - name='Day', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('video', models.FileField(upload_to='course_content')), - ('video_title', models.CharField(max_length=64)), - ('description', models.CharField(max_length=512)), - ('publish', models.BooleanField(default=False)), - ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), - ], - ), - ] diff --git a/classrooms/migrations/0008_classroomenrolled.py b/classrooms/migrations/0008_classroomenrolled.py deleted file mode 100644 index b6488d4..0000000 --- a/classrooms/migrations/0008_classroomenrolled.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.2 on 2021-05-12 03:21 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('classrooms', '0007_auto_20210511_2054'), - ] - - operations = [ - migrations.CreateModel( - name='ClassroomEnrolled', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/classrooms/migrations/0009_auto_20210517_1430.py b/classrooms/migrations/0009_auto_20210517_1430.py deleted file mode 100644 index 6129686..0000000 --- a/classrooms/migrations/0009_auto_20210517_1430.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 3.2 on 2021-05-17 14:30 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0008_classroomenrolled'), - ] - - operations = [ - migrations.RemoveField( - model_name='questions', - name='sec_category', - ), - migrations.RemoveField( - model_name='testpassed', - name='sec_category', - ), - migrations.RemoveField( - model_name='testpassed', - name='user', - ), - migrations.DeleteModel( - name='Answer', - ), - migrations.DeleteModel( - name='Questions', - ), - migrations.DeleteModel( - name='TestPassed', - ), - ] diff --git a/classrooms/migrations/0010_classroom_started.py b/classrooms/migrations/0010_classroom_started.py deleted file mode 100644 index 3499159..0000000 --- a/classrooms/migrations/0010_classroom_started.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2 on 2021-05-19 04:38 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0009_auto_20210517_1430'), - ] - - operations = [ - migrations.AddField( - model_name='classroom', - name='started', - field=models.BooleanField(default=False), - ), - ] diff --git a/classrooms/migrations/0011_auto_20210519_0902.py b/classrooms/migrations/0011_auto_20210519_0902.py deleted file mode 100644 index ae9b409..0000000 --- a/classrooms/migrations/0011_auto_20210519_0902.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2 on 2021-05-19 09:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0010_classroom_started'), - ] - - operations = [ - migrations.AlterField( - model_name='classroom', - name='description', - field=models.CharField(max_length=2048), - ), - migrations.AlterField( - model_name='day', - name='description', - field=models.CharField(max_length=2048), - ), - ] diff --git a/classrooms/migrations/0012_classroom_is_active.py b/classrooms/migrations/0012_classroom_is_active.py deleted file mode 100644 index ef6cf4f..0000000 --- a/classrooms/migrations/0012_classroom_is_active.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2 on 2021-05-21 03:21 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0011_auto_20210519_0902'), - ] - - operations = [ - migrations.AddField( - model_name='classroom', - name='is_active', - field=models.BooleanField(default=True), - ), - ] diff --git a/classrooms/migrations/0013_day_publishing_day.py b/classrooms/migrations/0013_day_publishing_day.py deleted file mode 100644 index 4b465c9..0000000 --- a/classrooms/migrations/0013_day_publishing_day.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2 on 2021-06-01 09:35 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0012_classroom_is_active'), - ] - - operations = [ - migrations.AddField( - model_name='day', - name='publishing_day', - field=models.DateTimeField(default=datetime.datetime.now), - ), - ] diff --git a/classrooms/migrations/0014_questionsqanda_replyqanda.py b/classrooms/migrations/0014_questionsqanda_replyqanda.py deleted file mode 100644 index f7b18e1..0000000 --- a/classrooms/migrations/0014_questionsqanda_replyqanda.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 3.2 on 2021-06-02 13:26 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('classrooms', '0013_day_publishing_day'), - ] - - operations = [ - migrations.CreateModel( - name='QuestionsQandA', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('question', models.CharField(max_length=512)), - ('date_posted', models.DateTimeField(auto_now_add=True)), - ('classroom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='ReplyQandA', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('answer', models.CharField(max_length=512)), - ('correct', models.BooleanField(default=False)), - ('date_posted', models.DateTimeField(auto_now_add=True)), - ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.questionsqanda')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/classrooms/migrations/0015_replyqanda_classroom.py b/classrooms/migrations/0015_replyqanda_classroom.py deleted file mode 100644 index 0f63dbc..0000000 --- a/classrooms/migrations/0015_replyqanda_classroom.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2 on 2021-06-02 15:52 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('classrooms', '0014_questionsqanda_replyqanda'), - ] - - operations = [ - migrations.AddField( - model_name='replyqanda', - name='classroom', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='classrooms.classroom'), - ), - ] diff --git a/classrooms/migrations/__pycache__/0001_initial.cpython-38.pyc b/classrooms/migrations/__pycache__/0001_initial.cpython-38.pyc index a827811..8b1c6ea 100644 Binary files a/classrooms/migrations/__pycache__/0001_initial.cpython-38.pyc and b/classrooms/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/instructor_test/migrations/0001_initial.py b/instructor_test/migrations/0001_initial.py index c403f18..75ab39e 100644 --- a/instructor_test/migrations/0001_initial.py +++ b/instructor_test/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2 on 2021-05-17 14:30 +# Generated by Django 3.2 on 2021-06-18 13:10 from django.conf import settings from django.db import migrations, models @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('classrooms', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('classrooms', '0009_auto_20210517_1430'), ] operations = [ diff --git a/instructor_test/migrations/__pycache__/0001_initial.cpython-38.pyc b/instructor_test/migrations/__pycache__/0001_initial.cpython-38.pyc index 9a60cbb..0a54357 100644 Binary files a/instructor_test/migrations/__pycache__/0001_initial.cpython-38.pyc and b/instructor_test/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/manage.py b/manage.py index 0d6eab4..da17b5f 100644 --- a/manage.py +++ b/manage.py @@ -2,11 +2,11 @@ """Django's command-line utility for administrative tasks.""" import os import sys +from decouple import config def main(): - """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'classroom.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', f'{config("PROJECT_NAME")}.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: @@ -20,3 +20,4 @@ def main(): if __name__ == '__main__': main() + diff --git a/media/course_content/I1IH8S47VQsample.mp4 b/media/course_content/I1IH8S47VQsample.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_4maS9bN.mp4 b/media/course_content/I1IH8S47VQsample_4maS9bN.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_4maS9bN.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_6HnwCFN.mp4 b/media/course_content/I1IH8S47VQsample_6HnwCFN.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_6HnwCFN.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_EOakK6I.mp4 b/media/course_content/I1IH8S47VQsample_EOakK6I.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_EOakK6I.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_HtF6sMC.mp4 b/media/course_content/I1IH8S47VQsample_HtF6sMC.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_HtF6sMC.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_JXbjd12.mp4 b/media/course_content/I1IH8S47VQsample_JXbjd12.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_JXbjd12.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_KkLevH4.mp4 b/media/course_content/I1IH8S47VQsample_KkLevH4.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_KkLevH4.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_Kr7Zdg3.mp4 b/media/course_content/I1IH8S47VQsample_Kr7Zdg3.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_Kr7Zdg3.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_MDuGTyb.mp4 b/media/course_content/I1IH8S47VQsample_MDuGTyb.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_MDuGTyb.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_NXjMdON.mp4 b/media/course_content/I1IH8S47VQsample_NXjMdON.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_NXjMdON.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_NZRPsbK.mp4 b/media/course_content/I1IH8S47VQsample_NZRPsbK.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_NZRPsbK.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_SfjYKam.mp4 b/media/course_content/I1IH8S47VQsample_SfjYKam.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_SfjYKam.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_SlC7HnD.mp4 b/media/course_content/I1IH8S47VQsample_SlC7HnD.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_SlC7HnD.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_Vx5WLEn.mp4 b/media/course_content/I1IH8S47VQsample_Vx5WLEn.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_Vx5WLEn.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_VyjWl5W.mp4 b/media/course_content/I1IH8S47VQsample_VyjWl5W.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_VyjWl5W.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_YT2eBJ0.mp4 b/media/course_content/I1IH8S47VQsample_YT2eBJ0.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_YT2eBJ0.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_aB0ZNwU.mp4 b/media/course_content/I1IH8S47VQsample_aB0ZNwU.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_aB0ZNwU.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_aLuoQlm.mp4 b/media/course_content/I1IH8S47VQsample_aLuoQlm.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_aLuoQlm.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_avo2eSc.mp4 b/media/course_content/I1IH8S47VQsample_avo2eSc.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_avo2eSc.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_hEetUDj.mp4 b/media/course_content/I1IH8S47VQsample_hEetUDj.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_hEetUDj.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_jCFDnLX.mp4 b/media/course_content/I1IH8S47VQsample_jCFDnLX.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_jCFDnLX.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_mMT39PF.mp4 b/media/course_content/I1IH8S47VQsample_mMT39PF.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_mMT39PF.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_nWRmc41.mp4 b/media/course_content/I1IH8S47VQsample_nWRmc41.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_nWRmc41.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_onBxtLR.mp4 b/media/course_content/I1IH8S47VQsample_onBxtLR.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_onBxtLR.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_p8k2kEy.mp4 b/media/course_content/I1IH8S47VQsample_p8k2kEy.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_p8k2kEy.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_sMyf7nF.mp4 b/media/course_content/I1IH8S47VQsample_sMyf7nF.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_sMyf7nF.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_siFebPp.mp4 b/media/course_content/I1IH8S47VQsample_siFebPp.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_siFebPp.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_uzQcXXq.mp4 b/media/course_content/I1IH8S47VQsample_uzQcXXq.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_uzQcXXq.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_wLAuDMG.mp4 b/media/course_content/I1IH8S47VQsample_wLAuDMG.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_wLAuDMG.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_yOmVit0.mp4 b/media/course_content/I1IH8S47VQsample_yOmVit0.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_yOmVit0.mp4 and /dev/null differ diff --git a/media/course_content/I1IH8S47VQsample_z1R3bTQ.mp4 b/media/course_content/I1IH8S47VQsample_z1R3bTQ.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/course_content/I1IH8S47VQsample_z1R3bTQ.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample.mp4 b/media/preview_videos/I1IH8S47VQsample.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_0FtdvVA.mp4 b/media/preview_videos/I1IH8S47VQsample_0FtdvVA.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_0FtdvVA.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_2kVupsA.mp4 b/media/preview_videos/I1IH8S47VQsample_2kVupsA.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_2kVupsA.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_3ABnMNB.mp4 b/media/preview_videos/I1IH8S47VQsample_3ABnMNB.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_3ABnMNB.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_4pnFEV5.mp4 b/media/preview_videos/I1IH8S47VQsample_4pnFEV5.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_4pnFEV5.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_6aZbRya.mp4 b/media/preview_videos/I1IH8S47VQsample_6aZbRya.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_6aZbRya.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_8c3CA2G.mp4 b/media/preview_videos/I1IH8S47VQsample_8c3CA2G.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_8c3CA2G.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_9h3VUil.mp4 b/media/preview_videos/I1IH8S47VQsample_9h3VUil.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_9h3VUil.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_BE3fm9D.mp4 b/media/preview_videos/I1IH8S47VQsample_BE3fm9D.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_BE3fm9D.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_M2Jzdba.mp4 b/media/preview_videos/I1IH8S47VQsample_M2Jzdba.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_M2Jzdba.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_OzDMqn3.mp4 b/media/preview_videos/I1IH8S47VQsample_OzDMqn3.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_OzDMqn3.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_Tah41ST.mp4 b/media/preview_videos/I1IH8S47VQsample_Tah41ST.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_Tah41ST.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_YUqpmJk.mp4 b/media/preview_videos/I1IH8S47VQsample_YUqpmJk.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_YUqpmJk.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_hs56Ex8.mp4 b/media/preview_videos/I1IH8S47VQsample_hs56Ex8.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_hs56Ex8.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_mXWR8eJ.mp4 b/media/preview_videos/I1IH8S47VQsample_mXWR8eJ.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_mXWR8eJ.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_peCH98U.mp4 b/media/preview_videos/I1IH8S47VQsample_peCH98U.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_peCH98U.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_v5Hkqv0.mp4 b/media/preview_videos/I1IH8S47VQsample_v5Hkqv0.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_v5Hkqv0.mp4 and /dev/null differ diff --git a/media/preview_videos/I1IH8S47VQsample_zkCVaBk.mp4 b/media/preview_videos/I1IH8S47VQsample_zkCVaBk.mp4 deleted file mode 100644 index 775a650..0000000 Binary files a/media/preview_videos/I1IH8S47VQsample_zkCVaBk.mp4 and /dev/null differ diff --git a/media/profile_pics/IMG_20210321_091700.jpg b/media/profile_pics/IMG_20210321_091700.jpg deleted file mode 100644 index 65decd2..0000000 Binary files a/media/profile_pics/IMG_20210321_091700.jpg and /dev/null differ diff --git a/media/profile_pics/IMG_20210321_091700_7nsdzu3.jpg b/media/profile_pics/IMG_20210321_091700_7nsdzu3.jpg deleted file mode 100644 index 65decd2..0000000 Binary files a/media/profile_pics/IMG_20210321_091700_7nsdzu3.jpg and /dev/null differ diff --git a/media/profile_pics/IMG_20210321_091737.jpg b/media/profile_pics/IMG_20210321_091737.jpg deleted file mode 100644 index 77a7a5c..0000000 Binary files a/media/profile_pics/IMG_20210321_091737.jpg and /dev/null differ diff --git a/media/profile_pics/IMG_20210321_091737_I9iZruN.jpg b/media/profile_pics/IMG_20210321_091737_I9iZruN.jpg deleted file mode 100644 index 77a7a5c..0000000 Binary files a/media/profile_pics/IMG_20210321_091737_I9iZruN.jpg and /dev/null differ diff --git a/media/profile_pics/IMG_20210321_091737_LFTO7Sl.jpg b/media/profile_pics/IMG_20210321_091737_LFTO7Sl.jpg deleted file mode 100644 index 77a7a5c..0000000 Binary files a/media/profile_pics/IMG_20210321_091737_LFTO7Sl.jpg and /dev/null differ diff --git a/media/profile_pics/IMG_20210321_091737_ogHo8pN.jpg b/media/profile_pics/IMG_20210321_091737_ogHo8pN.jpg deleted file mode 100644 index 77a7a5c..0000000 Binary files a/media/profile_pics/IMG_20210321_091737_ogHo8pN.jpg and /dev/null differ diff --git a/media/profile_pics/IMG_20210321_091737_pwuIwZ8.jpg b/media/profile_pics/IMG_20210321_091737_pwuIwZ8.jpg deleted file mode 100644 index 77a7a5c..0000000 Binary files a/media/profile_pics/IMG_20210321_091737_pwuIwZ8.jpg and /dev/null differ diff --git a/report/migrations/0001_initial.py b/report/migrations/0001_initial.py index 3b941d1..8cf6ea7 100644 --- a/report/migrations/0001_initial.py +++ b/report/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2 on 2021-05-24 10:40 +# Generated by Django 3.2 on 2021-06-18 13:10 from django.conf import settings from django.db import migrations, models @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('classrooms', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('classrooms', '0012_classroom_is_active'), ] operations = [ @@ -21,7 +21,9 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('subject', models.CharField(max_length=64)), ('description', models.CharField(max_length=2048)), - ('Day', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.day')), + ('resolved', models.BooleanField(default=False)), + ('report_date', models.DateTimeField(auto_now_add=True)), + ('day', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classrooms.day')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), diff --git a/report/migrations/0002_rename_day_reportclassroom_day.py b/report/migrations/0002_rename_day_reportclassroom_day.py deleted file mode 100644 index 4017b08..0000000 --- a/report/migrations/0002_rename_day_reportclassroom_day.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2 on 2021-05-24 12:18 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('report', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='reportclassroom', - old_name='Day', - new_name='day', - ), - ] diff --git a/report/migrations/0003_reportclassroom_resolved.py b/report/migrations/0003_reportclassroom_resolved.py deleted file mode 100644 index 51c6393..0000000 --- a/report/migrations/0003_reportclassroom_resolved.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2 on 2021-05-24 15:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('report', '0002_rename_day_reportclassroom_day'), - ] - - operations = [ - migrations.AddField( - model_name='reportclassroom', - name='resolved', - field=models.BooleanField(default=False), - ), - ] diff --git a/report/migrations/0004_reportclassroom_report_date.py b/report/migrations/0004_reportclassroom_report_date.py deleted file mode 100644 index 8df2c17..0000000 --- a/report/migrations/0004_reportclassroom_report_date.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.2 on 2021-05-24 15:19 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('report', '0003_reportclassroom_resolved'), - ] - - operations = [ - migrations.AddField( - model_name='reportclassroom', - name='report_date', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), - preserve_default=False, - ), - ] diff --git a/report/migrations/__pycache__/0001_initial.cpython-38.pyc b/report/migrations/__pycache__/0001_initial.cpython-38.pyc index aad880d..cb8ca5b 100644 Binary files a/report/migrations/__pycache__/0001_initial.cpython-38.pyc and b/report/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..60f25e2 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,45 @@ +asgiref==3.3.4 +attrs==20.3.0 +autobahn==21.3.1 +Automat==20.2.0 +boto3==1.17.97 +botocore==1.20.97 +certifi==2020.12.5 +cffi==1.14.5 +channels==3.0.3 +chardet==4.0.0 +constantly==15.1.0 +cryptography==3.4.7 +daphne==3.0.2 +defusedxml==0.7.1 +Django==3.2 +django-allauth==0.44.0 +django-crispy-forms==1.11.2 +django-storages==1.11.1 +hyperlink==21.0.0 +idna==3.2 +incremental==21.3.0 +jmespath==0.10.0 +oauthlib==3.1.0 +Pillow==8.2.0 +psycopg2-binary==2.8.6 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 +pycparser==2.20 +PyJWT==1.7.1 +pyOpenSSL==20.0.1 +python-dateutil==2.8.1 +python-decouple==3.4 +python3-openid==3.2.0 +pytz==2021.1 +requests==2.25.1 +requests-oauthlib==1.3.0 +s3transfer==0.4.2 +service-identity==21.1.0 +six==1.15.0 +sqlparse==0.4.1 +twilio==6.58.0 +Twisted==21.2.0 +txaio==21.2.1 +urllib3==1.26.4 +zope.interface==5.4.0 diff --git a/settings.ini b/settings.ini new file mode 100644 index 0000000..0704e05 --- /dev/null +++ b/settings.ini @@ -0,0 +1,15 @@ +[settings] +DEBUG=False +SECRET_KEY=django-insecure-_8po)(ryw0&!0!+m-(tod-=hpu^wc(+iy5-vs#d)rvrd&2ahb@ + +AWS_ACCESS_KEY_ID=RA4ZJDJIMY5ER2MIBHY5 +AWS_SECRET_ACCESS_KEY=VKjf3jCcK1Fa62jPlrR+z/xpyjSfgpN8dyl9mfc3G4c +AWS_STORAGE_BUCKET_NAME=classroom-spaces +AWS_S3_ENDPOINT_URL=https://sgp1.digitaloceanspaces.com +AWS_LOCATION=classroom-static + +DB_NAME=django_db +DB_USER=django +DB_PASSWORD=password + +PROJECT_NAME=classroom