{
initialSlide={repository === 'directory' ? activeDirectoryIndex : activeCategoryIndex}
onSlideChange={(data) => handleSlideChange(data.activeIndex)}
>
- {mockDirectories.map((item, index) => {
+ {slideItems.map((item, index) => {
const isActive =
repository === 'directory'
? index === activeDirectoryIndex
@@ -191,10 +234,15 @@ const RandomQuizView = ({ collections, directories }: Props) => {
return (
-
)
@@ -207,10 +255,10 @@ const RandomQuizView = ({ collections, directories }: Props) => {
@@ -219,17 +267,18 @@ const RandomQuizView = ({ collections, directories }: Props) => {
export default RandomQuizView
-interface CategoryItemProps {
+interface SlideItemProps {
isActive: boolean
data: {
- id: number
+ id: number | string
name: string
emoji: string
}
variant: 'directory' | 'collection'
+ quizCount: number
}
-const CategoryItem = ({ isActive, data, variant }: CategoryItemProps) => {
+const SlideItem = ({ isActive, data, variant, quizCount }: SlideItemProps) => {
const styles = {
directory: {
background: {
@@ -255,9 +304,13 @@ const CategoryItem = ({ isActive, data, variant }: CategoryItemProps) => {
@@ -267,9 +320,9 @@ const CategoryItem = ({ isActive, data, variant }: CategoryItemProps) => {
>
{data.name}
- {isActive && (
+ {isActive && quizCount > 0 && (
- 232문제
+ {quizCount}문제
)}
@@ -277,41 +330,3 @@ const CategoryItem = ({ isActive, data, variant }: CategoryItemProps) => {
)
}
-
-const mockDirectories = [
- {
- id: 1,
- name: '파이썬기본문법과응용',
- emoji: '❄️',
- },
- {
- id: 2,
- name: '통계학이론',
- emoji: '🌱',
- },
- {
- id: 3,
- name: '제테크상식',
- emoji: '💵',
- },
- {
- id: 4,
- name: '전공 공부',
- emoji: '🔥',
- },
- {
- id: 5,
- name: '세계사 1급',
- emoji: '🌍',
- },
- {
- id: 6,
- name: '강의 복기',
- emoji: '✏️',
- },
- {
- id: 7,
- name: '통계학이론',
- emoji: '🌂',
- },
-]
diff --git a/src/features/quiz/utils/index.ts b/src/features/quiz/utils/index.ts
index 823f07b2..e0846ea8 100644
--- a/src/features/quiz/utils/index.ts
+++ b/src/features/quiz/utils/index.ts
@@ -4,16 +4,16 @@ export const getOptionCondition = (
rightAnswer: string
) => {
if (!isQuizSolved(result)) return 'IDLE'
- if (result.answer === true && result.choseAnswer === option) return 'RIGHT'
- if (result.answer === false && result.choseAnswer === option) return 'WRONG'
+ if (result?.answer === true && result?.choseAnswer === option) return 'RIGHT'
+ if (result?.answer === false && result?.choseAnswer === option) return 'WRONG'
if (option === rightAnswer) return 'RIGHT'
return 'DISABLED'
}
export const getOXCondition = (result: Quiz.Result | null) => {
if (!isQuizSolved(result)) return 'IDLE'
- if (result.answer === true && result.choseAnswer === 'correct') return 'RIGHT'
- if (result.answer === false && result.choseAnswer === 'correct') return 'WRONG'
+ if (result?.answer === true && result?.choseAnswer === 'correct') return 'RIGHT'
+ if (result?.answer === false && result?.choseAnswer === 'correct') return 'WRONG'
return 'WRONG'
}
diff --git a/src/requests/collection/client.ts b/src/requests/collection/client.ts
index cde8c45e..640dae4b 100644
--- a/src/requests/collection/client.ts
+++ b/src/requests/collection/client.ts
@@ -75,3 +75,14 @@ export const getCollectionInfo = async ({ collectionId }: { collectionId: number
throw error
}
}
+
+export const getRandomCollectionQuizzes = async ({ categoryId }: { categoryId: string }) => {
+ try {
+ const { data } = await http.get
(
+ API_ENDPOINTS.COLLECTION.GET.RANDOM_QUIZZES(categoryId)
+ )
+ return data
+ } catch (error) {
+ throw error
+ }
+}
diff --git a/src/requests/collection/hooks.ts b/src/requests/collection/hooks.ts
index 77f22e47..efb6c994 100644
--- a/src/requests/collection/hooks.ts
+++ b/src/requests/collection/hooks.ts
@@ -8,6 +8,7 @@ import {
createBookmark,
getMyCollections,
getCollectionInfo,
+ getRandomCollectionQuizzes,
} from './client'
export const useCollections = () => {
@@ -38,6 +39,14 @@ export const useBookmarkedCollections = () => {
})
}
+export const useRandomCollectionQuizzes = (categoryId?: string) => {
+ return useQuery({
+ queryKey: ['randomCollectionQuizzes', categoryId],
+ queryFn: async () => getRandomCollectionQuizzes({ categoryId: categoryId! }),
+ enabled: categoryId != null,
+ })
+}
+
export const useCreateCollection = () => {
const queryClient = getQueryClient()
diff --git a/src/requests/collection/server.ts b/src/requests/collection/server.ts
index 951a8c2c..094fc8ce 100644
--- a/src/requests/collection/server.ts
+++ b/src/requests/collection/server.ts
@@ -25,3 +25,14 @@ export const getBookmarkedCollections = async () => {
throw error
}
}
+
+export const getMyCollections = async () => {
+ try {
+ const { data } = await httpServer.get(
+ API_ENDPOINTS.COLLECTION.GET.MY_COLLECTIONS
+ )
+ return data
+ } catch (error) {
+ throw error
+ }
+}
diff --git a/src/requests/directory/client.tsx b/src/requests/directory/client.tsx
index 9034393e..62604f9f 100644
--- a/src/requests/directory/client.tsx
+++ b/src/requests/directory/client.tsx
@@ -6,7 +6,7 @@ import { http } from '@/shared/lib/axios/http'
/**
* 모든 디렉토리 가져오기
*/
-export const fetchDirectories = async () => {
+export const getDirectories = async () => {
try {
const { data } = await http.get(
API_ENDPOINTS.DIRECTORY.GET.ALL
diff --git a/src/requests/directory/hooks.ts b/src/requests/directory/hooks.ts
index 6218ec47..91ae15ba 100644
--- a/src/requests/directory/hooks.ts
+++ b/src/requests/directory/hooks.ts
@@ -4,7 +4,7 @@ import { useMutation, useQuery } from '@tanstack/react-query'
import {
createDirectory,
deleteDirectory,
- fetchDirectories,
+ getDirectories,
fetchDirectory,
updateDirectoryInfo,
} from './client'
@@ -17,7 +17,7 @@ import { queries } from '@/shared/lib/tanstack-query/query-keys'
export const useDirectories = () => {
return useQuery({
queryKey: ['directories'],
- queryFn: async () => fetchDirectories(),
+ queryFn: async () => getDirectories(),
})
}
diff --git a/src/requests/directory/server.ts b/src/requests/directory/server.ts
new file mode 100644
index 00000000..aaf3f854
--- /dev/null
+++ b/src/requests/directory/server.ts
@@ -0,0 +1,19 @@
+'use server'
+
+import { API_ENDPOINTS } from '@/shared/configs/endpoint'
+import { httpServer } from '@/shared/lib/axios/http-server'
+
+/**
+ * 모든 디렉토리 가져오기
+ */
+export const getDirectories = async () => {
+ try {
+ const { data } = await httpServer.get(
+ API_ENDPOINTS.DIRECTORY.GET.ALL
+ )
+ return data
+ } catch (error: unknown) {
+ console.error(error)
+ throw error
+ }
+}
diff --git a/src/requests/quiz/hooks.ts b/src/requests/quiz/hooks.ts
index 948870c9..27978db2 100644
--- a/src/requests/quiz/hooks.ts
+++ b/src/requests/quiz/hooks.ts
@@ -18,7 +18,7 @@ import {
// })
// }
-export const useDirectoryQuizzes = (directoryId: number | null) => {
+export const useDirectoryQuizzes = (directoryId?: number) => {
return useQuery({
queryKey: ['directoryQuizzes', directoryId],
queryFn: async () => getDirectoryQuizzes({ directoryId: directoryId! }),
diff --git a/src/shared/configs/endpoint.ts b/src/shared/configs/endpoint.ts
index 184f5473..8d558f19 100644
--- a/src/shared/configs/endpoint.ts
+++ b/src/shared/configs/endpoint.ts
@@ -34,6 +34,8 @@ export const API_ENDPOINTS = {
BOOKMARKED: '/collections/bookmarked-collections',
/** GET /collections-analysis - 컬렉션 분석 */
ANALYSIS: '/collections-analysis',
+ /** GET /collections/{collection_category}/quizzes - 북마크하거나 소유한 컬렉션 분야별로 모든 퀴즈 랜덤하게 가져오기 */
+ RANDOM_QUIZZES: (categoryId: string) => `/collections/${categoryId}/quizzes`,
},
POST: {
/** POST /collections - 컬렉션 생성 */
diff --git a/src/types/collection.d.ts b/src/types/collection.d.ts
index b109a1ff..ce0c8934 100644
--- a/src/types/collection.d.ts
+++ b/src/types/collection.d.ts
@@ -102,6 +102,13 @@ declare global {
paths['/api/v2/collections-analysis']['get']['responses']['200']['content']['application/json;charset=UTF-8']
>
+ /** GET /api/v2/collections/{collection_category}/quizzes
+ * 북마크하거나 소유한 컬렉션 분야별로 모든 퀴즈 랜덤하게 가져오기
+ */
+ type GetRandomCollectionQuizzes = DeepRequired<
+ paths['/api/v2/collections/{collection_category}/quizzes']['get']['responses']['200']['content']['application/json;charset=UTF-8']
+ >
+
/** POST /api/v2/collections
* 컬렉션 생성
*/
diff --git a/src/types/quiz.d.ts b/src/types/quiz.d.ts
index 36afec0f..80fb6f12 100644
--- a/src/types/quiz.d.ts
+++ b/src/types/quiz.d.ts
@@ -17,6 +17,23 @@ type Metadata = {
directory: DeepRequired
}
+type RandomQuiz = {
+ id: number
+ question: string
+ answer: string
+ explanation: string
+ options: string[]
+ quizType: 'MIX_UP' | 'MULTIPLE_CHOICE'
+ document?: {
+ id: number
+ name: string
+ }
+ collection?: {
+ id: number
+ name: string
+ }
+}
+
declare global {
/** <참고>
* OX : correct/incorrect
@@ -25,6 +42,7 @@ declare global {
declare namespace Quiz {
type Item = QuizItem
type ReplayType = ReplayQuizType
+ type RandomItem = RandomQuiz
type Type = QuizType
type ReplayType = QuizType | 'RANDOM'