Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: 잘못된 필터링을 수정하고 불필요한 출력문을 제거한다 #591

Merged
merged 4 commits into from
Aug 17, 2023
Merged

refactor: 잘못된 필터링을 수정하고 불필요한 출력문을 제거한다 #591

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c1a2ce
fix: 잘못된 필터링 제거
gabrielyoon7 Aug 17, 2023
2f26eaa
refactor: 불필요한 출력문 제거
gabrielyoon7 Aug 17, 2023
6a25eff
refactor: 비로그인자의 토큰 전달 시도를 막도록 하는 기능 구현
gabrielyoon7 Aug 17, 2023
93be95b
refactor: 충전기 혼잡도 그룹 순서 변경
gabrielyoon7 Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/components/google-maps/map/CarFfeineMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const CarFfeineMapListener = () => {
const queryClient = useQueryClient();

const debouncedIdleHandler = debounce(() => {
console.log('idle (테스트용: 제거 예정)');
// console.log('idle (테스트용: 제거 예정)');
if (googleMap.getZoom() < INITIAL_ZOOM_SIZE) {
toastActions.showToast('지도를 조금만 더 확대해주세요', 'warning', 'bottom-center');
}
Expand Down
6 changes: 2 additions & 4 deletions frontend/src/components/ui/StationDetailsWindow/station/StationInformation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@ const StationInformation = ({ station }: StationInformationProps) => {
{stationName}
</Text>
<Text variant="body" mb={1.5}>
{contact?.length > 0 || !address || address === 'null' ? '주소 미확인' : address}
{!address || address?.length === 0 ? '주소 미확인' : address}
</Text>
<Text variant="caption" mb={1}>
{contact?.length > 0 || !address || detailLocation === 'null'
? '상세주소 미확인'
: detailLocation}
{!detailLocation || detailLocation?.length === 0 ? '상세주소 미확인' : detailLocation}
</Text>
</Box>
<Divider />
Expand Down
14 changes: 10 additions & 4 deletions frontend/src/hooks/tanstack-query/station-details/reports/useStationChargerReport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,19 @@ import { QUERY_KEY_STATION_CHARGER_REPORT } from '@constants/queryKeys';
const fetchStationChargerReport = (stationId: string) => {
const mode = serverStore.getState();
const memberToken = memberTokenStore.getState();
const headers =
memberToken === ''
? {
'Content-Type': 'application/json',
}
: {
Authorization: `Bearer ${memberToken}`,
'Content-Type': 'application/json',
};

return fetch(`${SERVERS[mode]}/stations/${stationId}/reports/me`, {
method: 'GET',
headers: {
Authorization: `Bearer ${memberToken}`,
'Content-Type': 'application/json',
},
headers: headers,
}).then<boolean>(async (response) => {
const data = await response.json();
return data.isReported;
Expand Down
Loading