fix(prod): prod rebirth

.gitignore

@@ -125,6 +125,8 @@ coverage
 # nyc test coverage
 .nyc_output
 
+.idea
+
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 

courses/urls.py

@@ -1,14 +1,13 @@
 from django.conf.urls import url
 from django.views.generic import TemplateView
-from termsandconditions.decorators import terms_required
 from django.views.decorators.cache import never_cache
 from django.contrib.auth.decorators import login_required
 from . import views
 
 urlpatterns = [
     url(r'^$', views.CourseListView.as_view(), name='course_list'),
     url(r'^dashboard/$', views.ManageCourseListView.as_view(), name='manage_course_list'),
-    url(r'^create/$', never_cache(login_required(terms_required(views.CourseCreateView.as_view()))), name='course_create'),
+    url(r'^create/$', never_cache(login_required(views.CourseCreateView.as_view())), name='course_create'),
     url(r'^(?P<pk>\d+)/edit/$', views.CourseUpdateView.as_view(), name='course_edit'),
     url(r'^(?P<pk>\d+)/delete/$', views.CourseDeleteView.as_view(), name='course_delete'),
     url(r'^(?P<pk>\d+)/module/$', views.CourseModuleUpdateView.as_view(), name='course_module_update'),
@@ -24,7 +23,6 @@
     url(r'^videos$', views.list_videos, name='videos_list'),
     url(r'^edit$', views.edit, name='edit'),
     url(r'^about-company$', TemplateView.as_view(template_name='about.html'), name='about_company'),
-    url(r'^termsrequired$', never_cache(terms_required(login_required(TemplateView.as_view(template_name='terms_required.html')))), name='terms_required'),
     url(r'^search$', views.SearchSubmitView.as_view(), name='search'),
     url(r'^search-ajax-submit$', views.SearchAjaxSubmitView.as_view(), name='search-ajax-submit'),
 ]

myelearning/settings.py

@@ -52,7 +52,6 @@
     'corsheaders',
     'taggit',
     'taggit_serializer',
-    'termsandconditions',
 ]
 
 MIDDLEWARE = [
@@ -63,7 +62,6 @@
     # 'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     # 'django.middleware.cache.FetchFromCacheMiddleware',
-    # 'termsandconditions.middleware.TermsAndConditionsRedirectMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -231,16 +229,4 @@
 CELERY_BROKER_URL = config('REDIS_URL', 'redis://localhost:6379/0', cast=str)
 CELERY_RESULT_BACKEND = config('REDIS_URL', 'redis://localhost:6379/0', cast=str)
 
-# Terms & Conditions settings
-
-DEFAULT_TERMS_SLUG = "site-terms"
-ACCEPT_TERMS_PATH = "/terms/accept/"
-TERMS_EXCLUDE_URL_PREFIX_LIST = {"/admin", "/terms"}
-TERMS_EXCLUDE_URL_LIST = {"/", "/course/termsrequired/", "/accounts/login/", "/students/register/student/", "/students/register/teacher/"}
-TERMS_CACHE_SECONDS = 60 * 15
-TERMS_EXCLUDE_USERS_WITH_PERM = "auth.can_skip_t&c"
-TERMS_IP_HEADER_NAME = "REMOTE_ADDR"
-TERMS_STORE_IP_ADDRESS = True
-TERMS_BASE_TEMPLATE = 'base.html'
-
 CRISPY_TEMPLATE_PACK = 'bootstrap4'

myelearning/urls.py

@@ -42,8 +42,6 @@
     url(r'^course/', include(('courses.urls', 'courses'))),
     url(r'^students/', include(('students.urls', 'students'))),
 
-    url(r'^terms/', include(('termsandconditions.urls', 'termsandconditions'))),
-
     url(r'^api/', include(('courses.api.urls', 'api'), namespace='api')),
 
     url(r'^sw.js', (TemplateView.as_view(template_name="service-worker.js", content_type='application/javascript', )), name='sw.js'),

myelearning/wsgi.py

@@ -10,9 +10,7 @@
 import os
 
 from django.core.wsgi import get_wsgi_application
-from whitenoise.django import DjangoWhiteNoise
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "myelearning.settings_production")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "myelearning.settings")
 
 application = get_wsgi_application()
-application = DjangoWhiteNoise(application)

requirements-dev.txt

@@ -13,7 +13,7 @@ pytz==2017.2
 requests==2.31.0
 six==1.11.0
 urllib3==1.26.18
-whitenoise==3.3.1
+whitenoise==5.0.1
 python-decouple==3.1
 django-widget-tweaks==1.4.3
 google-api-python-client==1.7.4
@@ -24,13 +24,12 @@ scipy==1.10.0
 sklearn==0.0
 django-storages==1.7.1
 django-webpack-loader==0.6.0
-django-cors-headers==4.3.1
+django-cors-headers==4.2.0
 Markdown==3.1.1
 django-taggit==1.1.0
 django-taggit-serializer==0.1.7
 mistune==2.0.3
 pygments==2.15.0
 celery==5.1.0
 redis==4.4.4
-django-autoslug==1.9.9
-django-termsandconditions==2.0.11
+django-autoslug==1.9.8

requirements.txt

@@ -25,14 +25,13 @@ scikit-learn==1.0.1
 scipy==1.10.0
 sklearn==0.0
 django-webpack-loader==0.6.0
-django-cors-headers==4.3.1
+django-cors-headers==4.2.0
 Markdown==3.1.1
 django-taggit==1.1.0
 django-taggit-serializer==0.1.7
 mistune==2.0.3
 pygments==2.15.0
 celery==5.1.0
 redis==4.4.4
-django-autoslug==1.9.9
-django-termsandconditions==2.0.11
+django-autoslug==1.9.8
 django-crispy-forms==1.9.2

students/migrations/0008_alter_user_first_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2024-05-10 23:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('students', '0007_auto_20220721_1312'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='first_name',
+            field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
+        ),
+    ]