Skip to content

Commit

Permalink
Merge pull request #24 from Soongsil-University-MakeUs-Challenge/feat…
Browse files Browse the repository at this point in the history
…ure/map-logic

feature/map-logic
  • Loading branch information
moana16 authored Sep 26, 2022
2 parents 324def2 + 60ef18b commit 32c3191
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pages/_document.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default class MyDocument extends Document {
return (
<Html lang="ko">
<Head />
<script type="text/javascript" src={`//dapi.kakao.com/v2/maps/sdk.js?appkey=1664a34e52ea5802af4d289cbdeef3ed&libraries=services`}/>
<script type="text/javascript" src={`//dapi.kakao.com/v2/maps/sdk.js?appkey=1664a34e52ea5802af4d289cbdeef3ed&libraries=services`} async/>
<body>
<Main />
<NextScript />
Expand Down
4 changes: 2 additions & 2 deletions pages/map/_components/KakaoAPIMap.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const dustMapper = {
};


export const KakaoAPIMap = ({dusts}) => { //{dusts}
export const KakaoAPIMap = ({dusts}) => {
const [myLocation, setMyLocation] = useState("");


Expand Down Expand Up @@ -43,7 +43,7 @@ export const KakaoAPIMap = ({dusts}) => { //{dusts}
center={{ lat: 37.496313, lng: 126.957037 }}
style={{ width: "100%", height: "100vh" }}
>
{dusts.map((dust) => {
{dusts && dusts.map((dust) => {
return (
!dust.caught&&(
<CustomOverlayMap
Expand Down
12 changes: 6 additions & 6 deletions pages/map/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ export default function Map() {
<div className={styles.stardust_container}>
{dusts.map((dust) => {
if(dust.dustId==1) {
return (<div className={dust.caught ? styles.catched_stardust_black : styles.stardust_black} />)
return (<div key={dust.dustId} className={dust.caught ? styles.catched_stardust_black : styles.stardust_black} />)
}
else if(dust.dustId==2) {
return (<div className={dust.caught ? styles.catched_stardust_white : styles.stardust_white } /> );
return (<div key={dust.dustId} className={dust.caught ? styles.catched_stardust_white : styles.stardust_white } /> );
}
else if(dust.dustId==3)
{
return (<div className={dust.caught ? styles.catched_stardust_green : styles.stardust_green } /> );
return (<div key={dust.dustId} className={dust.caught ? styles.catched_stardust_green : styles.stardust_green } /> );
}
else if(dust.dustId==4){
return (<div className={dust.caught ? styles.catched_stardust_yellow : styles.stardust_yellow } /> );
return (<div key={dust.dustId} className={dust.caught ? styles.catched_stardust_yellow : styles.stardust_yellow } /> );
}
else {
console.log(5);
return (<div className={dust.caught ? styles.catched_stardust_purple : styles.stardust_purple } /> );

return (<div key={dust.dustId} className={dust.caught ? styles.catched_stardust_purple : styles.stardust_purple } /> );
}
})};
</div>
Expand Down

0 comments on commit 32c3191

Please sign in to comment.