Merge branch 'ps_1' into main

arielfayol37 · Dec 5, 2023 · 7f9a2a1 · 7f9a2a1
2 parents 01389f5 + c6d121d
commit 7f9a2a1
Show file tree

Hide file tree

Showing 34 changed files with 13 additions and 1 deletion.
diff --git a/astros/views.py b/astros/views.py
@@ -60,7 +60,10 @@ def all_courses(request):
 @login_required(login_url='astros:login')
 def course_enroll(request, course_id, code):
  # Making sure the request is done by a Student.
- student = get_object_or_404(Student, pk=request.user.pk)
+ try:
+ student = get_object_or_404(Student, pk=request.user.pk)
+ except:
+ return HttpResponse(json.dumps({'state':False, 'response': 'LOGIN FIRST'}))
  course = get_object_or_404(Course, pk = course_id)
  if not Enrollment.objects.filter(student=student, course=course).exists():
  # Checking whether code is valid.

diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/deimos/views.py b/deimos/views.py
@@ -588,6 +588,11 @@ def register(request):
  username = str(username) + str(random.randint(1, 1000000))
  except:
  pass # if profile with this username does not exists.
+ try:
+ s = Student.objects.get(username=username)
+ username = str(username) + str(random.randint(1, 10000000))
+ except Student.DoesNotExist:
+ pass
  try:
  checking_student = Student.objects.get(email=email)
  if checking_student:

diff --git a/media/20231119_195754.jpg b/media/20231119_195754.jpg
diff --git a/media/Embid.jpeg b/media/Embid.jpeg
diff --git a/media/aii.jpg b/media/aii.jpg
diff --git a/media/deimos/images/notes_images/20231013_171615.jpg b/media/deimos/images/notes_images/20231013_171615.jpg
diff --git a/media/deimos/images/notes_images/20231030_092152.jpg b/media/deimos/images/notes_images/20231030_092152.jpg
diff --git a/media/deimos/images/notes_images/20231107_132602.jpg b/media/deimos/images/notes_images/20231107_132602.jpg
diff --git a/media/deimos/images/notes_images/20231107_132602_w9r4L1Y.jpg b/media/deimos/images/notes_images/20231107_132602_w9r4L1Y.jpg
diff --git a/media/deimos/images/notes_images/2f9cb09385c40f2df2cc069b0a96b7fa.jpg b/media/deimos/images/notes_images/2f9cb09385c40f2df2cc069b0a96b7fa.jpg
diff --git a/media/deimos/images/notes_images/Screenshot_2023-06-21_144313.png b/media/deimos/images/notes_images/Screenshot_2023-06-21_144313.png
diff --git a/media/deimos/images/notes_images/download.jpeg b/media/deimos/images/notes_images/download.jpeg
diff --git a/media/deimos/images/notes_images/mcc.PNG b/media/deimos/images/notes_images/mcc.PNG
diff --git a/media/deimos/images/notes_images/mount_fako.jpg b/media/deimos/images/notes_images/mount_fako.jpg
diff --git a/media/deimos/images/notes_images/rema.jpg b/media/deimos/images/notes_images/rema.jpg
diff --git a/media/embid.jpg b/media/embid.jpg
diff --git a/media/phobos/images/course_covers/ai.jpeg b/media/phobos/images/course_covers/ai.jpeg
diff --git a/media/phobos/images/course_covers/download_1.jpeg b/media/phobos/images/course_covers/download_1.jpeg
diff --git a/media/phobos/images/course_covers/phys_dept_1986.jpg b/media/phobos/images/course_covers/phys_dept_1986.jpg
diff --git a/media/phobos/images/question_images/6147159a045bbf0a0c9b9dc7352c7b82.30.jpg b/media/phobos/images/question_images/6147159a045bbf0a0c9b9dc7352c7b82.30.jpg
diff --git a/media/phobos/images/question_images/PXL_20221002_171441803.MP.jpg b/media/phobos/images/question_images/PXL_20221002_171441803.MP.jpg
diff --git a/media/phobos/images/question_images/ahidjo.jpg b/media/phobos/images/question_images/ahidjo.jpg
diff --git a/media/phobos/images/question_images/cameroon.png b/media/phobos/images/question_images/cameroon.png
diff --git a/media/phobos/images/question_images/fally_1.jpg b/media/phobos/images/question_images/fally_1.jpg
diff --git a/media/phobos/images/question_images/mount_fako.jpg b/media/phobos/images/question_images/mount_fako.jpg
diff --git a/media/phobos/images/question_images/paul.jpg b/media/phobos/images/question_images/paul.jpg
diff --git a/media/phobos/images/question_images/rema.jpg b/media/phobos/images/question_images/rema.jpg
diff --git a/media/phobos/images/question_images/salah.jpg b/media/phobos/images/question_images/salah.jpg
diff --git a/media/phobos/images/question_images/wave.jfif b/media/phobos/images/question_images/wave.jfif
diff --git a/media/phobos/images/question_images/wizkid.jpg b/media/phobos/images/question_images/wizkid.jpg
diff --git a/media/zym83jwwa4e61.png b/media/zym83jwwa4e61.png
diff --git a/phobos/migrations/0050_alter_course_subject.py b/phobos/migrations/0050_alter_course_subject.py
@@ -1,5 +1,6 @@
 # Generated by Django 4.2.3 on 2023-12-03 05:10
 
+
 from django.db import migrations, models
 
 

diff --git a/run.bat b/run.bat
@@ -0,0 +1,3 @@
+python manage.py makemigrations
+python manage.py migrate
+python manage.py runserver 0.0.0.0:8000