-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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: 수정 * fix: 위도 경도 수정 * fix: api 수정 * fix: api변경 * feat: 환승역 개발 * feat: 지하철 환승 페이지 완료 * fix: 지도 위치 변경 * fix: page 높이 수정 * feat: 길찾기 페이지 설명 자세히 * fix: refresh 버튼 이미지 추가 * fix: 로딩 환경 완료 * feat: loding component 구축 * feat: subway elevator loding 적용 * feat: Subway 휠체어 관련 위치 loding 완료 * feat: 환승 이동 경로 loding
- Loading branch information
Showing
35 changed files
with
472 additions
and
279 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
.loding{ | ||
animation: rotate_image 6s linear infinite; | ||
} | ||
@keyframes rotate_image{ | ||
100% { | ||
transform: rotate(360deg); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion
3
Backend/Frontend/creative/src/component/map/Mapping.module.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
.busmap, .subwaymap, .signmap { | ||
width: 100vw; | ||
height: 85vh; | ||
height: 90%; | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
Backend/Frontend/creative/src/component/sign-component/SignDetailInfoLIst.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
import React from "react"; | ||
import styled from "styled-components"; | ||
|
||
import {moveSubway} from "./signUtil.tsx" | ||
import BusTimer from "../bus-component/buslist/BusTimer.tsx" | ||
import useBusTimer from "../../hook/useBusTImer.tsx"; | ||
|
||
const StyledSignInfoList = styled.ul` | ||
display: flex; | ||
flex-direction: column; | ||
padding: 0; | ||
` | ||
|
||
const StyledSignInfoListDetail = styled.li` | ||
font-size: 0.8em; | ||
` | ||
|
||
const StyledSignInfoSubway = styled.button` | ||
display: flex; | ||
border: none; | ||
font-family: "Pretendard-Regular"; | ||
font-style: normal; | ||
background-color: white; | ||
font-size: 1em; | ||
padding: 0; | ||
margin: 1em 0; | ||
` | ||
|
||
|
||
const SignDetailInfoList = ({info}:any) => { | ||
const timer = useBusTimer(info.startArsID,info.lane[0].busNo) | ||
if(info.trafficType===2){//버스 | ||
return ( | ||
<StyledSignInfoList> | ||
{info.startName} | ||
<BusTimer timer={timer}/> | ||
{info.passStopList.stations.map((ele:any)=>( | ||
<StyledSignInfoListDetail key={ele.stationName}>{ele.stationName}</StyledSignInfoListDetail> | ||
))} | ||
</StyledSignInfoList> | ||
) | ||
} | ||
else if(info.trafficType===1){//지하철 | ||
return ( | ||
<StyledSignInfoList> | ||
<StyledSignInfoSubway onClick={()=>moveSubway(info.passStopList.stations[0].stationID,info.passStopList.stations[0].stationName)}>{info.startName} 편의시설</StyledSignInfoSubway> | ||
{info.passStopList.stations.map((ele:any)=>( | ||
<StyledSignInfoListDetail key={ele.stationName}>{ele.stationName}</StyledSignInfoListDetail> | ||
))} | ||
<StyledSignInfoSubway onClick={()=>moveSubway(info.passStopList.stations.at(-1).stationID,info.passStopList.stations.at(-1).stationName)}>{info.endName} 편의시설</StyledSignInfoSubway> | ||
</StyledSignInfoList> | ||
) | ||
} | ||
} | ||
|
||
export default SignDetailInfoList |
1 change: 0 additions & 1 deletion
1
Backend/Frontend/creative/src/component/sign-component/signSvg/BUS.svg
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
Backend/Frontend/creative/src/component/sign-component/signSvg/SUBWAY.svg
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 0 additions & 81 deletions
81
Backend/Frontend/creative/src/component/subway-component/subwaydetail/SubwayDetail.tsx
This file was deleted.
Oops, something went wrong.
34 changes: 34 additions & 0 deletions
34
Backend/Frontend/creative/src/component/subway-component/subwaydetail/SubwayDetailMain.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
import React,{Suspense} from "react"; | ||
import styled from "styled-components"; | ||
import SubwayMain from "./SubwayMain"; | ||
import Loding from "../../loding/Loding.tsx"; | ||
|
||
import {getSubwayDetail} from "../../../utils/getSubwayApi.ts" | ||
import { useParams } from "react-router-dom" | ||
|
||
const StyledDetailMain = styled.main` | ||
display:flex; | ||
flex-direction:column; | ||
justify-content: center; | ||
align-items: center; | ||
width: 98vw; | ||
height: 36vh; | ||
background-color:white; | ||
border: 4px solid #FFD12D; | ||
` | ||
|
||
const SubwayDetailMain = () => { | ||
const params = useParams() | ||
const stCd = params.stCd; | ||
const stNm = params.stNm; | ||
return ( | ||
<StyledDetailMain> | ||
<Suspense fallback={<Loding/>}> | ||
<SubwayMain info={getSubwayDetail(stCd,stNm)}/> | ||
</Suspense> | ||
</StyledDetailMain> | ||
) | ||
} | ||
|
||
|
||
export default SubwayDetailMain; |
Oops, something went wrong.