Skip to content

GitLab

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

.

parent d4cc2e87
Show whitespace changes
Inline Side-by-side
client/.eslintcache
View file @ f0fa48c9
[{"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"] [{"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":5084,"mtime":1608994023017,"results":"12","hashOfConfig":"8"},{"size":1611,"mtime":1608993232687,"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":3,"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","32"],"C:\\Users\\reyel\\OneDrive\\바탕 화면\\2020winter\\search-page\\client\\src\\home\\Home.jsx",["33","34"],{"ruleId":"35","replacedBy":"36"},{"ruleId":"37","replacedBy":"38"},{"ruleId":"39","severity":1,"message":"40","line":3,"column":8,"nodeType":"41","messageId":"42","endLine":3,"endColumn":12},{"ruleId":"39","severity":1,"message":"43","line":6,"column":10,"nodeType":"41","messageId":"42","endLine":6,"endColumn":18},{"ruleId":"39","severity":1,"message":"44","line":8,"column":8,"nodeType":"41","messageId":"42","endLine":8,"endColumn":11},{"ruleId":"39","severity":1,"message":"45","line":21,"column":11,"nodeType":"41","messageId":"42","endLine":21,"endColumn":22},{"ruleId":"39","severity":1,"message":"46","line":7,"column":8,"nodeType":"41","messageId":"42","endLine":7,"endColumn":11},{"ruleId":"39","severity":1,"message":"44","line":8,"column":8,"nodeType":"41","messageId":"42","endLine":8,"endColumn":11},"no-native-reassign",["47"],"no-negated-in-lhs",["48"],"no-unused-vars","'Home' is defined but never used.","Identifier","unusedVar","'Redirect' is defined but never used.","'Col' is defined but never used.","'clickSubmit' is assigned a value 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/src/home/Home.jsx
View file @ f0fa48c9
...@@ -8,7 +8,8 @@ import Row from "react-bootstrap/Row"; ...@@ -8,7 +8,8 @@ import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col"; import Col from "react-bootstrap/Col";
import Image from 'react-bootstrap/Image' import Image from 'react-bootstrap/Image'
import logo from './mainlogo.jpg' import mainlogo from '../picture/mainlogo.jpg'
// import Modal from "react-bootstrap/Modal"; // import Modal from "react-bootstrap/Modal";
// import 'bootstrap / dist / css / bootstrap.min.css'; // import 'bootstrap / dist / css / bootstrap.min.css';
...@@ -28,7 +29,7 @@ function Home() { ...@@ -28,7 +29,7 @@ function Home() {
<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> */} {/* <Row> */}
<Image src={logo} rounded /> <Image src={mainlogo} rounded />
<Form> <Form>
<Form.Group controlId="inputbox"> <Form.Group controlId="inputbox">
<Form.Label>오늘! 어디가?</Form.Label> <Form.Label>오늘! 어디가?</Form.Label>
......
client/src/home/Main.jsx
View file @ f0fa48c9
...@@ -7,10 +7,15 @@ import { Redirect } from "react-router-dom"; ...@@ -7,10 +7,15 @@ import { Redirect } from "react-router-dom";
import Row from "react-bootstrap/Row"; import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col"; import Col from "react-bootstrap/Col";
import Image from 'react-bootstrap/Image' import Image from 'react-bootstrap/Image'
import { Card } from 'react-bootstrap'
// import Modal from "react-bootstrap/Modal"; // import Modal from "react-bootstrap/Modal";
// import 'bootstrap / dist / css / bootstrap.min.css'; // import 'bootstrap / dist / css / bootstrap.min.css';
import logo from './mainlogo.jpg' import mainlogo from '../picture/mainlogo.jpg'
import hallasan from '../picture/hallasan.PNG'
import osulloc from '../picture/osulloc.PNG'
import sungsan from '../picture/sungsan.PNG'
import haenyeo from '../picture/haenyeo.PNG'
function Main() { function Main() {
const clickSubmit = (event) => { const clickSubmit = (event) => {
...@@ -23,52 +28,73 @@ function Main() { ...@@ -23,52 +28,73 @@ function Main() {
// } // }
return ( return (
<Container className="col-sm-6 col-md-5 col-lg-4 p-5"> <Container className="">
<Form> <Form>
<Image src={logo} rounded /> <Image src={mainlogo} rounded />
<Form.Label>오늘! 어디가? </Form.Label> <Form.Label>made by Cherry </Form.Label>
<Form.Group controlId="contentsbox"> <Form.Group controlId="contentsbox">
<Form.Label>관광지 정보</Form.Label> <Form.Text>관광지 정보</Form.Text>
<Form.Control {/* <Form.Control
/> /> */}
<Form.Text >
관광지의 정보가 나타납니다.
</Form.Text>
<Row> <Row>
<Link to="logo.svg"> <Card style={{ width: '30rem' }}>
<Form.Text > <Card.Img variant="top" src={hallasan} />
첫번째 관광지 <Card.Body>
</Form.Text> <Card.Title>한라산(hallasan)</Card.Title>
<Card.Text>
제주 서귀포시 토평동 산15-1 </Card.Text>
<Link to="/">
<Button variant="primary">한라산 자세히 살펴보기</Button>
</Link> </Link>
<Link to="logo.svg"> </Card.Body>
<Form.Text > </Card>
두번째 관광지
</Form.Text> <Card style={{ width: '30rem' }}>
<Card.Img variant="top" src={sungsan} />
<Card.Body>
<Card.Title>성산일출봉(sungsan)</Card.Title>
<Card.Text>
제주 서귀포시 성산읍 성산리 1 </Card.Text>
<Link to="/">
<Button variant="primary">성산일출봉 자세히 살펴보기</Button>
</Link> </Link>
</Card.Body>
</Card>
</Row> </Row>
<Row> <Row>
<Card style={{ width: '30rem' }}>
<Link to="logo.svg"> <Card.Img variant="top" src={haenyeo} />
<Form.Text > <Card.Body>
세번째 관광지 <Card.Title>해녀의 집(haenyeo)</Card.Title>
</Form.Text> <Card.Text>
제주 서귀포시 성산읍 한도로 141-13지번오조리 3 오조해녀의집 </Card.Text>
<Link to="/">
<Button variant="primary">해녀의 집 자세히 살펴보기</Button>
</Link> </Link>
</Card.Body>
</Card>
{/* modal같이 다른 창 띄우는 것도 방법이고 링크 넣거나 화면하나 만드는 것도 방법일 듯 */} {/* modal같이 다른 창 띄우는 것도 방법이고 링크 넣거나 화면하나 만드는 것도 방법일 듯 */}
<Link to="logo.svg"> <Card style={{ width: '30rem' }}>
<Form.Text > <Card.Img variant="top" src={osulloc} />
네번째 관광지 <Card.Body>
</Form.Text> <Card.Title>오설록 티 뮤지엄(osulloc)</Card.Title>
<Card.Text>
제주 서귀포시 안덕면 신화역사로 15 오설록지번서광리 1235-1 오설록 </Card.Text>
<Link to="/">
<Button variant="primary">오설록 티 뮤지엄 자세히 살펴보기</Button>
</Link> </Link>
</Card.Body>
</Card>
</Row> </Row>
</Form.Group> </Form.Group>
{/* <Button variant="primary" type="submit" onClick={clickSubmit}>Submit</Button> */} {/* <Button variant="primary" type="submit" onClick={clickSubmit}>Submit</Button> */}
<Form.Group controlId="inputbox"> {/* <Form.Group controlId="inputbox">
<Form.Label>다른 관광지 검색하기</Form.Label> <Form.Label>다른 관광지 검색하기</Form.Label>
<Form.Control <Form.Control
/> />
...@@ -77,12 +103,12 @@ function Main() { ...@@ -77,12 +103,12 @@ function Main() {
</Form.Text> </Form.Text>
</Form.Group> </Form.Group>
<Button variant="danger" type="submit" onClick={clickSubmit}>다른 관광지 검색하기</Button> <Button variant="danger" type="submit" onClick={clickSubmit}>다른 관광지 검색하기</Button> */}
</Form> </Form>
</Container> </Container >
); );
} }
......
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