Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/search #7

Open
wants to merge 6 commits into
base: feat/marker
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
83 changes: 83 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"@types/node": "^18.0.5",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@types/styled-components": "^5.1.26",
"axios": "^0.27.2",
"moment": "^2.29.4",
"react": "^17.0.2",
Expand Down
File renamed without changes.
Binary file added src/assets/price_marker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 4 additions & 5 deletions src/components/Router/Router.js
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
14 changes: 14 additions & 0 deletions src/components/helper/axiosGetAverageValue.tsx
Original file line number Diff line number Diff line change
@@ -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;
18 changes: 18 additions & 0 deletions src/components/helper/axiosGetinrange.tsx
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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 (
<Header>
<Link to="/">
<img src={logo_icon} />
<img src={logo_icon} alt="home" />
</Link>
<nav id="headernav">
<Link to="/map">도움말</Link>
Expand Down
46 changes: 34 additions & 12 deletions src/components/views/LandingPage/LandingPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
.sidebar {
width: 372px;
}

.detailsidebar {
width: 200px;
}
}

#searchTextbox {
Expand All @@ -45,37 +41,39 @@

.detailsidebar {
position: fixed;
top: 0;
left: 150px;
height: 100%;
top: 400px;
left: 400px;
height: 300px;
width: 900px;
background: var(--clr-white);
display: grid;
grid-template-rows: auto 1fr auto;
row-gap: 1rem;
box-shadow: var(--clr-red-dark);
background-size: cover;
/* transition: var(--transition); */
/* transform: translate(-100%); */
}

.show-detailsidebar {
transform: translate(0);
z-index: 1000;
z-index: 9999;
}

html {
height: 100%;
}
div#root {
height: calc(100% - 138px);
height: 100%;
}
div .landing-page .landing-page__inner .map-container,
div.landing-page .landing-page__inner,
div.landing-page {
height: 100%;
height: 1000px;
}

.map {
height: 100%;
height: 1000px;
margin-left: 372px;
}
.SearchComponent {
Expand All @@ -95,7 +93,12 @@ div.landing-page {
margin-left: 447px;
}

#selectAddress select {
#mainPageSelectAddress {
margin-left: 50px;
}

#selectAddress select,
#mainPageSelectAddress select {
width: 88px;
height: 28px;
border: 1px solid #c7c7c7;
Expand Down Expand Up @@ -165,3 +168,22 @@ div.landing-page {

color: #ffffff;
}

#searchButton {
float: left;
margin-left: 18px;
width: 69px;
height: 23px;
left: calc(50% - 69px / 2 + 459.5px);
top: calc(50% - 23px / 2 - 422.5px);

background: #f5a200;
border-radius: 4px;
font-style: normal;
font-weight: 800;
font-size: 11px;
line-height: 12px;
text-align: center;

color: #ffffff;
}
Loading