Merge pull request #94 from AvaCodeSolutions/feat/23/course-page-component

feat: #23 frontend UI for course page (PR1)

Author: payamnj

django_email_learning/api/serializers.py

@@ -174,6 +174,13 @@ class LessonCreate(BaseModel):
     type: Literal["lesson"]
 
 
+class LessonUpdate(BaseModel):
+    title: Optional[str] = None
+    content: Optional[str] = None
+
+    model_config = ConfigDict(extra="forbid")
+
+
 class LessonResponse(BaseModel):
     id: int
     title: str
@@ -282,10 +289,17 @@ def from_seconds(cls, seconds: int) -> "WaitingPeriod":
 
 
 class CreateCourseContentRequest(BaseModel):
-    priority: int = Field(gt=0, examples=[1])
+    priority: int | None = Field(gt=0, examples=[1], default=None)
     waiting_period: WaitingPeriod
     content: LessonCreate | QuizCreate = Field(discriminator="type")
 
+    @property
+    def required_priority(self) -> int:
+        if self.priority is not None:
+            return self.priority
+        else:
+            raise ValueError("Priority must be set before converting to Django model.")
+
     def to_django_model(self, course: Course) -> CourseContent:
         lesson = None
         quiz = None
@@ -319,7 +333,7 @@ def to_django_model(self, course: Course) -> CourseContent:
             content_type = "quiz"
         course_content = CourseContent.objects.create(
             course=course,
-            priority=self.priority,
+            priority=self.required_priority,
             waiting_period=self.waiting_period.to_seconds(),
             lesson=lesson,
             quiz=quiz,

django_email_learning/api/urls.py

@@ -3,6 +3,7 @@
 from django_email_learning.api.views import (
     CourseView,
     ImapConnectionView,
+    LessonView,
     OrganizationsView,
     SingleCourseView,
     CourseContentView,
@@ -38,6 +39,11 @@
         SingleCourseContentView.as_view(),
         name="single_course_content_view",
     ),
+    path(
+        "organizations/<int:organization_id>/lessons/<int:lesson_id>/",
+        LessonView.as_view(),
+        name="lesson_view",
+    ),
     path("organizations/", OrganizationsView.as_view(), name="organizations_view"),
     path("session", UpdateSessionView.as_view(), name="update_session_view"),
     path("", page_not_found, name="root"),

django_email_learning/api/views.py

@@ -4,13 +4,15 @@
 from django.db.utils import IntegrityError
 from django.http import JsonResponse
 from django.core.exceptions import ValidationError as DjangoValidationError
+from django.db import models
 from pydantic import ValidationError
 
 from django_email_learning.api import serializers
 from django_email_learning.models import (
     Course,
     CourseContent,
     ImapConnection,
+    Lesson,
     OrganizationUser,
     Organization,
 )
@@ -68,6 +70,14 @@ def post(self, request, *args, **kwargs) -> JsonResponse:  # type: ignore[no-unt
         try:
             serializer = serializers.CreateCourseContentRequest.model_validate(payload)
             course = Course.objects.get(id=kwargs["course_id"])
+            if serializer.priority is None:
+                # Set priority to max existing priority + 1
+                max_priority = (
+                    CourseContent.objects.filter(course_id=course.id)
+                    .aggregate(max_priority=models.Max("priority"))
+                    .get("max_priority")
+                )
+                serializer.priority = (max_priority or 0) + 1
             course_content = serializer.to_django_model(course=course)
 
             return JsonResponse(
@@ -130,6 +140,8 @@ def delete(self, request, *args, **kwargs):  # type: ignore[no-untyped-def]
         except (IntegrityError, ValueError) as e:
             return JsonResponse({"error": str(e)}, status=409)
 
+        # TODO: Implement POST method for updating course content.
+
 
 @method_decorator(accessible_for(roles={"admin", "editor"}), name="post")
 @method_decorator(accessible_for(roles={"admin", "editor"}), name="delete")
@@ -255,6 +267,29 @@ def post(self, request, *args, **kwargs) -> JsonResponse:  # type: ignore[no-unt
             return JsonResponse({"error": str(e)}, status=409)
 
 
+@method_decorator(accessible_for(roles={"admin", "editor"}), name="post")
+class LessonView(View):
+    def post(self, request, *args, **kwargs) -> JsonResponse:  # type: ignore[no-untyped-def]
+        payload = json.loads(request.body)
+        try:
+            serializer = serializers.LessonUpdate.model_validate(payload)
+            lesson = Lesson.objects.get(id=kwargs["lesson_id"])
+            if serializer.title is not None:
+                lesson.title = serializer.title
+            if serializer.content is not None:
+                lesson.content = serializer.content
+            lesson.save()
+
+            return JsonResponse(
+                {},
+                status=204,
+            )
+        except Lesson.DoesNotExist:
+            return JsonResponse({"error": "Lesson not found"}, status=404)
+        except ValidationError as e:
+            return JsonResponse({"error": e.errors()}, status=400)
+
+
 @method_decorator(is_an_organization_member(), name="post")
 class UpdateSessionView(View):
     def post(self, request, *args, **kwargs) -> JsonResponse:  # type: ignore[no-untyped-def]

django_email_learning/platform/views.py

@@ -82,7 +82,8 @@ class CourseView(BasePlatformView):
     def get_context_data(self, **kwargs) -> dict:  # type: ignore[no-untyped-def]
         context = super().get_context_data(**kwargs)
         course = Course.objects.get(pk=self.kwargs["course_id"])
-        context["page_title"] = course.title
+        context["course"] = course
+        context["page_title"] = f"Course: {course.title}"
         return context
 
 

django_email_learning/static/logo.png

@@ -1,4 +1,5 @@
 {% load django_vite %}
+{% load static %}
 <!doctype html>
 <html lang="en">
   <head>
@@ -14,6 +15,7 @@
     </script>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="icon" type="image/png" href="{% static 'logo.png' %}" />
     <title>{% block title %}{{ page_title }}{% endblock %}</title>
   </head>
   <body>

django_email_learning/templates/platform/base.html

@@ -1,5 +1,9 @@
 {% extends "platform/base.html" %}
 {% load django_vite %}
 {% block extra_head %}
-    <!-- {% vite_asset 'courses/Courses.jsx' %} -->
+    <script>
+        let course_title = "{{ course.title|escapejs }}";
+        let course_id = "{{ course.id }}";
+    </script>
+    {% vite_asset 'course/Course.jsx' %}
 {% endblock %}

django_email_learning/templates/platform/course.html

@@ -65,7 +65,7 @@
 
 CORS_ALLOW_CREDENTIALS = True
 CSRF_COOKIE_SECURE = False
-CSRF_COOKIE_SAMESITE = "None"
+# CSRF_COOKIE_SAMESITE = "None"
 
 
 ROOT_URLCONF = "django_service.urls"
@@ -148,7 +148,14 @@
 
 STATIC_URL = "static/"
 
-STATIC_ROOT = BASE_DIR / "static"
+# For development - where Django looks for static files
+STATICFILES_DIRS = [
+    BASE_DIR / "django_service" / "static",
+]
+
+# For production - where collectstatic puts files
+STATIC_ROOT = BASE_DIR / "staticfiles"
+
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field