From b60d2b62c7321e88f2514cacbfeeaf8f0b9dc98a Mon Sep 17 00:00:00 2001 From: Ginieee Date: Sun, 18 Aug 2024 16:14:13 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?= =?UTF-8?q?=EC=A0=95=EC=B1=85=20=EC=B6=94=EA=B0=80/=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=8B=9C=20=EC=9C=A0=EC=9D=98=EB=AC=B8=EA=B5=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(=EB=A9=94=EC=9D=BC=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/points/modules/PointPolicyInfoModule.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app/_components/admin/points/modules/PointPolicyInfoModule.tsx b/src/app/_components/admin/points/modules/PointPolicyInfoModule.tsx index be91a0b8..d727dff7 100644 --- a/src/app/_components/admin/points/modules/PointPolicyInfoModule.tsx +++ b/src/app/_components/admin/points/modules/PointPolicyInfoModule.tsx @@ -15,12 +15,8 @@ const PointPolicyInfoModule = () => { 적용됩니다.
  • - 새로운 정책에 대해 모든 회원에게 메일을 통해 안내 되며, 회원은 이러한 - 정책에 알맞은 포인트 신청을 진행할 수 있습니다. -
    • -
  • - 기존 정책 수정 시에도 회원들에게 메일을 통해 안내됩니다. 잦은 수정은 - 지양해주시길 바랍니다. + 회원은 이러한 정책에 알맞은 포인트 신청을 진행할 수 있습니다. 잦은 + 수정은 지양해주시길 바랍니다.
  • {`단발성 이벤트로 인한 포인트 지급은 정책 등록이 아닌 공지 > 이벤트 등록과 단체 포인트 지급하기 기능을 이용해주세요.`}
    • From 2fcefc4dd23a1aafe05b1a76a45b29a12ede112e Mon Sep 17 00:00:00 2001 From: Ginieee Date: Sun, 18 Aug 2024 16:17:19 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=EC=96=B4=EB=93=9C=EB=AF=BC=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=ED=96=89=20=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(route)/admin/(with-layout)/members/page.tsx | 4 +++- src/app/(route)/admin/(with-layout)/notices/page.tsx | 4 +++- src/app/(route)/admin/(with-layout)/points/policy/page.tsx | 4 +++- src/app/(route)/admin/(with-layout)/points/reward/page.tsx | 4 +++- src/app/(route)/admin/(with-layout)/workation/page.tsx | 4 +++- .../(route)/admin/(with-layout)/workation/reviews/page.tsx | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/app/(route)/admin/(with-layout)/members/page.tsx b/src/app/(route)/admin/(with-layout)/members/page.tsx index 7a4c8c22..63c41be9 100644 --- a/src/app/(route)/admin/(with-layout)/members/page.tsx +++ b/src/app/(route)/admin/(with-layout)/members/page.tsx @@ -131,7 +131,9 @@ const AdminMembersListPage = () => { ) : ( data.memberInfos.map((item, index) => ( - {index + 1} + + {(currentPage - 1) * 10 + index + 1} + {item.name} {item.accountId} {item.department} diff --git a/src/app/(route)/admin/(with-layout)/notices/page.tsx b/src/app/(route)/admin/(with-layout)/notices/page.tsx index 3b460dcf..42ac5808 100644 --- a/src/app/(route)/admin/(with-layout)/notices/page.tsx +++ b/src/app/(route)/admin/(with-layout)/notices/page.tsx @@ -142,7 +142,9 @@ const NoticesListPage = () => { ) : ( data.announcementInfos.map((item, index) => ( - {index + 1} + + {(currentPage - 1) * 10 + index + 1} + {noticeTypeConverter[item.announcementType]} diff --git a/src/app/(route)/admin/(with-layout)/points/policy/page.tsx b/src/app/(route)/admin/(with-layout)/points/policy/page.tsx index 4fd54dcb..5554e926 100644 --- a/src/app/(route)/admin/(with-layout)/points/policy/page.tsx +++ b/src/app/(route)/admin/(with-layout)/points/policy/page.tsx @@ -94,7 +94,9 @@ const AdminPointsPolicyPage = () => { ) : ( data.pointPolicyList.map((item, idx) => ( - {idx + 1} + + {(page - 1) * 10 + idx + 1} +
    {item.policyTitle} diff --git a/src/app/(route)/admin/(with-layout)/points/reward/page.tsx b/src/app/(route)/admin/(with-layout)/points/reward/page.tsx index f768adba..8406397f 100644 --- a/src/app/(route)/admin/(with-layout)/points/reward/page.tsx +++ b/src/app/(route)/admin/(with-layout)/points/reward/page.tsx @@ -135,7 +135,9 @@ const AdminPointsRewardPage = () => { ) : ( data.pointSupplyList.map((item, index) => ( - {index + 1} + + {(currentPage - 1) * 10 + index + 1} + { ) : ( data.wktInfos.map((item, index) => ( - {index + 1} + + {(currentPage - 1) * 10 + index + 1} + {item.title} {dayjs(item.createdAt).format('YYYY.MM.DD')} diff --git a/src/app/(route)/admin/(with-layout)/workation/reviews/page.tsx b/src/app/(route)/admin/(with-layout)/workation/reviews/page.tsx index 35f36fc1..f417362c 100644 --- a/src/app/(route)/admin/(with-layout)/workation/reviews/page.tsx +++ b/src/app/(route)/admin/(with-layout)/workation/reviews/page.tsx @@ -130,7 +130,9 @@ const AdminWorkationReviewsPage = () => { ) : ( data.reviewList.map((item, order) => ( - {order + 1} + + {(currentPage - 1) * 10 + order + 1} +
    {[...Array(item.rating)].map((_, index) => ( From 8d246a4e0d11a991c0f12af36b07b8295455d372 Mon Sep 17 00:00:00 2001 From: Ginieee Date: Sun, 18 Aug 2024 16:34:52 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=EB=8B=A8=EC=B2=B4=20=ED=8F=AC?= =?UTF-8?q?=EC=9D=B8=ED=8A=B8=20=EB=93=B1=EB=A1=9D=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=EC=B2=B4=ED=81=AC=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/(with-layout)/points/reward/new/page.tsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx b/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx index 4168128c..ed15755d 100644 --- a/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx +++ b/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx @@ -20,7 +20,7 @@ import { usePostPointSupplyMutation } from '@/_hooks/admin/usePostPointSupplyMut import { MemberType } from '@/_types/adminType'; import Image from 'next/image'; import { useRouter } from 'next/navigation'; -import { useRef, useState } from 'react'; +import { useEffect, useRef, useState } from 'react'; import AdminLoading from '@/_components/admin/adminLoading'; import { departmentList } from '@/_types/commonType'; @@ -46,6 +46,11 @@ const AdminPointsRewardNewPage = () => { pageable: { page: 1, size: 100, sort: 'name,ASC' }, }); + useEffect(() => { + console.log('selectedRequest', selectedRequest); + console.log('MemberList', memberList); + }, [selectedRequest]); + const { data: policyList, isLoading: policyListIsLoading, @@ -191,7 +196,12 @@ const AdminPointsRewardNewPage = () => { + request.accountId === member.accountId, + ) + } onClickBoolean={() => [ setSelectedRequest((prev) => prev.includes(member) From d0232e0c889336fbc84264a368514d686d778dbf Mon Sep 17 00:00:00 2001 From: Ginieee Date: Sun, 18 Aug 2024 16:35:15 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20console=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../(route)/admin/(with-layout)/points/reward/new/page.tsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx b/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx index ed15755d..a5c41f6f 100644 --- a/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx +++ b/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx @@ -20,7 +20,7 @@ import { usePostPointSupplyMutation } from '@/_hooks/admin/usePostPointSupplyMut import { MemberType } from '@/_types/adminType'; import Image from 'next/image'; import { useRouter } from 'next/navigation'; -import { useEffect, useRef, useState } from 'react'; +import { useState } from 'react'; import AdminLoading from '@/_components/admin/adminLoading'; import { departmentList } from '@/_types/commonType'; @@ -46,11 +46,6 @@ const AdminPointsRewardNewPage = () => { pageable: { page: 1, size: 100, sort: 'name,ASC' }, }); - useEffect(() => { - console.log('selectedRequest', selectedRequest); - console.log('MemberList', memberList); - }, [selectedRequest]); - const { data: policyList, isLoading: policyListIsLoading, From c7491e76a7598706e4a396fe8e88b6ee5d8113d2 Mon Sep 17 00:00:00 2001 From: Ginieee Date: Mon, 19 Aug 2024 09:45:14 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=EB=8B=A8=EC=B2=B4=20=ED=8F=AC?= =?UTF-8?q?=EC=9D=B8=ED=8A=B8=20=EB=93=B1=EB=A1=9D=20=EB=A9=A4=EB=B2=84=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20isPenalty=3Dtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/_hooks/admin/useGetMemberListInfiniteQuery.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/_hooks/admin/useGetMemberListInfiniteQuery.ts b/src/app/_hooks/admin/useGetMemberListInfiniteQuery.ts index bfc66e47..82a2903f 100644 --- a/src/app/_hooks/admin/useGetMemberListInfiniteQuery.ts +++ b/src/app/_hooks/admin/useGetMemberListInfiniteQuery.ts @@ -23,7 +23,14 @@ export const useGetMemberListInifiniteQuery = ({ queryFn: async ({ pageParam = pageable }) => { const { page, size, sort } = pageParam; // Destructure page, size, and sort from pageParam const res = await api.get('/api/member', { - params: { name: searchText, department, page, size, sort }, // Ensure the sort parameter is passed here + params: { + name: searchText, + department, + isPenalty: true, + page, + size, + sort, + }, // Ensure the sort parameter is passed here }); return memberListSchema.parse(res.data.data); },