Skip to content

Commit

Permalink
Frontend (#185)
Browse files Browse the repository at this point in the history 
* feat. 새로 고침 버튼 개발[#46]

* 새로 고침 버튼을 개발하여 클릭 시 다시 해당 정류장의 버스를 받는 기능을 개발하였다.
Resolves #46

* feat. map component 리팩토링

* 지하철 기능을 위해 map component 리팩토링 하였습니다.

* feat. 버스페이지 css작업 완료

* 버스페이지 css작업 완료

* feat. 입력 폼 변경

* 입력 부분에서 검색어 바뀔 때마다 서버에 요청

* feat. 지하철 page생성

지하철 page 뼈대를 만들었습니다.

* feat. map-slice수정

* feat. subway page개발(v1.1)

* feat. main화면 bus화면 디자인 변경

* 변경 했지만 반응형 추가 필요

* feat. 디자인 폰트, 버스 페이지 어느 정도 완성

* 디자인 폰트, 버스 페이지 80% 완성, 반응형으로 만들기 수정

* feat. 지하철 페이지 디자인에 맞춰 개발

* feat. 지하철 메뉴

* 지하철 메뉴에 해당하는 페이지 설정

* feat. 모바일 반응형

* 모바일 반응형 완료 아직 지하철 페이지는 개발 필요함

* feat. 환승 page개발

* feat. HashRouter로 변경

* BrowserRouter에서 HashRouter로 변경

* feat. 이모지 + 서버

* feat.지하철 수정

* feat. map focusing 수정

* feat. 휠체어 기능 하기 전 저장

* 휠체어 기능 하기 전 저장

* feat. 휠체어 수정 완료

* 휠체어 수정 완료

* feat. 디테일한 수정

* 디테일한 수정

* Update Api.js

* feat. 약간의 수정

* 약간의 수정

* feat.폰트, 맵 초기화 수정

* 폰트, 맵 초기화 수정

* feat. 최종 수정

* 최종 수정

* Update StationItem.js

* refac: typescript로 Refectoring중

* feat(front): ts변경 오류 다수 발견

* feat(front): gps기반 지도 중심 개발

* fix(front): Api 수정

* fix(front): map 변경

* feat: 간단 퍼블리싱(1)

* feat:menuBar 수정(SVG로 표현)

* feat(front): 모바일 환경에 맞게 수정

* feat(): busmode 완성

* feat: busmode 수정

* feat: 지하철 수정

* feat: 지하철 마무리

* feat: map Marker 클릭이벤트 등록 완료

* feat: 길찾기 솔루션 개발중

* feat: 수정
  • Loading branch information
@KyuTae98
KyuTae98 authored Dec 4, 2023
1 parent c2741ff commit d784caf
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 92 deletions.
4 changes: 0 additions & 4 deletions Backend/Frontend/creative/src/component/auth/Api.ts
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import axios from "axios"

export const api = axios.create({
<<<<<<< HEAD
baseURL: "http://34.145.39.241:3005"
=======
baseURL: "http://34.168.80.42:3005"
>>>>>>> a4564550bd27da525e96b6fc9b5b02b8210532dc
})

4 changes: 0 additions & 4 deletions Backend/Frontend/creative/src/component/header/Header.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ top: 0;
font-family: 'GmarketSansMedium';
border-bottom: 2px solid #EBEBEB;
width:100vw;
<<<<<<< HEAD
height:10vh;
=======
min-height:8vh;
>>>>>>> a4564550bd27da525e96b6fc9b5b02b8210532dc
.header_home{
font-size:5vw;
color:#000000;
Expand Down
29 changes: 0 additions & 29 deletions Backend/Frontend/creative/src/component/map/BusMapping.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const Mapping = () => {
const dispatch = useDispatch()
const marker = useSelector((state:RootState) => state.map.marker)
const position = useSelector((state:RootState) => state.map.position)
<<<<<<< HEAD:Backend/Frontend/creative/src/component/map/BusMapping.tsx
const arsid = useSelector((state:RootState)=> state.bus.currentStation);
const busmode = useSelector((state:RootState) => state.map.busmode);
const {curPosition} = usePosition(geolocationOptions);
Expand All @@ -27,42 +26,14 @@ const Mapping = () => {
const container = document.getElementById("busmap");
const x = position.tmX!==0?Number(position.tmX):tmX!==0?tmX:37.55068403524657;
const y = position.tmY!==0?Number(position.tmY):tmY!==0?tmY:127.07411251036736;
=======
const arsid = useSelector((state:RootState) => state.bus.currentStation)
const busmode = useSelector((state:RootState) => state.map.busmode)
const subwaymode = useSelector((state:RootState) => state.map.subwaymode)
const {curPosition} = usePosition();
const tmY = curPosition ? curPosition.tmY: position.tmY;
const tmX = curPosition ? curPosition.tmX: position.tmX;
useEffect(() => {
console.log(tmX,tmY);
const container = document.getElementById("map");
>>>>>>> a4564550bd27da525e96b6fc9b5b02b8210532dc:Backend/Frontend/creative/src/component/map/Mapping.tsx
const options = {
center: new window.kakao.maps.LatLng(y, x),
level: 3,
};
const map = new window.kakao.maps.Map(container, options);
if (busmode)
busmapcoordinate(marker, map)
<<<<<<< HEAD:Backend/Frontend/creative/src/component/map/BusMapping.tsx
},[tmX,tmY,busmode,arsid,position])

=======
else if (subwaymode)
subwaymapcoordinate(marker, map)
},[tmX,tmY])

const subwaymapcoordinate = (marker:any, map:any) => {
const markerPosition = new window.kakao.maps.LatLng(parseFloat(String(marker.tmY - 0.0000005)).toFixed(6), parseFloat(String(marker.tmX - 0.0000005)).toFixed(6))
const new_marker = new window.kakao.maps.Marker({
position: markerPosition,
clickable: true,
})
new_marker.setMap(map)
}

>>>>>>> a4564550bd27da525e96b6fc9b5b02b8210532dc:Backend/Frontend/creative/src/component/map/Mapping.tsx
const busmapcoordinate = (marker:any, map:any) => {
marker.forEach((element:any) => {
const imageSrc = './image/busImage.png' // 마커이미지의 주소입니다
Expand Down
43 changes: 0 additions & 43 deletions Backend/Frontend/creative/src/component/menu/MenuBar.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
import React from "react"
import styled from "styled-components"
<<<<<<< HEAD
import { NavLink } from "react-router-dom";
=======

>>>>>>> a4564550bd27da525e96b6fc9b5b02b8210532dc
import {ReactComponent as HOME} from "./menuSvg/HOME.svg";
import {ReactComponent as BUS} from "./menuSvg/BUS.svg";
import {ReactComponent as SUBWAY} from "./menuSvg/SUBWAY.svg";
import {ReactComponent as SIGN} from "./menuSvg/SIGN.svg";

<<<<<<< HEAD

const StyleMenuBar = styled.div`
display:flex;
justify-content: space-evenly;
Expand Down Expand Up @@ -47,43 +41,6 @@ const MenuBar = () => {
isActive?<SIGN fill="orange" height="4vh"/>:<SIGN fill="white" height="4vh"/>
)}
</NavLink>
=======



const StyleMenuBar = styled.div`
display:flex;
position: fixed;
bottom: 0;
justify-content: space-evenly;
align-items: center;
width: 100%;
height: 8vh;
background-color: #FFD12D;
text-decoration:none;
@media (max-width:500px){
justify-content: space-evenly;
}
`

const StyleButton = styled.button`
background-color: transparent;
border: 0;
.menu_img{
fill: white;
min-height: 4vh;
}
`


const MenuBar = () => {
return (
<StyleMenuBar>
<StyleButton><HOME fill="white" height="4vh"/></StyleButton>
<StyleButton><BUS fill="white" height="4vh"/></StyleButton>
<StyleButton><SUBWAY fill="white" height="4vh"/></StyleButton>
<StyleButton><SIGN fill="white" height="4vh"/></StyleButton>
>>>>>>> a4564550bd27da525e96b6fc9b5b02b8210532dc
</StyleMenuBar>
)
}
Expand Down
12 changes: 0 additions & 12 deletions Backend/Frontend/creative/src/page/MainPage.module.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ body {
}
.bottom {
width: 100%;
<<<<<<< HEAD
height: 100vh;
}

Expand All @@ -21,17 +20,6 @@ body {
flex-direction: column;
justify-content: space-evenly;
height: 30vh;
=======
height: 100vh;
}

.main {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100vh;
>>>>>>> a4564550bd27da525e96b6fc9b5b02b8210532dc
animation: fadein 2s;
-moz-animation: fadein 2s;
-webkit-animation: fadein 2s;
Expand Down
0 Backend/Frontend/creative/src/tsconfig.json → Backend/Frontend/creative/tsconfig.json
View file
File renamed without changes.

0 comments on commit d784caf

Please sign in to comment.