Merge branch 'develop' of https://github.com/team-nabi/nabi-market-cl…

…ient into develop

src/app/(root)/(routes)/cards/[cardId]/modify/hooks/useCardModifyForm.ts

@@ -49,7 +49,7 @@ export const useCardModifyForm = ({
         cardId: cardId,
         cardReq: data,
       })
-      router.push(AppPath.cardDetail(cardId))
+      router.push(AppPath.card(cardId))
       toast({
         title: 'Success',
         description: '게시글을 성공적으로 수정했습니다.',

src/app/(root)/(routes)/chatrooms/components/chat-room-card/ChatRoomCard.tsx

@@ -15,12 +15,12 @@ const ChatRoomCard = ({
   chatRoom: { chatRoomId, createdAt, fromCardInfo, toCardInfo },
 }: ChatRoomCardProps) => {
   return (
-    <Link href={AppPath.chatRooms(String(chatRoomId))}>
+    <Link href={AppPath.chatRoom(String(chatRoomId))}>
       <Card type={'line'} size={'xs'} className="p-2">
         <CardFlex justify={'between'} gap={'space'} className="h-full">
           <CardFlex align={'center'} gap={'space'} className="w-full">
             <CardFlex>
-              <div className="h-11 w-11 relative flex-shrink-0">
+              <div className="relative flex-shrink-0 h-11 w-11">
                 <CardImage
                   alt={'내 물건 이미지'}
                   src={fromCardInfo.cardInfo.thumbnail}
@@ -29,10 +29,7 @@ const ChatRoomCard = ({
                   className="rounded-full"
                 />
               </div>
-              <div
-                className="h-11 w-11 relative flex-shrink-0 right-4
-              "
-              >
+              <div className="relative flex-shrink-0 h-11 w-11 right-4 ">
                 <CardImage
                   alt={'상대 물건 아이디'}
                   src={toCardInfo.cardInfo.thumbnail}
@@ -58,7 +55,7 @@ const ChatRoomCard = ({
                   )}
                 </CardText>
               </CardFlex>
-              <div className="h-5 w-5 relative flex-shrink-0">
+              <div className="relative flex-shrink-0 w-5 h-5">
                 <CardImage
                   alt={'교환 아이콘'}
                   src={Assets.switchHorizontal}

src/app/(root)/(routes)/mypage/components/Links.tsx

@@ -15,19 +15,19 @@ const pages = [
   {
     id: 3,
     text: '거래 내역',
-    path: AppPath.histories(),
+    path: AppPath.myHistory(),
     icon: Assets.refreshIcon,
   },
   {
     id: 4,
     text: '채팅방 목록',
-    path: AppPath.chatRoomList(),
+    path: AppPath.chatRooms(),
     icon: Assets.chatIcon,
   },
   {
     id: 5,
     text: '알림',
-    path: AppPath.notifications(),
+    path: AppPath.myNotifications(),
     icon: Assets.alarmIcon,
   },
 ]

src/app/(root)/(routes)/mypage/suggestions/[myCardId]/components/my-card-description-section/MyCardDescriptionSection.tsx → src/app/(root)/(routes)/suggestions/[myCardId]/components/my-card-description-section/MyCardDescriptionSection.tsx

@@ -26,7 +26,7 @@ const MyCardDescriptionSection = ({
     tradeArea,
   },
 }: MyCardDescriptionSection) => (
-  <Link href={`${AppPath.cardDetail(String(cardId))}`} className="w-full">
+  <Link href={`${AppPath.card(String(cardId))}`} className="w-full">
     <div className="flex h-card-lg p-1.5 justify-center w-full">
       <CardFlex
         direction={'row'}

src/app/(root)/(routes)/mypage/suggestions/[myCardId]/components/my-suggestion-card/MySuggestionCard.tsx → src/app/(root)/(routes)/suggestions/[myCardId]/components/my-suggestion-card/MySuggestionCard.tsx

@@ -43,7 +43,7 @@ const SuggestionButtons = ({
 // TODO : 채팅 페이지 라우팅 및 설정이 나오면 라우팅 기능 만들기
 const AcceptedButton = () => {
   return (
-    <Link href={`${AppPath.chatRooms('')}`}>
+    <Link href={`${AppPath.chatRooms()}`}>
       <Button variant={'gradation'}>채팅</Button>
     </Link>
   )
@@ -95,7 +95,7 @@ const MySuggestionCard = ({
   }
 
   return (
-    <Link href={AppPath.cardDetail(String(cardId))}>
+    <Link href={AppPath.card(String(cardId))}>
       <div className="mb-6">
         <Card size={'lg'}>
           <CardFlex

src/components/domain/card/trade-status-card/TradeStatusCard.tsx

@@ -26,7 +26,7 @@ const TradeStatusCard = ({
   },
 }: TradeStatusCardProps) => {
   return (
-    <Link href={`${AppPath.cardDetail(String(cardId))}`}>
+    <Link href={`${AppPath.card(String(cardId))}`}>
       <Card size={'sm'}>
         <CardFlex
           direction={'row'}

src/components/domain/header/components/MenuButton.tsx

@@ -40,7 +40,7 @@ const MenuButton = () => {
           </DropdownMenuItem>
           <DropdownMenuItem
             onClick={() => {
-              router.push(AppPath.chatRoomList())
+              router.push(AppPath.chatRooms())
             }}
           >
             채팅방 조회

src/components/domain/header/components/NotificationButton.tsx

@@ -18,7 +18,7 @@ const NotificationButton = ({
   const router = useRouter()
 
   const onClickButton = () => {
-    router.push(AppPath.notifications())
+    router.push(AppPath.myNotifications())
   }
 
   return (

src/config/appPath.ts

@@ -4,23 +4,22 @@ const AppPath = {
   home: () => '/' as const,
   login: () => '/login' as const,
   logout: () => '/logout' as const,
-  cards: () => `/cards/` as const,
+  cards: () => `/cards` as const,
+  card: (cardId: string) => `/cards/${cardId}` as const,
   newCard: () => '/cards/new' as const,
-  cardDetail: (cardId: string) => `/cards/${cardId}` as const,
+  modifyCard: (cardId: string) => `/cards/${cardId}/modify` as const,
+  myCards: () => '/cards/my' as const,
   mypage: () => '/mypage' as const,
-  myDibs: () => '/mypage/mydibs',
-  myCards: () => '/mypage/mycards' as const,
-  notifications: () => '/mypage/notifications' as const,
-  mySuggestions: (cardId: number) => `/mypage/suggestions/${cardId}` as const,
-  histories: () => '/mypage/histories' as const,
+  myDibs: () => '/dibs' as const,
+  myNotifications: () => '/notifications' as const,
+  mySuggestions: (cardId: number) => `/suggestions/${cardId}` as const,
+  myHistory: () => '/history' as const,
   kakaoLogin: () =>
     `${Environment.apiAddress()}/users/oauth2/authorize/kakao/login` as const,
   googleLogin: () =>
     `${Environment.apiAddress()}/users/oauth2/authorize/google/login` as const,
-  modifyCard: (cardId: string) => `/cards/${cardId}/modify` as const,
+  chatRooms: () => '/chatrooms' as const,
   chatRoom: (chatRoomId: string) => `/chatrooms/${chatRoomId}` as const,
-  chatRoomList: () => '/chatrooms' as const,
-  chatRooms: (chatRoomId?: string) => `/chatrooms/${chatRoomId}`,
 } as const
 
 type AppPathReturnType = {