diff --git a/service/app/src/app/admin/layout.tsx b/service/app/src/app/admin/layout.tsx index 31e4e62f..3fb76add 100644 --- a/service/app/src/app/admin/layout.tsx +++ b/service/app/src/app/admin/layout.tsx @@ -36,7 +36,7 @@ export default function AdminLayout({ return (
- {children} +
{children}
) } diff --git a/service/app/src/app/admin/reports/page.tsx b/service/app/src/app/admin/reports/page.tsx index 78799d36..939d171f 100644 --- a/service/app/src/app/admin/reports/page.tsx +++ b/service/app/src/app/admin/reports/page.tsx @@ -26,19 +26,22 @@ export default function AdminReportsPage() { } return ( -
-
-

신고접수

- +
+
+
+

신고접수

+ +
+
+ {totalPages > 0 && ( + + )} +
- - {totalPages > 0 && ( - - )}
) } diff --git a/service/app/src/entities/report/hooks/useAdminReports.ts b/service/app/src/entities/report/hooks/useAdminReports.ts index 3258a490..cd8c0229 100644 --- a/service/app/src/entities/report/hooks/useAdminReports.ts +++ b/service/app/src/entities/report/hooks/useAdminReports.ts @@ -34,7 +34,7 @@ export const useAdminReports = ({ }) const games: ReportedGame[] = - data?.report.map((report) => mapAdminReportToReportedGame(report)) ?? [] + data?.content.map((report) => mapAdminReportToReportedGame(report)) ?? [] return { games, diff --git a/service/app/src/entities/report/model/types.ts b/service/app/src/entities/report/model/types.ts index aa1095b1..21323aa0 100644 --- a/service/app/src/entities/report/model/types.ts +++ b/service/app/src/entities/report/model/types.ts @@ -12,7 +12,7 @@ export interface ReportedGame { } export interface AdminReportsResponse { - report: AdminReport[] + content: AdminReport[] page: number size: number totalElements: number diff --git a/service/app/src/mocks/handlers/admin.ts b/service/app/src/mocks/handlers/admin.ts index 232a7cf6..228d0f4a 100644 --- a/service/app/src/mocks/handlers/admin.ts +++ b/service/app/src/mocks/handlers/admin.ts @@ -50,7 +50,7 @@ export const createAdminHandlers = (initialReports: AdminReport[]) => { const hasNext = page < totalPages - 1 const response: AdminReportsResponse = { - report: paginatedReports, + content: paginatedReports, page, size: PAGE_SIZE, totalElements, diff --git a/service/app/src/widgets/admin/reported-games-table/ui/ReportedGamesTable.tsx b/service/app/src/widgets/admin/reported-games-table/ui/ReportedGamesTable.tsx index e96f09d4..5c6eee53 100644 --- a/service/app/src/widgets/admin/reported-games-table/ui/ReportedGamesTable.tsx +++ b/service/app/src/widgets/admin/reported-games-table/ui/ReportedGamesTable.tsx @@ -18,7 +18,7 @@ export const ReportedGamesTable = ({ onRowClick, }: ReportedGamesTableProps) => { return ( - +