From d988727481db5caa4d91eca52a443f55afb3fd8a Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 15 Nov 2021 00:50:40 -0800 Subject: [PATCH] remove console.log in admin --- backend/public/js/app.js | 84 +++++++------------ backend/resources/js/admin/child/detail.jsx | 31 +++---- backend/resources/js/admin/child/edit.jsx | 45 ++++------ .../js/admin/child/password_edit.jsx | 6 -- backend/resources/js/admin/meeting/detail.jsx | 4 +- backend/resources/js/admin/meeting/edit.jsx | 3 - backend/resources/js/admin/parent/detail.jsx | 31 +++---- backend/resources/js/admin/parent/edit.jsx | 46 ++++------ backend/resources/js/admin/parent/index.jsx | 1 - .../js/admin/parent/password_edit.jsx | 8 -- .../resources/js/admin/parent/register.jsx | 4 - 11 files changed, 88 insertions(+), 175 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index f740bd8d..3248176e 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -35867,8 +35867,6 @@ var ChildDetail = function ChildDetail(props) { setChild(response.data.params); setImage(response.data.params.image); } - })["catch"](function (err) { - return console.log(err); }); }, []); @@ -36316,8 +36314,6 @@ var ChildEdit = function ChildEdit(props) { setCompany(child.company); } } - })["catch"](function (err) { - return console.log(err); }); }, []); @@ -36358,8 +36354,6 @@ var ChildEdit = function ChildEdit(props) { set422Errors(response.data.error_messages); break; } - })["catch"](function (err) { - return console.log(err); }); }; @@ -36904,8 +36898,6 @@ var ChildPasswordEdit = function ChildPasswordEdit(props) { set422Errors(response.data.error_messages); break; } - })["catch"](function (err) { - return console.log(err); }); }; @@ -37369,7 +37361,6 @@ var MeetingDetail = function MeetingDetail(props) { numerator: num })); if (list.meeting_image.length > 0) setThumbnail(list.meeting_image[0].image); - } else if (response.data.status_code == 400) {//TODO } }); }, []); @@ -37885,7 +37876,6 @@ var MeetingEdit = function MeetingEdit(props) { } setChildrenTemp(arr); - } else if (response.data.status_code == 400) {//TODO } }); }, []); @@ -38800,8 +38790,6 @@ var ParentDetail = function ParentDetail(props) { setParent(response.data.params); setImage(response.data.params.image); } - })["catch"](function (err) { - return console.log(err); }); }, []); @@ -39217,8 +39205,6 @@ var ParentEdit = function ParentEdit(props) { setProfile(parent.profile); } } - })["catch"](function (err) { - return console.log(err); }); }, []); @@ -39255,8 +39241,6 @@ var ParentEdit = function ParentEdit(props) { set422Errors(response.data.error_messages); break; } - })["catch"](function (err) { - return console.log(err); }); }; @@ -39423,15 +39407,14 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__) /* harmony export */ }); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); -/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js"); +/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js"); /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); -/* harmony import */ var _mui_material_IconButton__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @mui/material/IconButton */ "./node_modules/@mui/material/IconButton/IconButton.js"); -/* harmony import */ var _mui_icons_material_Search__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @mui/icons-material/Search */ "./node_modules/@mui/icons-material/Search.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); +/* harmony import */ var _mui_material_IconButton__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @mui/material/IconButton */ "./node_modules/@mui/material/IconButton/IconButton.js"); +/* harmony import */ var _mui_icons_material_Search__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @mui/icons-material/Search */ "./node_modules/@mui/icons-material/Search.js"); /* harmony import */ var react_infinite_scroll_component__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-infinite-scroll-component */ "./node_modules/react-infinite-scroll-component/dist/index.es.js"); -/* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); +/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); } function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } @@ -39453,7 +39436,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - var INFINITE = 8; var SCROLL_DELAY_TIME = 1500; @@ -39541,30 +39523,30 @@ var Parent = function Parent() { }); }; - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { className: "l-content", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "l-content__ttl", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "l-content__ttl__left", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("h2", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("h2", { children: "\u89AA\u4E00\u89A7" }) }) - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "l-content-wrap", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("section", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("section", { className: "search-container", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "meeting-head mt-4", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("form", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("form", { className: "position-relative", onSubmit: handleSearch, - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("label", { className: "control-label", htmlFor: "keyword", children: "\u30AD\u30FC\u30EF\u30FC\u30C9" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("input", { type: "search", name: "keyword", className: "input-default input-keyword input-w380 input-h60", @@ -39573,7 +39555,7 @@ var Parent = function Parent() { onChange: function onChange(e) { return setKeyword(e.target.value); } - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_5__.default, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_4__.default, { size: "large", style: { position: 'absolute', @@ -39582,7 +39564,7 @@ var Parent = function Parent() { padding: '5px' }, type: "submit", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_Search__WEBPACK_IMPORTED_MODULE_6__.default, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_mui_icons_material_Search__WEBPACK_IMPORTED_MODULE_5__.default, { fontSize: "large", style: { color: '#d0d0d0', @@ -39592,14 +39574,14 @@ var Parent = function Parent() { }) })] }) - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "search-wrap", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { className: "search-content position-relative", style: { minHeight: '100px' }, - children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_7__.default, { + children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, { color: "secondary", style: { top: '20px', @@ -39607,38 +39589,38 @@ var Parent = function Parent() { color: 'green', position: 'absolute' } - }), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_infinite_scroll_component__WEBPACK_IMPORTED_MODULE_2__.default, { + }), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(react_infinite_scroll_component__WEBPACK_IMPORTED_MODULE_2__.default, { dataLength: fetch_father_list.length, next: fetchMoreFatherList, hasMore: fetch_father_list.length != father_list.length, - loader: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { + loader: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { id: "dots3", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {})] + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {})] }), style: { overflow: 'none', position: 'relative' }, children: fetch_father_list.length > 0 ? fetch_father_list.map(function (father, k) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "search-item", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_7__.Link, { to: "/admin/parent/detail/".concat(father.id), - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { className: "user-wrap", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "user-avatar", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("img", { alt: "name", className: "avatar-img", src: father.image }) - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { className: "user-info", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("p", { className: "user-name mb-1 font-weight-bold", children: father.company - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("p", { className: "user-tel", children: father.email })] @@ -39646,7 +39628,7 @@ var Parent = function Parent() { }) }) }, k); - }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", { + }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("p", { className: "text-center py-5", children: "\u30C7\u30FC\u30BF\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u305B\u3093\u3002" }) @@ -39765,8 +39747,6 @@ var ParentPasswordEdit = function ParentPasswordEdit(props) { set422Errors(response.data.error_messages); break; } - })["catch"](function (err) { - return console.log(err); }); }; diff --git a/backend/resources/js/admin/child/detail.jsx b/backend/resources/js/admin/child/detail.jsx index fca9e89f..1e9f5ba0 100644 --- a/backend/resources/js/admin/child/detail.jsx +++ b/backend/resources/js/admin/child/detail.jsx @@ -26,33 +26,25 @@ const ChildDetail = (props) => { const [_success_delete, setSuccessDelete] = useState(''); const [_success_update_image, setSuccessUpdateImage] = useState(''); - useEffect( - () => { - - setLoaded(false); - axios.get(`/api/admin/children/detail/${props.match.params?.child_id}`) - .then(response => { - setLoaded(true); - if(response.data.status_code==200){ - setChild(response.data.params); - setImage(response.data.params.image); - } - }) - .catch(err=>console.log(err)) - },[] - ); + useEffect(() => { + setLoaded(false); + axios.get(`/api/admin/children/detail/${props.match.params?.child_id}`) + .then(response => { + setLoaded(true); + if(response.data.status_code==200){ + setChild(response.data.params); + setImage(response.data.params.image); + } + }) + },[]); const handleImageChange = (e) => { - e.preventDefault(); let reader = new FileReader(); let _file = e.target.files[0]; - reader.readAsDataURL(_file); - reader.onloadend = () => { - axios.put(`/api/admin/children/updateImage/${props.match.params?.child_id}`, {image: reader.result}) .then(response => { switch(response.data.status_code){ @@ -65,7 +57,6 @@ const ChildDetail = (props) => { case 422: set422Errors(response.data.error_messages); break; } }); - }; }; diff --git a/backend/resources/js/admin/child/edit.jsx b/backend/resources/js/admin/child/edit.jsx index 762a8ce6..bf4d46f3 100644 --- a/backend/resources/js/admin/child/edit.jsx +++ b/backend/resources/js/admin/child/edit.jsx @@ -33,34 +33,29 @@ const ChildEdit = (props) => { const [loaded, setLoaded] = useState(false); - useEffect( - () => { - setLoaded(false); - axios.get(`/api/admin/children/detail/${props.match.params?.child_id}`) - .then(response => { - setLoaded(true); - if(response.data.status_code==200) - { - var child = response.data.params; - if(child){ - setFirstName(child.first_name); - setLastName(child.last_name); - setIdentity(child.identity); - setEmail(child.email); - setTelephone(child.tel); - setCompany(child.company); - } + useEffect(() => { + setLoaded(false); + axios.get(`/api/admin/children/detail/${props.match.params?.child_id}`) + .then(response => { + setLoaded(true); + if(response.data.status_code==200) + { + var child = response.data.params; + if(child){ + setFirstName(child.first_name); + setLastName(child.last_name); + setIdentity(child.identity); + setEmail(child.email); + setTelephone(child.tel); + setCompany(child.company); } - }) - .catch(err=>console.log(err)) - },[] - ); - + } + }) + },[]); const handleSubmit = (e) => { e.preventDefault(); - set422Errors({ first_name:'', last_name:'', @@ -69,9 +64,7 @@ const ChildEdit = (props) => { tel:'', company:'' }); - setSubmit(true); - var request = { first_name: first_name, last_name: last_name, @@ -80,7 +73,6 @@ const ChildEdit = (props) => { tel: tel, company: company }; - axios.put(`/api/admin/children/updateProfile/${props.match.params?.child_id}`, request) .then(response => { setSubmit(false); @@ -90,7 +82,6 @@ const ChildEdit = (props) => { case 422: set422Errors(response.data.error_messages); break; } }) - .catch(err=>console.log(err)) } diff --git a/backend/resources/js/admin/child/password_edit.jsx b/backend/resources/js/admin/child/password_edit.jsx index 98acbac8..344451a7 100644 --- a/backend/resources/js/admin/child/password_edit.jsx +++ b/backend/resources/js/admin/child/password_edit.jsx @@ -26,19 +26,15 @@ const ChildPasswordEdit = (props) => { const handleSubmit = (e) => { e.preventDefault(); - set422Errors({ password:'', password_confirmation:'' }); - setSubmit(true); - const request = { password: password, password_confirmation: password_confirmation } - axios.put(`/api/admin/children/updatePassword/${props.match.params?.child_id}`, request) .then(response => { setSubmit(false); @@ -48,11 +44,9 @@ const ChildPasswordEdit = (props) => { case 422: set422Errors(response.data.error_messages); break; } }) - .catch(err=>console.log(err)) } - return (
diff --git a/backend/resources/js/admin/meeting/detail.jsx b/backend/resources/js/admin/meeting/detail.jsx index 16d43574..c2d3fc06 100644 --- a/backend/resources/js/admin/meeting/detail.jsx +++ b/backend/resources/js/admin/meeting/detail.jsx @@ -43,9 +43,7 @@ const MeetingDetail = (props) => { } setMeeting({...list, denominator:total, numerator:num}); if(list.meeting_image.length > 0) setThumbnail(list.meeting_image[0].image); - } else if(response.data.status_code==400){ - //TODO - } + } }); }, []); diff --git a/backend/resources/js/admin/meeting/edit.jsx b/backend/resources/js/admin/meeting/edit.jsx index 6895c7c8..7cf7c1c4 100644 --- a/backend/resources/js/admin/meeting/edit.jsx +++ b/backend/resources/js/admin/meeting/edit.jsx @@ -77,9 +77,6 @@ const MeetingEdit = (props) => { } setChildrenTemp(arr); } - else if(response.data.status_code==400){ - //TODO - } }); }, []); diff --git a/backend/resources/js/admin/parent/detail.jsx b/backend/resources/js/admin/parent/detail.jsx index a998edae..844b7825 100644 --- a/backend/resources/js/admin/parent/detail.jsx +++ b/backend/resources/js/admin/parent/detail.jsx @@ -32,33 +32,25 @@ const ParentDetail = (props) => { const [_success_delete, setSuccessDelete] = useState(''); const [_success_update_image, setSuccessUpdateImage] = useState(''); - useEffect( - () => { - - setLoaded(false); - axios.get(`/api/admin/fathers/detail/${props.match.params?.father_id}`) - .then(response => { - setLoaded(true); - if(response.data.status_code==200){ - setParent(response.data.params); - setImage(response.data.params.image); - } - }) - .catch(err=>console.log(err)) - },[] - ); + useEffect(() => { + setLoaded(false); + axios.get(`/api/admin/fathers/detail/${props.match.params?.father_id}`) + .then(response => { + setLoaded(true); + if(response.data.status_code==200){ + setParent(response.data.params); + setImage(response.data.params.image); + } + }) + },[]); const handleImageChange = (e) => { - e.preventDefault(); let reader = new FileReader(); let _file = e.target.files[0]; - reader.readAsDataURL(_file); - reader.onloadend = () => { - axios.put(`/api/admin/fathers/updateImage/${props.match.params?.father_id}`, {image: reader.result}) .then(response => { switch(response.data.status_code){ @@ -71,7 +63,6 @@ const ParentDetail = (props) => { case 422: set422Errors(response.data.error_messages); break; } }); - }; }; diff --git a/backend/resources/js/admin/parent/edit.jsx b/backend/resources/js/admin/parent/edit.jsx index 37104200..d38f84f1 100644 --- a/backend/resources/js/admin/parent/edit.jsx +++ b/backend/resources/js/admin/parent/edit.jsx @@ -3,11 +3,8 @@ import { useHistory } from 'react-router-dom'; import axios from 'axios'; import { LoadingButton } from '@material-ui/lab'; import { CircularProgress } from '@material-ui/core'; - import Alert from '../../component/alert'; - - const ParentEdit = (props) => { const history = useHistory(); @@ -30,49 +27,39 @@ const ParentEdit = (props) => { const [loaded, setLoaded] = useState(false); - - useEffect( - () => { - setLoaded(false); - axios.get(`/api/admin/fathers/detail/${props.match.params?.father_id}`) - .then(response => { - setLoaded(true); - if(response.data.status_code==200) - { - var parent = response.data.params; - if(parent){ - setCompany(parent?.company); - setEmail(parent.email); - setTelephone(parent.tel) - setProfile(parent.profile); - } + useEffect(() => { + setLoaded(false); + axios.get(`/api/admin/fathers/detail/${props.match.params?.father_id}`) + .then(response => { + setLoaded(true); + if(response.data.status_code==200){ + var parent = response.data.params; + if(parent){ + setCompany(parent?.company); + setEmail(parent.email); + setTelephone(parent.tel) + setProfile(parent.profile); } - }) - .catch(err=>console.log(err)) - },[] - ); + } + }) + },[]); - const handleSubmit = (e) => { e.preventDefault(); - set422Errors({ company:'', email:'', tel:'', profile:'', }); - setSubmit(true); - var request = { company: company, email: email, tel: tel, profile: profile, }; - axios.put(`/api/admin/fathers/updateProfile/${props.match.params?.father_id}`, request) .then(response => { setSubmit(false); @@ -82,11 +69,8 @@ const ParentEdit = (props) => { case 422: set422Errors(response.data.error_messages); break; } }) - .catch(err=>console.log(err)) } - - return (
diff --git a/backend/resources/js/admin/parent/index.jsx b/backend/resources/js/admin/parent/index.jsx index 526623f1..8eef0f20 100644 --- a/backend/resources/js/admin/parent/index.jsx +++ b/backend/resources/js/admin/parent/index.jsx @@ -5,7 +5,6 @@ import { useHistory, Link } from 'react-router-dom'; import IconButton from '@mui/material/IconButton'; import SearchIcon from '@mui/icons-material/Search'; import InfiniteScroll from "react-infinite-scroll-component"; -import Alert from '../../component/alert'; const INFINITE = 8; const SCROLL_DELAY_TIME = 1500; diff --git a/backend/resources/js/admin/parent/password_edit.jsx b/backend/resources/js/admin/parent/password_edit.jsx index c864be74..fad5a6bb 100644 --- a/backend/resources/js/admin/parent/password_edit.jsx +++ b/backend/resources/js/admin/parent/password_edit.jsx @@ -20,25 +20,20 @@ const ParentPasswordEdit = (props) => { const [_400error, set400Error] = useState(''); const [_success, setSuccess] = useState(''); - const [submit, setSubmit] = useState(false) const handleSubmit = (e) => { e.preventDefault(); - set422Errors({ password:'', password_confirmation:'' }); - setSubmit(true); - const request = { password: password, password_confirmation: password_confirmation } - axios.put(`/api/admin/fathers/updatePassword/${props.match.params?.father_id}`, request) .then(response => { setSubmit(false); @@ -48,11 +43,8 @@ const ParentPasswordEdit = (props) => { case 422: set422Errors(response.data.error_messages); break; } }) - .catch(err=>console.log(err)) } - - return (
diff --git a/backend/resources/js/admin/parent/register.jsx b/backend/resources/js/admin/parent/register.jsx index af7b4a8a..c6be4d76 100644 --- a/backend/resources/js/admin/parent/register.jsx +++ b/backend/resources/js/admin/parent/register.jsx @@ -12,11 +12,9 @@ const ParentRegister = () => { const history = useHistory(); const [email, setEmail] = useState(''); - const [_422errors, set422Errors] = useState({ email: '' }); const [_400error, set400Error] = useState(''); const [_success, setSuccess] = useState(''); - const [submit, setSubmit] = useState(false); @@ -39,7 +37,6 @@ const ParentRegister = () => { } - return (
@@ -48,7 +45,6 @@ const ParentRegister = () => {

親追加

-