Commit 2b2b96aa authored by baesangjune's avatar baesangjune
Browse files

디버깅 UI 다 완료

parent b6553221
[{"C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Pages\\Search.js":"1"},{"size":6738,"mtime":1612290129913,"results":"2","hashOfConfig":"3"},{"filePath":"4","messages":"5","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"13y9yvi","C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Pages\\Search.js",["6"],{"ruleId":null,"fatal":true,"severity":2,"message":"7","line":86,"column":2},"Parsing error: Unexpected token\n\n 84 | const include = bookmark.findIndex(i => i.name === place.name) !== -1\n 85 | if (!include) {\n> 86 | <<<<<<< HEAD\n | ^\n 87 | =======\n 88 | console.log(pagePlace[index])\n 89 | >>>>>>> origin/cherry"]
\ No newline at end of file
[{"C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Pages\\Search.js":"1","C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\index.js":"2","C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Components\\PrivateRoute.js":"3","C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Pages\\Place.js":"4","C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Pages\\App.js":"5","C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Pages\\Bookmark.js":"6"},{"size":6738,"mtime":1612290129913,"results":"7","hashOfConfig":"8"},{"size":1345,"mtime":1612156521448,"results":"9","hashOfConfig":"8"},{"size":438,"mtime":1612133560394,"results":"10","hashOfConfig":"8"},{"size":3291,"mtime":1612290884779,"results":"11","hashOfConfig":"8"},{"size":5510,"mtime":1612292446873,"results":"12","hashOfConfig":"8"},{"size":5982,"mtime":1612290784227,"results":"13","hashOfConfig":"8"},{"filePath":"14","messages":"15","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"13y9yvi",{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"18","messages":"19","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"20","messages":"21","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Pages\\Search.js",["26"],"C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\index.js",[],"C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Components\\PrivateRoute.js",[],"C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Pages\\Place.js",["27","28","29","30"],"C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Pages\\App.js",[],"C:\\Users\\노트북펜\\Desktop\\2021YDK\\search-page\\client\\src\\Pages\\Bookmark.js",["31","32"],{"ruleId":null,"fatal":true,"severity":2,"message":"33","line":86,"column":2},{"ruleId":"34","severity":1,"message":"35","line":1,"column":10,"nodeType":"36","messageId":"37","endLine":1,"endColumn":15},{"ruleId":"34","severity":1,"message":"38","line":11,"column":10,"nodeType":"39","messageId":"37","endLine":11,"endColumn":15},{"ruleId":"40","severity":1,"message":"41","line":30,"column":6,"nodeType":"42","endLine":30,"endColumn":8,"suggestions":"43"},{"ruleId":"44","severity":1,"message":"45","line":89,"column":11,"nodeType":"46","endLine":89,"endColumn":44},{"ruleId":"34","severity":1,"message":"47","line":26,"column":19,"nodeType":"39","messageId":"37","endLine":26,"endColumn":30},{"ruleId":"40","severity":1,"message":"48","line":77,"column":8,"nodeType":"42","endLine":77,"endColumn":10,"suggestions":"49"},"Parsing error: Unexpected token\n\n 84 | const include = bookmark.findIndex(i => i.name === place.name) !== -1\n 85 | if (!include) {\n> 86 | <<<<<<< HEAD\n | ^\n 87 | =======\n 88 | console.log(pagePlace[index])\n 89 | >>>>>>> origin/cherry","no-unused-vars","'kakao' is defined but never used.","Program","unusedVar","'error' is assigned a value but never used.","Identifier","react-hooks/exhaustive-deps","React Hook useEffect has a missing dependency: 'getReview'. Either include it or remove the dependency array.","ArrayExpression",["50"],"jsx-a11y/anchor-is-valid","The href attribute requires a valid value to be accessible. Provide a valid, navigable address as the href value. If you cannot provide a valid href, but still need the element to resemble a link, use a button and change it with appropriate styles. Learn more: https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/anchor-is-valid.md","JSXOpeningElement","'bookmarkArr' is assigned a value but never used.","React Hook useEffect has a missing dependency: 'getBookmark'. Either include it or remove the dependency array.",["51"],{"desc":"52","fix":"53"},{"desc":"54","fix":"55"},"Update the dependencies array to be: [getReview]",{"range":"56","text":"57"},"Update the dependencies array to be: [getBookmark]",{"range":"58","text":"59"},[1055,1057],"[getReview]",[2593,2595],"[getBookmark]"]
\ No newline at end of file
......@@ -97,53 +97,18 @@ function App() {
</InputGroup>
</Form>
</Row>
{/* <div class="row mb-2">
<div class="col-md-6">
<div class="row g-0 border rounded overflow-hidden flex-md-row mb-4 shadow-sm h-md-250 position-relative">
<div class="col p-4 d-flex flex-column position-static">
<strong class="d-inline-block mb-2 text-info">인기관광지</strong>
<h3 class="mb-0">{recommend.name}</h3>
<Image variant="top" style={{ padding: "5%", width: "100%", height: "340px" }} src={recommend.img} />
<p class="card-text mb-auto">{recommend.address}</p>
<Link to={`/place?name=${recommend.name}&src=${recommend.img}&address=${recommend.address}`} >
<Button variant="info"> {recommend.name} 자세히 살펴보기</Button>
</Link>
</div>
<div class="col-auto d-none d-lg-block">
</div>
</div>
</div>
<div class="col-md-6">
<div class="row g-0 border rounded overflow-hidden flex-md-row mb-4 shadow-sm h-md-250 position-relative">
<div class="col p-4 d-flex flex-column position-static">
<strong class="d-inline-block mb-2 text-success">최근검색 관광지</strong>
<h3 class="mb-0">{latest.name}</h3>
<Image variant="top" style={{ padding: "5%", width: "100%", height: "340px" }} src={latest.img} />
<p class="mb-auto">{latest.address}</p>
<Link to={`/place?name=${latest.name}&src=${latest.img}&address=${latest.address}`} >
<Button variant="info"> {latest.name} 자세히 살펴보기</Button>
</Link>
</div>
<div class="col-auto d-none d-lg-block">
</div>
</div>
</div>
</div> */}
<Row xs={6}>
<Col md={6} xs={12}>
<Card border="info" style={{ margin: "3%" }}>
<Card border="info" style={{ margin: "2%" }}>
<Card.Title style={{ margin: "0", paddingTop: "3%", fontSize: '200%', fontWeight: 'bold' }} >
<Row style={{ fontSize: "60%", marginLeft: "7%" }}><strong class="border p-2 text-danger mb-2">인기관광지</strong></Row>
<Row style={{ fontSize: "100%", marginLeft: "8%" }}>{recommend.name}</Row></Card.Title>
<Card.Img variant="top" style={{ padding: "5%", width: "100%", height: "340px" }} src={recommend.img} />
<Card.Body style={{ paddingTop: "0" }} >
<Card.Text style={{ margin: "0", overflow: 'auto', fontSize: '130%', width: '100%', height: "65px" }} >
<Card.Text style={{ margin: "0", overflow: 'auto', fontSize: '120%', width: '100%', height: "65px" }} >
{recommend.address} </Card.Text>
<Link to={`/place?id=${1}&place=${recommend.name}`} >
<Link to={`/place?name=${recommend.name}&src=${recommend.img}&address=${recommend.address}`} >
<Button variant="info"> {recommend.name} 자세히 살펴보기</Button>
</Link>
</Card.Body>
......@@ -151,15 +116,15 @@ function App() {
</Col>
<Col md={6} xs={12}>
<Card border="info" style={{ margin: "3%" }} >
<Card border="info" style={{ margin: "2%" }} >
<Card.Title style={{ margin: "0", paddingTop: "3%", fontSize: '200%', fontWeight: 'bold' }} >
<Row style={{ fontSize: "60%", marginLeft: "7%" }}><strong class="border p-2 text-success mb-2">최근 검색 관광지</strong></Row>
<Row style={{ fontSize: "100%", marginLeft: "8%" }}>{latest.name}</Row></Card.Title>
<Card.Img variant="top" style={{ padding: "5%", width: "100%", height: "340px" }} src={latest.img} />
<Card.Body style={{ paddingTop: "0" }}>
<Card.Text style={{ margin: "0", overflow: 'auto', fontSize: '130%', width: '100%', height: "65px" }} >
<Card.Text style={{ margin: "0", overflow: 'auto', fontSize: '120%', width: '100%', height: "65px" }} >
{latest.address} </Card.Text>
<Link to={`/place?id=${1}&place=${latest.name}`} >
<Link to={`/place?name=${latest.name}&src=${latest.img}&address=${latest.address}`} >
<Button variant="info"> {latest.name} 자세히 살펴보기</Button>
</Link>
</Card.Body>
......
......@@ -95,7 +95,7 @@ function Bookmark() {
{pagePlace.map((place, index) => {
return (
<Col key={index} md={6} >
<Card border="info" style={{ margin: "3%" }}>
<Card border="info" style={{ margin: "2%" }}>
<Card.Header style={{ margin: "0", fontSize: '200%', fontWeight: 'bold' }} >
{user ?
......
......@@ -42,7 +42,7 @@ function Place(props) {
<h6 class="border-bottom pb-2 mb-0">관광지 정보</h6>
<Row>
<Col>
<Image variant="top" style={{ padding: "5%", width: "100%", height: "340px" }} src={src} />
<Image variant="top" style={{ padding: "5%", width: "100%", height: "100%" }} src={src} />
</Col>
<Col>
<div class="d-flex text-muted pt-3">
......
......@@ -4,8 +4,11 @@ import axios from 'axios';
const search = async (req, res, next) => {
let DuplicateCheckReview = []
if (!req.body.db) { DuplicateCheckReview = await Review.find({ keyword: req.query.keyword }) }
if (!req.body.db && DuplicateCheckReview !== []) {
if (!req.body.db) {
DuplicateCheckReview = await Review.find({ keyword: req.query.keyword })
}
if (DuplicateCheckReview.length !== 0) {
req.review = DuplicateCheckReview
} else {
try {
......
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