Merge remote-tracking branch 'origin/Feat/#330/student-noti' into Feat/#330/student-noti

# Conflicts:
#	backend/src/main/java/org/example/backend/domain/lecture/entity/Lecture.java

Author: wntpdnjs

backend/src/main/java/org/example/backend/domain/lecture/entity/Lecture.java

@@ -10,9 +10,12 @@
 
 import org.example.backend.domain.classroom.entity.Classroom;
 import org.example.backend.domain.lectureNoteMapping.entity.LectureNoteMapping;
-import org.example.backend.domain.notification.entity.Notification;
+import org.example.backend.domain.question.entity.Question;
 import org.example.backend.domain.quiz.entity.Quiz;
+import org.example.backend.domain.studentClass.entity.StudentClass;
 import org.example.backend.global.entitiy.BaseEntity;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
 
 @Entity
 @Table(name = "lecture")
@@ -60,6 +63,6 @@ public class Lecture extends BaseEntity {
     private List<Quiz> quiz = new ArrayList<>();
 
     @OneToMany(mappedBy = "lecture", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Notification> notification = new ArrayList<>();
+    private List<Question> questions = new ArrayList<>();
 
 }

backend/src/main/java/org/example/backend/domain/question/service/ChatServiceImpl.java

@@ -61,7 +61,7 @@ public void sendMessage(UUID lectureId, MessageRequestDTO.MessageDTO messageDTO,
             // 2. 메시지 전파
             // 메시지 구성
             MessageRequestDTO.MessageDTO maskMessage = MessageRequestDTO.MessageDTO.builder()
-                    .senderId(null)
+                    .senderId(userId)
                     .senderName(null)
                     .content(messageDTO.getContent())
                     .role(sender.getRole())

backend/src/main/java/org/example/backend/domain/quizAnswer/converter/QuizResultStudentConverter.java

@@ -13,17 +13,20 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 @Component
 public class QuizResultStudentConverter {
     public static QuizResultStudentResponseDTO toResultStudentResponse(
             UUID lectureId,
             List<QuizResultStudentResponseDTO.QuizDTO> quizzes
     ) {
+        List<QuizResultStudentResponseDTO.QuizDTO> sortedQuizzes = quizzes.stream()
+                .sorted((q1, q2) -> Integer.compare(q1.getQuizOrder(), q2.getQuizOrder()))
+                .collect(Collectors.toList());
+
         return QuizResultStudentResponseDTO.builder()
                 .lectureId(lectureId)
-                .quizzes(quizzes)
+                .quizzes(sortedQuizzes)
                 .build();
     }
 
@@ -36,6 +39,7 @@ public static QuizResultStudentResponseDTO.QuizDTO toQuizDTO(
         boolean isCollect = (myAnswer != null) && Boolean.TRUE.equals(myAnswer.getIsCollect());
 
         List<QuizResultStudentResponseDTO.OptionDTO> optionDTOs = options.stream()
+                .sorted((o1, o2) -> Integer.compare(o1.getOptionOrder(), o2.getOptionOrder()))
                 .map(o -> QuizResultStudentResponseDTO.OptionDTO.builder()
                         .id(o.getId())
                         .optionOrder(o.getOptionOrder())

docker-compose.local.yml

@@ -31,7 +31,7 @@ services:
 
 
   ai:
-    image: classlog/ai:v3.4
+    image: classlog/ai:v4.1
     container_name: classlog-ai
     ports:
       - 8000:8000

docker-compose.yml

@@ -65,7 +65,7 @@ services:
 
 
   ai:
-    image: classlog/ai:v3.4
+    image: classlog/ai:v4.1
     container_name: classlog-ai
     ports:
       - 8000:8000

frontend/api/lectures/saveChatting.ts

@@ -0,0 +1,19 @@
+import axios from "axios";
+import { axiosInstance } from "@/api/axiosInstance";
+import { ENDPOINTS } from "@/constants/endpoints";
+import { ApiResponse } from "@/types/apiResponseTypes";
+
+export async function saveChatting( lectureId: string ) {
+  try {
+    const response = await axiosInstance.post<ApiResponse<null>>(
+      ENDPOINTS.LECTURES.SAVE_CHAT(lectureId)
+    );
+
+    return response.data;
+  } catch (error: unknown) {
+    if (axios.isAxiosError(error) && error.response) {
+      return error.response.data as ApiResponse<null>;
+    }
+    throw error;
+  }
+}

frontend/app/(non-login)/(landing)/_components/HeroSection.tsx

@@ -0,0 +1,67 @@
+"use client";
+
+import React from "react";
+import Image from "next/image";
+import Link from "next/link";
+import styles from "../page.module.scss";
+import { IMAGES } from "@/constants/images";
+import { ROUTES } from "@/constants/routes";
+import { MoveDown } from "lucide-react";
+
+interface HeroSectionProps {
+  introSectionRef?: React.RefObject<HTMLElement | null>;
+}
+
+export default function HeroSection({ introSectionRef }: HeroSectionProps) {
+  const handleScrollToIntro = () => {
+    if (introSectionRef?.current) {
+      introSectionRef.current.scrollIntoView({
+        behavior: "smooth",
+        block: "start",
+      });
+    }
+  };
+  return (
+    <section className={styles.heroSection}>
+      <div className={styles.heroInner}>
+        <div className={styles.heroLeft}>
+          <div className={styles.textWrapper}>
+            <Image
+              src={IMAGES.logo4}
+              alt="ClassLog Logo"
+              width={500}
+              height={120}
+              className={styles.logo}
+            />
+            <h2>당신의 강의를 더 스마트하게</h2>
+            <p>수업 녹음, 실시간 소통, AI 기반 퀴즈 생성을 통해</p>
+            <p>강의 준비부터 피드백까지 한 번에 해결하세요.</p>
+          </div>
+          <div className={styles.heroCtas}>
+            <Link href={ROUTES.login} className={styles.primaryCta}>
+              시작하기
+              <span className={styles.arrow} aria-hidden>
+                →
+              </span>
+            </Link>
+          </div>
+        </div>
+
+        <div className={styles.introImageWrapper}>
+          <Image
+            src={IMAGES.introImage}
+            alt="소개 이미지"
+            width={650}
+            height={300}
+            className={styles.heroImage}
+            priority
+          />
+        </div>
+      </div>
+
+      <div className={styles.scrollIndicator} onClick={handleScrollToIntro}>
+        <MoveDown className={styles.downArrow} size={30} strokeWidth={2.5} />
+      </div>
+    </section>
+  );
+}

frontend/app/(non-login)/(landing)/_components/IntroSection.tsx

@@ -0,0 +1,75 @@
+import React from "react";
+import styles from "../page.module.scss";
+import {
+  MessageCircle,
+  MessageCircleQuestion,
+  PencilLine,
+  Videotape,
+} from "lucide-react";
+
+const FEATURES = [
+  {
+    icon: <MessageCircle />,
+    title: "즉시 질문, 즉시 피드백",
+    description:
+      "수업 중 궁금한 점은 바로 질문하고 실시간으로 소통할 수 있어요.",
+  },
+  {
+    icon: <MessageCircleQuestion />,
+    title: "AI 기반 맞춤형 퀴즈",
+    description:
+      "강의자료와 녹음을 바탕으로 AI가 자동으로 퀴즈를 만들어요. 복습과 이해도 확인이 더 쉬워집니다.",
+  },
+  {
+    icon: <PencilLine />,
+    title: "강의자료 업로드 & 수업용 실시간 필기",
+    description:
+      "강의 중 자료에 바로 필기하며 핵심 내용을 학생들과 함께 나눌 수 있어요.",
+  },
+  {
+    icon: <Videotape />,
+    title: "언제든 다시 듣는 수업",
+    description:
+      "수업은 자동 녹음되며, 언제든 다시 듣거나 다운로드할 수 있어요.",
+  },
+];
+
+export default function IntroSection({
+  ref,
+}: {
+  ref: React.RefObject<HTMLElement | null>;
+}) {
+  return (
+    <section ref={ref} className={styles.introSection}>
+      <div className={styles.introHeader}>
+        <h2 className={styles.introTitle}>
+          What You Can Do
+          <br />
+          with ClassLog
+        </h2>
+        <div className={styles.introDescription}>
+          <p className={styles.introSubtitle}>
+            ClassLog의 핵심 기능 4가지를 소개합니다!
+          </p>
+          <p className={styles.introText}>
+            실시간 질문, AI 기반 퀴즈 생성, 강의자료 업로드 및 필기, 자동 수업
+            녹음 등 <br />
+            수업의 전 과정을 하나의 플랫폼에서 관리하고, 학습의 흐름을 놓치지
+            않도록 도와줍니다.
+          </p>
+        </div>
+      </div>
+      <div className={styles.featuresContainer}>
+        {FEATURES.map((feature) => (
+          <div key={feature.title} className={styles.featureCard}>
+            <div className={styles.featureIcon}>{feature.icon}</div>
+            <div className={styles.featureContent}>
+              <h3 className={styles.featureTitle}>{feature.title}</h3>
+              <p className={styles.featureDescription}>{feature.description}</p>
+            </div>
+          </div>
+        ))}
+      </div>
+    </section>
+  );
+}

frontend/app/(non-login)/(landing)/_components/Navbar.tsx

@@ -0,0 +1,42 @@
+"use client";
+
+import Link from "next/link";
+import Image from "next/image";
+import { useEffect, useState } from "react";
+import styles from "../page.module.scss";
+import { ROUTES } from "@/constants/routes";
+import { IMAGES } from "@/constants/images";
+
+export default function Navbar() {
+  const [isScrolled, setIsScrolled] = useState(false);
+
+  useEffect(() => {
+    const handleScroll = () => {
+      const scrollTop = window.scrollY;
+      setIsScrolled(scrollTop > 50);
+    };
+
+    handleScroll();
+
+    window.addEventListener("scroll", handleScroll, { passive: true });
+
+    return () => {
+      window.removeEventListener("scroll", handleScroll);
+    };
+  }, []);
+
+  return (
+    <nav className={`${styles.navbar} ${isScrolled ? styles.scrolled : ""}`}>
+      <Image
+        src={isScrolled ? IMAGES.logo3 : IMAGES.logo5}
+        alt="logo"
+        width={200}
+        height={100}
+        className={styles.logo}
+      />
+      <Link href={ROUTES.login} className={styles.login}>
+        Login
+      </Link>
+    </nav>
+  );
+}

frontend/app/(non-login)/(landing)/_components/RoadMapSection.tsx

@@ -0,0 +1,66 @@
+import styles from "../page.module.scss";
+
+const ROAD_MAP = [
+  {
+    title: "강사",
+    steps: [
+      "클래스 생성",
+      "클래스별 강의 생성",
+      "강의자료 업로드",
+      "강의 시작 (필기 + 질문 뷰어 + 자동 녹음)",
+      "강의 종료 후 AI 퀴즈 자동 생성 및 배포",
+      "퀴즈 결과 기반 대시보드 제공",
+    ],
+  },
+  {
+    title: "학생",
+    steps: [
+      "클래스 입장",
+      "강의자료 다운로드",
+      "실시간 질문 참여",
+      "녹음 파일 다운로드 및 다시 듣기",
+      "AI 퀴즈 풀기 + 결과 확인",
+    ],
+  },
+];
+
+export default function RoadMapSection() {
+  return (
+    <section className={styles.roadMapSection}>
+      <div className={styles.roadMapHeader}>
+        <h2 className={styles.roadMapTitle}>HOW IT WORKS?</h2>
+        <div className={styles.roadMapDescription}>
+          <div className={styles.roadMapText}>
+            ClassLog, 어떻게 활용할 수 있을까요?
+            <br />
+            강사와 학생 각각의 흐름에 맞춰 스마트한 학습 경험을 제공합니다.
+            <br />
+            수업 전부터 수업 중, 수업 후까지 — 모든 과정을 ClassLog 하나로
+            완성하세요.
+          </div>
+          <div className={styles.roadMapCta}>
+            <p>
+              Get to know More <br />
+              about ClassLog
+            </p>
+          </div>
+        </div>
+      </div>
+      <div className={styles.roadMapCards}>
+        {ROAD_MAP.map((item) => (
+          <div key={item.title} className={styles.roadMapCard}>
+            <h3 className={styles.cardTitle}>{item.title}</h3>
+            <ul className={styles.stepsList}>
+              {item.steps.map((step, index) => (
+                <li key={step} className={styles.stepItem}>
+                  <span className={styles.stepNumber}>{index + 1}</span>
+                  <span className={styles.stepText}>{step}</span>
+                </li>
+              ))}
+            </ul>
+          </div>
+        ))}
+      </div>
+    </section>
+  );
+}