From bbacbda4c17f5775de037efcafd821160bf60988 Mon Sep 17 00:00:00 2001 From: namesace <72364782+namesace0427@users.noreply.github.com> Date: Tue, 2 Aug 2022 19:54:33 +0900 Subject: [PATCH 1/4] Update README.md --- README.md | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/README.md b/README.md index 5b99da6..4c86b18 100644 --- a/README.md +++ b/README.md @@ -1 +1,70 @@ # fullbang_client + +This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). + +## Available Scripts + +In the project directory, you can run: + +### `npm start` + +Runs the app in the development mode.\ +Open [http://localhost:3000](http://localhost:3000) to view it in your browser. + +The page will reload when you make changes.\ +You may also see any lint errors in the console. + +### `npm test` + +Launches the test runner in the interactive watch mode.\ +See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. + +### `npm run build` + +Builds the app for production to the `build` folder.\ +It correctly bundles React in production mode and optimizes the build for the best performance. + +The build is minified and the filenames include the hashes.\ +Your app is ready to be deployed! + +See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. + +### `npm run eject` + +**Note: this is a one-way operation. Once you `eject`, you can't go back!** + +If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. + +Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own. + +You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it. + +## Learn More + +You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). + +To learn React, check out the [React documentation](https://reactjs.org/). + +### Code Splitting + +This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting) + +### Analyzing the Bundle Size + +This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size) + +### Making a Progressive Web App + +This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app) + +### Advanced Configuration + +This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration) + +### Deployment + +This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment) + +### `npm run build` fails to minify + +This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify) From b41020a3e1029d6a45644aa320f59a39af810803 Mon Sep 17 00:00:00 2001 From: namesace0427 Date: Sun, 4 Sep 2022 21:07:07 +0900 Subject: [PATCH 2/4] [DAY6-74] feat(marker clustring): add function --- src/{App.js => App.tsx} | 0 src/assets/price_marker.png | Bin 0 -> 385 bytes src/components/Router/Router.js | 9 +- .../helper/axiosGetAverageValue.tsx | 14 + src/components/helper/axiosGetinrange.tsx | 18 + .../bubjungdong.js => helper/bubjungdong.tsx} | 0 ...HeaderComponent.js => HeaderComponent.tsx} | 9 +- .../views/LandingPage/LandingPage.css | 46 +- .../views/LandingPage/LandingPage.tsx | 1489 ++++++- .../views/LandingPage/Sections/Map.tsx | 3949 +++++++++++++++-- src/components/views/MainPage/MainPage.css | 8 + src/components/views/MainPage/MainPage.js | 293 -- src/components/views/MainPage/MainPage.tsx | 219 + .../MainPage/MainPageSearchComponent.tsx | 172 + .../AccomodationType/AccomodationType.js | 70 - .../MainPage/component/Calendar/Calendar.js | 662 --- .../MainPage/component/Location/Location.js | 131 - .../views/Page404/{Page404.js => Page404.tsx} | 4 +- ...SearchComponent.js => SearchComponent.tsx} | 131 +- src/components/views/sidebar/Sidebar.css | 89 +- src/components/views/sidebar/Sidebar.js | 72 - src/components/views/sidebar/Sidebar.tsx | 74 + .../views/sidebar/SidebarMapDetail.js | 9 +- .../views/sidebar/SidebarMyPageDetail.js | 20 - .../views/sidebar/SidebarSearchDetail.js | 20 - src/{config.js => config.tsx} | 0 src/context.js | 56 +- 27 files changed, 5758 insertions(+), 1806 deletions(-) rename src/{App.js => App.tsx} (100%) create mode 100644 src/assets/price_marker.png create mode 100644 src/components/helper/axiosGetAverageValue.tsx create mode 100644 src/components/helper/axiosGetinrange.tsx rename src/components/{views/SearchComponent/bubjungdong.js => helper/bubjungdong.tsx} (100%) rename src/components/views/HeaderComponent/{HeaderComponent.js => HeaderComponent.tsx} (72%) delete mode 100644 src/components/views/MainPage/MainPage.js create mode 100644 src/components/views/MainPage/MainPage.tsx create mode 100644 src/components/views/MainPage/MainPageSearchComponent.tsx delete mode 100644 src/components/views/MainPage/component/AccomodationType/AccomodationType.js delete mode 100644 src/components/views/MainPage/component/Calendar/Calendar.js delete mode 100644 src/components/views/MainPage/component/Location/Location.js rename src/components/views/Page404/{Page404.js => Page404.tsx} (88%) rename src/components/views/SearchComponent/{SearchComponent.js => SearchComponent.tsx} (50%) delete mode 100644 src/components/views/sidebar/Sidebar.js create mode 100644 src/components/views/sidebar/Sidebar.tsx delete mode 100644 src/components/views/sidebar/SidebarMyPageDetail.js delete mode 100644 src/components/views/sidebar/SidebarSearchDetail.js rename src/{config.js => config.tsx} (100%) diff --git a/src/App.js b/src/App.tsx similarity index 100% rename from src/App.js rename to src/App.tsx diff --git a/src/assets/price_marker.png b/src/assets/price_marker.png new file mode 100644 index 0000000000000000000000000000000000000000..971f90591554956daeb9343e267b6818fde1e1b3 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^NkA;m!3HE{Bqaoa6lZ})WHAE+w=f7ZGR&GI!N9<1 z?CIhdlF|6~)A=|}B@Mv`i*DSN znIJH6gQ@YGnjk&9zo)vdTkhaeoM3W5tv0V9Te?xVfMG>Yhg$58={G~R$Vn7+Fjk1o z4c@j}tK|a2{7c?k-@};Ke&KSD_SP?$*dB1mS>vJNln(-46&$KIEkbfmocs%0P=&J+ zCdoaVk(I#q?U1wA_S5c{*(|vDG$Z-v6m>|xXb69xW3s|T`GZ4E{DV(o?V`-r_dh96 z`?q7+)NMMaqBuI@--_nt)t7c=cOG4= z`MRM$|N60#yE5J7E@cXGjyDA>L?SmaoGy3SrYsk#TOf4jqxyeEmIJzN$_zD(Jf8M5 Uenw2n0fs4qr>mdKI;Vst0Af>;Jpcdz literal 0 HcmV?d00001 diff --git a/src/components/Router/Router.js b/src/components/Router/Router.js index 562062f..c59b266 100644 --- a/src/components/Router/Router.js +++ b/src/components/Router/Router.js @@ -1,9 +1,8 @@ -import * as React from 'react'; -import { BrowserRouter, Route, Navigate, Routes } from 'react-router-dom'; +import { BrowserRouter, Route, Routes } from "react-router-dom"; -import MainPage from '../views/MainPage/MainPage'; -import LandingPage from '../views/LandingPage/LandingPage'; -import Page404 from '../views/Page404/Page404'; +import MainPage from "../views/MainPage/MainPage"; +import LandingPage from "../views/LandingPage/LandingPage"; +import Page404 from "../views/Page404/Page404"; const Router = () => { return ( diff --git a/src/components/helper/axiosGetAverageValue.tsx b/src/components/helper/axiosGetAverageValue.tsx new file mode 100644 index 0000000..1d05693 --- /dev/null +++ b/src/components/helper/axiosGetAverageValue.tsx @@ -0,0 +1,14 @@ +import axios from "axios"; + +type params = { + capacity: number; + date: string; + parkingAvailability: string; + placeType: string; +}; + +const axiosGetAverageValue = (url: string, params: params) => { + return axios.get(url, { params }); +}; + +export default axiosGetAverageValue; diff --git a/src/components/helper/axiosGetinrange.tsx b/src/components/helper/axiosGetinrange.tsx new file mode 100644 index 0000000..f1cc2e6 --- /dev/null +++ b/src/components/helper/axiosGetinrange.tsx @@ -0,0 +1,18 @@ +import axios from "axios"; + +type params = { + placeType: string; + date: string; + capacity: number; + parkingAvailability: number; + latitudeStart: number; + latitudeEnd: number; + longitudeStart: number; + longitudeEnd: number; +}; + +const axiosGetinrange = (url: string, params: params) => { + return axios.get(url, { params }); +}; + +export default axiosGetinrange; diff --git a/src/components/views/SearchComponent/bubjungdong.js b/src/components/helper/bubjungdong.tsx similarity index 100% rename from src/components/views/SearchComponent/bubjungdong.js rename to src/components/helper/bubjungdong.tsx diff --git a/src/components/views/HeaderComponent/HeaderComponent.js b/src/components/views/HeaderComponent/HeaderComponent.tsx similarity index 72% rename from src/components/views/HeaderComponent/HeaderComponent.js rename to src/components/views/HeaderComponent/HeaderComponent.tsx index a732e08..2f40141 100644 --- a/src/components/views/HeaderComponent/HeaderComponent.js +++ b/src/components/views/HeaderComponent/HeaderComponent.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import logo_icon from '../../../assets/logo_kor.png'; -import { Switch, Route, Link } from 'react-router-dom'; -import styled from 'styled-components'; +import logo_icon from "../../../assets/logo_kor.png"; +import { Link } from "react-router-dom"; +import styled from "styled-components"; const HeaderComponent = () => { return (
- + home