diff --git a/frontend/public/index.html b/frontend/public/index.html index e7bb99d94..9abbb51a1 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -3,6 +3,7 @@ + @@ -85,4 +86,9 @@ gtag('config', 'G-Z5MN0ZWS8M'); + diff --git a/frontend/src/components/ui/StationDetailsWindow/reviews/previews/ReviewPreview.tsx b/frontend/src/components/ui/StationDetailsWindow/reviews/previews/ReviewPreview.tsx index 8603035a7..1ea85e26a 100644 --- a/frontend/src/components/ui/StationDetailsWindow/reviews/previews/ReviewPreview.tsx +++ b/frontend/src/components/ui/StationDetailsWindow/reviews/previews/ReviewPreview.tsx @@ -68,7 +68,7 @@ const ReviewPreview = ({ stationId }: ReviewPreviewProps) => { return ( { - {totalRatings.totalRatings} + {parseFloat(totalRatings.totalRatings.toFixed(1))} ({totalRatings.totalCount}명) diff --git a/frontend/src/components/ui/StationDetailsWindow/reviews/replies/ReplyList.tsx b/frontend/src/components/ui/StationDetailsWindow/reviews/replies/ReplyList.tsx index 5bc541781..d17efcf70 100644 --- a/frontend/src/components/ui/StationDetailsWindow/reviews/replies/ReplyList.tsx +++ b/frontend/src/components/ui/StationDetailsWindow/reviews/replies/ReplyList.tsx @@ -22,7 +22,7 @@ const ReplyList = ({ stationId, reviewId, previewMode }: ReplyListProps) => { return ( <> {status === 'loading' ? ( - + ) : status === 'error' ? ( Error: {JSON.stringify(error)} @@ -47,24 +47,22 @@ const ReplyList = ({ stationId, reviewId, previewMode }: ReplyListProps) => { ))} ))} - {isFetchingNextPage && } - - fetchNextPage()} - disabled={!hasNextPage || isFetchingNextPage} - fullWidth - > - {isFetchingNextPage - ? '로딩중...' - : hasNextPage - ? '답글 더 보기' - : '더 이상 답글이 없습니다.'} - - + {isFetchingNextPage && } + {hasNextPage && ( + + fetchNextPage()} + disabled={!hasNextPage || isFetchingNextPage} + fullWidth + > + {isFetchingNextPage ? '로딩중...' : '답글 더 보기'} + + + )} )} diff --git a/frontend/src/components/ui/StationDetailsWindow/reviews/reviews/ReviewCard.tsx b/frontend/src/components/ui/StationDetailsWindow/reviews/reviews/ReviewCard.tsx index 6e54d3d1c..b4ef51526 100644 --- a/frontend/src/components/ui/StationDetailsWindow/reviews/reviews/ReviewCard.tsx +++ b/frontend/src/components/ui/StationDetailsWindow/reviews/reviews/ReviewCard.tsx @@ -107,10 +107,13 @@ const ReviewCard = ({ stationId, review, previewMode }: ReviewCardProps) => { {review.isDeleted ? '(삭제된 리뷰입니다.)' : review.content} - - setIsRepliesOpen(!isRepliesOpen)}> - {isRepliesOpen ? `닫기` : `답글 ${review.replySize > 0 ? review.replySize : '달기'}`} - + {!previewMode && ( + setIsRepliesOpen(!isRepliesOpen)}> + {isRepliesOpen + ? `닫기` + : `답글 ${review.replySize > 0 ? review.replySize : '달기'}`} + + )} {isRepliesOpen && ( diff --git a/frontend/src/components/ui/StationDetailsWindow/reviews/reviews/ReviewList.tsx b/frontend/src/components/ui/StationDetailsWindow/reviews/reviews/ReviewList.tsx index 7f8b3eb20..2ad0ee2f3 100644 --- a/frontend/src/components/ui/StationDetailsWindow/reviews/reviews/ReviewList.tsx +++ b/frontend/src/components/ui/StationDetailsWindow/reviews/reviews/ReviewList.tsx @@ -48,7 +48,7 @@ export default function ReviewList({ stationId }: ReviewListProps) { 충전소 후기 보기 {status === 'loading' ? ( - + ) : status === 'error' ? ( Error: {JSON.stringify(error)} diff --git a/frontend/src/components/ui/compound/NavigationBar/Menu.tsx b/frontend/src/components/ui/compound/NavigationBar/Menu.tsx index 152fc1e07..1c6f263e2 100644 --- a/frontend/src/components/ui/compound/NavigationBar/Menu.tsx +++ b/frontend/src/components/ui/compound/NavigationBar/Menu.tsx @@ -1,4 +1,9 @@ -import { AdjustmentsHorizontalIcon, Bars3Icon, UserCircleIcon } from '@heroicons/react/24/outline'; +import { + AdjustmentsHorizontalIcon, + Bars3Icon, + MegaphoneIcon, + UserCircleIcon, +} from '@heroicons/react/24/outline'; import { ArrowRightOnRectangleIcon, PencilSquareIcon } from '@heroicons/react/24/solid'; import { css } from 'styled-components'; @@ -13,8 +18,8 @@ import { modalActions } from '@stores/layout/modalStore'; import { memberTokenStore } from '@stores/login/memberTokenStore'; import { selectedCapacitiesFilterStore, - selectedConnectorTypesFilterStore, selectedCompaniesFilterStore, + selectedConnectorTypesFilterStore, } from '@stores/station-filters/serverStationFiltersStore'; import Button from '@common/Button'; @@ -103,6 +108,12 @@ const Menu = () => { > + ); }; diff --git a/frontend/src/style/GlobalStyle.ts b/frontend/src/style/GlobalStyle.ts index cab7e214b..86b447158 100644 --- a/frontend/src/style/GlobalStyle.ts +++ b/frontend/src/style/GlobalStyle.ts @@ -27,10 +27,6 @@ export const GlobalStyle = createGlobalStyle` --gray-200-color: #ebebeb; } - #map { - overflow: hidden; - } - body:has(.modal-open) { overflow: hidden; } @@ -38,6 +34,7 @@ export const GlobalStyle = createGlobalStyle` button.gm-ui-hover-effect { visibility: hidden; } + div.gm-style .gm-style-iw-c { padding: 0; }