Skip to content

GitLab

Commit d4cc2e87 authored by Sangjune Bae's avatar Sangjune Bae
Browse files

회의 전 커밋

parent ce5716cb
Show whitespace changes
Inline Side-by-side
client/.eslintcache
View file @ d4cc2e87
[{"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\index.js":"1","C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\App.js":"2","C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\reportWebVitals.js":"3","C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\MainRouter.jsx":"4","C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\home\\Main.jsx":"5","C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\home\\Home.jsx":"6"},{"size":628,"mtime":1608985510415,"results":"7","hashOfConfig":"8"},{"size":236,"mtime":1608984738585,"results":"9","hashOfConfig":"8"},{"size":362,"mtime":499162500000,"results":"10","hashOfConfig":"8"},{"size":513,"mtime":1608984681146,"results":"11","hashOfConfig":"8"},{"size":1060,"mtime":1608985184336,"results":"12","hashOfConfig":"8"},{"size":1158,"mtime":1608985296087,"results":"13","hashOfConfig":"8"},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1m5e6l2",{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"18","messages":"19","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"20"},{"filePath":"21","messages":"22","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"23","messages":"24","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"25","messages":"26","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\index.js",[],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\App.js",[],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\reportWebVitals.js",[],["27","28"],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\MainRouter.jsx",[],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\home\\Main.jsx",[],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\home\\Home.jsx",["29"],{"ruleId":"30","replacedBy":"31"},{"ruleId":"32","replacedBy":"33"},{"ruleId":"34","severity":1,"message":"35","line":5,"column":10,"nodeType":"36","messageId":"37","endLine":5,"endColumn":14},"no-native-reassign",["38"],"no-negated-in-lhs",["39"],"no-unused-vars","'Link' is defined but never used.","Identifier","unusedVar","no-global-assign","no-unsafe-negation"] [{"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\index.js":"1","C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\App.js":"2","C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\reportWebVitals.js":"3","C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\MainRouter.jsx":"4","C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\home\\Main.jsx":"5","C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\home\\Home.jsx":"6"},{"size":609,"mtime":1608987715524,"results":"7","hashOfConfig":"8"},{"size":236,"mtime":1608984738585,"results":"9","hashOfConfig":"8"},{"size":362,"mtime":499162500000,"results":"10","hashOfConfig":"8"},{"size":521,"mtime":1608989234127,"results":"11","hashOfConfig":"8"},{"size":2971,"mtime":1608989221247,"results":"12","hashOfConfig":"8"},{"size":1592,"mtime":1608989057081,"results":"13","hashOfConfig":"8"},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1m5e6l2",{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"18"},{"filePath":"19","messages":"20","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"18"},{"filePath":"21","messages":"22","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"23","messages":"24","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"25","messages":"26","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\index.js",[],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\App.js",[],["27","28"],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\reportWebVitals.js",[],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\MainRouter.jsx",["29"],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\home\\Main.jsx",["30","31"],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\home\\Home.jsx",["32","33"],{"ruleId":"34","replacedBy":"35"},{"ruleId":"36","replacedBy":"37"},{"ruleId":"38","severity":1,"message":"39","line":3,"column":8,"nodeType":"40","messageId":"41","endLine":3,"endColumn":12},{"ruleId":"38","severity":1,"message":"42","line":6,"column":10,"nodeType":"40","messageId":"41","endLine":6,"endColumn":18},{"ruleId":"38","severity":1,"message":"43","line":8,"column":8,"nodeType":"40","messageId":"41","endLine":8,"endColumn":11},{"ruleId":"38","severity":1,"message":"44","line":7,"column":8,"nodeType":"40","messageId":"41","endLine":7,"endColumn":11},{"ruleId":"38","severity":1,"message":"43","line":8,"column":8,"nodeType":"40","messageId":"41","endLine":8,"endColumn":11},"no-native-reassign",["45"],"no-negated-in-lhs",["46"],"no-unused-vars","'Home' is defined but never used.","Identifier","unusedVar","'Redirect' is defined but never used.","'Col' is defined but never used.","'Row' is defined but never used.","no-global-assign","no-unsafe-negation"]
\ No newline at end of file \ No newline at end of file
client/package.json
View file @ d4cc2e87
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"react-dom": "^17.0.1", "react-dom": "^17.0.1",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-scripts": "4.0.1", "react-scripts": "4.0.1",
"reactstrap": "^8.8.0",
"web-vitals": "^0.2.4" "web-vitals": "^0.2.4"
}, },
"scripts": { "scripts": {
......
client/src/App.css deleted 100644 → 0
View file @ ce5716cb
.App {
text-align: center;
}
.App-logo {
height: 40vmin;
pointer-events: none;
}
@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}
.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}
.App-link {
color: #61dafb;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
client/src/MainRouter.jsx
View file @ d4cc2e87
...@@ -6,10 +6,10 @@ import Main from "./home/Main"; ...@@ -6,10 +6,10 @@ import Main from "./home/Main";
function MainRouter() { function MainRouter() {
return ( return (
<div> <div>
<Home /> {/* <Main /> */}
<Switch> <Switch>
<Route exact path="/"> <Route exact path="/">
<Home /> <Main />
</Route> </Route>
<Route path="/main"> <Route path="/main">
<Main /> <Main />
......
client/src/home/Home.jsx
View file @ d4cc2e87
...@@ -2,13 +2,22 @@ import React from "react"; ...@@ -2,13 +2,22 @@ import React from "react";
import Button from "react-bootstrap/Button"; import Button from "react-bootstrap/Button";
import Form from "react-bootstrap/Form"; import Form from "react-bootstrap/Form";
import Container from "react-bootstrap/Container"; import Container from "react-bootstrap/Container";
import { Link } from "react-router-dom"; // import { Link } from "react-router-dom";
import { Redirect } from "react-router-dom"; import { Redirect } from "react-router-dom";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import Image from 'react-bootstrap/Image'
import logo from './mainlogo.jpg'
// import Modal from "react-bootstrap/Modal";
// import 'bootstrap / dist / css / bootstrap.min.css';
function Home() { function Home() {
const clickSubmit = (event) => { const clickSubmit = (event) => {
event.preventDefault(); event.preventDefault();
return <Redirect to="/" />; console.log("버튼실행 = 메인으로 넘기기 ")
return <Redirect to="/main"/>
}; };
// if (values.redirect) { // if (values.redirect) {
...@@ -16,10 +25,13 @@ function Home() { ...@@ -16,10 +25,13 @@ function Home() {
// } // }
return ( return (
<Container className="col-sm-6 col-md-5 col-lg-4 p-5"> <Container className="col-sm-6 col-md-5 col-lg-4 p-5">
{/* <Row> */}
<Image src={logo} rounded />
<Form> <Form>
<Form.Group controlId="inputbox"> <Form.Group controlId="inputbox">
<Form.Label>Email</Form.Label> <Form.Label>오늘! 어디가?</Form.Label>
<Form.Control <Form.Control
/> />
<Form.Text className="text-muted"> <Form.Text className="text-muted">
...@@ -27,12 +39,12 @@ function Home() { ...@@ -27,12 +39,12 @@ function Home() {
</Form.Text> </Form.Text>
</Form.Group> </Form.Group>
<Button variant="primary" type="submit" onClick={clickSubmit}>관광지 검색하기</Button> <Button variant="danger" type="submit" onClick={clickSubmit}>관광지 검색하기</Button>
</Form>
{/* </Row> */}
</Form>
</Container> </Container>
); );
} }
......
client/src/home/Main.jsx
View file @ d4cc2e87
...@@ -2,9 +2,18 @@ import React from "react"; ...@@ -2,9 +2,18 @@ import React from "react";
import Button from "react-bootstrap/Button"; import Button from "react-bootstrap/Button";
import Form from "react-bootstrap/Form"; import Form from "react-bootstrap/Form";
import Container from "react-bootstrap/Container"; import Container from "react-bootstrap/Container";
import { Link } from "react-router-dom";
import { Redirect } from "react-router-dom";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import Image from 'react-bootstrap/Image'
// import Modal from "react-bootstrap/Modal";
// import 'bootstrap / dist / css / bootstrap.min.css';
function Signin() { import logo from './mainlogo.jpg'
const clickSubmit = (event) => {
function Main() {
const clickSubmit = (event) => {
event.preventDefault(); event.preventDefault();
console.log("메인페이지 도착") console.log("메인페이지 도착")
}; };
...@@ -16,21 +25,65 @@ const clickSubmit = (event) => { ...@@ -16,21 +25,65 @@ const clickSubmit = (event) => {
return ( return (
<Container className="col-sm-6 col-md-5 col-lg-4 p-5"> <Container className="col-sm-6 col-md-5 col-lg-4 p-5">
<Form> <Form>
<Image src={logo} rounded />
<Form.Label>오늘! 어디가? </Form.Label>
<Form.Group controlId="contentsbox">
<Form.Label>관광지 정보</Form.Label>
<Form.Control
/>
<Form.Text >
관광지의 정보가 나타납니다.
</Form.Text>
<Row>
<Link to="logo.svg">
<Form.Text >
첫번째 관광지
</Form.Text>
</Link>
<Link to="logo.svg">
<Form.Text >
두번째 관광지
</Form.Text>
</Link>
</Row>
<Row>
<Link to="logo.svg">
<Form.Text >
세번째 관광지
</Form.Text>
</Link>
{/* modal같이 다른 창 띄우는 것도 방법이고 링크 넣거나 화면하나 만드는 것도 방법일 듯 */}
<Link to="logo.svg">
<Form.Text >
네번째 관광지
</Form.Text>
</Link>
</Row>
</Form.Group>
{/* <Button variant="primary" type="submit" onClick={clickSubmit}>Submit</Button> */}
<Form.Group controlId="inputbox"> <Form.Group controlId="inputbox">
<Form.Label>Email</Form.Label> <Form.Label>다른 관광지 검색하기</Form.Label>
<Form.Control <Form.Control
/> />
<Form.Text className="text-muted"> <Form.Text className="text-muted">
관광지를 입력하면 관련된 정보들이 나옵니다. 새로운 관광지를 검색합니다.
</Form.Text> </Form.Text>
</Form.Group> </Form.Group>
<Button variant="primary" type="submit" onClick={clickSubmit}> <Button variant="danger" type="submit" onClick={clickSubmit}>다른 관광지 검색하기</Button>
Submit
</Button>
</Form> </Form>
</Container> </Container>
); );
} }
export default Signin; export default Main;
client/src/index.js
View file @ d4cc2e87
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
// import './index.css';
import App from './App'; import App from './App';
import * as serviceWorker from './serviceWorker'; import reportWebVitals from './reportWebVitals';
import 'bootstrap/dist/css/bootstrap.min.css'; import 'bootstrap/dist/css/bootstrap.min.css';
import '@fortawesome/fontawesome-free/css/all.css' // import '@fortawesome/fontawesome-free/css/all.css'
// import MainRouter from './MainRouter';
ReactDOM.render( ReactDOM.render(
// <React.StrictMode> //<React.StrictMode>
<App />, <App />,
// </React.StrictMode>, //</React.StrictMode>,
document.getElementById('root') document.getElementById('root')
); );
// If you want your app to work offline and load faster, you can change // If you want to start measuring performance in your app, pass a function
// unregister() to register() below. Note this comes with some pitfalls. // to log results (for example: reportWebVitals(console.log))
// Learn more about service workers: https://bit.ly/CRA-PWA // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
serviceWorker.unregister(); reportWebVitals();
client/yarn.lock 0 → 100644
View file @ d4cc2e87
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment