diff --git a/src/api/feedback/getKeywords.ts b/src/api/feedback/getKeywords.ts index f08c649..abe7ce9 100644 --- a/src/api/feedback/getKeywords.ts +++ b/src/api/feedback/getKeywords.ts @@ -1,7 +1,6 @@ -import {keyword} from '@/src/interfaces/feedback'; import req from '../apiUtils'; -const getKeywords = async (cId: number, mId: number): Promise => { +const getKeywords = async (cId: number, mId: number) => { const response = await req( `/class/${cId}/feedback/materials/${mId}/get-keyword`, 'get', diff --git a/src/app/classes/[cId]/[mId]/components/AttendanceCard.tsx b/src/app/classes/[cId]/[mId]/components/AttendanceCard.tsx index 6c292c3..d5f2762 100644 --- a/src/app/classes/[cId]/[mId]/components/AttendanceCard.tsx +++ b/src/app/classes/[cId]/[mId]/components/AttendanceCard.tsx @@ -18,7 +18,7 @@ const AttendanceCard = ({cid}: {cid: number; uid: number}) => { const uids = res.map((user: ClassUser) => ({ uid: user.uid, cid: cid, - csid: 10, + csid: 19, status: '', })); setSubmitUsers(uids); diff --git a/src/app/classes/[cId]/[mId]/components/FeedbackKeywordList.tsx b/src/app/classes/[cId]/[mId]/components/FeedbackKeywordList.tsx index 6630ec5..35dea95 100644 --- a/src/app/classes/[cId]/[mId]/components/FeedbackKeywordList.tsx +++ b/src/app/classes/[cId]/[mId]/components/FeedbackKeywordList.tsx @@ -4,12 +4,16 @@ import Image from 'next/image'; import getKeywords from '@/src/api/feedback/getKeywords'; import {keyword} from '@/src/interfaces/feedback'; import getCheckRefer from '@/src/api/feedback/getCheckRefer'; +import gifs from '@/public/gif'; const FeedbackKeywordList = ({cId, mId}: {cId: number; mId: number}) => { const [references, setReferences] = useState(false); const [keywords, setKeywords] = useState([]); + const [keyWord, setKeyWord] = useState(null); const [loading, setLoading] = useState(true); + console.log(keywords.length); + useEffect(() => { getCheckRefer(cId, mId).then(res => { setReferences(res); @@ -24,7 +28,13 @@ const FeedbackKeywordList = ({cId, mId}: {cId: number; mId: number}) => { setLoading(true); getKeywords(cId, mId).then(res => { console.log(res); - setKeywords(res); + if (Array.isArray(res)) { + setKeywords(res); + } else if (res.length === 1) { + setKeyWord(res[0]); + } else { + setKeyWord(res); + } setLoading(false); }); }, [references, cId, mId]); @@ -37,13 +47,28 @@ const FeedbackKeywordList = ({cId, mId}: {cId: number; mId: number}) => { loading ? (
gif
+ ) : keyWord ? ( +
+
+
+ P +
+
{keyWord.page}
+
KeyWord
+
    +
  • {keyWord.keywords[0]}
  • +
  • {keyWord.keywords[1]}
  • +
  • {keyWord.keywords[2]}
  • +
+
+
) : ( keywords.map((keyword, index) => (
diff --git a/src/app/classes/[cId]/[mId]/components/QuizList.tsx b/src/app/classes/[cId]/[mId]/components/QuizList.tsx index 612cb2d..13d2f88 100644 --- a/src/app/classes/[cId]/[mId]/components/QuizList.tsx +++ b/src/app/classes/[cId]/[mId]/components/QuizList.tsx @@ -213,7 +213,7 @@ const QuizList = (props: {cId: number; mId: number; mName: string}) => { className="py-2 px-4 bg-red-500 text-white rounded-3xl" onClick={handleDeleteSet} > - 퀴즈 마감 + 퀴즈 삭제 ) : (