From 706dfe1959b37aafb5d45a0b33d01263d5351ce8 Mon Sep 17 00:00:00 2001 From: Dain Lee <108778921+feb-dain@users.noreply.github.com> Date: Thu, 17 Aug 2023 23:04:16 +0900 Subject: [PATCH] =?UTF-8?q?design:=20=EC=9E=90=EC=9E=98=ED=95=9C=20?= =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EA=B0=9C=EC=84=A0=20=EB=B0=8F=20?= =?UTF-8?q?=EC=84=A4=EB=AA=85=20=EC=B6=94=EA=B0=80=ED=95=9C=EB=8B=A4=20(#5?= =?UTF-8?q?84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [#583] --- .../ui/ServerStationFilters/FilterOption.tsx | 3 +-- .../ServerStationFilters.tsx | 26 +++++++++---------- .../charger/ChargerReportConfirmation.tsx | 3 ++- .../station/StationInformation.tsx | 6 +++-- .../ui/StationList/EmptyStationsNotice.tsx | 4 ++- frontend/src/style/index.ts | 4 +-- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/frontend/src/components/ui/ServerStationFilters/FilterOption.tsx b/frontend/src/components/ui/ServerStationFilters/FilterOption.tsx index 396c82d09..60c6d7aeb 100644 --- a/frontend/src/components/ui/ServerStationFilters/FilterOption.tsx +++ b/frontend/src/components/ui/ServerStationFilters/FilterOption.tsx @@ -34,7 +34,7 @@ const FilterSection = ({ `} > - + {title} 중복선택 가능 @@ -55,5 +55,4 @@ const FilterSection = ({ ); }; - export default FilterSection; diff --git a/frontend/src/components/ui/ServerStationFilters/ServerStationFilters.tsx b/frontend/src/components/ui/ServerStationFilters/ServerStationFilters.tsx index 0bb84b6d2..457ed9286 100644 --- a/frontend/src/components/ui/ServerStationFilters/ServerStationFilters.tsx +++ b/frontend/src/components/ui/ServerStationFilters/ServerStationFilters.tsx @@ -56,13 +56,13 @@ const ServerStationFilters = () => { return ( { CONNECTOR_TYPES[connectorType])} filterOptionValues={connectorTypes} toggleSelectFilter={toggleConnectorTypeFilter} getIsFilterSelected={getIsConnectorTypeSelected} /> Number(capacity))] as Capacity[]} filterOptionValues={[...capacities]} - filterButtonVariant={'sm'} + filterButtonVariant="sm" toggleSelectFilter={toggleCapacityFilter} getIsFilterSelected={getIsCapacitySelected} /> COMPANIES[companyKey])} filterOptionValues={[...companies]} toggleSelectFilter={toggleCompanyFilter} getIsFilterSelected={getIsCompanySelected} /> ); diff --git a/frontend/src/components/ui/StationDetailsWindow/reports/charger/ChargerReportConfirmation.tsx b/frontend/src/components/ui/StationDetailsWindow/reports/charger/ChargerReportConfirmation.tsx index 506fefa57..57fa6f0a7 100644 --- a/frontend/src/components/ui/StationDetailsWindow/reports/charger/ChargerReportConfirmation.tsx +++ b/frontend/src/components/ui/StationDetailsWindow/reports/charger/ChargerReportConfirmation.tsx @@ -24,7 +24,8 @@ const ChargerReportConfirmation = ({ stationId }: ChargerReportConfirmationProps 충전기가 고장나있다면 신고해주세요. - 표시된 정보가 실제 충전기 상태와 다를 수 있습니다. + 표시된 정보가 실제 충전기 상태와 다를 수 있습니다. + 충전소당 한 번만 신고할 수 있습니다. { {stationName} - {address?.length > 0 ? address : '도로명주소 없음'} + {contact?.length > 0 || !address || address === 'null' ? '주소 미확인' : address} - {detailLocation?.length > 0 ? detailLocation : '상세주소 없음'} + {contact?.length > 0 || !address || detailLocation === 'null' + ? '상세주소 미확인' + : detailLocation} diff --git a/frontend/src/components/ui/StationList/EmptyStationsNotice.tsx b/frontend/src/components/ui/StationList/EmptyStationsNotice.tsx index 981a15305..418e4cceb 100644 --- a/frontend/src/components/ui/StationList/EmptyStationsNotice.tsx +++ b/frontend/src/components/ui/StationList/EmptyStationsNotice.tsx @@ -9,7 +9,9 @@ const EmptyStationsNotice = () => { - 조회 가능한 충전소가 없습니다. + + 조회 가능한 충전소가 없습니다. + 화면을 조금 더 확대하거나 장소를 이동해보세요. diff --git a/frontend/src/style/index.ts b/frontend/src/style/index.ts index e605e77ae..9c97928b6 100644 --- a/frontend/src/style/index.ts +++ b/frontend/src/style/index.ts @@ -31,7 +31,7 @@ export const getSize = (size: string | number) => { export const getColor = (color?: Color) => { switch (color) { case 'primary': - return '#0d6efd'; + return '#0064ff'; case 'secondary': return '#212529BF'; case 'success': @@ -47,7 +47,7 @@ export const getColor = (color?: Color) => { case 'dark': return '#212529'; default: - return '#0d6efd'; + return '#0064ff'; } };