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

Main #33

Merged
merged 14 commits into from
Aug 30, 2024
Merged

Main #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d4d6554
Merge pull request #12 from delicious-algorithme/dev
Songhyejeong Aug 18, 2024
75e6559
Merge pull request #15 from delicious-algorithme/dev
Songhyejeong Aug 18, 2024
c8276cc
Merge pull request #19 from delicious-algorithme/dev
Songhyejeong Aug 19, 2024
e15fdd7
Merge pull request #22 from delicious-algorithme/dev
Songhyejeong Aug 21, 2024
fd25b71
Merge pull request #25 from delicious-algorithme/dev
Songhyejeong Aug 26, 2024
a796a0d
Merge pull request #26 from delicious-algorithme/dev
Songhyejeong Aug 26, 2024
53a0fd9
fix : html file head에 베이스 경로 추가
Songhyejeong Aug 26, 2024
a1a228c
Merge pull request #29 from delicious-algorithme/dev
Songhyejeong Aug 26, 2024
f4f7d93
Merge pull request #31 from delicious-algorithme/dev
Songhyejeong Aug 27, 2024
cc3448f
Merge pull request #32 from delicious-algorithme/dev
Songhyejeong Aug 29, 2024
4bfefbb
fix : mainheader placeholder 수정
Songhyejeong Aug 29, 2024
6afcf76
fix: map 줌 수정
Songhyejeong Aug 29, 2024
6a1eff3
fix : 필요없는 콘솔 삭제
Songhyejeong Aug 29, 2024
3737bab
fix: 로고 반응형 레이아웃 수정
Songhyejeong Aug 29, 2024
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
1 change: 1 addition & 0 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!doctype html>
<html lang="en">
<head>
<base href="/" />
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
Expand Down
5 changes: 1 addition & 4 deletions src/components/common/Map.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const MyMap = () => {
const mapRef = useRef(null);
const markersRef = useRef([]);
const { storeList } = useStoreList();
//const { id } = useParams();
const [currentLocation, setCurrentLocation] = useState({
lat: '37.5665',
lng: '126.9780',
Expand All @@ -21,8 +20,6 @@ const MyMap = () => {
lat: storeList[0].latitude,
lng: storeList[0].longitude,
});
} else {
console.log('Store not found');
}
}, [storeList]);
const markerClickHandler = useCallback(
Expand All @@ -48,7 +45,7 @@ const MyMap = () => {
mapDataControl: true,
scaleControl: true,
maxZoom: 20,
zoom: 13,
zoom: 10,
};
}
mapRef.current = new naver.maps.Map(mapElement.current, mapOptions);
Expand Down
1 change: 0 additions & 1 deletion src/components/common/StoreDetail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ const StoreDetail = () => {
}, [location.state]);
const closeHandler = () => {
setVisible(false);
//console.log(visible);
};
const toggleHours = () => {
setHourVisible(!hourVisible);
Expand Down
2 changes: 0 additions & 2 deletions src/components/common/StoreList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ const StoreList = ({ station }) => {
}
} catch (error) {
console.log(error);
//setHasMore(false);
} finally {
setIsLoading(false);
}
Expand Down Expand Up @@ -208,7 +207,6 @@ const StoreList = ({ station }) => {
}, [sortBy]);
useEffect(() => {
if (!isFirst && hasMore) {
console.log('not nothing');
fetchStoreData(storeCategory, storeName, stationInput, keywords, sortBy, page);
} else if (isFirst) {
fetchStoreAll(page);
Expand Down
6 changes: 5 additions & 1 deletion src/components/main/MainHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const MainHeader = () => {
</Icon>
<input
type="text"
placeholder="Search..."
placeholder="이름으로 검색..."
onChange={onChangeHandler}
onKeyDown={onKeyDownHandler}
value={name}
Expand All @@ -64,6 +64,10 @@ const MainHeaderLayout = styled.div`
height: auto;
justify-content: center;
//align-items: center;
@media screen and (max-width: 1024px) {
flex-direction: column;
align-items: center;
}
`;

const LogoBox = styled.div`
Expand Down
Loading