diff --git a/apps/admin/next.config.ts b/apps/admin/next.config.ts index b11c726..35c7d72 100644 --- a/apps/admin/next.config.ts +++ b/apps/admin/next.config.ts @@ -20,11 +20,26 @@ const nextConfig: NextConfig = { hostname: 't1.daumcdn.net', pathname: '/**', }, + { + protocol: 'https', + hostname: 't1.kakaocdn.net', + pathname: '/**', + }, + { + protocol: 'http', + hostname: 't1.kakaocdn.net', + pathname: '/**', + }, { protocol: 'https', hostname: 'blog.kakaocdn.net', pathname: '/**', }, + { + protocol: 'https', + hostname: process.env.NEXT_PUBLIC_API_URL_HOST || '', //테스트용 주소 + pathname: '/**', + }, ], }, } diff --git a/apps/admin/src/app/requests/[id]/RequestDetailPage.tsx b/apps/admin/src/app/requests/[id]/RequestDetailPage.tsx index 5ca8277..2a704e0 100644 --- a/apps/admin/src/app/requests/[id]/RequestDetailPage.tsx +++ b/apps/admin/src/app/requests/[id]/RequestDetailPage.tsx @@ -13,9 +13,11 @@ import { Banner } from '@repo/ui/components/Banner' import type { RequestDetail } from './_api/types' import { CLIENT_PATH } from '@/consts/path' import { requestReview } from './_api/services/request' -import { Location } from './_components/Location/Location' -import { Menus } from './_components/Menus/Menus' +import { Section } from './_components/Section' +import { Location } from './_components/Location' +import { Menus } from './_components/Menus' import { Description } from './_components/Description' +import { Tags } from './_components/Tags' import { ActionButtonGroup } from './_components/ActionButtonGroup' import { RejectModal } from './_components/RejectModal' @@ -70,9 +72,16 @@ export const RequestDetailPage = ({ data }: Props) => { /> )} - - - +
+ +
+
+ +
+
+ + +
diff --git a/apps/admin/src/app/requests/[id]/_components/Description/Description.tsx b/apps/admin/src/app/requests/[id]/_components/Description/Description.tsx index a5a910b..8668eb7 100644 --- a/apps/admin/src/app/requests/[id]/_components/Description/Description.tsx +++ b/apps/admin/src/app/requests/[id]/_components/Description/Description.tsx @@ -1,25 +1,14 @@ -import { Column, Flex } from '@repo/ui/components/Layout' -import { Chip } from '@repo/ui/components/Chip' import { Text } from '@repo/ui/components/Text' -import { RequestDetail } from '../../_api/types' +import type { RequestDetail } from '../../_api/types' type Props = { description: RequestDetail['description'] - tags: RequestDetail['tags'] } -export const Description = ({ description, tags }: Props) => { +export const Description = ({ description }: Props) => { return ( - - 소개 - - {description} - - - {tags.map((tag) => ( - - ))} - - + + {description} + ) } diff --git a/apps/admin/src/app/requests/[id]/_components/Location/Location.tsx b/apps/admin/src/app/requests/[id]/_components/Location/Location.tsx index b7d49c7..e53b4e7 100644 --- a/apps/admin/src/app/requests/[id]/_components/Location/Location.tsx +++ b/apps/admin/src/app/requests/[id]/_components/Location/Location.tsx @@ -1,7 +1,5 @@ import { useState } from 'react' -import { Column } from '@repo/ui/components/Layout' import { Container, Marker, NaverMap } from 'react-naver-maps' -import { Text } from '@repo/ui/components/Text' import { toLatLng } from '../../_utils/toLatLng' import type { RequestDetail } from '../../_api/types' @@ -14,18 +12,15 @@ export const Location = ({ location }: Props) => { const setLocation = toLatLng(location) return ( - - 위치 - - - - - - + + + + + ) } diff --git a/apps/admin/src/app/requests/[id]/_components/Menus/Menus.tsx b/apps/admin/src/app/requests/[id]/_components/Menus/Menus.tsx index bfa926a..368cbd5 100644 --- a/apps/admin/src/app/requests/[id]/_components/Menus/Menus.tsx +++ b/apps/admin/src/app/requests/[id]/_components/Menus/Menus.tsx @@ -1,5 +1,5 @@ import { Text } from '@repo/ui/components/Text' -import { Column, VerticalScrollArea } from '@repo/ui/components/Layout' +import { VerticalScrollArea } from '@repo/ui/components/Layout' import { cn } from '@repo/ui/utils/cn' import type { RequestDetail } from '@/app/requests/[id]/_api/types' import { Menu } from './Menu' @@ -22,44 +22,41 @@ export const Menus = ({ menus }: Props) => { ) return ( - - 메뉴 - - {/*메뉴 존재 유무*/} - {menus.length === 0 && ( - - 등록된 메뉴가 존재하지 않습니다 + + {/*메뉴 존재 유무*/} + {menus.length === 0 && ( + + 등록된 메뉴가 존재하지 않습니다 + + )} + {/*추천 메뉴 존재 유무*/} + {recommendedMenu.length > 0 && ( + <> + + 추천메뉴 - )} - {/*추천 메뉴 존재 유무*/} - {recommendedMenu.length > 0 && ( - <> - - 추천메뉴 - - {recommendedMenu.map((menu, index) => ( - - ))} -
- - )} - {unRecommendedMenu.map((menu, index) => ( - - ))} - - + {recommendedMenu.map((menu, index) => ( + + ))} +
+ + )} + {unRecommendedMenu.map((menu, index) => ( + + ))} + ) } diff --git a/apps/admin/src/app/requests/[id]/_components/Section/Section.tsx b/apps/admin/src/app/requests/[id]/_components/Section/Section.tsx new file mode 100644 index 0000000..99f738d --- /dev/null +++ b/apps/admin/src/app/requests/[id]/_components/Section/Section.tsx @@ -0,0 +1,21 @@ +import { Column, Flex } from '@repo/ui/components/Layout' +import { Icon, type IconType } from '@repo/ui/components/Icon' +import { Text } from '@repo/ui/components/Text' + +type Props = { + icon: IconType + title: string + children: React.ReactNode +} + +export const Section = ({ icon, title, children }: Props) => ( + + + + + {title} + + + {children} + +) diff --git a/apps/admin/src/app/requests/[id]/_components/Section/index.ts b/apps/admin/src/app/requests/[id]/_components/Section/index.ts new file mode 100644 index 0000000..9ddde66 --- /dev/null +++ b/apps/admin/src/app/requests/[id]/_components/Section/index.ts @@ -0,0 +1 @@ +export { Section } from './Section' diff --git a/apps/admin/src/app/requests/[id]/_components/Tags/Tags.tsx b/apps/admin/src/app/requests/[id]/_components/Tags/Tags.tsx new file mode 100644 index 0000000..db34215 --- /dev/null +++ b/apps/admin/src/app/requests/[id]/_components/Tags/Tags.tsx @@ -0,0 +1,15 @@ +import { Flex } from '@repo/ui/components/Layout' +import { Chip } from '@repo/ui/components/Chip' +import type { RequestDetail } from '../../_api/types' + +type Props = { + tags: RequestDetail['tags'] +} + +export const Tags = ({ tags }: Props) => ( + + {tags.map((tag) => ( + + ))} + +) diff --git a/apps/admin/src/app/requests/[id]/_components/Tags/index.ts b/apps/admin/src/app/requests/[id]/_components/Tags/index.ts new file mode 100644 index 0000000..88e7703 --- /dev/null +++ b/apps/admin/src/app/requests/[id]/_components/Tags/index.ts @@ -0,0 +1 @@ +export { Tags } from './Tags' diff --git a/apps/web/app/_components/PlaceListItem/PlaceListItem.tsx b/apps/web/app/_components/PlaceListItem/PlaceListItem.tsx index 129f5ee..ab97537 100644 --- a/apps/web/app/_components/PlaceListItem/PlaceListItem.tsx +++ b/apps/web/app/_components/PlaceListItem/PlaceListItem.tsx @@ -46,7 +46,7 @@ export const PlaceListItem = ({ {address} {tags.length > 0 && ( - + {tags.map((tag) => ( ))} diff --git a/apps/web/app/categories/[id]/_components/SwipeableArea/SwipeableArea.tsx b/apps/web/app/categories/[id]/_components/SwipeableArea/SwipeableArea.tsx index 72432b5..d26093d 100644 --- a/apps/web/app/categories/[id]/_components/SwipeableArea/SwipeableArea.tsx +++ b/apps/web/app/categories/[id]/_components/SwipeableArea/SwipeableArea.tsx @@ -33,7 +33,7 @@ export const SwipeableArea = ({ } return ( -
+
- + {placeName} - + 등록 신청 일자: {requestDate} diff --git a/packages/ui/src/components/Chip/Chip.tsx b/packages/ui/src/components/Chip/Chip.tsx index b1ba339..a0f710c 100644 --- a/packages/ui/src/components/Chip/Chip.tsx +++ b/packages/ui/src/components/Chip/Chip.tsx @@ -81,7 +81,11 @@ export const Chip: ChipType = ({ onClick={onClick} > - + {label}