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.

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

[Fix/#208] 지도뷰 수정 #215

Merged
merged 6 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions src/apis/auth/usePostKakaoLogin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,9 @@ export const usePostKakaoLogin = () => {
onSuccess: (response) => {
const resData = response.data.data;
if (resData) {
const { userId, userName, accessToken } = resData;
const user = { userId, userName };
localStorage.setItem('user', JSON.stringify(user));
const { userName, accessToken } = resData;
localStorage.setItem('accessToken', accessToken);
localStorage.setItem('userName', userName);

queryClient.invalidateQueries({ queryKey: [queryKey.KAKAO_LOGIN] });
goHomePage();
Expand Down
6 changes: 5 additions & 1 deletion src/apis/myPage/useFetchUser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ const fetchUser = async (): Promise<UserResponse> => {
return response.data.data;
} catch (error) {
const errorResponse = error as ErrorResponse;
if (errorResponse.response.status === 401) {
if (
errorResponse.response.status === 401 ||
errorResponse.response.status === 404
) {
console.log(error);
return {
userName: '',
userEmail: '',
Expand Down
22 changes: 15 additions & 7 deletions src/apis/view/useFetchLikesStoreCoordinate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,31 @@ import { END_POINT, queryKey } from '@constants';

import {
ApiResponseType,
ErrorResponse,
StoreCoordinate,
StoreCoordinateListResponse,
} from '@types';

const fetchLikesStoreCoordinate = async (): Promise<StoreCoordinate[]> => {
const response = await instance.get<
ApiResponseType<StoreCoordinateListResponse>
>(END_POINT.FETCH_LIKES_STORE_COORDINATE_LIST);
if (!response.data) return [];
return response.data.data.stores;
try {
const response = await instance.get<
ApiResponseType<StoreCoordinateListResponse>
>(END_POINT.FETCH_LIKES_STORE_COORDINATE_LIST);
if (!response.data) return [];
return response.data.data.stores;
} catch (error) {
const errorResponse = error as ErrorResponse;
if (errorResponse.response.status === 401) {
return [];
}
throw error;
}
};

export const useFetchLikesStoreCoordinate = (isSaveActive: boolean) => {
export const useFetchLikesStoreCoordinate = () => {
return useQuery({
queryKey: [queryKey.LIKES_STORE_COORDINATE_LIST],
queryFn: fetchLikesStoreCoordinate,
enabled: isSaveActive,
staleTime: 0,
gcTime: 0,
});
Expand Down
6 changes: 5 additions & 1 deletion src/components/common/IconButton/IconButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ButtonHTMLAttributes, useState } from 'react';
import React, { ButtonHTMLAttributes, useEffect, useState } from 'react';

import {
useDeleteCakeLikes,
Expand Down Expand Up @@ -64,6 +64,10 @@ const IconButton = ({
const [localActive, setLocalActive] = useState(isActive);
const [localCount, setLocalCount] = useState<number | undefined>(count);

useEffect(() => {
setLocalActive(isActive);
}, [isActive]);

const { mutate: postStoreLikes } = usePostStoreLikes();
const { mutate: postCakeLikes } = usePostCakeLikes();
const { mutate: deleteStoreLikes } = useDeleteStoreLikes();
Expand Down
1 change: 1 addition & 0 deletions src/components/common/Image/Image.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export const imageStyle = recipe({
base: {
width: '100%',
height: '100%',
objectFit: 'cover',
},
variants: {
variant: {
Expand Down
6 changes: 2 additions & 4 deletions src/pages/home/page/HomePage/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ const HomePage = () => {
const { goViewPage, goDesignListPage } = useEasyNavigate();
const { data: storeRankData } = useFetchStoreRank();
const { data: cakeRankData } = useFetchCakeRank();
const user = isLogin
? JSON.parse(localStorage.getItem('user') || '{}')
: null;
const user = isLogin ? localStorage.getItem('userName') : null;

const handleAllButtonClick = () => {
goDesignListPage('BIRTH');
Expand All @@ -56,7 +54,7 @@ const HomePage = () => {
<img src={MainKeyVisual} />
<div className={mainContentContainer}>
<h1 className={mainTextStyle}>
{isLogin ? `${user.userName} 님,` : '안녕하세요!'}
{isLogin ? `${user} 님,` : '안녕하세요!'}
</h1>

<div className={mainContentWrapper}>
Expand Down
3 changes: 2 additions & 1 deletion src/pages/view/components/KakaoMap/KakaoMap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const KakaoMap = ({ currentLocation }: KakaoMapProps) => {
center,
isSaveActive,
isGpsActive,
mapLevel,
setCenter,
handleCenterChanged,
handleGpsButtonClick,
Expand All @@ -62,7 +63,7 @@ const KakaoMap = ({ currentLocation }: KakaoMapProps) => {
<div className={mapContainer}>
<Map
center={center}
level={2}
level={mapLevel}
className={mapStyle({ animateState })}
onCenterChanged={handleCenterChanged}
onClick={handleMapClick}
Expand Down
8 changes: 7 additions & 1 deletion src/pages/view/hooks/useKakaoMap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ export const useKakaoMap = (
// gps 버튼 활성화 상태
const [isGpsActive, setIsGpsActive] = useState(false);

// Map level 관리하기
const [mapLevel, setMapLevel] = useState(2);

const { data: likesStoreCoordinateList } =
useFetchLikesStoreCoordinate(isSaveActive);
useFetchLikesStoreCoordinate();

const location = useLocation();
const locationState = location?.state?.location || null;
Expand Down Expand Up @@ -131,6 +134,7 @@ export const useKakaoMap = (
setIsGpsActive(false);
if (currentLocation.stationEnName === 'ALL') {
fetchCurrentPosition();
setMapLevel(9)
} else {
setCenter({
lat: currentLocation.latitude,
Expand All @@ -142,6 +146,7 @@ export const useKakaoMap = (
clicked: false,
}))
);
setMapLevel(2)
}
} else {
handleAnimateChange('default');
Expand Down Expand Up @@ -196,6 +201,7 @@ export const useKakaoMap = (
center,
isSaveActive,
isGpsActive,
mapLevel,
setCenter,
handleCenterChanged,
handleGpsButtonClick,
Expand Down
Loading