diff --git a/frontend-monorepo/packages/hanglog-admin/src/hooks/adminMember/useAddAdminMemberForm.ts b/frontend-monorepo/packages/hanglog-admin/src/hooks/adminMember/useAddAdminMemberForm.ts index 165cf6dd..846cb4dd 100644 --- a/frontend-monorepo/packages/hanglog-admin/src/hooks/adminMember/useAddAdminMemberForm.ts +++ b/frontend-monorepo/packages/hanglog-admin/src/hooks/adminMember/useAddAdminMemberForm.ts @@ -72,9 +72,7 @@ export const useAddAdminMemberForm = ({ onSuccess, onError }: useAddAdminMemberF addAdminMemberMutaion.mutate( { - username: adminMemberInformation.username, - adminType: adminMemberInformation.adminType, - password: adminMemberInformation.password, + ...adminMemberInformation, }, { onSuccess, onError } ); diff --git a/frontend-monorepo/packages/hanglog-admin/src/hooks/adminMember/useUpdatePasswordForm.ts b/frontend-monorepo/packages/hanglog-admin/src/hooks/adminMember/useUpdatePasswordForm.ts index 5f438193..4d30db96 100644 --- a/frontend-monorepo/packages/hanglog-admin/src/hooks/adminMember/useUpdatePasswordForm.ts +++ b/frontend-monorepo/packages/hanglog-admin/src/hooks/adminMember/useUpdatePasswordForm.ts @@ -78,9 +78,8 @@ export const useUpdatePasswordForm = ( updatePasswordMutaion.mutate( { - adminMemberId: adminMemberId, - currentPassword: adminMemberInformation.currentPassword, - newPassword: adminMemberInformation.newPassword, + adminMemberId, + ...adminMemberInformation, }, { onSuccess, onError } ); diff --git a/frontend-monorepo/packages/hanglog-admin/src/pages/AdminMemberPage/AdminMemberPage.tsx b/frontend-monorepo/packages/hanglog-admin/src/pages/AdminMemberPage/AdminMemberPage.tsx index a64e9d49..725601e0 100644 --- a/frontend-monorepo/packages/hanglog-admin/src/pages/AdminMemberPage/AdminMemberPage.tsx +++ b/frontend-monorepo/packages/hanglog-admin/src/pages/AdminMemberPage/AdminMemberPage.tsx @@ -1,5 +1,7 @@ import { Button, Flex, Heading, useOverlay } from 'hang-log-design-system'; -import { useCallback, useEffect, useState } from 'react'; +import { Suspense, useCallback, useEffect, useState } from 'react'; + +import AdminMemberTableSkeleton from '@/components/adminMember/AdminMemberTable/AdminMemberTableSkeleton'; import AdminMemberAddModal from '@components/adminMember/AdminMemberAddModal/AdminMemberAddModal'; import AdminMemberTable from '@components/adminMember/AdminMemberTable/AdminMemberTable'; @@ -53,7 +55,9 @@ const AdminMemberPage = () => { 추가하기
- + }> + +
{ - return ( - <> - - - - - 관리자 멤버 관리 - - -
- -
-
- -
-
-
- - ); -}; - -export default AdminMemberPageSkeleton; diff --git a/frontend-monorepo/packages/hanglog-admin/src/pages/CategoryPage/CategoryPage.tsx b/frontend-monorepo/packages/hanglog-admin/src/pages/CategoryPage/CategoryPage.tsx index d34c6e3b..939c1ee0 100644 --- a/frontend-monorepo/packages/hanglog-admin/src/pages/CategoryPage/CategoryPage.tsx +++ b/frontend-monorepo/packages/hanglog-admin/src/pages/CategoryPage/CategoryPage.tsx @@ -1,5 +1,7 @@ import { Button, Flex, Heading, useOverlay } from 'hang-log-design-system'; -import { useCallback, useEffect, useState } from 'react'; +import { Suspense, useCallback, useEffect, useState } from 'react'; + +import CategoryTableSkeleton from '@/components/category/CategoryTable/CategoryTableSkeleton'; import CategoryAddModal from '@components/category/CategoryAddModal/CategoryAddModal'; import CategoryTable from '@components/category/CategoryTable/CategoryTable'; @@ -53,7 +55,9 @@ const CategoryPage = () => { 추가하기
- + }> + +
{ - return ( - <> - - - - - 카테고리 관리 - - -
- -
-
- -
-
-
- - ); -}; - -export default CategoryPageSkeleton; diff --git a/frontend-monorepo/packages/hanglog-admin/src/pages/CityPage/CityPage.tsx b/frontend-monorepo/packages/hanglog-admin/src/pages/CityPage/CityPage.tsx index c8658dc4..88b168df 100644 --- a/frontend-monorepo/packages/hanglog-admin/src/pages/CityPage/CityPage.tsx +++ b/frontend-monorepo/packages/hanglog-admin/src/pages/CityPage/CityPage.tsx @@ -1,5 +1,7 @@ import { Button, Flex, Heading, useOverlay } from 'hang-log-design-system'; -import { useCallback, useEffect, useState } from 'react'; +import { Suspense, useCallback, useEffect, useState } from 'react'; + +import CityTableSkeleton from '@/components/city/CityTable/CityTableSkeleton'; import CityAddModal from '@components/city/CityAddModal/CityAddModal'; import CityTable from '@components/city/CityTable/CityTable'; @@ -45,7 +47,9 @@ const CityPage = () => { 추가하기
- + }> + +
{ - return ( - <> - - - - - 도시 관리 - - -
- -
-
- -
-
-
- - ); -}; - -export default CityPageSkeleton; diff --git a/frontend-monorepo/packages/hanglog-admin/src/pages/CurrencyPage/CurrencyPage.tsx b/frontend-monorepo/packages/hanglog-admin/src/pages/CurrencyPage/CurrencyPage.tsx index d84351be..379c6be0 100644 --- a/frontend-monorepo/packages/hanglog-admin/src/pages/CurrencyPage/CurrencyPage.tsx +++ b/frontend-monorepo/packages/hanglog-admin/src/pages/CurrencyPage/CurrencyPage.tsx @@ -1,5 +1,7 @@ import { Button, Flex, Heading, useOverlay } from 'hang-log-design-system'; -import { useCallback, useEffect, useState } from 'react'; +import { Suspense, useCallback, useEffect, useState } from 'react'; + +import CurrencyTableSkeleton from '@/components/currency/CurrencyTable/CurrencyTableSkeleton'; import PageNavigation from '@components/common/PageNavigation/PageNavigation'; import SidebarNavigation from '@components/common/SidebarNavigation/SidebarNavigation'; @@ -50,7 +52,9 @@ const CurrencyPage = () => { 추가하기
- + }> + +
{ - return ( - <> - - - - - 환율 관리 - - - -
- -
-
- -
-
-
- - ); -}; - -export default CurrencyPageSkeleton; diff --git a/frontend-monorepo/packages/hanglog-admin/src/router/AppRouter.tsx b/frontend-monorepo/packages/hanglog-admin/src/router/AppRouter.tsx index 9204a0c0..c0de082b 100644 --- a/frontend-monorepo/packages/hanglog-admin/src/router/AppRouter.tsx +++ b/frontend-monorepo/packages/hanglog-admin/src/router/AppRouter.tsx @@ -5,13 +5,9 @@ import App from '@/App'; import AdminMainPage from '@pages/AdminMainPage/AdminMainPage'; import AdminMemberPage from '@pages/AdminMemberPage/AdminMemberPage'; -import AdminMemberPageSkeleton from '@pages/AdminMemberPage/AdminMemberPageSkeleton'; import CategoryPage from '@pages/CategoryPage/CategoryPage'; -import CategoryPageSkeleton from '@pages/CategoryPage/CategoryPageSkeleton'; import CityPage from '@pages/CityPage/CityPage'; -import CityPageSkeleton from '@pages/CityPage/CityPageSkeleton'; import CurrencyPage from '@pages/CurrencyPage/CurrencyPage'; -import CurrencyPageSkeleton from '@pages/CurrencyPage/CurrencyPageSkeleton'; import NotFoundPage from '@pages/NotFoundPage/NotFoundPage'; import { PATH } from '@constants/path'; @@ -37,7 +33,7 @@ const router = createBrowserRouter([ { path: PATH.ADMIN_MEMBER, element: ( - }> + ), @@ -45,7 +41,7 @@ const router = createBrowserRouter([ { path: PATH.CITY, element: ( - }> + ), @@ -53,7 +49,7 @@ const router = createBrowserRouter([ { path: PATH.CATEGORY, element: ( - }> + ), @@ -61,7 +57,7 @@ const router = createBrowserRouter([ { path: PATH.CURRENCY, element: ( - }> + ),