회의 전 커밋

client/.eslintcache

-[{"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

client/package.json

@@ -12,6 +12,7 @@
     "react-dom": "^17.0.1",
     "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.1",
+    "reactstrap": "^8.8.0",
     "web-vitals": "^0.2.4"
   },
   "scripts": {

client/src/App.css

-.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

@@ -6,10 +6,10 @@ import Main from "./home/Main";
 function MainRouter() {
   return (
     <div>
-      <Home />
+      {/* <Main /> */}
       <Switch>
         <Route exact path="/">
-          <Home />
+          <Main />
         </Route>
         <Route path="/main">
           <Main />

client/src/home/Home.jsx

@@ -2,13 +2,22 @@ import React from "react";
 import Button from "react-bootstrap/Button";
 import Form from "react-bootstrap/Form";
 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 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() {
     const clickSubmit = (event) => {
         event.preventDefault();
-        return <Redirect to="/" />;
+        console.log("버튼실행 = 메인으로 넘기기 ")
+        return <Redirect to="/main"/>
     };
 
     // if (values.redirect) {
@@ -16,10 +25,13 @@ function Home() {
     //   }
 
     return (
+
         <Container className="col-sm-6 col-md-5 col-lg-4 p-5">
+            {/* <Row> */}
+            <Image src={logo} rounded />
             <Form>
                 <Form.Group controlId="inputbox">
-                    <Form.Label>Email</Form.Label>
+                    <Form.Label>오늘! 어디가?</Form.Label>
                     <Form.Control
                     />
                     <Form.Text className="text-muted">
@@ -27,12 +39,12 @@ function Home() {
           </Form.Text>
                 </Form.Group>
 
-                    <Button variant="primary" type="submit" onClick={clickSubmit}>관광지 검색하기</Button>
-
-                
-
+                <Button variant="danger" type="submit" onClick={clickSubmit}>관광지 검색하기</Button>
 
             </Form>
+           
+            {/* </Row> */}
+
         </Container>
     );
 }

client/src/home/Main.jsx

@@ -2,11 +2,20 @@ import React from "react";
 import Button from "react-bootstrap/Button";
 import Form from "react-bootstrap/Form";
 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() {
-const clickSubmit = (event) => {
-    event.preventDefault();
-    console.log("메인페이지 도착")
+import logo from './mainlogo.jpg'
+
+function Main() {
+    const clickSubmit = (event) => {
+        event.preventDefault();
+        console.log("메인페이지 도착")
     };
 
     // if (values.redirect) {
@@ -16,21 +25,65 @@ const clickSubmit = (event) => {
     return (
         <Container className="col-sm-6 col-md-5 col-lg-4 p-5">
             <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.Label>Email</Form.Label>
+                    <Form.Label>다른 관광지 검색하기</Form.Label>
                     <Form.Control
                     />
                     <Form.Text className="text-muted">
-                        관광지를 입력하면 관련된 정보들이 나옵니다.
+                        새로운 관광지를 검색합니다.
           </Form.Text>
                 </Form.Group>
 
-                <Button variant="primary" type="submit" onClick={clickSubmit}>
-                    Submit
-        </Button>
+                <Button variant="danger" type="submit" onClick={clickSubmit}>다른 관광지 검색하기</Button>
+
             </Form>
+
+
         </Container>
     );
 }
 
-export default Signin;
+export default Main;

client/src/index.js

 import React from 'react';
 import ReactDOM from 'react-dom';
+// import './index.css';
 import App from './App';
-import * as serviceWorker from './serviceWorker';
+import reportWebVitals from './reportWebVitals';
 import 'bootstrap/dist/css/bootstrap.min.css';
-import '@fortawesome/fontawesome-free/css/all.css'
-// import MainRouter from './MainRouter';
+// import '@fortawesome/fontawesome-free/css/all.css'
 
 ReactDOM.render(
-  // <React.StrictMode>
+  //<React.StrictMode>
     <App />,
-  // </React.StrictMode>,
+  //</React.StrictMode>,
   document.getElementById('root')
 );
 
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();
+// If you want to start measuring performance in your app, pass a function
+// to log results (for example: reportWebVitals(console.log))
+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+reportWebVitals();