From 14db22289a4c9322a1c340d2bdbeb4a43031dda3 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Wed, 17 Nov 2021 03:34:29 -0800 Subject: [PATCH] remove console.log --- backend/public/js/app.js | 182 ++++++++---------- backend/resources/js/parent/child/add.jsx | 1 + backend/resources/js/parent/child/detail.jsx | 3 +- .../resources/js/parent/favorite/index.jsx | 2 - backend/resources/js/parent/meeting/add.jsx | 35 ++-- .../resources/js/parent/meeting/detail.jsx | 43 ++--- backend/resources/js/parent/meeting/edit.jsx | 38 ++-- backend/resources/js/parent/meeting/index.jsx | 2 - 8 files changed, 139 insertions(+), 167 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 599707b6..1f2723fe 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -45762,10 +45762,12 @@ __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_lab__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.js"); -/* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx"); -/* harmony import */ var _notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../notification */ "./resources/js/parent/notification.jsx"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); +/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.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 _component_alert__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx"); +/* harmony import */ var _notification__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../notification */ "./resources/js/parent/notification.jsx"); +/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__ = __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."); } @@ -45785,6 +45787,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } + var ChildAdd = function ChildAdd() { var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(localStorage.getItem('notice')), _useState2 = _slicedToArray(_useState, 2), @@ -45829,7 +45832,7 @@ var ChildAdd = function ChildAdd() { formdata.append('identity', identity); formdata.append('father_id', father_id); setSubmit(true); - axios.post('/api/fathers/relations/register', formdata).then(function (response) { + axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/fathers/relations/register', formdata).then(function (response) { setSubmit(false); setNotice(response.data.notice); @@ -45863,38 +45866,38 @@ var ChildAdd = function ChildAdd() { }); }; - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { className: "l-content", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { className: "l-content-w560", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { className: "l-content__ttl", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "l-content__ttl__left", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("h2", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("h2", { children: "\u5B50\u8FFD\u52A0" }) - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_notification__WEBPACK_IMPORTED_MODULE_2__.default, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_notification__WEBPACK_IMPORTED_MODULE_3__.default, { notice: notice })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "l-content-wrap", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("section", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("section", { className: "edit-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "edit-wrap", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { className: "edit-content", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("form", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("form", { className: "edit-form", onSubmit: handleSubmit, - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { className: "edit-set", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("label", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", { className: "control-label", htmlFor: "identify", children: "\u8FFD\u52A0\u3059\u308B\u5B50\u306EID\u3092\u5165\u529B" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("input", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", { type: "text", name: "identity", id: "identity", @@ -45903,11 +45906,11 @@ var ChildAdd = function ChildAdd() { return setIdentity(e.target.value); }, className: "input-default input-title input-h60 input-w480 ".concat(_422errors.identity && 'is-invalid c-input__target', " ") - }), _422errors.identity && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { + }), _422errors.identity && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { className: "l-alert__text--error ft-16 ft-md-14", children: _422errors.identity })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_4__.default, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_5__.default, { type: "submit", fullWidth: true, loading: submit, @@ -45915,12 +45918,12 @@ var ChildAdd = function ChildAdd() { style: { marginTop: '50px' }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { className: "ft-20 ft-xs-16 font-weight-bold ".concat(!submit && 'text-black'), children: "\u8FFD\u52A0" }) })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { style: { color: "#49A3FC", display: "flex", @@ -45928,11 +45931,11 @@ var ChildAdd = function ChildAdd() { alignItems: "center", paddingTop: 40 }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("a", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("a", { onClick: copyInviteURL, children: "\u62DB\u5F85\u7528URL\u3092\u30B3\u30D4\u30FC\u3059\u308B" }) - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { style: { color: "#49A3FC", display: "flex", @@ -45940,7 +45943,7 @@ var ChildAdd = function ChildAdd() { alignItems: "center", paddingTop: 20 }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("a", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("a", { onClick: copyLineText, children: "\u62DB\u5F85\u7528URL\u3092LINE\u3067\u8FFD\u4FE1" }) @@ -45949,13 +45952,13 @@ var ChildAdd = function ChildAdd() { }) }) })] - }), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_1__.default, { + }), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, { type: "success", hide: function hide() { return setSuccess(''); }, children: _success - }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_1__.default, { + }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, { type: "fail", hide: function hide() { return set400Error(''); @@ -46060,7 +46063,6 @@ var ChildDetail = function ChildDetail(props) { } }).then(function (response) { setLoaded(true); - console.log(response.data); setNotice(response.data.notice); if (response.data.status_code == 200) { @@ -46082,9 +46084,9 @@ var ChildDetail = function ChildDetail(props) { var handleAcceptDelete = function handleAcceptDelete() { setSubmit(true); axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/fathers/relations/deleteRelationChild/".concat(child_id)).then(function (response) { - setNotice(response.data.notice); setSubmit(false); setShowDelete(false); + setNotice(response.data.notice); switch (response.data.status_code) { case 200: @@ -46796,7 +46798,6 @@ var Favorite = function Favorite(props) { }).then(function (response) { setLoaded1(true); setNotice(response.data.notice); - console.log(response.data); if (response.data.status_code == 200) { var list = response.data.params; @@ -46829,7 +46830,6 @@ var Favorite = function Favorite(props) { }).then(function (response) { setLoaded2(true); setNotice(response.data.notice); - console.log(response.data); if (response.data.status_code == 200) { var list = response.data.params; @@ -47348,7 +47348,6 @@ var MeetingAdd = function MeetingAdd(props) { setCheckRadio('false'); setLoaded(false); var state = props.history.location.state; - console.log(state); if (state) { setLoaded(true); @@ -47435,37 +47434,32 @@ var MeetingAdd = function MeetingAdd(props) { formdata.append('text', text); formdata.append('memo', memo); formdata.append('pdf', pdf); + setSubmit(true); + axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/fathers/meetings/register', formdata).then(function (response) { + setSubmit(false); + setNotice(response.data.notice); - try { - setSubmit(true); - axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/fathers/meetings/register', formdata).then(function (response) { - setNotice(response.data.notice); - setSubmit(false); + switch (response.data.status_code) { + case 200: + { + var _props$match$params; - switch (response.data.status_code) { - case 200: - { - var _props$match$params; - - history.push({ - pathname: "/p-account/meeting/detail/".concat((_props$match$params = props.match.params) === null || _props$match$params === void 0 ? void 0 : _props$match$params.meeting_id), - state: "登録成功しました" - }); - break; - } - - case 400: - set400Error("更新失敗しました。"); + history.push({ + pathname: "/p-account/meeting/detail/".concat((_props$match$params = props.match.params) === null || _props$match$params === void 0 ? void 0 : _props$match$params.meeting_id), + state: "登録成功しました" + }); break; + } - case 422: - set422Errors(response.data.error_messages); - break; - } - }); - } catch (error) { - console.log('error', error); - } + case 400: + set400Error("更新失敗しました。"); + break; + + case 422: + set422Errors(response.data.error_messages); + break; + } + }); }; var handleImageChange = function handleImageChange(e) { @@ -47989,7 +47983,6 @@ var MeetingDetail = function MeetingDetail(props) { father_id: father_id } }).then(function (response) { - console.log(response.data.params); setLoaded(true); setNotice(response.data.notice); @@ -48097,6 +48090,8 @@ var MeetingDetail = function MeetingDetail(props) { meeting_id: (_props$match$params3 = props.match.params) === null || _props$match$params3 === void 0 ? void 0 : _props$match$params3.meeting_id } }).then(function (response) { + setNotice(response.data.notice); + if (response.data.status_code == 200) { var list = response.data.params; var tel_list = []; @@ -48123,8 +48118,6 @@ var MeetingDetail = function MeetingDetail(props) { } }); } - - setNotice(response.data.notice); }); }; @@ -48641,43 +48634,38 @@ var MeetingEdit = function MeetingEdit(props) { meeting_id: meeting_id } }); + var request = { + title: title, + text: text, + memo: memo, + pdf: pdf + }; + setSubmit(true); + axios__WEBPACK_IMPORTED_MODULE_1___default().put("/api/fathers/meetings/update/".concat(meeting_id), request).then(function (response) { + setNotice(response.data.notice); + setSubmit(false); - try { - var request = { - title: title, - text: text, - memo: memo, - pdf: pdf - }; - setSubmit(true); - axios__WEBPACK_IMPORTED_MODULE_1___default().put("/api/fathers/meetings/update/".concat(meeting_id), request).then(function (response) { - setNotice(response.data.notice); - setSubmit(false); + switch (response.data.status_code) { + case 200: + { + var _props$match$params; - switch (response.data.status_code) { - case 200: - { - var _props$match$params; - - history.push({ - pathname: "/p-account/meeting/detail/".concat((_props$match$params = props.match.params) === null || _props$match$params === void 0 ? void 0 : _props$match$params.meeting_id), - state: "更新成功しました!" - }); - break; - } - - case 400: - set400Error("更新失敗しました。"); + history.push({ + pathname: "/p-account/meeting/detail/".concat((_props$match$params = props.match.params) === null || _props$match$params === void 0 ? void 0 : _props$match$params.meeting_id), + state: "更新成功しました!" + }); break; + } - case 422: - set422Errors(response.data.error_messages); - break; - } - }); - } catch (error) { - console.log('error', error); - } + case 400: + set400Error("更新失敗しました。"); + break; + + case 422: + set422Errors(response.data.error_messages); + break; + } + }); }; var handleImageChange = function handleImageChange(e) { @@ -49188,7 +49176,6 @@ var Meeting = function Meeting(props) { }).then(function (response) { setLoaded1(true); setNotice(response.data.notice); - console.log(response.data); if (response.data.status_code == 200) { var list = response.data.params; @@ -49221,7 +49208,6 @@ var Meeting = function Meeting(props) { }).then(function (response) { setLoaded2(true); setNotice(response.data.notice); - console.log(response.data); if (response.data.status_code == 200) { var list = response.data.params; diff --git a/backend/resources/js/parent/child/add.jsx b/backend/resources/js/parent/child/add.jsx index 4e1cddb6..bce84958 100644 --- a/backend/resources/js/parent/child/add.jsx +++ b/backend/resources/js/parent/child/add.jsx @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; import { LoadingButton } from '@material-ui/lab'; +import axios from 'axios'; import Alert from '../../component/alert'; import Notification from '../notification'; diff --git a/backend/resources/js/parent/child/detail.jsx b/backend/resources/js/parent/child/detail.jsx index e6292133..f1a761a8 100644 --- a/backend/resources/js/parent/child/detail.jsx +++ b/backend/resources/js/parent/child/detail.jsx @@ -25,7 +25,6 @@ const ChildDetail = (props) => { axios.get('/api/fathers/children/detail/'+child_id, {params:{father_id: father_id}}) .then(response => { setLoaded(true); - console.log(response.data); setNotice(response.data.notice); if(response.data.status_code==200){ setChild(response.data.params); @@ -46,9 +45,9 @@ const ChildDetail = (props) => { setSubmit(true); axios.delete(`/api/fathers/relations/deleteRelationChild/${child_id}`) .then(response => { - setNotice(response.data.notice); setSubmit(false); setShowDelete(false); + setNotice(response.data.notice); switch(response.data.status_code){ case 200: { history.push({ pathname: "/p-account/child", diff --git a/backend/resources/js/parent/favorite/index.jsx b/backend/resources/js/parent/favorite/index.jsx index d40a54a8..e750084e 100644 --- a/backend/resources/js/parent/favorite/index.jsx +++ b/backend/resources/js/parent/favorite/index.jsx @@ -39,7 +39,6 @@ const Favorite = (props) => { .then(response => { setLoaded1(true); setNotice(response.data.notice); - console.log(response.data); if(response.data.status_code==200){ var list = response.data.params; var arr = []; @@ -63,7 +62,6 @@ const Favorite = (props) => { .then(response => { setLoaded2(true); setNotice(response.data.notice); - console.log(response.data); if(response.data.status_code==200){ var list = response.data.params; var arr = []; diff --git a/backend/resources/js/parent/meeting/add.jsx b/backend/resources/js/parent/meeting/add.jsx index 1e49e46a..185cd627 100644 --- a/backend/resources/js/parent/meeting/add.jsx +++ b/backend/resources/js/parent/meeting/add.jsx @@ -39,7 +39,6 @@ const MeetingAdd = (props) => { setCheckRadio('false'); setLoaded(false); const state = props.history.location.state; - console.log(state); if(state){ setLoaded(true); setTitle(state?.title); @@ -103,26 +102,22 @@ const MeetingAdd = (props) => { formdata.append('memo', memo); formdata.append('pdf', pdf); - try { - setSubmit(true); - axios.post('/api/fathers/meetings/register', formdata) - .then(response => { - setNotice(response.data.notice); - setSubmit(false); - switch(response.data.status_code){ - case 200: { - history.push({ - pathname: `/p-account/meeting/detail/${props.match.params?.meeting_id}`, - state: "登録成功しました"}); - break; - } - case 400: set400Error("更新失敗しました。"); break; - case 422: set422Errors(response.data.error_messages); break; + setSubmit(true); + axios.post('/api/fathers/meetings/register', formdata) + .then(response => { + setSubmit(false); + setNotice(response.data.notice); + switch(response.data.status_code){ + case 200: { + history.push({ + pathname: `/p-account/meeting/detail/${props.match.params?.meeting_id}`, + state: "登録成功しました"}); + break; } - }); - } catch (error) { - console.log('error', error); - } + case 400: set400Error("更新失敗しました。"); break; + case 422: set422Errors(response.data.error_messages); break; + } + }); } diff --git a/backend/resources/js/parent/meeting/detail.jsx b/backend/resources/js/parent/meeting/detail.jsx index 1a31377f..e539c86c 100644 --- a/backend/resources/js/parent/meeting/detail.jsx +++ b/backend/resources/js/parent/meeting/detail.jsx @@ -37,7 +37,6 @@ const MeetingDetail = (props) => { setLoaded(false); axios.get(`/api/fathers/meetings/detail/${props.match.params?.meeting_id}`, {params: { father_id: father_id}}) .then((response) => { - console.log(response.data.params); setLoaded(true); setNotice(response.data.notice); if(response.data.status_code==200){ @@ -102,28 +101,28 @@ const MeetingDetail = (props) => { const handleNotifyAllChild = () => { setSubmitNotify(true); axios.get('/api/fathers/meeting/approvals/listChildrenOfUnapprovel', {params:{meeting_id: props.match.params?.meeting_id}}) - .then(response => { - if(response.data.status_code == 200){ - var list = response.data.params; - const tel_list = []; - for(var i in list){ - tel_list.push(list[i].child.tel); - } - const formdata = new FormData(); - formdata.append('tel', JSON.stringify(tel_list)); - formdata.append('meeting_id', props.match.params.meeting_id); - axios.post('/api/fathers/approvalNotification', formdata) - .then(response=>{ - setSubmitNotify(false); - setShowNotify(false); - switch(response.data.status_code){ - case 200: setSuccess('SMSの送信に成功しました!'); break; - case 400: set400Error('SMSの送信に失敗しました。'); break; - } - }) + .then(response => { + setNotice(response.data.notice); + if(response.data.status_code == 200){ + var list = response.data.params; + const tel_list = []; + for(var i in list){ + tel_list.push(list[i].child.tel); } - setNotice(response.data.notice); - }); + const formdata = new FormData(); + formdata.append('tel', JSON.stringify(tel_list)); + formdata.append('meeting_id', props.match.params.meeting_id); + axios.post('/api/fathers/approvalNotification', formdata) + .then(response=>{ + setSubmitNotify(false); + setShowNotify(false); + switch(response.data.status_code){ + case 200: setSuccess('SMSの送信に成功しました!'); break; + case 400: set400Error('SMSの送信に失敗しました。'); break; + } + }) + } + }); } diff --git a/backend/resources/js/parent/meeting/edit.jsx b/backend/resources/js/parent/meeting/edit.jsx index 7fa05543..1a218e49 100644 --- a/backend/resources/js/parent/meeting/edit.jsx +++ b/backend/resources/js/parent/meeting/edit.jsx @@ -117,28 +117,24 @@ useEffect(()=>{ axios.post('/api/fathers/meeting/approvals/register', formdata, {params:{meeting_id: meeting_id}}) axios.delete('/api/fathers/meeting/approvals/delete', {params:{children: approval_deleteIndexes, meeting_id: meeting_id}}) - try { - const request = { title: title, text: text, memo: memo, pdf: pdf }; - setSubmit(true); - axios.put(`/api/fathers/meetings/update/${meeting_id}`, request) - .then(response => { - setNotice(response.data.notice); - setSubmit(false); - switch(response.data.status_code){ - case 200: { - history.push({ - pathname: `/p-account/meeting/detail/${props.match.params?.meeting_id}`, - state: "更新成功しました!" - }); - break; - } - case 400: set400Error("更新失敗しました。"); break; - case 422: set422Errors(response.data.error_messages); break; + const request = { title: title, text: text, memo: memo, pdf: pdf }; + setSubmit(true); + axios.put(`/api/fathers/meetings/update/${meeting_id}`, request) + .then(response => { + setNotice(response.data.notice); + setSubmit(false); + switch(response.data.status_code){ + case 200: { + history.push({ + pathname: `/p-account/meeting/detail/${props.match.params?.meeting_id}`, + state: "更新成功しました!" + }); + break; } - }); - } catch (error) { - console.log('error', error); - } + case 400: set400Error("更新失敗しました。"); break; + case 422: set422Errors(response.data.error_messages); break; + } + }); } diff --git a/backend/resources/js/parent/meeting/index.jsx b/backend/resources/js/parent/meeting/index.jsx index 5e9e78a2..3c8a2d74 100644 --- a/backend/resources/js/parent/meeting/index.jsx +++ b/backend/resources/js/parent/meeting/index.jsx @@ -52,7 +52,6 @@ const Meeting = (props) => { .then(response => { setLoaded1(true); setNotice(response.data.notice); - console.log(response.data); if(response.data.status_code==200){ var list = response.data.params; var arr = []; @@ -76,7 +75,6 @@ const Meeting = (props) => { .then(response => { setLoaded2(true); setNotice(response.data.notice); - console.log(response.data); if(response.data.status_code==200){ var list = response.data.params; var arr = [];