Skip to content

GitLab

Commit 1f388bc8 authored by Lee SeoYeon's avatar Lee SeoYeon
Browse files

.

parent ce982093
Show whitespace changes
Inline Side-by-side
client/src/Pages/App.js → client/src/App.js
View file @ 1f388bc8
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Link, Redirect } from 'react-router-dom'; import { Link, Redirect } from 'react-router-dom';
<<<<<<< HEAD:client/src/App.js import ohuh from './ohuh.PNG'
import ohuh from './ohuh.PNG'; import { Container, Row, Form, Image, InputGroup, Button, Col, FormControl, Navbar, Nav } from 'react-bootstrap';
import { Col, FormControl, Container, Row, Form, Image, InputGroup, Button, Navbar, Nav } from 'react-bootstrap'; import { handleLogout, isAuthenticated } from './utils/auth.js'
import { handleLogout, isAuthenticated } from './utils/auth'
=======
import ohuh from '../ohuh.PNG';
import { Container, Row, Form, Image, InputGroup, Button, Col, FormControl } from 'react-bootstrap';
>>>>>>> origin/cherry:client/src/Pages/App.js
function App() { function App() {
const [state, setState] = useState(false); const [state, setState] = useState(false);
...@@ -35,8 +29,6 @@ function App() { ...@@ -35,8 +29,6 @@ function App() {
return ( return (
<Container className="vh-100"> <Container className="vh-100">
<Row className="d-flex justify-content-md-center"> <Row className="d-flex justify-content-md-center">
<<<<<<< HEAD:client/src/App.js
{/* <Row as={Image} src={ohuh} col-sm-5 col-lg-6 offset-lg-0> */}
<Col md={6} className="mt-5"> <Col md={6} className="mt-5">
<Image src={ohuh} fluid /> <Image src={ohuh} fluid />
</Col> </Col>
...@@ -53,14 +45,7 @@ function App() { ...@@ -53,14 +45,7 @@ function App() {
</Nav> </Nav>
</Navbar> </Navbar>
</Col> </Col>
{/* </Row> */}
<Col lg={{ span: 10, offset: 1 }} > {/*xs={{ span: 12, offset: 3 }} */}
=======
<Col md={6} className="mt-5">
<Image src={ohuh} fluid />
</Col>
<Col lg={{ span: 10, offset: 1 }} > <Col lg={{ span: 10, offset: 1 }} >
>>>>>>> origin/cherry:client/src/Pages/App.js
<InputGroup size="lg" lg={6} xs={4} fluid> <InputGroup size="lg" lg={6} xs={4} fluid>
<FormControl <FormControl
className="d-flex justify-content-lg-center" className="d-flex justify-content-lg-center"
...@@ -73,13 +58,6 @@ function App() { ...@@ -73,13 +58,6 @@ function App() {
<Button variant="outline-secondary" onClick={handleSubmit}>검색</Button> <Button variant="outline-secondary" onClick={handleSubmit}>검색</Button>
</InputGroup.Append> </InputGroup.Append>
</InputGroup> </InputGroup>
<<<<<<< HEAD:client/src/App.js
{/* <form onSubmit={handleSubmit}>
<input className="" name="search" type="text" placeholder="검색어를 입력하세요." onChange={handleChange}></input>
<Link to="/search"><button type="submit">검색</button></Link>
</form> */}
=======
>>>>>>> origin/cherry:client/src/Pages/App.js
</Col> </Col>
</Row> </Row>
</Container> </Container>
......
client/src/Components/Place.js
View file @ 1f388bc8
...@@ -20,33 +20,6 @@ function Place(props) { ...@@ -20,33 +20,6 @@ function Place(props) {
return ( return (
<<<<<<< HEAD
<>
<style type="text/css">
{`
.modal-backdrop.in {
opacity: 0;
}
`}
</style>
<Modal {...props}
size="xl"
keyboard="true"
variant="backdrop.in"
// show={lgShow}
// onHide={() => setLgShow(false)}
aria-labelledby="example-modal-sizes-title-lg">
<Modal.Header closeButton>
<Modal.Title id="contained-modal-title-vcenter" style={{fontSize:'40px'}}>
{props.search.name}
</Modal.Title>
</Modal.Header>
<Modal.Body className="show-grid">
<Container style={{fontSize:'30px'}}>
<Row className="mt-4">
<div>주도 전역을 지배하는 한라산은 남한에서 가장 높은 산으로 높이는 1,947.3m이다. 한라산이라는 이름은 산이 높아 산정에 서면 은하수를 잡아당길 수 있다는 뜻이며, 부악·원산·선산·두무악·영주산·부라산·혈망봉·여장군 등으로도 불려왔다.</div>
<a href="https://www.daum.net">다음의 블로그</a>
=======
<Modal {...props} <Modal {...props}
size="xl" size="xl"
keyboard="true" keyboard="true"
...@@ -85,7 +58,6 @@ function Place(props) { ...@@ -85,7 +58,6 @@ function Place(props) {
<Accordion.Collapse eventKey="1"> <Accordion.Collapse eventKey="1">
<Card.Body><div>한라산은 1966년 한라산 천연보호구역으로, 1970년 국립공원으로 지정되었다. 그리고 2002년에는 유네스코 생물권보전지역으로 지정되었으며 2007년에는 유네스코 세계자연유산으로 등재되었다. 2008년에는 물장오리오름 산정화구호 습지가 람사르 습지로 등록되어 보호 관리되고 있다</div></Card.Body> <Card.Body><div>한라산은 1966년 한라산 천연보호구역으로, 1970년 국립공원으로 지정되었다. 그리고 2002년에는 유네스코 생물권보전지역으로 지정되었으며 2007년에는 유네스코 세계자연유산으로 등재되었다. 2008년에는 물장오리오름 산정화구호 습지가 람사르 습지로 등록되어 보호 관리되고 있다</div></Card.Body>
</Accordion.Collapse> </Accordion.Collapse>
>>>>>>> origin/cherry
</Row> </Row>
<Row> <Row>
<Accordion.Toggle as={Button} variant="link" eventKey="2"> <Accordion.Toggle as={Button} variant="link" eventKey="2">
...@@ -95,18 +67,6 @@ function Place(props) { ...@@ -95,18 +67,6 @@ function Place(props) {
<Card.Body><div>한라산은 제주도에 있는 해발 1,947.06m, 면적 약 1,820km²의 화산으로, 제주도의 면적 대부분을 차지하고 있다. 정상에 백록담이라는 화산호가 있는데, 백록담이라는 이름은 흰 사슴이 물을 먹는 곳이라는 뜻에서 왔다고 전해진다.</div></Card.Body> <Card.Body><div>한라산은 제주도에 있는 해발 1,947.06m, 면적 약 1,820km²의 화산으로, 제주도의 면적 대부분을 차지하고 있다. 정상에 백록담이라는 화산호가 있는데, 백록담이라는 이름은 흰 사슴이 물을 먹는 곳이라는 뜻에서 왔다고 전해진다.</div></Card.Body>
</Accordion.Collapse> </Accordion.Collapse>
</Row> </Row>
<<<<<<< HEAD
<Row className="mt-4">
<div>한라산은 제주도에 있는 해발 1,947.06m, 면적 약 1,820km²의 화산으로, 제주도의 면적 대부분을 차지하고 있다. 정상에 백록담이라는 화산호가 있는데, 백록담이라는 이름은 흰 사슴이 물을 먹는 곳이라는 뜻에서 왔다고 전해진다.</div>
<a href="https://www.google.com/">구글의 블로그</a></Row>
</Container>
</Modal.Body>
<Modal.Footer>
<Button block onClick={props.onHide}>Close</Button>
</Modal.Footer>
</Modal>
</>
=======
</Accordion> </Accordion>
<Row style={{ color: 'white' }}> <Row style={{ color: 'white' }}>
<a href="https://www.daum.net/" className="mb-2">다음</a><a href="https://www.naver.com/" className="mb-2">네이버</a><a href="https://www.google.com/" className="mb-2">구글</a> <a href="https://www.daum.net/" className="mb-2">다음</a><a href="https://www.naver.com/" className="mb-2">네이버</a><a href="https://www.google.com/" className="mb-2">구글</a>
...@@ -131,7 +91,6 @@ function Place(props) { ...@@ -131,7 +91,6 @@ function Place(props) {
<Button block onClick={props.onHide}>Close</Button> <Button block onClick={props.onHide}>Close</Button>
</Modal.Footer> </Modal.Footer>
</Modal> </Modal>
>>>>>>> origin/cherry
); );
} }
......
client/src/Pages/Search.js → client/src/Search.js
View file @ 1f388bc8
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { Link, Redirect } from 'react-router-dom'; import { Link, Redirect } from 'react-router-dom';
<<<<<<< HEAD:client/src/Search.js
import ohuh from './ohuh-sm.PNG'; import ohuh from './ohuh-sm.PNG';
import Place from './Components/Place'; import Place from './Components/Place';
import { Container, Form, Row, Col, Card, Image, InputGroup, FormControl, Button, Pagination, Nav, Navbar } from 'react-bootstrap'; import { Container, Form, Row, Col, Card, Image, InputGroup, FormControl, Button, Pagination, Nav, Navbar } from 'react-bootstrap';
import Paginations from './pagination.js'; import Paginations from './pagination.js';
=======
import ohuh from '../ohuh-sm.PNG';
import Place from '../Components/Place';
import { Container, Form, Row, Col, Card, Image, InputGroup, FormControl, Button, Pagination } from 'react-bootstrap';
import Paginations from '../Components/Paginations';
>>>>>>> origin/cherry:client/src/Pages/Search.js
function Search(props) { function Search(props) {
const endPage = 10; const endPage = 10;
...@@ -462,16 +455,15 @@ function Search(props) { ...@@ -462,16 +455,15 @@ function Search(props) {
return ( return (
<Container > <Container >
<Link to="/" className="d-flex justify-content-center"><Image src={ohuh} /></Link> <Link to="/" className="d-flex justify-content-center"><Image src={ohuh} /></Link>
<<<<<<< HEAD:client/src/Search.js <Row className='d-flex justify-content-flex-start'>
{/* <Row className='d-flex justify-content-flex-start'> {/* <Navbar bg="#fff" variant="light">
<Navbar bg="#fff" variant="light">
<Nav className="mr-auto"> <Nav className="mr-auto">
<Nav.Link href="#home">회원가입</Nav.Link> <Nav.Link href="#home">회원가입</Nav.Link>
<Nav.Link href="#features">로그인</Nav.Link> <Nav.Link href="#features">로그인</Nav.Link>
<Nav.Link href="#pricing">로그아웃</Nav.Link> <Nav.Link href="#pricing">로그아웃</Nav.Link>
</Nav> </Nav>
</Navbar> </Navbar> */}
</Row> */} </Row>
<Row className="mb-2" className="d-flex justify-content-center"> <Row className="mb-2" className="d-flex justify-content-center">
<Form style={{ width: "90vw" }} onSubmit={handleSubmit}> <Form style={{ width: "90vw" }} onSubmit={handleSubmit}>
<InputGroup size="lg"> <InputGroup size="lg">
...@@ -480,11 +472,6 @@ function Search(props) { ...@@ -480,11 +472,6 @@ function Search(props) {
{/* <Image src={ohuh} fluid width="130px" /> */} {/* <Image src={ohuh} fluid width="130px" /> */}
</Col> </Col>
</Link> </Link>
=======
<Row className="mb-2" className="d-flex justify-content-center">
<Form style={{ width: "90vw" }} onSubmit={handleSubmit}>
<InputGroup size="lg">
>>>>>>> origin/cherry:client/src/Pages/Search.js
<FormControl <FormControl
placeholder="검색어를 입력하세요." placeholder="검색어를 입력하세요."
value={search} value={search}
......
client/src/index.js
View file @ 1f388bc8
...@@ -2,9 +2,8 @@ import React from 'react'; ...@@ -2,9 +2,8 @@ import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import './index.css'; import './index.css';
import 'bootstrap/dist/css/bootstrap.min.css'; import 'bootstrap/dist/css/bootstrap.min.css';
import App from './Pages/App'; import App from './App'
import Search from './Pages/Search'; import Search from './Search';
import axios from 'axios';
import reportWebVitals from './reportWebVitals'; import reportWebVitals from './reportWebVitals';
import Signup from './Components/Signup' import Signup from './Components/Signup'
import Login from './Components/Login' import Login from './Components/Login'
...@@ -16,9 +15,6 @@ import { ...@@ -16,9 +15,6 @@ import {
} from "react-router-dom"; } from "react-router-dom";
import axios from 'axios'; import axios from 'axios';
axios.defaults.validateStatus = function (status) {
return status < 500; // default
}
ReactDOM.render( ReactDOM.render(
<React.StrictMode> <React.StrictMode>
......
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