Merge branch 'main' into lesson_related_unit_test

Author: EthanZ23

backend/apps/bookings/migrations/0005_alter_booking_student_alter_review_unique_together.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.6 on 2025-03-27 07:26
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookings', '0004_rename_bookings_booking_rename_reviews_review'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='booking',
+            name='student',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_bookings', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterUniqueTogether(
+            name='review',
+            unique_together={('tutor', 'reviewer')},
+        ),
+    ]

backend/apps/submissions/tests.py

@@ -426,7 +426,7 @@ def setUp(self):
             "version": 1,
             "asset_id": "sample_asset_id"
         }
-        self.file_record = UploadRecord.objects.create(upload_data=self.upload_data, user=self.user)
+        self.file_record = UploadRecord.objects.create(self.upload_data, self.profile)
         self.quiz_submission = QuizSubmissions.objects.create(submission=self.submission)
 
         self.login_url = "/users/login/"

backend/backend/urls.py

@@ -29,6 +29,6 @@
     path('api/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
     path('notifications/', include('apps.notifications.urls')),
     path('lessons/', include('apps.lessons.urls')),
-    path('submissions/', include('apps.submissions.urls')),
+    path('submissions/', include('apps.submissions.urls'))
 ]
 

frontend/src/Components/Chat.jsx

@@ -6,7 +6,7 @@ import botIcon from "/assets/images/UNLV_pic.png"; // Placeholder bot icon
 const Chat = () => {
     const [messages, setMessages] = useState([]);
     const [input, setInput] = useState("");
-    const [buttonClicked, setButtonClicked] = useState("");
+    const [setButtonClicked] = useState("");
 
     const sendMessage = () => {
         if (input.trim() === "") return; // Prevent sending empty messages