From b34bb21e1af1428a8fac9884d2c971ef8fe5638b Mon Sep 17 00:00:00 2001 From: hyunjun_cho <gusrkfl0609@ajou.ac.kr> Date: Sun, 13 Dec 2020 03:31:19 +0900 Subject: [PATCH] update on BUG --- client/.eslintcache | 2 +- client/src/components/InList.js | 2 +- client/src/components/Info.js | 25 +++++++++++++++++++------ client/src/components/Join.js | 12 +++++------- client/src/components/Match.js | 8 ++++---- 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/client/.eslintcache b/client/.eslintcache index 468fb251..acf1c587 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\index.js":"1","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\App.js":"2","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\reportWebVitals.js":"3","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Home.js":"4","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Login.js":"5","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Signup.js":"6","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Menu.js":"7","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Header.js":"8","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Info.js":"9","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Join.js":"10","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Match.js":"11","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\JList.js":"12","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\MList.js":"13","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\request.js":"14","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\InList.js":"15"},{"size":500,"mtime":499162500000,"results":"16","hashOfConfig":"17"},{"size":986,"mtime":1607731725247,"results":"18","hashOfConfig":"17"},{"size":362,"mtime":499162500000,"results":"19","hashOfConfig":"17"},{"size":306,"mtime":1607357448211,"results":"20","hashOfConfig":"17"},{"size":3248,"mtime":1607769232317,"results":"21","hashOfConfig":"17"},{"size":5080,"mtime":1607719645143,"results":"22","hashOfConfig":"17"},{"size":1049,"mtime":1607402199570,"results":"23","hashOfConfig":"17"},{"size":2996,"mtime":1607768749803,"results":"24","hashOfConfig":"17"},{"size":3303,"mtime":1607775226312,"results":"25","hashOfConfig":"17"},{"size":3430,"mtime":1607772598595,"results":"26","hashOfConfig":"17"},{"size":3363,"mtime":1607775045745,"results":"27","hashOfConfig":"17"},{"size":3577,"mtime":1607772117404,"results":"28","hashOfConfig":"17"},{"size":3580,"mtime":1607772145606,"results":"29","hashOfConfig":"17"},{"size":2305,"mtime":1607728004747,"results":"30","hashOfConfig":"17"},{"size":3633,"mtime":1607771917918,"results":"31","hashOfConfig":"17"},{"filePath":"32","messages":"33","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},"acqgsi",{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"39","messages":"40","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"41","messages":"42","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"51","messages":"52","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"55","messages":"56","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"57","messages":"58","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"59","messages":"60","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":"61","usedDeprecatedRules":"34"},{"filePath":"62","messages":"63","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\index.js",[],["64","65"],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\App.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\reportWebVitals.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Home.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Login.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Signup.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Menu.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Header.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Info.js",["66"],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Join.js",["67"],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Match.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\JList.js",["68","69","70"],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\MList.js",["71","72"],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\request.js",["73"],"import axios from 'axios';\r\n\r\nconst API_DEFAULT = \"http://localhost:3001/\";\r\nconst instance = axios.create({ baseURL: API_DEFAULT });\r\n\r\nexport async function getUser() {\r\n const result = await instance.get('/');\r\n console.log(result)\r\n return result.data\r\n}\r\n\r\nexport async function dropUser() {\r\n const result = await instance.get('/logout');\r\n return result.data\r\n}\r\n\r\n// export async function searchUser(email) {\r\n// const result = await instance.get('/login' + email);\r\n// return result.data\r\n// }\r\n\r\nexport async function putUser({username, email, password}) {\r\n const result = await instance.post('/routes/save', {\r\n username: username,\r\n email: email, \r\n password: password \r\n });\r\n console.log(result);\r\n return result.data\r\n}\r\n\r\nexport async function checkUser({email, password}) {\r\n const result = await instance.post('/routes/login', {\r\n email: email, \r\n password: password \r\n });\r\n console.log(result);\r\n return result.data\r\n}\r\n\r\nexport async function joinList({title, description}) {\r\n const result = await instance.post('/routes/join', {\r\n title: title,\r\n description: description\r\n });\r\n return result.data\r\n}\r\n\r\nexport async function matchList({title, description}) {\r\n const result = await instance.post('/routes/match', {\r\n title: title,\r\n description: description\r\n });\r\n return result.data\r\n}\r\n\r\nexport async function infoList({name, time, location}) {\r\n const result = await instance.post('/routes/info', {\r\n name: name,\r\n time: time,\r\n location: location\r\n });\r\n console.log(result.data)\r\n return result.data\r\n}\r\n\r\nexport async function getJoinList() {\r\n const result = await instance.get('/routes/join/return');\r\n return result.data;\r\n}\r\n\r\nexport async function getMatchList() {\r\n const result = await instance.get('/routes/match/return');\r\n return result.data;\r\n}\r\n\r\nexport async function getInfoList() {\r\n const result = await instance.get('/routes/info/return');\r\n return result.data;\r\n}\r\n\r\nexport default {\r\n getUser,\r\n dropUser,\r\n putUser,\r\n checkUser,\r\n // searchUser,\r\n joinList,\r\n matchList,\r\n getJoinList,\r\n getMatchList,\r\n infoList,\r\n getInfoList\r\n}\r\n\r\n\r\n\r\n\r\n","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\InList.js",[],{"ruleId":"74","replacedBy":"75"},{"ruleId":"76","replacedBy":"77"},{"ruleId":"78","severity":1,"message":"79","line":72,"column":39,"nodeType":"80","messageId":"81","endLine":72,"endColumn":41},{"ruleId":"82","severity":1,"message":"83","line":4,"column":22,"nodeType":"84","messageId":"85","endLine":4,"endColumn":30},{"ruleId":"82","severity":1,"message":"83","line":3,"column":22,"nodeType":"84","messageId":"85","endLine":3,"endColumn":30},{"ruleId":"78","severity":1,"message":"79","line":19,"column":35,"nodeType":"80","messageId":"81","endLine":19,"endColumn":37},{"ruleId":"78","severity":1,"message":"79","line":45,"column":39,"nodeType":"80","messageId":"81","endLine":45,"endColumn":41},{"ruleId":"78","severity":1,"message":"79","line":19,"column":35,"nodeType":"80","messageId":"81","endLine":19,"endColumn":37},{"ruleId":"78","severity":1,"message":"79","line":47,"column":39,"nodeType":"80","messageId":"81","endLine":47,"endColumn":41},{"ruleId":"86","severity":1,"message":"87","line":82,"column":1,"nodeType":"88","endLine":94,"endColumn":2},"no-native-reassign",["89"],"no-negated-in-lhs",["90"],"array-callback-return","Array.prototype.map() expects a return value from arrow function.","ArrowFunctionExpression","expectedInside","no-unused-vars","'Redirect' is defined but never used.","Identifier","unusedVar","import/no-anonymous-default-export","Assign object to a variable before exporting as module default","ExportDefaultDeclaration","no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\index.js":"1","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\App.js":"2","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\reportWebVitals.js":"3","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Home.js":"4","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Login.js":"5","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Signup.js":"6","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Menu.js":"7","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Header.js":"8","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Info.js":"9","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Join.js":"10","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Match.js":"11","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\JList.js":"12","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\MList.js":"13","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\request.js":"14","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\InList.js":"15"},{"size":500,"mtime":499162500000,"results":"16","hashOfConfig":"17"},{"size":986,"mtime":1607731725247,"results":"18","hashOfConfig":"17"},{"size":362,"mtime":499162500000,"results":"19","hashOfConfig":"17"},{"size":306,"mtime":1607357448211,"results":"20","hashOfConfig":"17"},{"size":3248,"mtime":1607769232317,"results":"21","hashOfConfig":"17"},{"size":5080,"mtime":1607719645143,"results":"22","hashOfConfig":"17"},{"size":1049,"mtime":1607402199570,"results":"23","hashOfConfig":"17"},{"size":2996,"mtime":1607768749803,"results":"24","hashOfConfig":"17"},{"size":3511,"mtime":1607794268173,"results":"25","hashOfConfig":"17"},{"size":3412,"mtime":1607793389828,"results":"26","hashOfConfig":"17"},{"size":3375,"mtime":1607793400265,"results":"27","hashOfConfig":"17"},{"size":3577,"mtime":1607772117404,"results":"28","hashOfConfig":"17"},{"size":3580,"mtime":1607772145606,"results":"29","hashOfConfig":"17"},{"size":2305,"mtime":1607728004747,"results":"30","hashOfConfig":"17"},{"size":3620,"mtime":1607793823210,"results":"31","hashOfConfig":"17"},{"filePath":"32","messages":"33","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},"acqgsi",{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"39","messages":"40","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"41","messages":"42","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":5,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"51","messages":"52","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"55","messages":"56","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":"57","usedDeprecatedRules":"34"},{"filePath":"58","messages":"59","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":"60","usedDeprecatedRules":"34"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":"63","usedDeprecatedRules":"34"},{"filePath":"64","messages":"65","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\index.js",[],["66","67"],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\App.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\reportWebVitals.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Home.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Login.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Signup.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Menu.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Header.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Info.js",["68","69","70","71","72"],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Join.js",["73"],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\Match.js",[],"C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\JList.js",["74","75","76"],"import React from 'react'\r\nimport request from '../request'\r\nimport { withRouter, Redirect } from 'react-router-dom'\r\n\r\nclass JList extends React.Component {\r\n constructor(props) {\r\n super(props);\r\n this.state = {\r\n Lists: [],\r\n click: false,\r\n content : \"\",\r\n title: \"\"\r\n }\r\n }\r\n showDes = e => {\r\n this.setState({\r\n click: true\r\n })\r\n this.state.Lists.map(list => {\r\n if(list.title === e.target.innerText) {\r\n this.setState({\r\n content: list.description,\r\n title: list.title\r\n })\r\n }\r\n })\r\n }\r\n Goback = e => {\r\n this.setState({\r\n click: false\r\n });\r\n this.props.history.push('/join');\r\n }\r\n componentDidMount() { \r\n request.getJoinList().then().then(data => {\r\n this.setState({\r\n Lists: data\r\n })\r\n });\r\n }\r\n render() {\r\n const format = [];\r\n const number = []\r\n if(this.state.Lists.length > 0){\r\n this.state.Lists.map(list => {\r\n number.push(1);\r\n format.push(<tr></tr>)\r\n format.push(<td>{number.length}</td>)\r\n format.push(<td onClick={this.showDes}>{list.title}</td>)\r\n });\r\n }\r\n \r\n if(this.state.click === true) {\r\n return(\r\n <div>\r\n <div className=\"form_container\">\r\n <div className=\"form_title_div\">\r\n <p className=\"form_title_p\">게시물</p>\r\n </div>\r\n <div>\r\n <div>\r\n <p className=\"form_item_name\">title</p>\r\n </div>\r\n <div>\r\n <input type=\"text\" className=\"form_input\" value={this.state.title}/>\r\n </div>\r\n <div className=\"form_text_alert_padding\">\r\n <div id=\"alert_username\" className=\"form_text_alert\"></div>\r\n </div>\r\n </div>\r\n <div>\r\n <div>\r\n <p className=\"form_item_name\">Content</p>\r\n </div>\r\n <div>\r\n <textarea className=\"form_input\" value={this.state.content}/>\r\n </div>\r\n <div className=\"form_text_alert_padding\">\r\n <div id=\"alert_password\" className=\"form_text_alert\"></div>\r\n </div>\r\n </div>\r\n <div>\r\n <button type=\"button\" className=\"form_submit_button\" onClick={this.Goback}>Back</button>\r\n </div>\r\n </div>\r\n </div>\r\n \r\n ) \r\n } else {\r\n return(\r\n <div className=\"showList\">\r\n <table>\r\n <tr>\r\n <th>Index</th>\r\n <th>Title</th>\r\n </tr>\r\n {format}\r\n </table>\r\n </div> \r\n ) \r\n } \r\n }\r\n}\r\n\r\nexport default withRouter(JList)","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\MList.js",["77","78"],"import React from 'react'\r\nimport request from '../request'\r\nimport { withRouter } from 'react-router-dom'\r\n\r\nclass MList extends React.Component {\r\n constructor(props) {\r\n super(props);\r\n this.state = {\r\n Lists: [],\r\n click: false,\r\n content : \"\",\r\n title: \"\"\r\n }\r\n }\r\n showDes = e => {\r\n this.setState({\r\n click: true\r\n })\r\n this.state.Lists.map(list => {\r\n if(list.title === e.target.innerText) {\r\n this.setState({\r\n content: list.description,\r\n title: list.title\r\n })\r\n }\r\n })\r\n }\r\n Goback = e => {\r\n this.setState({\r\n click: false\r\n });\r\n this.props.history.push('/match');\r\n }\r\n componentDidMount() { \r\n \r\n request.getMatchList().then().then(data => {\r\n this.setState({\r\n Lists: data\r\n })\r\n });\r\n \r\n }\r\n render() {\r\n const format = [];\r\n const number = []\r\n if(this.state.Lists.length > 0) {\r\n this.state.Lists.map(list => {\r\n number.push(1);\r\n format.push(<tr></tr>)\r\n format.push(<td>{number.length}</td>)\r\n format.push(<td onClick={this.showDes}>{list.title}</td>)\r\n });\r\n }\r\n if(this.state.click === true) {\r\n return(\r\n <div>\r\n <div className=\"form_container\">\r\n <div className=\"form_title_div\">\r\n <p className=\"form_title_p\">게시물</p>\r\n </div>\r\n <div>\r\n <div>\r\n <p className=\"form_item_name\">title</p>\r\n </div>\r\n <div>\r\n <input type=\"text\" className=\"form_input\" value={this.state.title}/>\r\n </div>\r\n <div className=\"form_text_alert_padding\">\r\n <div id=\"alert_username\" className=\"form_text_alert\"></div>\r\n </div>\r\n </div>\r\n <div>\r\n <div>\r\n <p className=\"form_item_name\">Content</p>\r\n </div>\r\n <div>\r\n <textarea className=\"form_input\" value={this.state.content}/>\r\n </div>\r\n <div className=\"form_text_alert_padding\">\r\n <div id=\"alert_password\" className=\"form_text_alert\"></div>\r\n </div>\r\n </div>\r\n <div>\r\n <button type=\"button\" className=\"form_submit_button\" onClick={this.Goback}>Back</button>\r\n </div>\r\n </div>\r\n </div>\r\n \r\n ) \r\n } else {\r\n return(\r\n <div className=\"showList\">\r\n <table>\r\n <tr>\r\n <th>Index</th>\r\n <th>Title</th>\r\n </tr>\r\n {format}\r\n </table>\r\n </div> \r\n ) \r\n } \r\n }\r\n}\r\n\r\nexport default withRouter(MList)","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\request.js",["79"],"import axios from 'axios';\r\n\r\nconst API_DEFAULT = \"http://localhost:3001/\";\r\nconst instance = axios.create({ baseURL: API_DEFAULT });\r\n\r\nexport async function getUser() {\r\n const result = await instance.get('/');\r\n console.log(result)\r\n return result.data\r\n}\r\n\r\nexport async function dropUser() {\r\n const result = await instance.get('/logout');\r\n return result.data\r\n}\r\n\r\n// export async function searchUser(email) {\r\n// const result = await instance.get('/login' + email);\r\n// return result.data\r\n// }\r\n\r\nexport async function putUser({username, email, password}) {\r\n const result = await instance.post('/routes/save', {\r\n username: username,\r\n email: email, \r\n password: password \r\n });\r\n console.log(result);\r\n return result.data\r\n}\r\n\r\nexport async function checkUser({email, password}) {\r\n const result = await instance.post('/routes/login', {\r\n email: email, \r\n password: password \r\n });\r\n console.log(result);\r\n return result.data\r\n}\r\n\r\nexport async function joinList({title, description}) {\r\n const result = await instance.post('/routes/join', {\r\n title: title,\r\n description: description\r\n });\r\n return result.data\r\n}\r\n\r\nexport async function matchList({title, description}) {\r\n const result = await instance.post('/routes/match', {\r\n title: title,\r\n description: description\r\n });\r\n return result.data\r\n}\r\n\r\nexport async function infoList({name, time, location}) {\r\n const result = await instance.post('/routes/info', {\r\n name: name,\r\n time: time,\r\n location: location\r\n });\r\n console.log(result.data)\r\n return result.data\r\n}\r\n\r\nexport async function getJoinList() {\r\n const result = await instance.get('/routes/join/return');\r\n return result.data;\r\n}\r\n\r\nexport async function getMatchList() {\r\n const result = await instance.get('/routes/match/return');\r\n return result.data;\r\n}\r\n\r\nexport async function getInfoList() {\r\n const result = await instance.get('/routes/info/return');\r\n return result.data;\r\n}\r\n\r\nexport default {\r\n getUser,\r\n dropUser,\r\n putUser,\r\n checkUser,\r\n // searchUser,\r\n joinList,\r\n matchList,\r\n getJoinList,\r\n getMatchList,\r\n infoList,\r\n getInfoList\r\n}\r\n\r\n\r\n\r\n\r\n","C:\\Users\\82106\\Desktop\\Final_project\\web-project\\client\\src\\components\\InList.js",[],{"ruleId":"80","replacedBy":"81"},{"ruleId":"82","replacedBy":"83"},{"ruleId":"84","severity":1,"message":"85","line":4,"column":10,"nodeType":"86","messageId":"87","endLine":4,"endColumn":23},{"ruleId":"84","severity":1,"message":"88","line":4,"column":37,"nodeType":"86","messageId":"87","endLine":4,"endColumn":43},{"ruleId":"84","severity":1,"message":"89","line":4,"column":45,"nodeType":"86","messageId":"87","endLine":4,"endColumn":50},{"ruleId":"84","severity":1,"message":"90","line":4,"column":52,"nodeType":"86","messageId":"87","endLine":4,"endColumn":56},{"ruleId":"91","severity":1,"message":"92","line":85,"column":39,"nodeType":"93","messageId":"94","endLine":85,"endColumn":41},{"ruleId":"84","severity":1,"message":"95","line":4,"column":22,"nodeType":"86","messageId":"87","endLine":4,"endColumn":30},{"ruleId":"84","severity":1,"message":"95","line":3,"column":22,"nodeType":"86","messageId":"87","endLine":3,"endColumn":30},{"ruleId":"91","severity":1,"message":"92","line":19,"column":35,"nodeType":"93","messageId":"94","endLine":19,"endColumn":37},{"ruleId":"91","severity":1,"message":"92","line":45,"column":39,"nodeType":"93","messageId":"94","endLine":45,"endColumn":41},{"ruleId":"91","severity":1,"message":"92","line":19,"column":35,"nodeType":"93","messageId":"94","endLine":19,"endColumn":37},{"ruleId":"91","severity":1,"message":"92","line":47,"column":39,"nodeType":"93","messageId":"94","endLine":47,"endColumn":41},{"ruleId":"96","severity":1,"message":"97","line":82,"column":1,"nodeType":"98","endLine":94,"endColumn":2},"no-native-reassign",["99"],"no-negated-in-lhs",["100"],"no-unused-vars","'BrowserRouter' is defined but never used.","Identifier","unusedVar","'Switch' is defined but never used.","'Route' is defined but never used.","'Link' is defined but never used.","array-callback-return","Array.prototype.map() expects a return value from arrow function.","ArrowFunctionExpression","expectedInside","'Redirect' is defined but never used.","import/no-anonymous-default-export","Assign object to a variable before exporting as module default","ExportDefaultDeclaration","no-global-assign","no-unsafe-negation"] \ No newline at end of file diff --git a/client/src/components/InList.js b/client/src/components/InList.js index f32dabef..88b96523 100644 --- a/client/src/components/InList.js +++ b/client/src/components/InList.js @@ -48,7 +48,7 @@ class InList extends react.Component { } Cancel = event => { event.preventDefault(); - this.props.history.push('/info'); + this.props.return(); } render() { return( diff --git a/client/src/components/Info.js b/client/src/components/Info.js index 8c353a86..873cef76 100644 --- a/client/src/components/Info.js +++ b/client/src/components/Info.js @@ -12,6 +12,7 @@ class Info extends React.Component { location: "", Lists: [] } + this.returnsearch = this.returnsearch.bind(this) } detect = event => { this.setState({ @@ -36,7 +37,23 @@ class Info extends React.Component { click: false }) } + returnsearch() { + this.setState({ + update: false + }); + } + onUpate = event => { + event.preventDefault(); + this.setState({ + update: true + }) + } render() { + if(this.state.update === true) { + return( + <InList return={this.returnsearch}></InList> + ) + } if(this.state.click === false) { return( <div className="form_container"> @@ -58,12 +75,8 @@ class Info extends React.Component { <div className="form_text_alert_padding"> <div id="alert_username" className="form_text_alert"></div> </div> - <BrowserRouter> - <Link to='/sign'><button type="button" className="form_submit_button">New</button></Link> - <Switch> - <Route exact path='/sign' component= {InList}></Route> - </Switch> - </BrowserRouter> + <button type="button" className="form_submit_button" onClick={this.onUpate.bind(this)}>New</button> + </div> </div> ) diff --git a/client/src/components/Join.js b/client/src/components/Join.js index 539662a6..4e155d71 100644 --- a/client/src/components/Join.js +++ b/client/src/components/Join.js @@ -44,13 +44,12 @@ class Join extends React.Component { }); request.joinList(data).then(result => { - this.setState({ - title: "", - description: "" - }) + // this.setState({ + // title: "", + // description: "" + // }) this.props.history.push('/join'); - }); - + }); } render() { if(this.state.click === false){ @@ -92,7 +91,6 @@ class Join extends React.Component { <button type="button" onClick={this.Goback} className="form_cancel_button">back</button> </div> </div> - </div> ) } diff --git a/client/src/components/Match.js b/client/src/components/Match.js index e3fadb76..75a118e4 100644 --- a/client/src/components/Match.js +++ b/client/src/components/Match.js @@ -44,10 +44,10 @@ class Match extends React.Component { }); request.matchList(data).then(result => { - this.setState({ - title: "", - description: "" - }) + // this.setState({ + // title: "", + // description: "" + // }) this.props.history.push('/match') }); -- GitLab