From 73d00d01724ff9d814146095e5cf9bb387269d2f Mon Sep 17 00:00:00 2001 From: KimKyungYun <60084235+KimKyungYun@users.noreply.github.com> Date: Sat, 24 Jun 2023 09:43:10 +0900 Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=EB=A7=88=EC=BB=A4=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarkerHtml/MarkerHtml.module.scss | 73 +++++++++++-------- .../Map/components/MarkerHtml/index.tsx | 9 ++- src/pages/Home/static/marker.ts | 24 ++++-- 3 files changed, 66 insertions(+), 40 deletions(-) diff --git a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss index 238a9c6f..0d4c7a7b 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss +++ b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss @@ -11,6 +11,15 @@ height: 68px; font-weight: 500; + @include media.media-breakpoint-down(mobile){ + background-color: #ff7f23; + width: 32px; + height: 32px; + position: absolute; + top: 40px; + left: 20px; + } + &::after { content: ""; position: absolute; @@ -20,6 +29,11 @@ top: 68px; left: 22px; z-index: -1; + + @include media.media-breakpoint-down(mobile){ + top: 26px; + left: 2px; + } } &--clicked { @@ -34,6 +48,15 @@ color: white; font-weight: 500; + @include media.media-breakpoint-down(mobile){ + background-color: #ff7f23; + width: 32px; + height: 32px; + position: absolute; + top: 40px; + left: 22px; + } + &::after { content: ""; position: absolute; @@ -42,6 +65,12 @@ border-right: 14px solid transparent; top: 68px; left: 22px; + z-index: -1; + + @include media.media-breakpoint-down(mobile){ + top: 26px; + left: 0; + } } } } @@ -57,9 +86,14 @@ width: 62px; height: 62px; border-radius: 89.5px; + + @include media.media-breakpoint-down(mobile){ + width: 30px; + height: 30px; + } } - &__name { +&__name { margin-left: 10px; padding-right: 10px; @@ -67,41 +101,16 @@ margin: 0; padding: 0; position: absolute; - top: 85px; - right: 0; + top: 40px; width: 100%; display: flex; justify-content: center; - font-size: 15px; + font-size: 12px; font-weight: 500; - line-height: 15px; color: #222222; // stylelint-disable-next-line - text-shadow: -1px -1px 0 white, 1px -1px 0 white, -1px 1px 0 white, - 1px 1px 0 white; - } - } - - &--clicked { - display: flex; - align-items: center; - - &__photo img { - display: flex; - align-items: center; - width: 65px; - height: 65px; - border-radius: 89.5px; - } - - &__name { - margin-left: 10px; - padding-right: 10px; - - @include media.media-breakpoint-down(mobile) { - padding: 0; - display: none; - } + // text-shadow: -1px -1px 0 white, 1px -1px 0 white, -1px 1px 0 white, + // 1px 1px 0 white; } } } @@ -115,5 +124,9 @@ border-top: 12px solid #ffffff; border-left: 12px solid transparent; border-right: 12px solid transparent; + + @include media.media-breakpoint-down(mobile){ + display: none; + } } } diff --git a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx index 6ada6e67..44ef6350 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx +++ b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx @@ -5,11 +5,14 @@ export function MarkerHtml(defaultImg:string, name:string) {
- 음식 이미지 +
${name}
+
+ +
@@ -21,12 +24,14 @@ export function ClickedMarkerHtml(defaultImg:string, name:string) {
- 음식 이미지 + s
${name}
+
+
`; diff --git a/src/pages/Home/static/marker.ts b/src/pages/Home/static/marker.ts index dc52674b..33c0f094 100644 --- a/src/pages/Home/static/marker.ts +++ b/src/pages/Home/static/marker.ts @@ -1,43 +1,51 @@ const MARKER = [ { - placeName: '장소1', + placeName: '1', latitude: 36.862341, longitude: 127.209635, + index: 1, }, { - placeName: '장소2', + placeName: '2', latitude: 36.762341, longitude: 125.254645, + index: 2, }, { - placeName: '장소3', + placeName: '3', latitude: 36.722341, longitude: 127.269665, + index: 3, }, { - placeName: '장소4', + placeName: '4', latitude: 37.762341, longitude: 125.189675, + index: 4, }, { - placeName: '장소5', + placeName: '5', latitude: 36.862341, longitude: 127.254631, + index: 5, }, { - placeName: '장소6', + placeName: '6', latitude: 36.962341, longitude: 127.218645, + index: 6, }, { - placeName: '장소7', + placeName: '7', latitude: 36.562341, longitude: 127.299565, + index: 7, }, { - placeName: '장소8', + placeName: '8', latitude: 36.552341, longitude: 126.259775, + index: 8, }, ]; From e0b1b1223f6f20da9d470f1e3a6a13bad19726fd Mon Sep 17 00:00:00 2001 From: KimKyungYun <60084235+KimKyungYun@users.noreply.github.com> Date: Sat, 24 Jun 2023 16:35:47 +0900 Subject: [PATCH 02/12] =?UTF-8?q?feat:=20=EB=A7=88=EC=BB=A4=20=EC=9D=B8?= =?UTF-8?q?=EB=8D=B1=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarkerHtml/MarkerHtml.module.scss | 34 ++++++++++++------- .../Map/components/MarkerHtml/index.tsx | 17 +++++----- src/pages/Home/components/Map/index.tsx | 7 ++-- src/pages/Home/static/marker.ts | 12 +++---- 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss index 0d4c7a7b..abc9bf67 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss +++ b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss @@ -54,7 +54,7 @@ height: 32px; position: absolute; top: 40px; - left: 22px; + left: 20px; } &::after { @@ -69,7 +69,7 @@ @include media.media-breakpoint-down(mobile){ top: 26px; - left: 0; + left: 2px; } } } @@ -81,7 +81,7 @@ box-sizing: content-box; &__photo img { - display: flex; + display: none; align-items: center; width: 62px; height: 62px; @@ -93,24 +93,34 @@ } } -&__name { + &__name { + text-align: center; margin-left: 10px; padding-right: 10px; @include media.media-breakpoint-down(mobile) { - margin: 0; - padding: 0; - position: absolute; - top: 40px; - width: 100%; display: flex; justify-content: center; + width: 100%; + position: absolute; + top: 40px; + right: -10px; font-size: 12px; font-weight: 500; color: #222222; - // stylelint-disable-next-line - // text-shadow: -1px -1px 0 white, 1px -1px 0 white, -1px 1px 0 white, - // 1px 1px 0 white; + } + } + + &__index { + display: none; + + @include media.media-breakpoint-down(mobile){ + display: block; + color: #ffffff; + position: absolute; + top: 6px; + left: 12px; + font-size: 16px; } } } diff --git a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx index 44ef6350..0e7e8b0b 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx +++ b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx @@ -1,37 +1,38 @@ import styles from './MarkerHtml.module.scss'; -export function MarkerHtml(defaultImg:string, name:string) { +export function MarkerHtml(defaultImg:string, name:string, index:number = 0) { return `
+
+ ${index} +
${name}
-
- -
`; } -export function ClickedMarkerHtml(defaultImg:string, name:string) { +export function ClickedMarkerHtml(defaultImg:string, name:string, index:number) { return `
- s + +
+
+ ${index}
${name}
-
-
`; diff --git a/src/pages/Home/components/Map/index.tsx b/src/pages/Home/components/Map/index.tsx index 23a63c43..29899674 100644 --- a/src/pages/Home/components/Map/index.tsx +++ b/src/pages/Home/components/Map/index.tsx @@ -12,6 +12,7 @@ interface MarkerType { latitude: number; longitude: number; placeName: string; + index: number; } const options = { maximumAge: 1000, @@ -24,7 +25,7 @@ export default function Map(): JSX.Element { const markerHighlightEvent = (markerCur:naver.maps.Marker, item:MarkerType) => { naver.maps.Event.addListener(markerCur, 'click', () => { - if (selectedMarker.current) { + if (selectedMarker.current && !isMobile) { selectedMarker.current.setIcon({ content: MarkerHtml(defaultImage, selectedMarker.current.getTitle()), size: new naver.maps.Size(50, 52), @@ -33,7 +34,7 @@ export default function Map(): JSX.Element { } markerCur.setIcon({ - content: ClickedMarkerHtml(defaultImage, item.placeName), + content: ClickedMarkerHtml(defaultImage, item.placeName, item.index), size: new naver.maps.Size(50, 52), anchor: new naver.maps.Point(25, 26), }); @@ -78,7 +79,7 @@ export default function Map(): JSX.Element { title: item.placeName, map: mapRef.current, icon: { - content: MarkerHtml(defaultImage, item.placeName), + content: MarkerHtml(defaultImage, item.placeName, item.index), size: new naver.maps.Size(50, 52), anchor: new naver.maps.Point(25, 26), }, diff --git a/src/pages/Home/static/marker.ts b/src/pages/Home/static/marker.ts index 33c0f094..4aa5d29b 100644 --- a/src/pages/Home/static/marker.ts +++ b/src/pages/Home/static/marker.ts @@ -1,14 +1,14 @@ const MARKER = [ { - placeName: '1', - latitude: 36.862341, - longitude: 127.209635, + placeName: '박순자 아우내순대', + latitude: 36.761724, + longitude: 127.299092, index: 1, }, { - placeName: '2', - latitude: 36.762341, - longitude: 125.254645, + placeName: '집', + latitude: 36.343087, + longitude: 127.448879, index: 2, }, { From 8ababd91b31d68e0f594cf4ec331300c512c0174 Mon Sep 17 00:00:00 2001 From: KimKyungYun <60084235+KimKyungYun@users.noreply.github.com> Date: Mon, 26 Jun 2023 18:07:01 +0900 Subject: [PATCH 03/12] =?UTF-8?q?fix=20:=20=EB=93=9C=EB=A1=AD=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=20=EB=A9=94=EB=89=B4=20=EC=A0=81=EC=9A=A9,=20?= =?UTF-8?q?=EB=A7=88=EC=BB=A4=20=EA=B8=B0=EB=B3=B8=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/search/defaultImg.png | Bin 0 -> 120 bytes src/assets/svg/home/location-marker.svg | 5 + src/assets/svg/home/verticalDot.svg | 5 + .../MarkerHtml/MarkerHtml.module.scss | 132 +++++------------- .../Map/components/MarkerHtml/index.tsx | 23 +-- .../MobileOptions/MobileOptions.module.scss | 50 +++++-- .../Map/components/MobileOptions/index.tsx | 31 ++-- src/pages/Home/components/Map/index.tsx | 15 +- 8 files changed, 123 insertions(+), 138 deletions(-) create mode 100644 src/assets/images/search/defaultImg.png create mode 100644 src/assets/svg/home/location-marker.svg create mode 100644 src/assets/svg/home/verticalDot.svg diff --git a/src/assets/images/search/defaultImg.png b/src/assets/images/search/defaultImg.png new file mode 100644 index 0000000000000000000000000000000000000000..fac42a7204fc033b73dd93fda687f61427faee19 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^(}4H{BQuaR@a|FrQp^E9A+G=Hm4%gLYk*wN0*}aI z1_r((Aj~*bn@<`jDDCOu7~;|S_MjmnkauXoSN~id`2|2`!*)jg1q_T@&qbJkJO)o! KKbLh*2~7aBEE@U% literal 0 HcmV?d00001 diff --git a/src/assets/svg/home/location-marker.svg b/src/assets/svg/home/location-marker.svg new file mode 100644 index 00000000..73abfb32 --- /dev/null +++ b/src/assets/svg/home/location-marker.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/svg/home/verticalDot.svg b/src/assets/svg/home/verticalDot.svg new file mode 100644 index 00000000..8a38c725 --- /dev/null +++ b/src/assets/svg/home/verticalDot.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss index abc9bf67..b255b6f0 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss +++ b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss @@ -2,141 +2,81 @@ .marker { display: flex; + flex-direction: column; justify-content: center; align-items: center; - border: 2px solid #ff7f23; - border-radius: 33.5px; - background-color: #ffffff; - width: 100%; - height: 68px; - font-weight: 500; - - @include media.media-breakpoint-down(mobile){ - background-color: #ff7f23; - width: 32px; - height: 32px; - position: absolute; - top: 40px; - left: 20px; - } + width: 69px; + height: 69px; - &::after { - content: ""; - position: absolute; - border-top: 14px solid #ff7f23; - border-left: 14px solid transparent; - border-right: 14px solid transparent; - top: 68px; - left: 22px; - z-index: -1; - @include media.media-breakpoint-down(mobile){ - top: 26px; - left: 2px; - } + @include media.media-breakpoint-down(mobile) { + width: 48px; + height: 48px; } &--clicked { display: flex; + flex-direction: column; justify-content: center; align-items: center; - border: 2px solid #ff7f23; - border-radius: 33.5px; - background-color: #ff7f23; - width: 100%; - height: 68px; - color: white; - font-weight: 500; + width: 69px; + height: 69px; - @include media.media-breakpoint-down(mobile){ - background-color: #ff7f23; - width: 32px; - height: 32px; - position: absolute; - top: 40px; - left: 20px; - } - - &::after { - content: ""; - position: absolute; - border-top: 14px solid #ff7f23; - border-left: 14px solid transparent; - border-right: 14px solid transparent; - top: 68px; - left: 22px; - z-index: -1; - - @include media.media-breakpoint-down(mobile){ - top: 26px; - left: 2px; - } + @include media.media-breakpoint-down(mobile) { + width: 48px; + height: 48px; } } } .bubble { display: flex; + width: 100%; + height: 100%; align-items: center; box-sizing: content-box; &__photo img { - display: none; - align-items: center; - width: 62px; - height: 62px; + width: 43px; + height: 43px; border-radius: 89.5px; + position: absolute; + top: 10px; + left: 13px; - @include media.media-breakpoint-down(mobile){ + @include media.media-breakpoint-down(mobile) { width: 30px; height: 30px; + top: 7px; + left: 9px; } } &__name { text-align: center; - margin-left: 10px; - padding-right: 10px; + font-size: 18px; + font-weight: 500; + width: 100%; @include media.media-breakpoint-down(mobile) { - display: flex; - justify-content: center; - width: 100%; - position: absolute; - top: 40px; - right: -10px; font-size: 12px; - font-weight: 500; + font-weight: 700; color: #222222; } } - - &__index { - display: none; - - @include media.media-breakpoint-down(mobile){ - display: block; - color: #ffffff; - position: absolute; - top: 6px; - left: 12px; - font-size: 16px; - } - } -} -.dummy { - &::after { - content: ""; + &__index { + color: #ffffff; position: absolute; - top: 67px; - left: 23px; - border-top: 12px solid #ffffff; - border-left: 12px solid transparent; - border-right: 12px solid transparent; + top: 20px; + left: 28px; + font-size: 24px; + font-weight: 700; - @include media.media-breakpoint-down(mobile){ - display: none; + @include media.media-breakpoint-down(mobile) { + font-size: 16px; + top: 12px; + left: 20px; } } } diff --git a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx index 0e7e8b0b..d96e87ae 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx +++ b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx @@ -1,39 +1,40 @@ +import Default from 'assets/images/search/defaultImg.png'; +import MarkerLogo from 'assets/svg/home/location-marker.svg'; import styles from './MarkerHtml.module.scss'; -export function MarkerHtml(defaultImg:string, name:string, index:number = 0) { +export function MarkerHtml(defaultImg:string, name:string, index:number) { return ` -
+
- +
- ${index} + ${defaultImg === Default ? index : ''} +
${name}
-
-
+ `; } export function ClickedMarkerHtml(defaultImg:string, name:string, index:number) { return ` -
-
+ +
- ${index} + ${defaultImg === Default ? index : ''}
${name}
-
-
+ `; } diff --git a/src/pages/Home/components/Map/components/MobileOptions/MobileOptions.module.scss b/src/pages/Home/components/Map/components/MobileOptions/MobileOptions.module.scss index eba18f57..e6e7fb55 100644 --- a/src/pages/Home/components/Map/components/MobileOptions/MobileOptions.module.scss +++ b/src/pages/Home/components/Map/components/MobileOptions/MobileOptions.module.scss @@ -10,6 +10,7 @@ display: flex; align-items: center; justify-content: space-between; + width: 70%; height: 48px; background: #ffffff; box-shadow: 2px 3px 12px 1px rgb(0 0 0 / 10%); @@ -22,35 +23,60 @@ margin-bottom: 10px; } + &__filter { + width: 48px; + height: 48px; + background-color: #ffffff; + border-radius: 37px; + opacity: 0.8; + box-shadow: 2px 3px 12px 1px rgba(0 0 0 / 10%); + border: 1px solid #eeeeee; + position: absolute; + top: 0; + right: 0; + display: flex; + justify-content: center; + align-items: center; + + &--clicked { + svg path { + stroke: #ff7f23; + } + } + } + &__list { - display: grid; - grid-template-columns: 1fr 1fr 1fr; - gap: 4px; - justify-items: center; + display: flex; + float: right; + flex-direction: column; + justify-content: space-around; + width: 118px; + height: 78px; + border-radius: 15px; + opacity: 0.8; + border: 1px solid #eeeeee; + background-color: #ffffff; + box-shadow: 2px 3px 12px 1px rgba(0 0 0 / 10%); } &__text { display: flex; - justify-content: center; align-items: center; - box-sizing: border-box; width: 100%; height: 30px; - background: rgb(251 251 250 / 90%); - border: 1px solid #c4c4c4; - box-shadow: 2px 3px 12px 1px rgb(0 0 0 / 10%); - border-radius: 37px; + margin-left: 10px; font-weight: 500; font-size: 12px; color: #595959; cursor: pointer; + background-color: transparent; + border: none; svg { padding-right: 5px; } - &--selected { - border: 1px solid #ff7f23; + &--clicked { color: #ff7f23; svg path { diff --git a/src/pages/Home/components/Map/components/MobileOptions/index.tsx b/src/pages/Home/components/Map/components/MobileOptions/index.tsx index 2dcc749f..21774424 100644 --- a/src/pages/Home/components/Map/components/MobileOptions/index.tsx +++ b/src/pages/Home/components/Map/components/MobileOptions/index.tsx @@ -1,13 +1,15 @@ import { ReactComponent as LensIcon } from 'assets/svg/home/lens.svg'; -import { ReactComponent as StoreFrontIcon } from 'assets/svg/home/storefront.svg'; import { ReactComponent as GroupIcon } from 'assets/svg/home/group.svg'; import { ReactComponent as BookMarkIcon } from 'assets/svg/home/bookmark.svg'; +import { ReactComponent as VerticalDot } from 'assets/svg/home/verticalDot.svg'; import { Link } from 'react-router-dom'; import cn from 'utils/ts/classNames'; import { useState } from 'react'; +import useBooleanState from 'utils/hooks/useBooleanState'; import styles from './MobileOptions.module.scss'; export default function MobileOptions(): JSX.Element { + const [filter, , ,toggle] = useBooleanState(false); const [selected, setSelected] = useState(''); const handleClick = (type: string) => { setSelected(type); @@ -22,18 +24,18 @@ export default function MobileOptions(): JSX.Element {
- - + + {filter && ( +
- +
+ )}
); diff --git a/src/pages/Home/components/Map/index.tsx b/src/pages/Home/components/Map/index.tsx index 29899674..ca544c46 100644 --- a/src/pages/Home/components/Map/index.tsx +++ b/src/pages/Home/components/Map/index.tsx @@ -1,7 +1,7 @@ import { useEffect, useRef } from 'react'; import useGeolocation from 'utils/hooks/useGeolocation'; import MARKER from 'pages/Home/static/marker'; -import defaultImage from 'assets/images/search/default-image.png'; +import defaultImg from 'assets/images/search/default-image.png'; import useMediaQuery from 'utils/hooks/useMediaQuery'; import styles from './Map.module.scss'; import OptionButtons from './components/OptionButtons'; @@ -25,16 +25,20 @@ export default function Map(): JSX.Element { const markerHighlightEvent = (markerCur:naver.maps.Marker, item:MarkerType) => { naver.maps.Event.addListener(markerCur, 'click', () => { - if (selectedMarker.current && !isMobile) { + if (selectedMarker.current) { selectedMarker.current.setIcon({ - content: MarkerHtml(defaultImage, selectedMarker.current.getTitle()), + content: MarkerHtml( + defaultImg, + selectedMarker.current.getTitle(), + selectedMarker.current.getZIndex(), + ), size: new naver.maps.Size(50, 52), anchor: new naver.maps.Point(25, 26), }); } markerCur.setIcon({ - content: ClickedMarkerHtml(defaultImage, item.placeName, item.index), + content: ClickedMarkerHtml(defaultImg, item.placeName, item.index), size: new naver.maps.Size(50, 52), anchor: new naver.maps.Point(25, 26), }); @@ -78,8 +82,9 @@ export default function Map(): JSX.Element { position: new naver.maps.LatLng(item.latitude, item.longitude), title: item.placeName, map: mapRef.current, + zIndex: item.index, icon: { - content: MarkerHtml(defaultImage, item.placeName, item.index), + content: MarkerHtml(defaultImg, item.placeName, item.index), size: new naver.maps.Size(50, 52), anchor: new naver.maps.Point(25, 26), }, From 6ee55c7dbd1858c54094adc0ac31355d8aa00215 Mon Sep 17 00:00:00 2001 From: KimKyungYun <60084235+KimKyungYun@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:36:42 +0900 Subject: [PATCH 04/12] =?UTF-8?q?feat:=20=EB=A7=88=EC=BB=A4=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD,sv?= =?UTF-8?q?g=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/svg/home/selected-marker.svg | 4 ++ .../MarkerHtml/MarkerHtml.module.scss | 46 +++++++++++++++++-- .../Map/components/MarkerHtml/index.tsx | 7 +-- 3 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 src/assets/svg/home/selected-marker.svg diff --git a/src/assets/svg/home/selected-marker.svg b/src/assets/svg/home/selected-marker.svg new file mode 100644 index 00000000..adda4745 --- /dev/null +++ b/src/assets/svg/home/selected-marker.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss index b255b6f0..09df8007 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss +++ b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss @@ -19,12 +19,12 @@ flex-direction: column; justify-content: center; align-items: center; - width: 69px; + width: 175px; height: 69px; @include media.media-breakpoint-down(mobile) { - width: 48px; - height: 48px; + width: 125px; + height: 45px; } } } @@ -52,6 +52,22 @@ } } + &__photo--clicked img { + width: 56px; + height: 56px; + border-radius: 89.5px; + position: absolute; + top: 3px; + left: 5px; + + @include media.media-breakpoint-down(moblie) { + width: 36px; + height: 36px; + top: 2px; + left: 8px; + } + } + &__name { text-align: center; font-size: 18px; @@ -63,6 +79,29 @@ font-weight: 700; color: #222222; } + + &--clicked { + display: flex; + justify-content: center; + align-items: center; + width: 100px; + height: 40px; + position: absolute; + text-align: center; + top: 10px; + left: 60px; + font-size: 20px; + font-weight: 700; + color: #fe7f23; + + @include media.media-breakpoint-down(mobile) { + width: 70px; + height: 34px; + top: 3px; + left: 40px; + font-size: 14px; + } + } } &__index { @@ -72,6 +111,7 @@ left: 28px; font-size: 24px; font-weight: 700; + z-index: 999; @include media.media-breakpoint-down(mobile) { font-size: 16px; diff --git a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx index d96e87ae..5c08bfbd 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx +++ b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx @@ -1,5 +1,6 @@ import Default from 'assets/images/search/defaultImg.png'; import MarkerLogo from 'assets/svg/home/location-marker.svg'; +import Selected from 'assets/svg/home/selected-marker.svg'; import styles from './MarkerHtml.module.scss'; export function MarkerHtml(defaultImg:string, name:string, index:number) { @@ -23,15 +24,15 @@ export function MarkerHtml(defaultImg:string, name:string, index:number) { export function ClickedMarkerHtml(defaultImg:string, name:string, index:number) { return ` - +
-
+
${defaultImg === Default ? index : ''}
-
+
${name}
From 1de2d3d1976841a4be94ea73e2608648a8d4e5ec Mon Sep 17 00:00:00 2001 From: KimKyungYun <60084235+KimKyungYun@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:39:08 +0900 Subject: [PATCH 05/12] =?UTF-8?q?fix:=20lint=EC=97=90=EB=9F=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Map/components/MarkerHtml/MarkerHtml.module.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss index 09df8007..3809ffd0 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss +++ b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss @@ -8,7 +8,6 @@ width: 69px; height: 69px; - @include media.media-breakpoint-down(mobile) { width: 48px; height: 48px; @@ -87,13 +86,13 @@ width: 100px; height: 40px; position: absolute; - text-align: center; + text-align: center; top: 10px; left: 60px; font-size: 20px; font-weight: 700; color: #fe7f23; - + @include media.media-breakpoint-down(mobile) { width: 70px; height: 34px; From 7ca3ba29eb1c2c356e3bbdeaade88ca4599ed5f1 Mon Sep 17 00:00:00 2001 From: KimKyungYun <60084235+KimKyungYun@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:49:13 +0900 Subject: [PATCH 06/12] =?UTF-8?q?fix:=20css=20=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Map/components/MarkerHtml/MarkerHtml.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss index 3809ffd0..870ac879 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss +++ b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss @@ -59,7 +59,7 @@ top: 3px; left: 5px; - @include media.media-breakpoint-down(moblie) { + @include media.media-breakpoint-down(mobile) { width: 36px; height: 36px; top: 2px; From ad36af9af987f0276614da995c3b50ed59740f62 Mon Sep 17 00:00:00 2001 From: KimKyungYun <60084235+KimKyungYun@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:53:18 +0900 Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=EB=93=9C=EB=A1=AD=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=ED=95=84=ED=84=B0=20=EC=A1=B0=EA=B1=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/components/Map/components/MobileOptions/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Home/components/Map/components/MobileOptions/index.tsx b/src/pages/Home/components/Map/components/MobileOptions/index.tsx index 21774424..1395aaf9 100644 --- a/src/pages/Home/components/Map/components/MobileOptions/index.tsx +++ b/src/pages/Home/components/Map/components/MobileOptions/index.tsx @@ -28,7 +28,7 @@ export default function MobileOptions(): JSX.Element { type="button" className={cn({ [styles['top-options__filter']]: true, - [styles['top-options__filter--clicked']]: selected !== '', + [styles['top-options__filter--clicked']]: selected !== '' && !filter, })} onClick={toggle} > From 978779a396c6782594a4e39503528203030fb46b Mon Sep 17 00:00:00 2001 From: KimDoToRi <60084235+KimKyungYun@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:37:03 +0900 Subject: [PATCH 08/12] =?UTF-8?q?fix:=20=EB=A7=88=EC=BB=A4=20png=EB=B3=80?= =?UTF-8?q?=EA=B2=BD,=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/home/location-marker.png | Bin 0 -> 873 bytes src/assets/images/home/selected-marker.png | Bin 0 -> 1778 bytes src/assets/svg/home/location-marker.svg | 5 ---- src/assets/svg/home/selected-marker.svg | 4 --- .../MarkerHtml/MarkerHtml.module.scss | 28 +++++++++++------- .../Map/components/MarkerHtml/index.tsx | 12 ++++---- 6 files changed, 24 insertions(+), 25 deletions(-) create mode 100644 src/assets/images/home/location-marker.png create mode 100644 src/assets/images/home/selected-marker.png delete mode 100644 src/assets/svg/home/location-marker.svg delete mode 100644 src/assets/svg/home/selected-marker.svg diff --git a/src/assets/images/home/location-marker.png b/src/assets/images/home/location-marker.png new file mode 100644 index 0000000000000000000000000000000000000000..0e5ef3f0fc57d5434a9503f3a558570d65608bd1 GIT binary patch literal 873 zcmV-v1D5=WP)6>{_z>yu?Dp(pK`oN z*++&}EQ2oK4{vguOVO8Qg+jgQ=L_%fyhCU7^5X^$QE-S}9WGH6w}FHhN)-B5UmY&t z5NDCH7t&FUsnEKn7oS&ffDZdqT zl8KT5Y9I65vX#6=9x16r$v~$T5MnWWbcK{4I)@OE6kR_$iFn2N8#5mACz3bFB1N|q zQlwRtq`7eT&=aJHqGM5W$e1BXw8!DoCz%t3L?5Pf_>@SKQqtII=Ivi0OZfv*DOQi- z5g_WfbfQgE3ZFI#kWRFs2dik%^i|Sa8Yy>367BIRnN*sQ(y5K4xiC_`87ZmFD~&Y! zCX%vG1ncfS(&7d}YNIgf)P&5ecz{@kmDMr(%3a9Z^2UkaH{wt@5hZ`O?Pcee= zsRPwsNVn1c;C@hhhLN}_+UX1bOa+1{7wQ%xq?_AT8vKg8@~%n6xD#Sx)t1p>!U!=0 zy96~(OgJHipf|(p#Do=MnC80Ny~TtVVhAq9a6d8A2r*0|WkA;tYd#$~{jJ2K;dJLU zAE&&YLWp5fDFc0hp`LMfnm&1z$z(E_%>TxBQ7=Jbo@%gu00000NkvXXu0mjfTAzZk literal 0 HcmV?d00001 diff --git a/src/assets/images/home/selected-marker.png b/src/assets/images/home/selected-marker.png new file mode 100644 index 0000000000000000000000000000000000000000..2f0a2d5ddcd586541deefd4a6d514b65acbea96a GIT binary patch literal 1778 zcmVG~mL9LjozKfri3&lljl=?B4p$_I>Q0ca#55TJ7w8IE8R+CSts*uNlE%STrnBOPPZRyFMqI+$%(g`JJlw^!K5E?Rv*Im?hOfB<7 z66;T&zbHyI?FHo}lhFQdr_8IOy5}d!na7gY+_Y6iS8j-pz7V(mKIJ8ola_hQMCJ42 zM&*$ucIiX+ds`C2joIldF83v5TDJZ&B7bRw{?=V<-Bg!;Umo@ABT1~6kG^aELaqtQ zWf1qwSB$6Nem_0+Sho23X@()D%-DkXEkl_3>RL z79HHTH*siMP+&4^yvQiwnvpH*?!r)s^)kMoqAJAaLdbytkUX6)B1JCr2A` z8o@l66bYoYHa}KNJJX7EBo4H*y#9d@QYerWV2%!`=u|Y0B~C?QOra#CXxK?+wpvl| zkH$$P4zvrujKZX-V5-BAXly066$uoT8HGvFK{R&M?W1twBXKWSvghi85K?Fmjs5IN zJj*FwVkNKHGovsm1GTr^**%ObDsFDT@Q;2GLJAKabNcLMH&)$e0@<$A?8T86g^*Iv zpHgfess*Mh;Uwl$8l+74psRXDVx{KYizkGT(%^j!)O-*xDdmdDgp`9g{na&8C)_eq z{j2g2Qgq^=tLB1uK|jt|BV{7-wHgQ^C5IA|(nE6_5!PV6H*qiaJNOb1L>-c9WxS>GU0vg z1z{kEx?%hx^I}p4{1yt}&~`hB7NQ8ZX4=mRL16LW!esO9&|(xMy>nx=^iHUoGhgKt39WUobZ&#RBreOQ5=o{coit zPDNwvEk;ODSpCqCT01vv9Gr^jEk{ZbxAq7*KoEhQi&$iPV1K&-iJj%@yuE<^$!sA) zW)C{aaT*~*x6K_oDPApapl%#mfp5RZ{FodJ*1vOZtktq=Zmtgd*zQkusP3C~!aQ2h zcP|SeGX(;--tn2hs=Bn%-0h>gN^Bb-s&^7U&Tb-|B-VuFOG;pD#+a@~>}1bp>}>v_ z0*Xv#2Xf$)z*BCE>q%{oi{)QWUlBqw2QB5KM-d{W&18de4@D-q0cr8Syl*LMxvnm4 zE{*#2ktMc2nx3$o92SZr=7{Vu=Ao zCNX|R9+b#1#`)p;u;(^I>6#n2mB}OTPNtF=%tU1T^`iaA2}xxHQMPSNxnpX+t!bm~ zFs7CmNQ{&d?B2!>8Cb>uqCK8zflL^Re zy8}0k6Z4UyiS@0sdq3*r=a5ohGA6l2Voxd}W3Rl0hDdcG*-Q`8qLYJ(Ag-H3fyr3p zE-`Q-SFW1j>3u#r@*Gk^JTsBlqnpR-($fu5dfxogwdmE3Xt^Unuo|s - - - - diff --git a/src/assets/svg/home/selected-marker.svg b/src/assets/svg/home/selected-marker.svg deleted file mode 100644 index adda4745..00000000 --- a/src/assets/svg/home/selected-marker.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss index 870ac879..5aa682d0 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss +++ b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss @@ -1,10 +1,13 @@ @use "src/utils/styles/mediaQuery" as media; -.marker { +.container{ display: flex; - flex-direction: column; justify-content: center; + flex-direction: column; align-items: center; +} + +.marker { width: 69px; height: 69px; @@ -14,6 +17,8 @@ } &--clicked { + position: absolute; + left: 20px; display: flex; flex-direction: column; justify-content: center; @@ -35,13 +40,14 @@ align-items: center; box-sizing: content-box; + &__photo img { width: 43px; height: 43px; border-radius: 89.5px; position: absolute; top: 10px; - left: 13px; + left: 28px; @include media.media-breakpoint-down(mobile) { width: 30px; @@ -52,12 +58,12 @@ } &__photo--clicked img { - width: 56px; - height: 56px; + width: 56.007px; + height: 55.723px; border-radius: 89.5px; position: absolute; - top: 3px; - left: 5px; + top: 2px; + left: 23px; @include media.media-breakpoint-down(mobile) { width: 36px; @@ -68,11 +74,11 @@ } &__name { - text-align: center; + width: 100px; font-size: 18px; font-weight: 500; - width: 100%; - + text-align: center; + @include media.media-breakpoint-down(mobile) { font-size: 12px; font-weight: 700; @@ -88,7 +94,7 @@ position: absolute; text-align: center; top: 10px; - left: 60px; + left: 75px; font-size: 20px; font-weight: 700; color: #fe7f23; diff --git a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx index 5c08bfbd..071793d2 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx +++ b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx @@ -1,11 +1,12 @@ import Default from 'assets/images/search/defaultImg.png'; -import MarkerLogo from 'assets/svg/home/location-marker.svg'; -import Selected from 'assets/svg/home/selected-marker.svg'; +import MarkerLogo from 'assets/images/home/location-marker.png'; +import Selected from 'assets/images/home/selected-marker.png'; import styles from './MarkerHtml.module.scss'; export function MarkerHtml(defaultImg:string, name:string, index:number) { return ` - +
+
@@ -18,12 +19,13 @@ export function MarkerHtml(defaultImg:string, name:string, index:number) { ${name}
- +
`; } export function ClickedMarkerHtml(defaultImg:string, name:string, index:number) { return ` +
@@ -36,6 +38,6 @@ export function ClickedMarkerHtml(defaultImg:string, name:string, index:number) ${name}
- +
`; } From 407826a80247ec1a124a05be785b5a6197f8c894 Mon Sep 17 00:00:00 2001 From: KimDoToRi <60084235+KimKyungYun@users.noreply.github.com> Date: Thu, 13 Jul 2023 10:11:53 +0900 Subject: [PATCH 09/12] =?UTF-8?q?fix:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?= =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Map/components/MarkerHtml/MarkerHtml.module.scss | 6 +++--- .../Home/components/Map/components/MarkerHtml/index.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss index 5aa682d0..2754a782 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss +++ b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss @@ -53,7 +53,7 @@ width: 30px; height: 30px; top: 7px; - left: 9px; + left: 35px; } } @@ -69,7 +69,7 @@ width: 36px; height: 36px; top: 2px; - left: 8px; + left: 22px; } } @@ -103,7 +103,7 @@ width: 70px; height: 34px; top: 3px; - left: 40px; + left: 55px; font-size: 14px; } } diff --git a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx index 071793d2..29472dbb 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/index.tsx +++ b/src/pages/Home/components/Map/components/MarkerHtml/index.tsx @@ -6,7 +6,7 @@ import styles from './MarkerHtml.module.scss'; export function MarkerHtml(defaultImg:string, name:string, index:number) { return `
- + marker
From 097964477eeba1f5b11cd4ad56f0aacd0c451695 Mon Sep 17 00:00:00 2001 From: KimDoToRi <60084235+KimKyungYun@users.noreply.github.com> Date: Thu, 13 Jul 2023 10:23:57 +0900 Subject: [PATCH 10/12] =?UTF-8?q?fix:=20=EB=93=9C=EB=A1=AD=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=20=EB=A9=94=EB=89=B4=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarkerHtml/MarkerHtml.module.scss | 7 +++---- .../MobileOptions/MobileOptions.module.scss | 7 ++++--- .../Map/components/MobileOptions/index.tsx | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss index 2754a782..153df651 100644 --- a/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss +++ b/src/pages/Home/components/Map/components/MarkerHtml/MarkerHtml.module.scss @@ -1,13 +1,13 @@ @use "src/utils/styles/mediaQuery" as media; -.container{ +.container { display: flex; justify-content: center; flex-direction: column; align-items: center; } -.marker { +.marker { width: 69px; height: 69px; @@ -40,7 +40,6 @@ align-items: center; box-sizing: content-box; - &__photo img { width: 43px; height: 43px; @@ -78,7 +77,7 @@ font-size: 18px; font-weight: 500; text-align: center; - + @include media.media-breakpoint-down(mobile) { font-size: 12px; font-weight: 700; diff --git a/src/pages/Home/components/Map/components/MobileOptions/MobileOptions.module.scss b/src/pages/Home/components/Map/components/MobileOptions/MobileOptions.module.scss index e6e7fb55..bd779712 100644 --- a/src/pages/Home/components/Map/components/MobileOptions/MobileOptions.module.scss +++ b/src/pages/Home/components/Map/components/MobileOptions/MobileOptions.module.scss @@ -1,5 +1,8 @@ -.top-options { +.nav { position: absolute; + display: grid; + grid-template-columns: 1fr auto; + gap: 50px; top: 20px; left: 50%; transform: translate(-50%); @@ -10,7 +13,6 @@ display: flex; align-items: center; justify-content: space-between; - width: 70%; height: 48px; background: #ffffff; box-shadow: 2px 3px 12px 1px rgb(0 0 0 / 10%); @@ -20,7 +22,6 @@ color: #666666; padding-left: 18px; padding-right: 15px; - margin-bottom: 10px; } &__filter { diff --git a/src/pages/Home/components/Map/components/MobileOptions/index.tsx b/src/pages/Home/components/Map/components/MobileOptions/index.tsx index 1395aaf9..cee53828 100644 --- a/src/pages/Home/components/Map/components/MobileOptions/index.tsx +++ b/src/pages/Home/components/Map/components/MobileOptions/index.tsx @@ -17,9 +17,9 @@ export default function MobileOptions(): JSX.Element { }; return (
-
+
- + 검색어를 입력해주세요. @@ -27,20 +27,20 @@ export default function MobileOptions(): JSX.Element { {filter && ( -
+