Commit 7b91ffa0 authored by 이재연's avatar 이재연
Browse files

Merge remote-tracking branch 'origin/ourMaster' into jaeyeon

parents 033d3da9 c20e9d7b
[{"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\index.js":"1","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\App.js":"2","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\reportWebVitals.js":"3","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Admin.js":"4","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\ShoppingCart.js":"5","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Signup.js":"6","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Login.js":"7","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Home.js":"8","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Payment.js":"9","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\MainNav.js":"10","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\SubNav.js":"11"},{"size":1078,"mtime":1609128888500,"results":"12","hashOfConfig":"13"},{"size":652,"mtime":1608705187305,"results":"14","hashOfConfig":"13"},{"size":362,"mtime":499162500000,"results":"15","hashOfConfig":"13"},{"size":351,"mtime":1608970621902,"results":"16","hashOfConfig":"13"},{"size":365,"mtime":1608970610659,"results":"17","hashOfConfig":"13"},{"size":5099,"mtime":1609239072978,"results":"18","hashOfConfig":"13"},{"size":2947,"mtime":1609236978314,"results":"19","hashOfConfig":"13"},{"size":303,"mtime":1608969605724,"results":"20","hashOfConfig":"13"},{"size":309,"mtime":1608969608040,"results":"21","hashOfConfig":"13"},{"size":208,"mtime":1608969598585,"results":"22","hashOfConfig":"13"},{"size":206,"mtime":1608969599915,"results":"23","hashOfConfig":"13"},{"filePath":"24","messages":"25","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":"26","usedDeprecatedRules":"27"},"1f8h90z",{"filePath":"28","messages":"29","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"27"},{"filePath":"32","messages":"33","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":"34","usedDeprecatedRules":"27"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":"37","usedDeprecatedRules":"27"},{"filePath":"38","messages":"39","errorCount":0,"warningCount":5,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"40","messages":"41","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"42","messages":"43","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":"44","usedDeprecatedRules":"27"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":"47","usedDeprecatedRules":"27"},{"filePath":"48","messages":"49","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":"50","usedDeprecatedRules":"27"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":"53","usedDeprecatedRules":"27"},"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\index.js",["54","55","56"],"import React from 'react';\r\nimport ReactDOM from 'react-dom';\r\nimport { BrowserRouter as Router, Route, Redirect, Switch } from 'react-router-dom';\r\nimport Home from './Pages/Home';\r\nimport Login from './Pages/Login';\r\nimport Signup from './Pages/Signup';\r\nimport Admin from './Pages/Admin';\r\nimport ShoppingCart from './Pages/ShoppingCart';\r\nimport Payment from './Pages/Payment';\r\nimport reportWebVitals from './reportWebVitals';\r\nimport 'bootstrap/dist/css/bootstrap.min.css';\r\n\r\nReactDOM.render(\r\n <React.StrictMode>\r\n <Router>\r\n <Switch>\r\n <Route exact path=\"/\" component={Home} />\r\n <Route path=\"/login\" component={Login} />\r\n <Route path=\"/signup\" component={Signup} />\r\n <Redirect path=\"/\" to=\"/\" />\r\n </Switch>\r\n </Router>\r\n </React.StrictMode>,\r\n document.getElementById('root')\r\n);\r\n\r\n// If you want to start measuring performance in your app, pass a function\r\n// to log results (for example: reportWebVitals(console.log))\r\n// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals\r\nreportWebVitals();\r\n",["57","58"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\App.js",[],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\reportWebVitals.js",[],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Admin.js",["59","60","61","62"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport { Redirect } from 'react-router-dom';\r\nimport Nav1 from '../Components/MainNav';\r\nimport Nav2 from '../Components/SubNav';\r\n\r\nfunction Admin() {\r\n\r\n return (\r\n <div>\r\n <Nav1 />\r\n <Nav2 />\r\n \r\n </div>\r\n )\r\n}\r\n\r\nexport default Admin","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\ShoppingCart.js",["63","64","65","66"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport { Redirect } from 'react-router-dom';\r\nimport Nav1 from '../Components/MainNav';\r\nimport Nav2 from '../Components/SubNav';\r\n\r\nfunction ShoppingCart() {\r\n\r\n return (\r\n <div>\r\n <Nav1 />\r\n <Nav2 />\r\n \r\n </div>\r\n )\r\n}\r\n\r\nexport default ShoppingCart","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Signup.js",["67","68","69","70","71"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Login.js",["72","73","74"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Home.js",["75","76","77"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport Nav1 from '../Components/MainNav';\r\nimport Nav2 from '../Components/SubNav';\r\n\r\nfunction Home() {\r\n\r\n return (\r\n <div>\r\n <Nav1 />\r\n <Nav2 />\r\n \r\n </div>\r\n )\r\n}\r\n\r\nexport default Home","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Payment.js",["78","79","80"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport Nav1 from '../Components/MainNav';\r\nimport Nav2 from '../Components/SubNav';\r\n\r\nfunction Payment() {\r\n\r\n return (\r\n <div>\r\n <Nav1 />\r\n <Nav2 />\r\n \r\n </div>\r\n )\r\n}\r\n\r\nexport default Payment","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\MainNav.js",["81","82","83","84"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport { Link } from 'react-router-dom';\r\n\r\nfunction MainNav() {\r\n\r\n return (\r\n <div>\r\n </div>\r\n )\r\n}\r\n\r\nexport default MainNav","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\SubNav.js",["85","86","87","88"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport { Link } from 'react-router-dom';\r\n\r\nfunction SubNav() {\r\n\r\n return (\r\n <div>\r\n </div>\r\n )\r\n}\r\n\r\nexport default SubNav",{"ruleId":"89","severity":1,"message":"90","line":7,"column":8,"nodeType":"91","messageId":"92","endLine":7,"endColumn":13},{"ruleId":"89","severity":1,"message":"93","line":8,"column":8,"nodeType":"91","messageId":"92","endLine":8,"endColumn":20},{"ruleId":"89","severity":1,"message":"94","line":9,"column":8,"nodeType":"91","messageId":"92","endLine":9,"endColumn":15},{"ruleId":"95","replacedBy":"96"},{"ruleId":"97","replacedBy":"98"},{"ruleId":"89","severity":1,"message":"99","line":1,"column":17,"nodeType":"91","messageId":"92","endLine":1,"endColumn":25},{"ruleId":"89","severity":1,"message":"100","line":1,"column":27,"nodeType":"91","messageId":"92","endLine":1,"endColumn":36},{"ruleId":"89","severity":1,"message":"101","line":1,"column":38,"nodeType":"91","messageId":"92","endLine":1,"endColumn":44},{"ruleId":"89","severity":1,"message":"102","line":2,"column":10,"nodeType":"91","messageId":"92","endLine":2,"endColumn":18},{"ruleId":"89","severity":1,"message":"99","line":1,"column":17,"nodeType":"91","messageId":"92","endLine":1,"endColumn":25},{"ruleId":"89","severity":1,"message":"100","line":1,"column":27,"nodeType":"91","messageId":"92","endLine":1,"endColumn":36},{"ruleId":"89","severity":1,"message":"101","line":1,"column":38,"nodeType":"91","messageId":"92","endLine":1,"endColumn":44},{"ruleId":"89","severity":1,"message":"102","line":2,"column":10,"nodeType":"91","messageId":"92","endLine":2,"endColumn":18},{"ruleId":"89","severity":1,"message":"99","line":1,"column":17,"nodeType":"91","messageId":"92","endLine":1,"endColumn":25},{"ruleId":"89","severity":1,"message":"100","line":1,"column":27,"nodeType":"91","messageId":"92","endLine":1,"endColumn":36},{"ruleId":"89","severity":1,"message":"101","line":1,"column":38,"nodeType":"91","messageId":"92","endLine":1,"endColumn":44},{"ruleId":"89","severity":1,"message":"102","line":2,"column":10,"nodeType":"91","messageId":"92","endLine":2,"endColumn":18},{"ruleId":"89","severity":1,"message":"103","line":6,"column":8,"nodeType":"91","messageId":"92","endLine":6,"endColumn":22},{"ruleId":"89","severity":1,"message":"100","line":1,"column":27,"nodeType":"91","messageId":"92","endLine":1,"endColumn":36},{"ruleId":"89","severity":1,"message":"101","line":1,"column":38,"nodeType":"91","messageId":"92","endLine":1,"endColumn":44},{"ruleId":"89","severity":1,"message":"102","line":5,"column":17,"nodeType":"91","messageId":"92","endLine":5,"endColumn":25},{"ruleId":"89","severity":1,"message":"99","line":1,"column":17,"nodeType":"91","messageId":"92","endLine":1,"endColumn":25},{"ruleId":"89","severity":1,"message":"100","line":1,"column":27,"nodeType":"91","messageId":"92","endLine":1,"endColumn":36},{"ruleId":"89","severity":1,"message":"101","line":1,"column":38,"nodeType":"91","messageId":"92","endLine":1,"endColumn":44},{"ruleId":"89","severity":1,"message":"99","line":1,"column":17,"nodeType":"91","messageId":"92","endLine":1,"endColumn":25},{"ruleId":"89","severity":1,"message":"100","line":1,"column":27,"nodeType":"91","messageId":"92","endLine":1,"endColumn":36},{"ruleId":"89","severity":1,"message":"101","line":1,"column":38,"nodeType":"91","messageId":"92","endLine":1,"endColumn":44},{"ruleId":"89","severity":1,"message":"99","line":1,"column":17,"nodeType":"91","messageId":"92","endLine":1,"endColumn":25},{"ruleId":"89","severity":1,"message":"100","line":1,"column":27,"nodeType":"91","messageId":"92","endLine":1,"endColumn":36},{"ruleId":"89","severity":1,"message":"101","line":1,"column":38,"nodeType":"91","messageId":"92","endLine":1,"endColumn":44},{"ruleId":"89","severity":1,"message":"104","line":2,"column":10,"nodeType":"91","messageId":"92","endLine":2,"endColumn":14},{"ruleId":"89","severity":1,"message":"99","line":1,"column":17,"nodeType":"91","messageId":"92","endLine":1,"endColumn":25},{"ruleId":"89","severity":1,"message":"100","line":1,"column":27,"nodeType":"91","messageId":"92","endLine":1,"endColumn":36},{"ruleId":"89","severity":1,"message":"101","line":1,"column":38,"nodeType":"91","messageId":"92","endLine":1,"endColumn":44},{"ruleId":"89","severity":1,"message":"104","line":2,"column":10,"nodeType":"91","messageId":"92","endLine":2,"endColumn":14},"no-unused-vars","'Admin' is defined but never used.","Identifier","unusedVar","'ShoppingCart' is defined but never used.","'Payment' is defined but never used.","no-native-reassign",["105"],"no-negated-in-lhs",["106"],"'useState' is defined but never used.","'useEffect' is defined but never used.","'useRef' is defined but never used.","'Redirect' is defined but never used.","'FormCheckInput' is defined but never used.","'Link' is defined but never used.","no-global-assign","no-unsafe-negation"] [{"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\index.js":"1","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\App.js":"2","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\reportWebVitals.js":"3","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Admin.js":"4","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\ShoppingCart.js":"5","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Signup.js":"6","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Login.js":"7","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Home.js":"8","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Payment.js":"9","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\MainNav.js":"10","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\SubNav.js":"11","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\ProductsRegist.js":"12","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\Pagination.js":"13"},{"size":1364,"mtime":1609240129210,"results":"14","hashOfConfig":"15"},{"size":652,"mtime":1608705187305,"results":"16","hashOfConfig":"15"},{"size":362,"mtime":499162500000,"results":"17","hashOfConfig":"15"},{"size":4826,"mtime":1609240129179,"results":"18","hashOfConfig":"15"},{"size":4675,"mtime":1609240129200,"results":"19","hashOfConfig":"15"},{"size":5655,"mtime":1609240129273,"results":"20","hashOfConfig":"15"},{"size":3186,"mtime":1609240129284,"results":"21","hashOfConfig":"15"},{"size":6208,"mtime":1609240129182,"results":"22","hashOfConfig":"15"},{"size":6324,"mtime":1609240129185,"results":"23","hashOfConfig":"15"},{"size":1188,"mtime":1609240129167,"results":"24","hashOfConfig":"15"},{"size":5929,"mtime":1609240129173,"results":"25","hashOfConfig":"15"},{"size":319,"mtime":1609240129196,"results":"26","hashOfConfig":"15"},{"size":533,"mtime":1609240129169,"results":"27","hashOfConfig":"15"},{"filePath":"28","messages":"29","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1f8h90z",{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"32","messages":"33","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":"37","usedDeprecatedRules":"34"},{"filePath":"38","messages":"39","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":"40","usedDeprecatedRules":"34"},{"filePath":"41","messages":"42","errorCount":0,"warningCount":5,"fixableErrorCount":0,"fixableWarningCount":0,"source":"43","usedDeprecatedRules":"34"},{"filePath":"44","messages":"45","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":"46","usedDeprecatedRules":"34"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":"49","usedDeprecatedRules":"34"},{"filePath":"50","messages":"51","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":"52","usedDeprecatedRules":"34"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":"55","usedDeprecatedRules":"34"},{"filePath":"56","messages":"57","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":"58","usedDeprecatedRules":"34"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"61","messages":"62","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\index.js",[],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\App.js",[],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\reportWebVitals.js",[],["63","64"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Admin.js",["65","66","67","68"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport { Redirect } from 'react-router-dom';\r\nimport Nav1 from '../Components/MainNav';\r\nimport Nav2 from '../Components/SubNav';\r\n\r\nfunction Admin() {\r\n\r\n return (\r\n <div>\r\n <Nav1 />\r\n <Nav2 />\r\n \r\n </div>\r\n )\r\n}\r\n\r\nexport default Admin","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\ShoppingCart.js",["69","70","71","72"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport { Redirect } from 'react-router-dom';\r\nimport Nav1 from '../Components/MainNav';\r\nimport Nav2 from '../Components/SubNav';\r\n\r\nfunction ShoppingCart() {\r\n\r\n return (\r\n <div>\r\n <Nav1 />\r\n <Nav2 />\r\n \r\n </div>\r\n )\r\n}\r\n\r\nexport default ShoppingCart","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Signup.js",["73","74","75","76","77"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport { Redirect } from 'react-router-dom';\r\n<<<<<<< HEAD\r\nimport Nav1 from '../Components/MainNav';\r\nimport Nav2 from '../Components/SubNav';\r\nimport { Form, Col, Container, Button, Row } from 'react-bootstrap'\r\nimport FormCheckInput from 'react-bootstrap/esm/FormCheckInput';\r\n=======\r\nimport MainNav from '../Components/MainNav';\r\nimport SubNav from '../Components/SubNav';\r\n>>>>>>> origin/ourMaster\r\n\r\nfunction Signup() {\r\n\r\n\r\n return (\r\n<<<<<<< HEAD\r\n <div>\r\n\r\n <Nav1 />\r\n <Nav2 />\r\n <Container className=\"my-5\">\r\n <Row className=\"justify-content-center\">\r\n <Col md={6} xs={10} className=\"border\">\r\n <h2 className=\"text-center mt-5\">Sign Up</h2>\r\n\r\n <Form className=\"p-5\">\r\n\r\n <Form.Group controlId=\"formBasicId\">\r\n <Form.Row>\r\n <Form.Label for=\"id\">User Name</Form.Label>\r\n\r\n <Col>\r\n <Form.Control type=\"text\" id=\"id\" size=\"sm\" placeholder=\"UserName\" className=\"mx-sm-3\"></Form.Control>\r\n </Col>\r\n </Form.Row>\r\n </Form.Group>\r\n\r\n <Form.Group controlId=\"formBasicName\">\r\n <Form.Row>\r\n <Form.Label for=\"name\">Real Name</Form.Label>\r\n\r\n <Col>\r\n <Form.Control type=\"text\" id=\"name\" size=\"sm\" placeholder=\"Enter your Real Name\" className=\"mx-sm-3\"></Form.Control>\r\n </Col>\r\n </Form.Row>\r\n </Form.Group>\r\n\r\n <Form.Group controlId=\"formBasicNumber\">\r\n <Form.Row>\r\n <Form.Label for=\"number\">Resident registration number</Form.Label>\r\n\r\n <Col as={Row}>\r\n <Form.Control type=\"text\" id=\"number1\" size=\"sm\" maxlength=\"6\" className=\"mx-sm-3\" style={{width:'120px'}}></Form.Control>\r\n -\r\n <Form.Control type=\"text\" id=\"number2\" size=\"sm\" maxlength=\"1\" className=\"mx-sm-3\" style={{width:'25px'}}></Form.Control>\r\n ******\r\n </Col>\r\n\r\n </Form.Row>\r\n </Form.Group>\r\n\r\n <Form.Group controlId=\"formBasicPassword\">\r\n <Form.Row>\r\n <Form.Label for=\"password\">Password</Form.Label>\r\n\r\n <Col>\r\n <Form.Control type=\"password\" id=\"password\" size=\"sm\" aria-describedby=\"passwordHelpBlock\" className=\"mx-sm-3\"></Form.Control>\r\n <Form.Text id=\"password\" muted>Must be 8-20 characters long.</Form.Text>\r\n </Col>\r\n </Form.Row>\r\n </Form.Group>\r\n\r\n <Form.Group controlId=\"formBasicPassword2\">\r\n <Form.Row>\r\n <Form.Label for=\"password2\">Confirm Password</Form.Label>\r\n\r\n <Col>\r\n <Form.Control type=\"password\" id=\"password2\" size=\"sm\" placeholder=\"Confirm Password\" className=\"mx-sm-3\"></Form.Control>\r\n </Col>\r\n </Form.Row>\r\n </Form.Group>\r\n\r\n <Form.Group controlId=\"formBasicTel\">\r\n <Form.Row>\r\n <Form.Label for=\"tel\">Phone Number</Form.Label>\r\n\r\n <Col>\r\n <Form.Control type=\"text\" id=\"tel\" size=\"sm\" placeholder=\"Enter your Phone Number\" className=\"mx-sm-3\"></Form.Control>\r\n </Col>\r\n </Form.Row>\r\n </Form.Group>\r\n=======\r\n <div class=\"form-container\">\r\n <MainNav />\r\n <SubNav />\r\n <form id=\"form\" class=\"form\">\r\n <h1>회원가입</h1>\r\n <div class=\"form-control\">\r\n <label for=\"id\">아이디</label>\r\n <input type=\"text\" id=\"id\" placeholder=\"아이디를 입력하세요\"></input>\r\n>>>>>>> origin/ourMaster\r\n\r\n <Form.Group controlId=\"formBasicAdd\">\r\n <Form.Row>\r\n <Form.Label>Address</Form.Label>\r\n\r\n <Col>\r\n <Form.Control type=\"text\" id=\"add\" size=\"sm\" placeholder=\"Enter your Address\" className=\"mx-sm-3\"></Form.Control>\r\n </Col>\r\n </Form.Row>\r\n </Form.Group>\r\n\r\n <Button variant=\"outline-dark\" type=\"submit\" block>Sign Up</Button>\r\n </Form>\r\n\r\n </Col>\r\n </Row>\r\n\r\n </Container>\r\n </div>\r\n\r\n )\r\n}\r\n\r\nexport default Signup","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Login.js",["78","79","80"],"import React, { useState, useEffect, useRef } from 'react';\r\n<<<<<<< HEAD\r\nimport Nav1 from '../Components/MainNav';\r\nimport Nav2 from '../Components/SubNav';\r\nimport { Form, Col, Container, Button, Row } from 'react-bootstrap'\r\nimport { Link , Redirect} from 'react-router-dom'\r\n\r\n\r\nfunction Login(authenticated,login,location) {\r\n const [id, setId] = useState(\"\");\r\n const [password,setPassword]= useState(\"\");\r\n\r\n const handleClick =() => {\r\n try {\r\n Login({id,password})\r\n } catch(e) {\r\n alert(\"Failed to login\")\r\n setId(\"\")\r\n setPassword(\"\")\r\n }\r\n }\r\n\r\n return (\r\n <div>\r\n <Nav1 />\r\n <Nav2 />\r\n <Container className=\"my-5\">\r\n <Row className=\"justify-content-center\">\r\n\r\n <Col md={5} xs={10} className=\"border\">\r\n <h3 className=\"text-center mt-5\">Login</h3>\r\n <Form className=\"p-5\">\r\n\r\n\r\n <Form.Group controlId=\"formBasicId\">\r\n <Form.Row>\r\n <Form.Label for=\"id\">User Name</Form.Label>\r\n <Col>\r\n <Form.Control \r\n type=\"text\" \r\n value={id} \r\n onChange={({target:{value}})=>setId(value)} \r\n className=\"mx-sm-3\" size=\"sm\" placeholder=\"User Name\">\r\n </Form.Control>\r\n </Col>\r\n </Form.Row>\r\n </Form.Group>\r\n\r\n <Form.Group controlId=\"formBasicPassword\">\r\n <Form.Row>\r\n <Form.Label for=\"password\">Password</Form.Label>\r\n <Col>\r\n <Form.Control \r\n type=\"password\" \r\n value={password}\r\n onChange={({target:{value}})=>setPassword(value)} \r\n className=\"mx-sm-3\" size=\"sm\" placeholder=\"Password\"></Form.Control>\r\n </Col>\r\n </Form.Row>\r\n </Form.Group>\r\n <Button variant=\"outline-dark\" type=\"submit\" onClick={handleClick} block>Login</Button>\r\n <div className=\"loginLine\">\r\n <Link to=\"/signup\">SignUp?</Link>\r\n </div>\r\n </Form>\r\n </Col>\r\n </Row>\r\n\r\n\r\n\r\n\r\n </Container>\r\n=======\r\nimport MainNav from '../Components/MainNav';\r\nimport SubNav from '../Components/SubNav';\r\nfunction Login() {\r\n\r\n return (\r\n <div>\r\n <MainNav />\r\n <SubNav />\r\n>>>>>>> origin/ourMaster\r\n </div>\r\n\r\n\r\n )\r\n}\r\n\r\nexport default Login","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Home.js",["81","82","83"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport Nav1 from '../Components/MainNav';\r\nimport Nav2 from '../Components/SubNav';\r\n\r\nfunction Home() {\r\n\r\n return (\r\n <div>\r\n <Nav1 />\r\n <Nav2 />\r\n \r\n </div>\r\n )\r\n}\r\n\r\nexport default Home","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Payment.js",["84","85","86"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport Nav1 from '../Components/MainNav';\r\nimport Nav2 from '../Components/SubNav';\r\n\r\nfunction Payment() {\r\n\r\n return (\r\n <div>\r\n <Nav1 />\r\n <Nav2 />\r\n \r\n </div>\r\n )\r\n}\r\n\r\nexport default Payment","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\MainNav.js",["87","88","89","90"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport { Link } from 'react-router-dom';\r\n\r\nfunction MainNav() {\r\n\r\n return (\r\n <div>\r\n </div>\r\n )\r\n}\r\n\r\nexport default MainNav","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\SubNav.js",["91","92","93","94"],"import React, { useState, useEffect, useRef } from 'react';\r\nimport { Link } from 'react-router-dom';\r\n\r\nfunction SubNav() {\r\n\r\n return (\r\n <div>\r\n </div>\r\n )\r\n}\r\n\r\nexport default SubNav","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\ProductsRegist.js",["95","96","97"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\Pagination.js",["98","99","100"],{"ruleId":"101","replacedBy":"102"},{"ruleId":"103","replacedBy":"104"},{"ruleId":"105","severity":1,"message":"106","line":1,"column":17,"nodeType":"107","messageId":"108","endLine":1,"endColumn":25},{"ruleId":"105","severity":1,"message":"109","line":1,"column":27,"nodeType":"107","messageId":"108","endLine":1,"endColumn":36},{"ruleId":"105","severity":1,"message":"110","line":1,"column":38,"nodeType":"107","messageId":"108","endLine":1,"endColumn":44},{"ruleId":"105","severity":1,"message":"111","line":2,"column":10,"nodeType":"107","messageId":"108","endLine":2,"endColumn":18},{"ruleId":"105","severity":1,"message":"106","line":1,"column":17,"nodeType":"107","messageId":"108","endLine":1,"endColumn":25},{"ruleId":"105","severity":1,"message":"109","line":1,"column":27,"nodeType":"107","messageId":"108","endLine":1,"endColumn":36},{"ruleId":"105","severity":1,"message":"110","line":1,"column":38,"nodeType":"107","messageId":"108","endLine":1,"endColumn":44},{"ruleId":"105","severity":1,"message":"111","line":2,"column":10,"nodeType":"107","messageId":"108","endLine":2,"endColumn":18},{"ruleId":"105","severity":1,"message":"106","line":1,"column":17,"nodeType":"107","messageId":"108","endLine":1,"endColumn":25},{"ruleId":"105","severity":1,"message":"109","line":1,"column":27,"nodeType":"107","messageId":"108","endLine":1,"endColumn":36},{"ruleId":"105","severity":1,"message":"110","line":1,"column":38,"nodeType":"107","messageId":"108","endLine":1,"endColumn":44},{"ruleId":"105","severity":1,"message":"111","line":2,"column":10,"nodeType":"107","messageId":"108","endLine":2,"endColumn":18},{"ruleId":"105","severity":1,"message":"112","line":6,"column":8,"nodeType":"107","messageId":"108","endLine":6,"endColumn":22},{"ruleId":"105","severity":1,"message":"109","line":1,"column":27,"nodeType":"107","messageId":"108","endLine":1,"endColumn":36},{"ruleId":"105","severity":1,"message":"110","line":1,"column":38,"nodeType":"107","messageId":"108","endLine":1,"endColumn":44},{"ruleId":"105","severity":1,"message":"111","line":5,"column":17,"nodeType":"107","messageId":"108","endLine":5,"endColumn":25},{"ruleId":"105","severity":1,"message":"106","line":1,"column":17,"nodeType":"107","messageId":"108","endLine":1,"endColumn":25},{"ruleId":"105","severity":1,"message":"109","line":1,"column":27,"nodeType":"107","messageId":"108","endLine":1,"endColumn":36},{"ruleId":"105","severity":1,"message":"110","line":1,"column":38,"nodeType":"107","messageId":"108","endLine":1,"endColumn":44},{"ruleId":"105","severity":1,"message":"106","line":1,"column":17,"nodeType":"107","messageId":"108","endLine":1,"endColumn":25},{"ruleId":"105","severity":1,"message":"109","line":1,"column":27,"nodeType":"107","messageId":"108","endLine":1,"endColumn":36},{"ruleId":"105","severity":1,"message":"110","line":1,"column":38,"nodeType":"107","messageId":"108","endLine":1,"endColumn":44},{"ruleId":"105","severity":1,"message":"106","line":1,"column":17,"nodeType":"107","messageId":"108","endLine":1,"endColumn":25},{"ruleId":"105","severity":1,"message":"109","line":1,"column":27,"nodeType":"107","messageId":"108","endLine":1,"endColumn":36},{"ruleId":"105","severity":1,"message":"110","line":1,"column":38,"nodeType":"107","messageId":"108","endLine":1,"endColumn":44},{"ruleId":"105","severity":1,"message":"113","line":2,"column":10,"nodeType":"107","messageId":"108","endLine":2,"endColumn":14},{"ruleId":"105","severity":1,"message":"106","line":1,"column":17,"nodeType":"107","messageId":"108","endLine":1,"endColumn":25},{"ruleId":"105","severity":1,"message":"109","line":1,"column":27,"nodeType":"107","messageId":"108","endLine":1,"endColumn":36},{"ruleId":"105","severity":1,"message":"110","line":1,"column":38,"nodeType":"107","messageId":"108","endLine":1,"endColumn":44},{"ruleId":"105","severity":1,"message":"113","line":2,"column":10,"nodeType":"107","messageId":"108","endLine":2,"endColumn":14},{"ruleId":"105","severity":1,"message":"106","line":1,"column":17,"nodeType":"107","messageId":"108","endLine":1,"endColumn":25},{"ruleId":"105","severity":1,"message":"109","line":1,"column":27,"nodeType":"107","messageId":"108","endLine":1,"endColumn":36},{"ruleId":"105","severity":1,"message":"110","line":1,"column":38,"nodeType":"107","messageId":"108","endLine":1,"endColumn":44},{"ruleId":"105","severity":1,"message":"106","line":1,"column":17,"nodeType":"107","messageId":"108","endLine":1,"endColumn":25},{"ruleId":"105","severity":1,"message":"109","line":1,"column":27,"nodeType":"107","messageId":"108","endLine":1,"endColumn":36},{"ruleId":"105","severity":1,"message":"110","line":1,"column":38,"nodeType":"107","messageId":"108","endLine":1,"endColumn":44},"no-native-reassign",["114"],"no-negated-in-lhs",["115"],"no-unused-vars","'useState' is defined but never used.","Identifier","unusedVar","'useEffect' is defined but never used.","'useRef' is defined but never used.","'Redirect' is defined but never used.","'FormCheckInput' is defined but never used.","'Link' is defined but never used.","no-global-assign","no-unsafe-negation"]
\ No newline at end of file \ No newline at end of file
...@@ -9483,11 +9483,6 @@ ...@@ -9483,11 +9483,6 @@
} }
} }
}, },
"jquery": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
"js-tokens": { "js-tokens": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
...@@ -11001,11 +10996,6 @@ ...@@ -11001,11 +10996,6 @@
"ts-pnp": "^1.1.6" "ts-pnp": "^1.1.6"
} }
}, },
"popper.js": {
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
"integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
},
"portfinder": { "portfinder": {
"version": "1.0.28", "version": "1.0.28",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
......
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
"@testing-library/react": "^11.2.2", "@testing-library/react": "^11.2.2",
"@testing-library/user-event": "^12.6.0", "@testing-library/user-event": "^12.6.0",
"bootstrap": "^4.5.3", "bootstrap": "^4.5.3",
"jquery": "^3.5.1",
"popper.js": "^1.16.1",
"react": "^17.0.1", "react": "^17.0.1",
"react-bootstrap": "^1.4.0", "react-bootstrap": "^1.4.0",
"react-dom": "^17.0.1", "react-dom": "^17.0.1",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> <link rel="icon" href="%PUBLIC_URL%/footprint.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<meta <meta
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL. work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<title>React App</title> <title>KU#</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>
......
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { Link } from 'react-router-dom'; import { Navbar, Nav } from 'react-bootstrap';
import logo from '../footprint.svg';
import cart from '../cart.svg';
import option from '../option.svg';
function MainNav() { function MainNav() {
function handleClick() {
alert('로그아웃이 완료되었습니다.')
}
return ( return (
<div> <Navbar fixed="top" bg="dark" variant="dark" style={{position: "sticky"}}>
</div> <Navbar.Brand href="/home">
<img src={logo} width="23" height="23" />
{' '}KU#
</Navbar.Brand>
<Nav className="justify-content-end">
<Nav.Link href="/login">Login</Nav.Link>
<Nav.Link href="/signup">Signup</Nav.Link>
<Nav.Link href="/shoppingcart">
<img src={cart} width="30" height="30" />
</Nav.Link>
<Nav.Link onClick={() => handleClick()}>Logout</Nav.Link>
<Nav.Link href="/admin/:id">
<img src={option} width="30" height="30" />
</Nav.Link>
</Nav>
</Navbar>
) )
} }
......
import React, { useState, useEffect, useRef } from 'react';
import { Pagination } from 'react-bootstrap';
function pagination() {
let active = 1;
let items = [];
for (let number = 1; number <= 5; number++) {
items.push(
<Pagination.Item key={number} active={number === active}>
{number}
</Pagination.Item>,
);
}
return (
<Pagination className="justify-content-center mt-5">{items}</Pagination>
)
}
export default pagination
\ No newline at end of file
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { Link } from 'react-router-dom'; import { Redirect } from 'react-router-dom';
import { Nav, NavDropdown } from 'react-bootstrap';
function SubNav() { function SubNav() {
const [toggle, setToggle] = useState({ "dress": false, "outer": false, "top": false, "pants": false, "skirt": false, "training": false, "shoes": false });
function handleMouseEnter(id) {
setToggle({ [id]: true })
}
function handleMouseLeave(id) {
setToggle({ [id]: false })
}
function handleToggle(id) {
setToggle({ [id]: !toggle[`${id}`] })
}
function handleClick(url) {
return <Redirect to={url} />
}
return ( return (
<div> <Nav fixed="top" className="flex-nowrap">
</div> <NavDropdown title="DRESS" onMouseEnter={() => handleMouseEnter("dress")} onMouseLeave={() => handleMouseLeave("dress")} show={toggle.dress} toggle={() => handleToggle("dress")} onClick={() => handleClick("/dress")}>
<NavDropdown.Item href="/dress/long">LONG DRESS</NavDropdown.Item>
<NavDropdown.Item href="/dress/short">SHORT DRESS</NavDropdown.Item>
<NavDropdown.Item href="/dress/knit">KNIT DRESS</NavDropdown.Item>
<NavDropdown.Item href="/dress/shirt">SHIRT DRESS</NavDropdown.Item>
<NavDropdown.Item href="/dress/pattern">PATTERN DRESS</NavDropdown.Item>
<NavDropdown.Item href="/dress/bustier">BUSTIER DRESS</NavDropdown.Item>
<NavDropdown.Item href="/dress/two-piece">TWO-PIECE DRESS</NavDropdown.Item>
</NavDropdown>
<NavDropdown title="OUTER" onMouseEnter={() => handleMouseEnter("outer")} onMouseLeave={() => handleMouseLeave("outer")} show={toggle.outer} toggle={() => handleToggle("outer")} onClick={() => handleClick("/outer")}>
<NavDropdown.Item href="/outer/padded-jacket">PADDED JACKET</NavDropdown.Item>
<NavDropdown.Item href="/outer/jacket">JACKET</NavDropdown.Item>
<NavDropdown.Item href="/outer/jumper">JUMPER</NavDropdown.Item>
<NavDropdown.Item href="/outer/coat">COAT</NavDropdown.Item>
<NavDropdown.Item href="/outer/fleece">FLEECE</NavDropdown.Item>
<NavDropdown.Item href="/outer/cardigan_vest">CARDIGAN / VEST</NavDropdown.Item>
</NavDropdown>
<NavDropdown title="TOP" onMouseEnter={() => handleMouseEnter("top")} onMouseLeave={() => handleMouseLeave("top")} show={toggle.top} toggle={() => handleToggle("top")} onClick={() => handleClick("/top")}>
<NavDropdown.Item href="/top/knit">KNIT</NavDropdown.Item>
<NavDropdown.Item href="/top/hoody">HOODY</NavDropdown.Item>
<NavDropdown.Item href="/top/blouse">BLOUSE</NavDropdown.Item>
<NavDropdown.Item href="/top/shirt">SHIRT</NavDropdown.Item>
<NavDropdown.Item href="/top/sweatshirt">SWEATSHIRT</NavDropdown.Item>
<NavDropdown.Item href="/top/long-sleeve-shirt">LONG SLEEVE SHIRT</NavDropdown.Item>
<NavDropdown.Item href="/top/short-sleeved-shirt_sleeveless-shirt">SHORT SLEEVE / SLEEVELESS SHIRT</NavDropdown.Item>
</NavDropdown>
<NavDropdown title="PANTS" onMouseEnter={() => handleMouseEnter("pants")} onMouseLeave={() => handleMouseLeave("pants")} show={toggle.pants} toggle={() => handleToggle("pants")} onClick={() => handleClick("/pants")}>
<NavDropdown.Item href="/pants/jeans">JEANS</NavDropdown.Item>
<NavDropdown.Item href="/pants/skinny-jeans">SKINNY JEANS</NavDropdown.Item>
<NavDropdown.Item href="/pants/banding">BANDING PANTS</NavDropdown.Item>
<NavDropdown.Item href="/pants/wide-fit">WIDE-FIT PANTS</NavDropdown.Item>
<NavDropdown.Item href="/pants/boot-cut">BOOT-CUT PANTS</NavDropdown.Item>
<NavDropdown.Item href="/pants/straight-fit">STRAIGHT-FIT PANTS</NavDropdown.Item>
<NavDropdown.Item href="/pants/wide-fit">WIDE-FIT PANTS</NavDropdown.Item>
<NavDropdown.Item href="/pants/shorts">SHORTS</NavDropdown.Item>
<NavDropdown.Item href="/pants/trousers">TROUSERS</NavDropdown.Item>
<NavDropdown.Item href="/pants/leggings">LEGGINGS</NavDropdown.Item>
<NavDropdown.Item href="/pants/jumpsuit_overalls">JUMPSUIT / OVERALLS</NavDropdown.Item>
</NavDropdown>
<NavDropdown title="SKIRT" onMouseEnter={() => handleMouseEnter("skirt")} onMouseLeave={() => handleMouseLeave("skirt")} show={toggle.skirt} toggle={() => handleToggle("skirt")} onClick={() => handleClick("/skirt")}>
<NavDropdown.Item href="/skirt/long">LONG SKIRT</NavDropdown.Item>
<NavDropdown.Item href="/skirt/midi">MIDI SKIRT</NavDropdown.Item>
<NavDropdown.Item href="/skirt/mini">MINI SKIRT</NavDropdown.Item>
</NavDropdown>
<Nav.Item>
<Nav.Link href="/training">TRAINING</Nav.Link>
</Nav.Item>
<NavDropdown title="SHOES" onMouseEnter={() => handleMouseEnter("shoes")} onMouseLeave={() => handleMouseLeave("shoes")} show={toggle.shoes} toggle={() => handleToggle("shoes")} onClick={() => handleClick("/shoes")}>
<NavDropdown.Item href="/skirt/sneakers_slip-on">SNEAKERS / SLIP-ON</NavDropdown.Item>
<NavDropdown.Item href="/skirt/flat_loafer">FLAT / LOAFER</NavDropdown.Item>
<NavDropdown.Item href="/skirt/heel_pump">HEEL / PUMP</NavDropdown.Item>
<NavDropdown.Item href="/skirt/boots">BOOTS</NavDropdown.Item>
<NavDropdown.Item href="/skirt/sandal_slipper">SANDAL / SLIPPER</NavDropdown.Item>
</NavDropdown>
</Nav>
) )
} }
......
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { Redirect } from 'react-router-dom'; import { Redirect } from 'react-router-dom';
import Nav1 from '../Components/MainNav'; import MainNav from '../Components/MainNav';
import Nav2 from '../Components/SubNav'; import SubNav from '../Components/SubNav';
import Pagination from '../Components/Pagination';
import search from '../search.svg';
import { Row, Col, Form, FormControl, Button, Card } from 'react-bootstrap';
function Admin() { function Admin() {
return ( return (
<div> <div>
<Nav1 /> <MainNav />
<Nav2 /> <SubNav />
<Row className="justify-content-end mt-5 mr-3">
<Col md={4} sm={5} xs={8} as={Form} inline className="justify-content-end">
<FormControl type="text" placeholder="Search" className="mr-1" />
<Button bg="dark" variant="dark" type="submit" className="px-2">
<img src={search} width="20" height="20" />
</Button>
</Col>
<Col sm={2} xs={3} as={Button} variant="dark" type="button" href="/:id/productsregist">상품 등록</Col>
</Row>
<Row className="mt-5 m-auto justify-content-start">
<Card className="m-4" style={{width: "18rem"}}>
<Card.Img variant="top" src="https://img.sonyunara.com/files/goods/67460/1607053816_0.jpg" />
<Card.Body>
<Card.Title>케이시앵글부츠(SH)</Card.Title>
<Card.Text>
재고: 8
구매자 : 10
</Card.Text>
</Card.Body>
</Card>
<Card className="m-4" style={{width: "18rem"}}>
<Card.Img variant="top" src="https://img.sonyunara.com/files/goods/48705/1552562469_0.jpg" />
<Card.Body>
<Card.Title>메리제인플랫(SH)</Card.Title>
<Card.Text>
재고: 20
구매자 : 60
</Card.Text>
</Card.Body>
</Card>
<Card className="m-4" style={{width: "18rem"}}>
<Card.Img variant="top" src="https://img.sonyunara.com/files/goods/53386/1567390097_2.jpg" />
<Card.Body>
<Card.Title>솔티드스니커즈(SH)</Card.Title>
<Card.Text>
재고: 34
구매자 : 5
</Card.Text>
</Card.Body>
</Card>
<Card className="m-4" style={{width: "18rem"}}>
<Card.Img variant="top" src="https://img.sonyunara.com/files/goods/61286/1587540563_0.jpg" />
<Card.Body>
<Card.Title>버켄슬리퍼(SH)</Card.Title>
<Card.Text>
재고:
구매자 :
</Card.Text>
</Card.Body>
</Card>
<Card className="m-4" style={{width: "18rem"}}>
<Card.Img variant="top" src="https://hotping.co.kr/web/product/big/202011/b8f4c6471955b80fc3991b7d6df8926a.jpg" />
<Card.Body>
<Card.Title>크레센도 하이힐펌프스</Card.Title>
<Card.Text>
재고: 35
구매자 : 70
</Card.Text>
</Card.Body>
</Card>
<Card className="m-4" style={{width: "18rem"}}>
<Card.Img variant="top" src="https://hotping.co.kr/web/product/big/202011/888e4e8d6a2c2e7da385b079151fcba2.jpg" />
<Card.Body>
<Card.Title>어텀솔져1cm 스웨이드로퍼</Card.Title>
<Card.Text>
재고: 40
구매자 : 30
</Card.Text>
</Card.Body>
</Card>
<Card className="m-4" style={{width: "18rem"}}>
<Card.Img variant="top" src="https://hotping.co.kr/web/product/big/202007/3308564012eb14e6c11ed621fa7555fb.jpg" />
<Card.Body>
<Card.Title>포웰3.5cm 스니커즈</Card.Title>
<Card.Text>
재고: 15
구매자 : 50
</Card.Text>
</Card.Body>
</Card>
</Row>
<Pagination />
</div> </div>
) )
} }
......
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import Nav1 from '../Components/MainNav'; import MainNav from '../Components/MainNav';
import Nav2 from '../Components/SubNav'; import SubNav from '../Components/SubNav';
import { Card, CardDeck, CardColumns, Container, Row } from 'react-bootstrap';
function Home() { function Home() {
return ( return (
<div> <div>
<Nav1 /> <MainNav />
<Nav2 /> <SubNav />
<Container>
<div className="my-3">
<h3 ><u>Best</u></h3>
<Row className="justify-content-center">
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
</Row>
</div>
<div className="my-3">
<h3><u>New Arrival</u></h3>
<Row className="justify-content-center">
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
<Card className="mx-1" style={{ width: '18rem' }}>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" />
<Card.Body>
<Card.Title className="font-weight-bold">제품명</Card.Title>
<Card.Text>가격</Card.Text>
</Card.Body>
</Card>
</Row>
</div>
</Container>
</div> </div>
) )
} }
......
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import Nav1 from '../Components/MainNav'; import MainNav from '../Components/MainNav';
import Nav2 from '../Components/SubNav'; import SubNav from '../Components/SubNav';
import { Container, Card, Row, Col, Button, Form } from 'react-bootstrap';
function Payment() { function Payment() {
const [paymentWay, setPaymentWay] = useState([])
function handleClick() {
if (paymentWay.length !== 0) {
setPaymentWay([])
}
else {
const a = (
<div>
<Form>
<Form.Group controlId="exampleForm.ControlSelect1">
<Form.Label>입금은행</Form.Label>
<Form.Control as="select" placeholder="입금은행을 선택하세요.">
<option>농협 / 352-0559-2528-83 / 김수빈</option>
<option>우리은행 / 0000-000-000000 / 이재연</option>
<option>국민은행 / 111111-11-111111 / 윤대기</option>
</Form.Control>
</Form.Group>
<Form.Group controlId="formName">
<Form.Label>입금자</Form.Label>
<Form.Control type="email" placeholder="윤지원" />
</Form.Group>
<Form.Group controlId="formDay">
<Form.Label>입금예정일</Form.Label>
<Form.Control type="date" />
</Form.Group>
</Form>
</div>)
setPaymentWay(a)
}
}
function handleClick2() {
if (paymentWay.length !== 0) {
setPaymentWay([])
// paymentWay=[]
}
}
return ( return (
<div> <div>
<Nav1 /> <MainNav />
<Nav2 /> <SubNav />
<Container>
<h3 className="my-5 font-weight-bold text-center" style={{ color: '#F2A400' }}>주문/결제</h3>
<div>
<h5 className="bg-light font-weight-bold py-3 border-top border-bottom text-center">주문자 정보</h5>
<Form>
<Form.Group controlId="formBasicName">
<Form.Label>이름</Form.Label>
<Form.Control type="text" placeholder="윤지원" />
</Form.Group>
<Form.Group controlId="formBasicEmail">
<Form.Label>이메일</Form.Label>
<Form.Control type="email" placeholder="jiwon5393@naver.com" />
</Form.Group>
<Form.Group controlId="formBasicTel">
<Form.Label>휴대전화</Form.Label>
<Form.Control type="tel" placeholder="010-0000-0000" />
</Form.Group>
</Form>
</div>
<div>
<h5 className="bg-light font-weight-bold py-3 border-top border-bottom text-center">배송지 정보</h5>
</div>
<div>
<h5 className="bg-light font-weight-bold py-3 border-top border-bottom text-center">주문상품정보</h5>
<Card >
<Row>
<Col className="text-center align-self-center">
<input className="" type="checkbox" id="exampleCheck1"></input>
</Col>
<Col>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" style={{ width: '20rem' }} />
</Col>
<Col>
<Card.Body>
<img src="https://img.icons8.com/fluent-systems-regular/24/000000/close-window.png" className="float-right" />
<Card.Title className="font-weight-bold mt-3">제품명</Card.Title>
<Card.Text>가격</Card.Text>
<Card.Text>옵션</Card.Text>
<div>
<Button variant="outline-dark" size="sm">-</Button>
<input type="text" style={{ width: '30px' }} className="align-middle mx-1" readOnly></input>
<Button variant="outline-dark" size="sm">+</Button>
</div>
</Card.Body>
</Col>
</Row>
</Card>
</div>
<div className="bg-light p-5 m-5">
<ul className="pl-0" style={{ listStyle: 'none' }}>
<li>
<span className="text-secondary"> 상품금액</span>
<span className="text-secondary float-right">12,000</span>
</li>
<li>
<span className="text-secondary">배송비</span>
<span className="text-secondary float-right">2,500</span>
</li>
</ul>
<div className="my-1 pt-2 border-top font-weight-bold">
결제금액<span className="float-right">14,500</span>
</div>
</div>
<div>
<h5 className="bg-light font-weight-bold py-3 border-top border-bottom text-center">결제수단</h5>
<div className="text-center">
<Button variant="success" onClick={handleClick} >무통장입금</Button>
<Button variant="warning" style={{ color: '#ffffff' }} onClick={handleClick2}>카카오페이</Button>
</div>
{paymentWay}
</div>
</Container>
</div> </div>
) )
} }
......
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import Nav1 from '../Components/MainNav'; import MainNav from '../Components/MainNav';
import Nav2 from '../Components/SubNav'; import SubNav from '../Components/SubNav';
function Products() { function Products() {
return ( return (
<div> <div>
<Nav1 /> <MainNav />
<Nav2 /> <SubNav />
</div> </div>
) )
} }
......
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import Nav1 from '../Components/MainNav'; import MainNav from '../Components/MainNav';
import Nav2 from '../Components/SubNav'; import SubNav from '../Components/SubNav';
import Products from './Products'; import Products from './Products';
function ProductsList() { function ProductsList() {
return ( return (
<div> <div>
<Nav1 /> <MainNav />
<Nav2 /> <SubNav />
</div> </div>
) )
} }
......
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import Nav1 from '../Components/MainNav'; import MainNav from '../Components/MainNav';
import Nav2 from '../Components/SubNav'; import SubNav from '../Components/SubNav';
function ProductsRegist() { function ProductsRegist() {
return ( return (
<div> <div>
<Nav1 /> <MainNav />
<Nav2 /> <SubNav />
</div> </div>
) )
} }
......
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { Redirect } from 'react-router-dom'; import { Redirect } from 'react-router-dom';
import Nav1 from '../Components/MainNav'; import MainNav from '../Components/MainNav';
import Nav2 from '../Components/SubNav'; import SubNav from '../Components/SubNav';
import { Card, Button, Container, Row, Col } from 'react-bootstrap';
function ShoppingCart() { function ShoppingCart() {
return ( return (
<div> <div>
<Nav1 /> <MainNav />
<Nav2 /> <SubNav />
<Container className="justify-content-center">
<h3 className="my-5 font-weight-bold text-center" style={{ color: '#F2A400' }}>장바구니</h3>
<div>
<h4 className="bg-light font-weight-bold py-3 border-top border-bottom text-center">주문상품정보</h4>
<Card >
<Row>
<Col>
<input className="mx-5" type="checkbox" id="exampleCheck1"></input>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" style={{ width: '20rem' }} />
</Col>
<Col md={6}>
<Card.Body>
<img src="https://img.icons8.com/fluent-systems-regular/24/000000/close-window.png" className="float-right" />
<Card.Title className="font-weight-bold mt-3">제품명</Card.Title>
<Card.Text>가격</Card.Text>
<Card.Text>옵션</Card.Text>
<Card.Text>수량</Card.Text>
<div>
<Button variant="outline-dark" size="sm">-</Button>
<input type="text" style={{ width: '30px' }} className="align-middle mx-1" readOnly></input>
<Button variant="outline-dark" size="sm">+</Button>
</div>
</Card.Body>
</Col>
</Row>
</Card>
<Card>
<Row>
<Col>
<input className="mx-5" type="checkbox" id="exampleCheck1"></input>
<Card.Img className="img-fluid" variant="top" src="img/asd.jpg" style={{ width: '20rem' }} />
</Col>
<Col>
<Card.Body>
<img src="https://img.icons8.com/fluent-systems-regular/24/000000/close-window.png" className="float-right" />
<Card.Title className="font-weight-bold mt-3">제품명</Card.Title>
<Card.Text>가격</Card.Text>
<Card.Text>옵션</Card.Text>
<Card.Text>수량</Card.Text>
<div>
<Button variant="outline-dark" size="sm">-</Button>
<input type="text" style={{ width: '30px' }} className="align-middle mx-1" readOnly></input>
<Button variant="outline-dark" size="sm">+</Button>
</div>
</Card.Body>
</Col>
</Row>
</Card>
</div>
<div className="bg-light p-5 m-5">
<ul className="pl-0" style={{ listStyle: 'none' }}>
<li>
<span className="text-secondary"> 상품금액</span>
<span className="text-secondary float-right">12,000</span>
</li>
<li>
<span className="text-secondary">배송비</span>
<span className="text-secondary float-right">2,500</span>
</li>
</ul>
<div className="my-1 pt-2 border-top font-weight-bold">
결제금액<span className="float-right">14,500</span>
</div>
</div>
<div className="text-center">
<Button className="px-5">결제하기</Button>
</div>
</Container>
</div> </div>
) )
......
<?xml version="1.0" ?><svg viewBox="0 0 32 32" style="fill:rgba(255,255,255,.5)" xmlns="http://www.w3.org/2000/svg"><defs><style>.cls-1{fill:none;}</style></defs><title/><g data-name="Layer 2" id="Layer_2"><path d="M23.52,29h-15a5.48,5.48,0,0,1-5.31-6.83L6.25,9.76a1,1,0,0,1,1-.76H24a1,1,0,0,1,1,.7l3.78,12.16a5.49,5.49,0,0,1-.83,4.91A5.41,5.41,0,0,1,23.52,29ZM8,11,5.11,22.65A3.5,3.5,0,0,0,8.48,27h15a3.44,3.44,0,0,0,2.79-1.42,3.5,3.5,0,0,0,.53-3.13L23.28,11Z"/><path d="M20,17a1,1,0,0,1-1-1V8a3,3,0,0,0-6,0v8a1,1,0,0,1-2,0V8A5,5,0,0,1,21,8v8A1,1,0,0,1,20,17Z"/></g><g id="frame"><rect class="cls-1" height="32" width="32"/></g></svg>
\ No newline at end of file
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="32.000000pt" height="32.000000pt" viewBox="0 0 32.000000 32.000000"
preserveAspectRatio="xMidYMid meet">
<g transform="translate(0.000000,32.000000) scale(0.100000,-0.100000)"
fill="#fff" stroke="none">
<path d="M86 288 c-19 -27 -20 -39 -4 -73 13 -28 52 -35 62 -9 10 26 7 79 -6
92 -18 18 -35 15 -52 -10z m52 -21 c6 -30 -7 -67 -23 -67 -22 0 -38 46 -24 71
12 24 42 21 47 -4z"/>
<path d="M187 292 c-19 -21 -22 -64 -7 -93 30 -55 95 21 68 79 -16 33 -39 39
-61 14z m51 -43 c4 -47 -23 -74 -44 -44 -26 36 -14 88 20 83 16 -2 22 -11 24
-39z"/>
<path d="M8 175 c-17 -38 0 -80 32 -80 29 0 46 38 36 79 -9 36 -52 37 -68 1z
m58 -9 c6 -26 -10 -66 -27 -66 -19 0 -32 46 -20 69 16 28 39 27 47 -3z"/>
<path d="M251 174 c-25 -31 -27 -57 -6 -74 21 -17 51 -4 65 30 26 62 -18 96
-59 44z m54 5 c9 -13 -13 -66 -30 -73 -26 -10 -38 20 -20 53 16 31 38 40 50
20z"/>
<path d="M95 100 c-41 -42 -48 -53 -39 -68 9 -14 27 -17 104 -17 79 0 94 3
104 18 9 15 7 22 -12 35 -13 9 -37 32 -54 50 -17 17 -36 32 -42 32 -7 0 -34
-23 -61 -50z m119 -14 c34 -32 43 -46 34 -52 -22 -14 -177 -12 -182 1 -6 16
64 94 85 94 8 1 36 -19 63 -43z"/>
</g>
</svg>
...@@ -5,6 +5,7 @@ import Home from './Pages/Home'; ...@@ -5,6 +5,7 @@ import Home from './Pages/Home';
import Login from './Pages/Login'; import Login from './Pages/Login';
import Signup from './Pages/Signup'; import Signup from './Pages/Signup';
import Admin from './Pages/Admin'; import Admin from './Pages/Admin';
import ProductsRegist from './Pages/ProductsRegist';
import ShoppingCart from './Pages/ShoppingCart'; import ShoppingCart from './Pages/ShoppingCart';
import Payment from './Pages/Payment'; import Payment from './Pages/Payment';
import reportWebVitals from './reportWebVitals'; import reportWebVitals from './reportWebVitals';
...@@ -17,6 +18,10 @@ ReactDOM.render( ...@@ -17,6 +18,10 @@ ReactDOM.render(
<Route exact path="/" component={Home} /> <Route exact path="/" component={Home} />
<Route path="/login" component={Login} /> <Route path="/login" component={Login} />
<Route path="/signup" component={Signup} /> <Route path="/signup" component={Signup} />
<Route path="/admin" component={Admin} />
<Route path="/regist" component={ProductsRegist} />
<Route path="/shoppingcart" component={ShoppingCart} />
<Route path="/payment" component={Payment} />
<Redirect path="/" to="/" /> <Redirect path="/" to="/" />
</Switch> </Switch>
</Router> </Router>
......
<?xml version="1.0" ?><svg viewBox="0 0 32 32" style="fill:rgba(255,255,255,.5)" xmlns="http://www.w3.org/2000/svg"><title/><g id="setting"><path d="M19.06,32H12.94A1.94,1.94,0,0,1,11,30.06V28.38c-.19-.08-.38-.15-.57-.24L9.21,29.37a1.92,1.92,0,0,1-2.68,0l-3.9-3.9a1.92,1.92,0,0,1,0-2.68l1.24-1.23c-.09-.19-.16-.38-.24-.57H1.94A1.94,1.94,0,0,1,0,19.06V12.94A1.94,1.94,0,0,1,1.94,11H3.62c.08-.19.15-.38.24-.57L2.63,9.21a1.92,1.92,0,0,1,0-2.68l3.9-3.9a1.92,1.92,0,0,1,2.68,0l1.23,1.24c.19-.09.38-.16.57-.24V1.94A1.94,1.94,0,0,1,12.94,0h6.12A1.94,1.94,0,0,1,21,1.94V3.62l.57.24,1.22-1.23a1.92,1.92,0,0,1,2.68,0l3.9,3.9a1.92,1.92,0,0,1,0,2.68l-1.24,1.23c.09.19.16.38.24.57h1.68A1.94,1.94,0,0,1,32,12.94v6.12A1.94,1.94,0,0,1,30.06,21H28.38c-.08.19-.15.38-.24.57l1.23,1.22a1.92,1.92,0,0,1,0,2.68l-3.9,3.9a1.92,1.92,0,0,1-2.68,0l-1.23-1.24c-.19.09-.38.16-.57.24v1.68A1.94,1.94,0,0,1,19.06,32Zm-9-7,.63.32a10.57,10.57,0,0,0,1.6.66l.67.22V30l5.62-.06-.06-3.05.7-.22A11.36,11.36,0,0,0,20.93,26l.65-.32,2.29,2.2L27.81,24,25.52,21.9l.31-.59a10.72,10.72,0,0,0,.73-1.71l.21-.6H30l-.06-6H26.89l-.2-.62A11.72,11.72,0,0,0,26,10.71l-.31-.61,2.2-2.2L24,4.11,21.9,6.31,21.27,6a10.57,10.57,0,0,0-1.6-.66L19,5.11V2l-6.06.06L13,5.11l-.67.22a10.57,10.57,0,0,0-1.6.66l-.63.32L7.9,4.11,4.11,8l2.2,2.12L6,10.73a10.57,10.57,0,0,0-.66,1.6L5.11,13H2l.06,5.41,3.05-.06.22.67A10.57,10.57,0,0,0,6,20.62l.32.63-2.2,2.2L8,27.24Z"/><path d="M16,24a8,8,0,1,1,8-8A8,8,0,0,1,16,24Zm0-14a6,6,0,1,0,6,6A6,6,0,0,0,16,10Z"/></g></svg>
\ No newline at end of file
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