diff --git a/backend/public/js/app.js b/backend/public/js/app.js
index e7a9c70f..eaee78db 100644
--- a/backend/public/js/app.js
+++ b/backend/public/js/app.js
@@ -40323,8 +40323,9 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.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_10__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
-/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js");
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js");
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
+/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js");
/* harmony import */ var _notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../notification */ "./resources/js/child/notification.jsx");
/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! moment */ "./node_modules/moment/moment.js");
/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_3__);
@@ -40359,6 +40360,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
var MeetingDetail = function MeetingDetail(props) {
+ var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useHistory)();
+
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(localStorage.getItem('notice')),
_useState2 = _slicedToArray(_useState, 2),
notice = _useState2[0],
@@ -40411,8 +40414,13 @@ var MeetingDetail = function MeetingDetail(props) {
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState22 = _slicedToArray(_useState21, 2),
- _success = _useState22[0],
- setSuccess = _useState22[1];
+ _404error = _useState22[0],
+ set404Error = _useState22[1];
+
+ var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
+ _useState24 = _slicedToArray(_useState23, 2),
+ _success = _useState24[0],
+ setSuccess = _useState24[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
var _props$match$params;
@@ -40438,6 +40446,13 @@ var MeetingDetail = function MeetingDetail(props) {
} else {
set400Error("失敗しました。");
}
+ })["catch"](function (err) {
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+
+ if (err.response.status == 404) {
+ set404Error(err.response.data.message);
+ }
});
}, []);
@@ -40491,7 +40506,7 @@ var MeetingDetail = function MeetingDetail(props) {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_notification__WEBPACK_IMPORTED_MODULE_2__.default, {
notice: notice
})]
- }), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_9__.default, {
+ }), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_10__.default, {
className: "css-loader"
}), loaded && meeting && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
className: "l-content-wrap",
@@ -40518,7 +40533,7 @@ var MeetingDetail = function MeetingDetail(props) {
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
className: "user-wrap user-sm",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_10__.Link, {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_11__.Link, {
to: "/c-account/parent/detail/".concat(meeting === null || meeting === void 0 ? void 0 : meeting.father_id),
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
className: "user-avatar",
@@ -40632,18 +40647,27 @@ var MeetingDetail = function MeetingDetail(props) {
},
handleAccept: handleApprovalRegister,
loading: submit
- }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
- type: "fail",
- hide: function hide() {
- return set400Error('');
- },
- children: _400error
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
type: "success",
hide: function hide() {
return setSuccess('');
},
children: _success
+ }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
+ type: "fail",
+ hide: function hide() {
+ return set400Error('');
+ },
+ children: _400error
+ }), _404error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
+ type: "fail",
+ hide: function hide() {
+ set404Error('');
+ history.push({
+ pathname: "/c-account/meeting"
+ });
+ },
+ children: _404error
})]
})
});
@@ -41620,23 +41644,28 @@ var ProfileEdit = function ProfileEdit() {
var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState20 = _slicedToArray(_useState19, 2),
- _400error = _useState20[0],
- set400Error = _useState20[1];
+ _success = _useState20[0],
+ setSuccess = _useState20[1];
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState22 = _slicedToArray(_useState21, 2),
- _success = _useState22[0],
- setSuccess = _useState22[1];
+ _400error = _useState22[0],
+ set400Error = _useState22[1];
- var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
+ var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState24 = _slicedToArray(_useState23, 2),
- submit = _useState24[0],
- setSubmit = _useState24[1];
+ _404error = _useState24[0],
+ set404Error = _useState24[1];
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState26 = _slicedToArray(_useState25, 2),
- loaded = _useState26[0],
- setLoaded = _useState26[1];
+ submit = _useState26[0],
+ setSubmit = _useState26[1];
+
+ var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
+ _useState28 = _slicedToArray(_useState27, 2),
+ loaded = _useState28[0],
+ setLoaded = _useState28[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
@@ -41657,6 +41686,13 @@ var ProfileEdit = function ProfileEdit() {
} else {
set400Error("失敗しました。");
}
+ })["catch"](function (err) {
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+
+ if (err.response.status == 404) {
+ set404Error(err.response.data.message);
+ }
});
}, []);
@@ -41877,6 +41913,14 @@ var ProfileEdit = function ProfileEdit() {
return setSuccess('');
},
children: _success
+ }), _404error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, {
+ type: "fail",
+ hide: function hide() {
+ history.push({
+ pathname: "/c-account/profile"
+ });
+ },
+ children: _404error
})]
})
})]
@@ -41900,12 +41944,13 @@ __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 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 _material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/IconButton */ "./node_modules/@material-ui/core/IconButton/IconButton.js");
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js");
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
+/* harmony import */ var _material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core/IconButton */ "./node_modules/@material-ui/core/IconButton/IconButton.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 _material_ui_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js");
-/* harmony import */ var _mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @mui/icons-material/PhotoCameraOutlined */ "./node_modules/@mui/icons-material/PhotoCameraOutlined.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 _mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @mui/icons-material/PhotoCameraOutlined */ "./node_modules/@mui/icons-material/PhotoCameraOutlined.js");
/* 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/child/notification.jsx");
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
@@ -41933,6 +41978,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
var Profile = function Profile(props) {
+ var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_5__.useHistory)();
+
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(localStorage.getItem('notice')),
_useState2 = _slicedToArray(_useState, 2),
notice = _useState2[0],
@@ -41958,17 +42005,22 @@ var Profile = function Profile(props) {
_400error = _useState10[0],
set400Error = _useState10[1];
- var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
+ var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
+ _useState12 = _slicedToArray(_useState11, 2),
+ _404error = _useState12[0],
+ set404Error = _useState12[1];
+
+ var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
image: ''
}),
- _useState12 = _slicedToArray(_useState11, 2),
- _422errors = _useState12[0],
- set422Errors = _useState12[1];
-
- var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state),
_useState14 = _slicedToArray(_useState13, 2),
- _success = _useState14[0],
- setSuccess = _useState14[1];
+ _422errors = _useState14[0],
+ set422Errors = _useState14[1];
+
+ var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state),
+ _useState16 = _slicedToArray(_useState15, 2),
+ _success = _useState16[0],
+ setSuccess = _useState16[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
@@ -41977,11 +42029,24 @@ var Profile = function Profile(props) {
setLoaded(true);
setNotice(response.data.notice);
- if (response.data.status_code == 200) {
- setProfile(response.data.params);
- setImage(response.data.params.image);
- } else {
- set400Error("失敗しました。");
+ switch (response.data.status_code) {
+ case 200:
+ {
+ setProfile(response.data.params);
+ setImage(response.data.params.image);
+ break;
+ }
+
+ case 400:
+ set400Error("失敗しました。");
+ break;
+ }
+ })["catch"](function (err) {
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+
+ if (err.response.status == 404) {
+ set404Error(err.response.data.message);
}
});
}, []);
@@ -42054,7 +42119,7 @@ var Profile = function Profile(props) {
className: "l-content-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("section", {
className: "profile-container",
- children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_5__.default, {
+ children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
className: "css-loader"
}), loaded && profile && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-wrap",
@@ -42075,12 +42140,12 @@ var Profile = function Profile(props) {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", {
htmlFor: "avatar",
className: "avatar-label",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_6__.default, {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_7__.default, {
color: "primary",
"aria-label": "upload picture",
component: "span",
className: "bg-yellow shadow-sm w-50-px h-50-px",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_7__.default, {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_8__.default, {
style: {
width: '25px',
height: '25px',
@@ -42159,7 +42224,7 @@ var Profile = function Profile(props) {
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "p-profile-btn",
- 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_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, {
to: "/c-account/profile/edit/".concat(document.getElementById('child_id').value),
className: "btn-default btn-yellow btn-profile btn-r8 btn-h52",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
@@ -42169,7 +42234,7 @@ var Profile = function Profile(props) {
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "p-profile-btn",
- 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_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, {
to: "/c-account/profile/password-edit/".concat(document.getElementById('child_id').value),
className: "btn-default btn-yellow btn-password btn-r8 btn-h52",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
@@ -42189,7 +42254,7 @@ var Profile = function Profile(props) {
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "p-profile-txtLink",
- 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_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, {
to: "/c-account/profile/withdrawal",
className: "btn-default btn-password btn-r8 btn-h30",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
@@ -42199,18 +42264,26 @@ var Profile = function Profile(props) {
})
})]
})
- }), _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('');
- },
- children: _400error
}), _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_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
+ type: "fail",
+ hide: function hide() {
+ return set400Error('');
+ },
+ children: _400error
+ }), _404error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
+ type: "fail",
+ hide: function hide() {
+ history.push({
+ pathname: "/c-account/profile"
+ });
+ },
+ children: _404error
})]
})
})]
@@ -47312,7 +47385,6 @@ var MeetingAdd = function MeetingAdd(props) {
var state = props.history.location.state;
if (state) {
- console.log(state);
setLoaded(true);
setTitle(state === null || state === void 0 ? void 0 : state.title);
setMemo(state === null || state === void 0 ? void 0 : state.memo);
@@ -47784,17 +47856,16 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_2__);
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var react_toastify__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-toastify */ "./node_modules/react-toastify/dist/react-toastify.esm.js");
-/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js");
-/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
-/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js");
-/* harmony import */ var _component_modal_memo__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../component/modal_memo */ "./resources/js/component/modal_memo.jsx");
-/* harmony import */ var _component_modal_confirm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../component/modal_confirm */ "./resources/js/component/modal_confirm.jsx");
-/* harmony import */ var _component_pdf_modal_pdf__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../component/pdf/modal_pdf */ "./resources/js/component/pdf/modal_pdf.jsx");
-/* harmony import */ var _notification__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../notification */ "./resources/js/parent/notification.jsx");
-/* harmony import */ var _component_modal_setting_notify__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../component/modal_setting_notify */ "./resources/js/component/modal_setting_notify.jsx");
-/* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx");
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js");
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
+/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js");
+/* harmony import */ var _component_modal_memo__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../component/modal_memo */ "./resources/js/component/modal_memo.jsx");
+/* harmony import */ var _component_modal_confirm__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../component/modal_confirm */ "./resources/js/component/modal_confirm.jsx");
+/* harmony import */ var _component_pdf_modal_pdf__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../component/pdf/modal_pdf */ "./resources/js/component/pdf/modal_pdf.jsx");
+/* harmony import */ var _notification__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../notification */ "./resources/js/parent/notification.jsx");
+/* harmony import */ var _component_modal_setting_notify__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../component/modal_setting_notify */ "./resources/js/component/modal_setting_notify.jsx");
+/* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx");
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -47833,11 +47904,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
var MeetingDetail = function MeetingDetail(props) {
var _meeting$approval, _props$match$params4;
- var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_12__.useHistory)();
+ var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_11__.useHistory)();
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState2 = _slicedToArray(_useState, 2),
@@ -47869,40 +47939,45 @@ var MeetingDetail = function MeetingDetail(props) {
_400error = _useState12[0],
set400Error = _useState12[1];
- var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
+ var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
_useState14 = _slicedToArray(_useState13, 2),
- show_delete_modal = _useState14[0],
- setShowDeleteModal = _useState14[1];
+ _404error = _useState14[0],
+ set404Error = _useState14[1];
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState16 = _slicedToArray(_useState15, 2),
- show_notify_all_modal = _useState16[0],
- setShowNotifyAllModal = _useState16[1];
+ show_delete_modal = _useState16[0],
+ setShowDeleteModal = _useState16[1];
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState18 = _slicedToArray(_useState17, 2),
- show_memo_modal = _useState18[0],
- setShowMemoModal = _useState18[1];
+ show_notify_all_modal = _useState18[0],
+ setShowNotifyAllModal = _useState18[1];
var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState20 = _slicedToArray(_useState19, 2),
- show_notify_pickup_modal = _useState20[0],
- setShowNotifySelectModal = _useState20[1];
+ show_memo_modal = _useState20[0],
+ setShowMemoModal = _useState20[1];
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState22 = _slicedToArray(_useState21, 2),
- show_pdf_modal = _useState22[0],
- setShowPDFModal = _useState22[1];
+ show_notify_pickup_modal = _useState22[0],
+ setShowNotifySelectModal = _useState22[1];
- var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
+ var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState24 = _slicedToArray(_useState23, 2),
- meeting = _useState24[0],
- setMeeting = _useState24[1];
+ show_pdf_modal = _useState24[0],
+ setShowPDFModal = _useState24[1];
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
_useState26 = _slicedToArray(_useState25, 2),
- thumbnail = _useState26[0],
- setThumbnail = _useState26[1];
+ meeting = _useState26[0],
+ setMeeting = _useState26[1];
+
+ var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
+ _useState28 = _slicedToArray(_useState27, 2),
+ thumbnail = _useState28[0],
+ setThumbnail = _useState28[1];
(0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
var _props$match$params;
@@ -47937,6 +48012,13 @@ var MeetingDetail = function MeetingDetail(props) {
} else {
set400Error("失敗しました。");
}
+ })["catch"](function (err) {
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+
+ if (err.response.status == 404) {
+ set404Error(err.response.data.message);
+ }
});
}, []); //-------------------------------------------------------------
@@ -48050,60 +48132,60 @@ var MeetingDetail = function MeetingDetail(props) {
});
};
- return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", {
className: "l-content",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", {
className: "l-content-w560",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", {
className: "l-content__ttl",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", {
className: "l-content__ttl__left",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("h2", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("h2", {
children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u8A73\u7D30"
})
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_notification__WEBPACK_IMPORTED_MODULE_8__.default, {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_notification__WEBPACK_IMPORTED_MODULE_7__.default, {
notice: notice
})]
- }), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_13__.default, {
+ }), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_12__.default, {
className: "css-loader"
- }), loaded && meeting && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
+ }), loaded && meeting && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", {
className: "l-content-wrap",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", {
className: "p-article",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", {
className: "p-article-wrap",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("article", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("article", {
className: "p-article__body",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", {
className: "p-article__content",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", {
className: "meeting-member",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", {
className: "meeting-member-wrap",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", {
className: "meeting-member-link",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("ul", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("ul", {
className: "meeting-member-count",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", {
className: "numerator",
children: meeting === null || meeting === void 0 ? void 0 : meeting.numerator
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", {
className: "denominator",
children: meeting === null || meeting === void 0 ? void 0 : meeting.denominator
})]
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("ul", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("ul", {
className: "meeting-member-list",
role: "list",
onClick: function onClick() {
return setShowNotifyAllModal(true);
},
children: (_meeting$approval = meeting.approval) === null || _meeting$approval === void 0 ? void 0 : _meeting$approval.map(function (v, inx) {
- return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", {
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", {
className: "avatar",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("img", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("img", {
alt: "name",
className: "avatar-img",
src: v === null || v === void 0 ? void 0 : v.child.image
@@ -48114,37 +48196,37 @@ var MeetingDetail = function MeetingDetail(props) {
})]
})
})
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("h3", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("h3", {
className: "meeting-ttl",
children: meeting === null || meeting === void 0 ? void 0 : meeting.title
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("time", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("time", {
dateTime: "2021-07-30",
className: "meeting-time",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("span", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("span", {
className: "meeting-date",
children: moment__WEBPACK_IMPORTED_MODULE_2___default()(meeting === null || meeting === void 0 ? void 0 : meeting.updated_at).format('YYYY/MM/DD')
})
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("ul", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("ul", {
className: "p-article-btn-list",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", {
className: "p-article-btn__item",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Link, {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Link, {
to: "/p-account/meeting/edit/".concat((_props$match$params4 = props.match.params) === null || _props$match$params4 === void 0 ? void 0 : _props$match$params4.meeting_id),
className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48",
children: "\u7DE8\u96C6"
})
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", {
className: "p-article-btn__item",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("a", {
onClick: function onClick() {
return setShowDeleteModal(true);
},
className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48",
children: "\u524A\u9664"
})
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", {
className: "p-article-btn__item",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("a", {
onClick: function onClick() {
return history.push({
pathname: "/p-account/meeting/new",
@@ -48154,9 +48236,9 @@ var MeetingDetail = function MeetingDetail(props) {
className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48",
children: "\u8907\u88FD"
})
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", {
className: "p-article-btn__item",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("a", {
onClick: function onClick() {
return setShowNotifySelectModal(true);
},
@@ -48164,53 +48246,53 @@ var MeetingDetail = function MeetingDetail(props) {
children: "\u518D\u901A\u77E5"
})
})]
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", {
className: "p-article__context",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", {
className: "p-file-list",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", {
className: "p-file-for",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("figure", {
- children: thumbnail && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("img", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("figure", {
+ children: thumbnail && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("img", {
src: thumbnail,
alt: "thumbnail"
})
})
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", {
className: "p-file-nav",
children: meeting.meeting_image.map(function (v, inx) {
- return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("figure", {
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("figure", {
onClick: function onClick() {
return setThumbnail(v.image);
},
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("img", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("img", {
src: v.image,
alt: ""
})
}, inx);
})
})]
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", {
className: "p-article__pdf",
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", {
className: "p-article__pdf__btn",
- children: meeting.pdf ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", {
+ children: meeting.pdf ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("a", {
"data-v-ade1d018": "",
className: "btn-default btn-yellow btn-pdf btn-r8 btn-h52",
onClick: function onClick(e) {
return setShowPDFModal(true);
},
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("span", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("span", {
children: "PDF\u3092\u78BA\u8A8D\u3059\u308B"
})
- }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", {
+ }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("a", {
"data-v-ade1d018": "",
className: "btn-default btn-yellow btn-pdf btn-r8 btn-h52 btn-disabled",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("span", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("span", {
children: "PDF\u3092\u78BA\u8A8D\u3059\u308B"
})
})
- }), meeting.memo ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("button", {
+ }), meeting.memo ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("button", {
type: "button",
"aria-label": "\u304A\u6C17\u306B\u5165\u308A",
"data-tooltip": "\u304A\u6C17\u306B\u5165\u308A",
@@ -48219,13 +48301,13 @@ var MeetingDetail = function MeetingDetail(props) {
onClick: function onClick() {
return setShowMemoModal(true);
}
- }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("button", {
+ }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("button", {
type: "button",
"aria-label": "\u304A\u6C17\u306B\u5165\u308A",
"data-tooltip": "\u304A\u6C17\u306B\u5165\u308A",
"aria-pressed": "false",
className: "icon a-icon like-icon icon-text icon-text-wrap a-icon-size_medium"
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("button", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("button", {
type: "button",
onClick: function onClick(e) {
return handleFavorite(meeting.id, meeting.is_favorite);
@@ -48235,7 +48317,7 @@ var MeetingDetail = function MeetingDetail(props) {
"aria-pressed": "false",
className: "icon a-icon like-icon ".concat(meeting.is_favorite == 1 ? "icon-starFill icon-starFill-wrap" : "icon-star icon-star-wrap", " a-icon-size_medium")
})]
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("p", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("p", {
className: "p-article__txt",
children: meeting.text
})]
@@ -48243,20 +48325,20 @@ var MeetingDetail = function MeetingDetail(props) {
})
})
})
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_setting_notify__WEBPACK_IMPORTED_MODULE_9__.default, {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_component_modal_setting_notify__WEBPACK_IMPORTED_MODULE_8__.default, {
show: show_notify_all_modal,
meetingId: meeting.id,
handleClose: function handleClose() {
return setShowNotifyAllModal(false);
}
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_memo__WEBPACK_IMPORTED_MODULE_5__.default, {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_component_modal_memo__WEBPACK_IMPORTED_MODULE_4__.default, {
show: show_memo_modal,
title: "メモ",
content: meeting === null || meeting === void 0 ? void 0 : meeting.memo,
handleClose: function handleClose() {
return setShowMemoModal(false);
}
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_confirm__WEBPACK_IMPORTED_MODULE_6__.default, {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_component_modal_confirm__WEBPACK_IMPORTED_MODULE_5__.default, {
show: show_delete_modal,
message: "本当に削除しても\nよろしいでしょうか？",
handleClose: function handleClose() {
@@ -48264,7 +48346,7 @@ var MeetingDetail = function MeetingDetail(props) {
},
handleAccept: handleAcceptDelete,
loading: submit_delete
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_confirm__WEBPACK_IMPORTED_MODULE_6__.default, {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_component_modal_confirm__WEBPACK_IMPORTED_MODULE_5__.default, {
show: show_notify_pickup_modal,
message: "未承知の方に再通知しますが\nよろしいでしょうか？",
handleClose: function handleClose() {
@@ -48272,7 +48354,7 @@ var MeetingDetail = function MeetingDetail(props) {
},
handleAccept: handleNotifyAllChild,
loading: submit_notify
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_pdf_modal_pdf__WEBPACK_IMPORTED_MODULE_7__.default, {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_component_pdf_modal_pdf__WEBPACK_IMPORTED_MODULE_6__.default, {
show: show_pdf_modal,
pdfPath: meeting.pdf,
handleClose: function handleClose() {
@@ -48280,18 +48362,27 @@ var MeetingDetail = function MeetingDetail(props) {
}
})]
})]
- }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_10__.default, {
+ }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_9__.default, {
type: "fail",
hide: function hide() {
return set400Error('');
},
children: _400error
- }), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_10__.default, {
+ }), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_9__.default, {
type: "success",
hide: function hide() {
return setSuccess('');
},
children: _success
+ }), _404error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_9__.default, {
+ type: "fail",
+ hide: function hide() {
+ set404Error('');
+ history.push({
+ pathname: "/p-account/meeting"
+ });
+ },
+ children: _404error
})]
});
};
@@ -48433,28 +48524,33 @@ var MeetingEdit = function MeetingEdit(props) {
var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState24 = _slicedToArray(_useState23, 2),
- _success = _useState24[0],
- setSuccess = _useState24[1];
+ _404error = _useState24[0],
+ set404Error = _useState24[1];
- var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
+ var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState26 = _slicedToArray(_useState25, 2),
- loaded = _useState26[0],
- setLoaded = _useState26[1];
+ _success = _useState26[0],
+ setSuccess = _useState26[1];
var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState28 = _slicedToArray(_useState27, 2),
- submit = _useState28[0],
- setSubmit = _useState28[1];
+ loaded = _useState28[0],
+ setLoaded = _useState28[1];
- var _useState29 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
+ var _useState29 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState30 = _slicedToArray(_useState29, 2),
- check_radio = _useState30[0],
- setCheckRadio = _useState30[1];
+ submit = _useState30[0],
+ setSubmit = _useState30[1];
- var _useState31 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
+ var _useState31 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
_useState32 = _slicedToArray(_useState31, 2),
- image_sending = _useState32[0],
- setImageSending = _useState32[1];
+ check_radio = _useState32[0],
+ setCheckRadio = _useState32[1];
+
+ var _useState33 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
+ _useState34 = _slicedToArray(_useState33, 2),
+ image_sending = _useState34[0],
+ setImageSending = _useState34[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
@@ -48498,6 +48594,13 @@ var MeetingEdit = function MeetingEdit(props) {
} else {
set400Error("失敗しました。");
}
+ })["catch"](function (err) {
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+
+ if (err.response.status == 404) {
+ set404Error(err.response.data.message);
+ }
});
}, []); //-------------------------------------------------------------
@@ -48966,6 +49069,15 @@ var MeetingEdit = function MeetingEdit(props) {
return setSuccess('');
},
children: _success
+ }), _404error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, {
+ type: "fail",
+ hide: function hide() {
+ set404Error('');
+ history.push({
+ pathname: "/p-account/meeting"
+ });
+ },
+ children: _404error
})]
})
})
@@ -49686,25 +49798,30 @@ var ProfileEdit = function ProfileEdit() {
_400error = _useState16[0],
set400Error = _useState16[1];
- var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
+ var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
+ _useState18 = _slicedToArray(_useState17, 2),
+ _404error = _useState18[0],
+ set404Error = _useState18[1];
+
+ var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
company: '',
email: '',
tel: '',
profile: ''
}),
- _useState18 = _slicedToArray(_useState17, 2),
- _422errors = _useState18[0],
- set422Errors = _useState18[1];
-
- var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState20 = _slicedToArray(_useState19, 2),
- loaded = _useState20[0],
- setLoaded = _useState20[1];
+ _422errors = _useState20[0],
+ set422Errors = _useState20[1];
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState22 = _slicedToArray(_useState21, 2),
- submit = _useState22[0],
- setSubmit = _useState22[1];
+ loaded = _useState22[0],
+ setLoaded = _useState22[1];
+
+ var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
+ _useState24 = _slicedToArray(_useState23, 2),
+ submit = _useState24[0],
+ setSubmit = _useState24[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
@@ -49723,6 +49840,13 @@ var ProfileEdit = function ProfileEdit() {
} else {
set400Error("失敗しました。");
}
+ })["catch"](function (err) {
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+
+ if (err.response.status == 404) {
+ set404Error(err.response.data.message);
+ }
});
}, []);
@@ -49893,6 +50017,15 @@ var ProfileEdit = function ProfileEdit() {
return setSuccess('');
},
children: _success
+ }), _404error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
+ type: "fail",
+ hide: function hide() {
+ set404Error('');
+ history.push({
+ pathname: "/p-account/profile"
+ });
+ },
+ children: _404error
})]
})
})]
@@ -49916,12 +50049,13 @@ __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 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 _material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/IconButton */ "./node_modules/@material-ui/core/IconButton/IconButton.js");
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js");
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
+/* harmony import */ var _material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core/IconButton */ "./node_modules/@material-ui/core/IconButton/IconButton.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 _material_ui_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js");
-/* harmony import */ var _mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @mui/icons-material/PhotoCameraOutlined */ "./node_modules/@mui/icons-material/PhotoCameraOutlined.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 _mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @mui/icons-material/PhotoCameraOutlined */ "./node_modules/@mui/icons-material/PhotoCameraOutlined.js");
/* 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");
@@ -49949,6 +50083,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
var Profile = function Profile(props) {
+ var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_5__.useHistory)();
+
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(localStorage.getItem('notice')),
_useState2 = _slicedToArray(_useState, 2),
notice = _useState2[0],
@@ -49974,17 +50110,22 @@ var Profile = function Profile(props) {
_400error = _useState10[0],
set400Error = _useState10[1];
- var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
+ var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
+ _useState12 = _slicedToArray(_useState11, 2),
+ _404error = _useState12[0],
+ set404Error = _useState12[1];
+
+ var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
image: ''
}),
- _useState12 = _slicedToArray(_useState11, 2),
- _422errors = _useState12[0],
- set422Errors = _useState12[1];
-
- var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state),
_useState14 = _slicedToArray(_useState13, 2),
- _success = _useState14[0],
- setSuccess = _useState14[1];
+ _422errors = _useState14[0],
+ set422Errors = _useState14[1];
+
+ var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state),
+ _useState16 = _slicedToArray(_useState15, 2),
+ _success = _useState16[0],
+ setSuccess = _useState16[1];
var father_id = document.getElementById('father_id').value;
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
@@ -49999,6 +50140,13 @@ var Profile = function Profile(props) {
} else {
set400Error("失敗しました。");
}
+ })["catch"](function (err) {
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+
+ if (err.response.status == 404) {
+ set404Error(err.response.data.message);
+ }
});
}, []);
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
@@ -50070,7 +50218,7 @@ var Profile = function Profile(props) {
className: "l-content-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("section", {
className: "profile-container",
- children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_5__.default, {
+ children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-wrap",
@@ -50091,12 +50239,12 @@ var Profile = function Profile(props) {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", {
htmlFor: "avatar",
className: "avatar-label",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_6__.default, {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_7__.default, {
color: "primary",
"aria-label": "upload picture",
component: "span",
className: "bg-yellow shadow-sm w-50-px h-50-px",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_7__.default, {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_8__.default, {
style: {
width: '25px',
height: '25px',
@@ -50157,7 +50305,7 @@ var Profile = function Profile(props) {
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "p-profile-btn",
- 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_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, {
to: "/p-account/profile/edit/".concat(father_id),
className: "btn-default btn-yellow btn-profile btn-r8 btn-h52",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
@@ -50167,7 +50315,7 @@ var Profile = function Profile(props) {
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "p-profile-btn",
- 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_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, {
to: "/p-account/profile/edit/password/".concat(father_id),
className: "btn-default btn-yellow btn-password btn-r8 btn-h52",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
@@ -50187,7 +50335,7 @@ var Profile = function Profile(props) {
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "p-profile-txtLink",
- 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_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, {
to: "/p-account/profile/withdrawal",
className: "btn-default btn-password btn-r8 btn-h30",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
@@ -50209,6 +50357,15 @@ var Profile = function Profile(props) {
return setSuccess('');
},
children: _success
+ }), _404error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
+ type: "fail",
+ hide: function hide() {
+ set404Error('');
+ history.push({
+ pathname: "/p-account/profile"
+ });
+ },
+ children: _404error
})]
})
})]
@@ -177150,1476 +177307,6 @@ function pathToRegexp (path, keys, options) {
}
-/***/ }),
-
-/***/ "./node_modules/react-toastify/dist/react-toastify.esm.js":
-/*!****************************************************************!*\
- !*** ./node_modules/react-toastify/dist/react-toastify.esm.js ***!
- \****************************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */ "Bounce": () => (/* binding */ Bounce),
-/* harmony export */ "Flip": () => (/* binding */ Flip),
-/* harmony export */ "Icons": () => (/* binding */ Icons),
-/* harmony export */ "Slide": () => (/* binding */ Slide),
-/* harmony export */ "ToastContainer": () => (/* binding */ ToastContainer),
-/* harmony export */ "Zoom": () => (/* binding */ Zoom),
-/* harmony export */ "collapseToast": () => (/* binding */ collapseToast),
-/* harmony export */ "cssTransition": () => (/* binding */ cssTransition),
-/* harmony export */ "toast": () => (/* binding */ toast),
-/* harmony export */ "useToast": () => (/* binding */ useToast),
-/* harmony export */ "useToastContainer": () => (/* binding */ useToastContainer)
-/* harmony export */ });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js");
-/* harmony import */ var clsx__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! clsx */ "./node_modules/clsx/dist/clsx.m.js");
-/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-dom */ "./node_modules/react-dom/index.js");
-
-
-
-
-function _extends() {
- _extends = Object.assign || function (target) {
- for (var i = 1; i < arguments.length; i++) {
- var source = arguments[i];
-
- for (var key in source) {
- if (Object.prototype.hasOwnProperty.call(source, key)) {
- target[key] = source[key];
- }
- }
- }
-
- return target;
- };
-
- return _extends.apply(this, arguments);
-}
-
-function _objectWithoutPropertiesLoose(source, excluded) {
- if (source == null) return {};
- var target = {};
- var sourceKeys = Object.keys(source);
- var key, i;
-
- for (i = 0; i < sourceKeys.length; i++) {
- key = sourceKeys[i];
- if (excluded.indexOf(key) >= 0) continue;
- target[key] = source[key];
- }
-
- return target;
-}
-
-function isNum(v) {
- return typeof v === 'number' && !isNaN(v);
-}
-function isBool(v) {
- return typeof v === 'boolean';
-}
-function isStr(v) {
- return typeof v === 'string';
-}
-function isFn(v) {
- return typeof v === 'function';
-}
-function parseClassName(v) {
- return isStr(v) || isFn(v) ? v : null;
-}
-function isToastIdValid(toastId) {
- return toastId === 0 || toastId;
-}
-function getAutoCloseDelay(toastAutoClose, containerAutoClose) {
- return toastAutoClose === false || isNum(toastAutoClose) && toastAutoClose > 0 ? toastAutoClose : containerAutoClose;
-}
-var canUseDom = !!(typeof window !== 'undefined' && window.document && window.document.createElement);
-function canBeRendered(content) {
- return (0,react__WEBPACK_IMPORTED_MODULE_0__.isValidElement)(content) || isStr(content) || isFn(content) || isNum(content);
-}
-
-var POSITION = {
- TOP_LEFT: 'top-left',
- TOP_RIGHT: 'top-right',
- TOP_CENTER: 'top-center',
- BOTTOM_LEFT: 'bottom-left',
- BOTTOM_RIGHT: 'bottom-right',
- BOTTOM_CENTER: 'bottom-center'
-};
-var TYPE = {
- INFO: 'info',
- SUCCESS: 'success',
- WARNING: 'warning',
- ERROR: 'error',
- DEFAULT: 'default'
-};
-
-/**
- * Used to collapse toast after exit animation
- */
-function collapseToast(node, done, duration
-/* COLLAPSE_DURATION */
-) {
- if (duration === void 0) {
- duration = 300;
- }
-
- var scrollHeight = node.scrollHeight,
- style = node.style;
- requestAnimationFrame(function () {
- style.minHeight = 'initial';
- style.height = scrollHeight + 'px';
- style.transition = "all " + duration + "ms";
- requestAnimationFrame(function () {
- style.height = '0';
- style.padding = '0';
- style.margin = '0';
- setTimeout(done, duration);
- });
- });
-}
-
-/**
- * Css animation that just work.
- * You could use animate.css for instance
- *
- *
- * ```
- * cssTransition({
- * enter: "animate__animated animate__bounceIn",
- * exit: "animate__animated animate__bounceOut"
- * })
- * ```
- *
- */
-
-function cssTransition(_ref) {
- var enter = _ref.enter,
- exit = _ref.exit,
- _ref$appendPosition = _ref.appendPosition,
- appendPosition = _ref$appendPosition === void 0 ? false : _ref$appendPosition,
- _ref$collapse = _ref.collapse,
- collapse = _ref$collapse === void 0 ? true : _ref$collapse,
- _ref$collapseDuration = _ref.collapseDuration,
- collapseDuration = _ref$collapseDuration === void 0 ? 300 : _ref$collapseDuration;
- return function ToastTransition(_ref2) {
- var children = _ref2.children,
- position = _ref2.position,
- preventExitTransition = _ref2.preventExitTransition,
- done = _ref2.done,
- nodeRef = _ref2.nodeRef,
- isIn = _ref2.isIn;
- var enterClassName = appendPosition ? enter + "--" + position : enter;
- var exitClassName = appendPosition ? exit + "--" + position : exit;
- var baseClassName = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
- var animationStep = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(0
- /* Enter */
- );
- (0,react__WEBPACK_IMPORTED_MODULE_0__.useLayoutEffect)(function () {
- onEnter();
- }, []);
- (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
- if (!isIn) preventExitTransition ? onExited() : onExit();
- }, [isIn]);
-
- function onEnter() {
- var node = nodeRef.current;
- baseClassName.current = node.className;
- node.className += " " + enterClassName;
- node.addEventListener('animationend', onEntered);
- }
-
- function onEntered(e) {
- if (e.target !== nodeRef.current) return;
- var node = nodeRef.current;
- node.removeEventListener('animationend', onEntered);
-
- if (animationStep.current === 0
- /* Enter */
- ) {
- node.className = baseClassName.current;
- }
- }
-
- function onExit() {
- animationStep.current = 1
- /* Exit */
- ;
- var node = nodeRef.current;
- node.className += " " + exitClassName;
- node.addEventListener('animationend', onExited);
- }
-
- function onExited() {
- var node = nodeRef.current;
- node.removeEventListener('animationend', onExited);
- collapse ? collapseToast(node, done, collapseDuration) : done();
- }
-
- return react__WEBPACK_IMPORTED_MODULE_0__.createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, children);
- };
-}
-
-var eventManager = {
- list: /*#__PURE__*/new Map(),
- emitQueue: /*#__PURE__*/new Map(),
- on: function on(event, callback) {
- this.list.has(event) || this.list.set(event, []);
- this.list.get(event).push(callback);
- return this;
- },
- off: function off(event, callback) {
- if (callback) {
- var cb = this.list.get(event).filter(function (cb) {
- return cb !== callback;
- });
- this.list.set(event, cb);
- return this;
- }
-
- this.list["delete"](event);
- return this;
- },
- cancelEmit: function cancelEmit(event) {
- var timers = this.emitQueue.get(event);
-
- if (timers) {
- timers.forEach(clearTimeout);
- this.emitQueue["delete"](event);
- }
-
- return this;
- },
-
- /**
- * Enqueue the event at the end of the call stack
- * Doing so let the user call toast as follow:
- * toast('1')
- * toast('2')
- * toast('3')
- * Without setTimemout the code above will not work
- */
- emit: function emit(event) {
- var _this = this;
-
- for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
- args[_key - 1] = arguments[_key];
- }
-
- this.list.has(event) && this.list.get(event).forEach(function (callback) {
- var timer = setTimeout(function () {
- // @ts-ignore
- callback.apply(void 0, args);
- }, 0);
- _this.emitQueue.has(event) || _this.emitQueue.set(event, []);
-
- _this.emitQueue.get(event).push(timer);
- });
- }
-};
-
-/**
- * `useKeeper` is a helper around `useRef`.
- *
- * You don't need to access the `.current`property to get the value
- * If refresh is set to true. The ref will be updated every render
- */
-
-function useKeeper(arg, refresh) {
- if (refresh === void 0) {
- refresh = false;
- }
-
- var ref = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(arg);
- (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
- if (refresh) ref.current = arg;
- });
- return ref.current;
-}
-
-function reducer(state, action) {
- switch (action.type) {
- case 0
- /* ADD */
- :
- return [].concat(state, [action.toastId]).filter(function (id) {
- return id !== action.staleId;
- });
-
- case 1
- /* REMOVE */
- :
- return isToastIdValid(action.toastId) ? state.filter(function (id) {
- return id !== action.toastId;
- }) : [];
- }
-}
-
-var _excluded = ["delay", "staleId"];
-function useToastContainer(props) {
- var _useReducer = (0,react__WEBPACK_IMPORTED_MODULE_0__.useReducer)(function (x) {
- return x + 1;
- }, 0),
- forceUpdate = _useReducer[1];
-
- var _useReducer2 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useReducer)(reducer, []),
- toast = _useReducer2[0],
- dispatch = _useReducer2[1];
-
- var containerRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(null);
- var toastCount = useKeeper(0);
- var queue = useKeeper([]);
- var collection = useKeeper({});
- var instance = useKeeper({
- toastKey: 1,
- displayedToast: 0,
- props: props,
- containerId: null,
- isToastActive: isToastActive,
- getToast: function getToast(id) {
- return collection[id] || null;
- }
- });
- (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
- instance.containerId = props.containerId;
- eventManager.cancelEmit(3
- /* WillUnmount */
- ).on(0
- /* Show */
- , buildToast).on(1
- /* Clear */
- , function (toastId) {
- return containerRef.current && removeToast(toastId);
- }).on(5
- /* ClearWaitingQueue */
- , clearWaitingQueue).emit(2
- /* DidMount */
- , instance);
- return function () {
- return eventManager.emit(3
- /* WillUnmount */
- , instance);
- };
- }, []);
- (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
- instance.isToastActive = isToastActive;
- instance.displayedToast = toast.length;
- eventManager.emit(4
- /* Change */
- , toast.length, props.containerId);
- }, [toast]);
- (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
- instance.props = props;
- });
-
- function isToastActive(id) {
- return toast.indexOf(id) !== -1;
- }
-
- function clearWaitingQueue(_ref) {
- var containerId = _ref.containerId;
- var limit = instance.props.limit;
-
- if (limit && (!containerId || instance.containerId === containerId)) {
- toastCount -= queue.length;
- queue = [];
- }
- }
-
- function removeToast(toastId) {
- dispatch({
- type: 1
- /* REMOVE */
- ,
- toastId: toastId
- });
- }
-
- function dequeueToast() {
- var _queue$shift = queue.shift(),
- toastContent = _queue$shift.toastContent,
- toastProps = _queue$shift.toastProps,
- staleId = _queue$shift.staleId;
-
- appendToast(toastContent, toastProps, staleId);
- }
- /**
- * check if a container is attached to the dom
- * check for multi-container, build only if associated
- * check for duplicate toastId if no update
- */
-
-
- function isNotValid(_ref2) {
- var containerId = _ref2.containerId,
- toastId = _ref2.toastId,
- updateId = _ref2.updateId;
- return !containerRef.current || instance.props.enableMultiContainer && containerId !== instance.props.containerId || collection[toastId] && updateId == null ? true : false;
- } // this function and all the function called inside needs to rely on ref(`useKeeper`)
-
-
- function buildToast(content, _ref3) {
- var _options$icon;
-
- var delay = _ref3.delay,
- staleId = _ref3.staleId,
- options = _objectWithoutPropertiesLoose(_ref3, _excluded);
-
- if (!canBeRendered(content) || isNotValid(options)) return;
- var toastId = options.toastId,
- updateId = options.updateId,
- data = options.data;
- var props = instance.props;
-
- var closeToast = function closeToast() {
- return removeToast(toastId);
- };
-
- var isNotAnUpdate = options.updateId == null;
- if (isNotAnUpdate) toastCount++;
- var toastProps = {
- toastId: toastId,
- updateId: updateId,
- isLoading: options.isLoading,
- theme: options.theme || props.theme,
- icon: (_options$icon = options.icon) != null ? _options$icon : props.icon,
- isIn: false,
- key: options.key || instance.toastKey++,
- type: options.type,
- closeToast: closeToast,
- closeButton: options.closeButton,
- rtl: props.rtl,
- position: options.position || props.position,
- transition: options.transition || props.transition,
- className: parseClassName(options.className || props.toastClassName),
- bodyClassName: parseClassName(options.bodyClassName || props.bodyClassName),
- style: options.style || props.toastStyle,
- bodyStyle: options.bodyStyle || props.bodyStyle,
- onClick: options.onClick || props.onClick,
- pauseOnHover: isBool(options.pauseOnHover) ? options.pauseOnHover : props.pauseOnHover,
- pauseOnFocusLoss: isBool(options.pauseOnFocusLoss) ? options.pauseOnFocusLoss : props.pauseOnFocusLoss,
- draggable: isBool(options.draggable) ? options.draggable : props.draggable,
- draggablePercent: isNum(options.draggablePercent) ? options.draggablePercent : props.draggablePercent,
- draggableDirection: options.draggableDirection || props.draggableDirection,
- closeOnClick: isBool(options.closeOnClick) ? options.closeOnClick : props.closeOnClick,
- progressClassName: parseClassName(options.progressClassName || props.progressClassName),
- progressStyle: options.progressStyle || props.progressStyle,
- autoClose: options.isLoading ? false : getAutoCloseDelay(options.autoClose, props.autoClose),
- hideProgressBar: isBool(options.hideProgressBar) ? options.hideProgressBar : props.hideProgressBar,
- progress: options.progress,
- role: isStr(options.role) ? options.role : props.role,
- deleteToast: function deleteToast() {
- removeFromCollection(toastId);
- }
- };
- if (isFn(options.onOpen)) toastProps.onOpen = options.onOpen;
- if (isFn(options.onClose)) toastProps.onClose = options.onClose; // tweak for vertical dragging
-
- if (toastProps.draggableDirection === "y"
- /* Y */
- && toastProps.draggablePercent === 80
- /* DRAGGABLE_PERCENT */
- ) {
- toastProps.draggablePercent *= 1.5;
- }
-
- var closeButton = props.closeButton;
-
- if (options.closeButton === false || canBeRendered(options.closeButton)) {
- closeButton = options.closeButton;
- } else if (options.closeButton === true) {
- closeButton = canBeRendered(props.closeButton) ? props.closeButton : true;
- }
-
- toastProps.closeButton = closeButton;
- var toastContent = content;
-
- if ((0,react__WEBPACK_IMPORTED_MODULE_0__.isValidElement)(content) && !isStr(content.type)) {
- toastContent = (0,react__WEBPACK_IMPORTED_MODULE_0__.cloneElement)(content, {
- closeToast: closeToast,
- toastProps: toastProps,
- data: data
- });
- } else if (isFn(content)) {
- toastContent = content({
- closeToast: closeToast,
- toastProps: toastProps,
- data: data
- });
- } // not handling limit + delay by design. Waiting for user feedback first
-
-
- if (props.limit && props.limit > 0 && toastCount > props.limit && isNotAnUpdate) {
- queue.push({
- toastContent: toastContent,
- toastProps: toastProps,
- staleId: staleId
- });
- } else if (isNum(delay) && delay > 0) {
- setTimeout(function () {
- appendToast(toastContent, toastProps, staleId);
- }, delay);
- } else {
- appendToast(toastContent, toastProps, staleId);
- }
- }
-
- function appendToast(content, toastProps, staleId) {
- var toastId = toastProps.toastId;
- if (staleId) delete collection[staleId];
- collection[toastId] = {
- content: content,
- props: toastProps
- };
- dispatch({
- type: 0
- /* ADD */
- ,
- toastId: toastId,
- staleId: staleId
- });
- }
-
- function removeFromCollection(toastId) {
- delete collection[toastId];
- var queueLen = queue.length;
- toastCount = isToastIdValid(toastId) ? toastCount - 1 : toastCount - instance.displayedToast;
- if (toastCount < 0) toastCount = 0;
-
- if (queueLen > 0) {
- var freeSlot = isToastIdValid(toastId) ? 1 : instance.props.limit;
-
- if (queueLen === 1 || freeSlot === 1) {
- instance.displayedToast++;
- dequeueToast();
- } else {
- var toDequeue = freeSlot > queueLen ? queueLen : freeSlot;
- instance.displayedToast = toDequeue;
-
- for (var i = 0; i < toDequeue; i++) {
- dequeueToast();
- }
- }
- } else {
- forceUpdate();
- }
- }
-
- function getToastToRender(cb) {
- var toastToRender = {};
- var toastList = props.newestOnTop ? Object.keys(collection).reverse() : Object.keys(collection);
-
- for (var i = 0; i < toastList.length; i++) {
- var _toast = collection[toastList[i]];
- var position = _toast.props.position;
- toastToRender[position] || (toastToRender[position] = []);
- toastToRender[position].push(_toast);
- }
-
- return Object.keys(toastToRender).map(function (p) {
- return cb(p, toastToRender[p]);
- });
- }
-
- return {
- getToastToRender: getToastToRender,
- collection: collection,
- containerRef: containerRef,
- isToastActive: isToastActive
- };
-}
-
-function getX(e) {
- return e.targetTouches && e.targetTouches.length >= 1 ? e.targetTouches[0].clientX : e.clientX;
-}
-
-function getY(e) {
- return e.targetTouches && e.targetTouches.length >= 1 ? e.targetTouches[0].clientY : e.clientY;
-}
-
-function useToast(props) {
- var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(true),
- isRunning = _useState[0],
- setIsRunning = _useState[1];
-
- var _useState2 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
- preventExitTransition = _useState2[0],
- setPreventExitTransition = _useState2[1];
-
- var toastRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(null);
- var drag = useKeeper({
- start: 0,
- x: 0,
- y: 0,
- delta: 0,
- removalDistance: 0,
- canCloseOnClick: true,
- canDrag: false,
- boundingRect: null
- });
- var syncProps = useKeeper(props, true);
- var autoClose = props.autoClose,
- pauseOnHover = props.pauseOnHover,
- closeToast = props.closeToast,
- onClick = props.onClick,
- closeOnClick = props.closeOnClick;
- (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
- if (isFn(props.onOpen)) props.onOpen((0,react__WEBPACK_IMPORTED_MODULE_0__.isValidElement)(props.children) && props.children.props);
- return function () {
- if (isFn(syncProps.onClose)) syncProps.onClose((0,react__WEBPACK_IMPORTED_MODULE_0__.isValidElement)(syncProps.children) && syncProps.children.props);
- };
- }, []);
- (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
- props.draggable && bindDragEvents();
- return function () {
- props.draggable && unbindDragEvents();
- };
- }, [props.draggable]);
- (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
- props.pauseOnFocusLoss && bindFocusEvents();
- return function () {
- props.pauseOnFocusLoss && unbindFocusEvents();
- };
- }, [props.pauseOnFocusLoss]);
-
- function onDragStart(e) {
- if (props.draggable) {
- var toast = toastRef.current;
- drag.canCloseOnClick = true;
- drag.canDrag = true;
- drag.boundingRect = toast.getBoundingClientRect();
- toast.style.transition = '';
- drag.x = getX(e.nativeEvent);
- drag.y = getY(e.nativeEvent);
-
- if (props.draggableDirection === "x"
- /* X */
- ) {
- drag.start = drag.x;
- drag.removalDistance = toast.offsetWidth * (props.draggablePercent / 100);
- } else {
- drag.start = drag.y;
- drag.removalDistance = toast.offsetHeight * (props.draggablePercent / 100);
- }
- }
- }
-
- function onDragTransitionEnd() {
- if (drag.boundingRect) {
- var _drag$boundingRect = drag.boundingRect,
- top = _drag$boundingRect.top,
- bottom = _drag$boundingRect.bottom,
- left = _drag$boundingRect.left,
- right = _drag$boundingRect.right;
-
- if (props.pauseOnHover && drag.x >= left && drag.x <= right && drag.y >= top && drag.y <= bottom) {
- pauseToast();
- } else {
- playToast();
- }
- }
- }
-
- function playToast() {
- setIsRunning(true);
- }
-
- function pauseToast() {
- setIsRunning(false);
- }
-
- function bindFocusEvents() {
- if (!document.hasFocus()) pauseToast();
- window.addEventListener('focus', playToast);
- window.addEventListener('blur', pauseToast);
- }
-
- function unbindFocusEvents() {
- window.removeEventListener('focus', playToast);
- window.removeEventListener('blur', pauseToast);
- }
-
- function bindDragEvents() {
- document.addEventListener('mousemove', onDragMove);
- document.addEventListener('mouseup', onDragEnd);
- document.addEventListener('touchmove', onDragMove);
- document.addEventListener('touchend', onDragEnd);
- }
-
- function unbindDragEvents() {
- document.removeEventListener('mousemove', onDragMove);
- document.removeEventListener('mouseup', onDragEnd);
- document.removeEventListener('touchmove', onDragMove);
- document.removeEventListener('touchend', onDragEnd);
- }
-
- function onDragMove(e) {
- if (drag.canDrag) {
- e.preventDefault();
- var toast = toastRef.current;
- if (isRunning) pauseToast();
- drag.x = getX(e);
- drag.y = getY(e);
-
- if (props.draggableDirection === "x"
- /* X */
- ) {
- drag.delta = drag.x - drag.start;
- } else {
- drag.delta = drag.y - drag.start;
- } // prevent false positif during a toast click
-
-
- if (drag.start !== drag.x) drag.canCloseOnClick = false;
- toast.style.transform = "translate" + props.draggableDirection + "(" + drag.delta + "px)";
- toast.style.opacity = "" + (1 - Math.abs(drag.delta / drag.removalDistance));
- }
- }
-
- function onDragEnd() {
- var toast = toastRef.current;
-
- if (drag.canDrag) {
- drag.canDrag = false;
-
- if (Math.abs(drag.delta) > drag.removalDistance) {
- setPreventExitTransition(true);
- props.closeToast();
- return;
- }
-
- toast.style.transition = 'transform 0.2s, opacity 0.2s';
- toast.style.transform = "translate" + props.draggableDirection + "(0)";
- toast.style.opacity = '1';
- }
- }
-
- var eventHandlers = {
- onMouseDown: onDragStart,
- onTouchStart: onDragStart,
- onMouseUp: onDragTransitionEnd,
- onTouchEnd: onDragTransitionEnd
- };
-
- if (autoClose && pauseOnHover) {
- eventHandlers.onMouseEnter = pauseToast;
- eventHandlers.onMouseLeave = playToast;
- } // prevent toast from closing when user drags the toast
-
-
- if (closeOnClick) {
- eventHandlers.onClick = function (e) {
- onClick && onClick(e);
- drag.canCloseOnClick && closeToast();
- };
- }
-
- return {
- playToast: playToast,
- pauseToast: pauseToast,
- isRunning: isRunning,
- preventExitTransition: preventExitTransition,
- toastRef: toastRef,
- eventHandlers: eventHandlers
- };
-}
-
-function CloseButton(_ref) {
- var closeToast = _ref.closeToast,
- theme = _ref.theme,
- _ref$ariaLabel = _ref.ariaLabel,
- ariaLabel = _ref$ariaLabel === void 0 ? 'close' : _ref$ariaLabel;
- return (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)("button", {
- className: "Toastify"
- /* CSS_NAMESPACE */
- + "__close-button " + "Toastify"
- /* CSS_NAMESPACE */
- + "__close-button--" + theme,
- type: "button",
- onClick: function onClick(e) {
- e.stopPropagation();
- closeToast(e);
- },
- "aria-label": ariaLabel
- }, (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)("svg", {
- "aria-hidden": "true",
- viewBox: "0 0 14 16"
- }, (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)("path", {
- fillRule: "evenodd",
- d: "M7.71 8.23l3.75 3.75-1.48 1.48-3.75-3.75-3.75 3.75L1 11.98l3.75-3.75L1 4.48 2.48 3l3.75 3.75L9.98 3l1.48 1.48-3.75 3.75z"
- })));
-}
-
-function ProgressBar(_ref) {
- var _cx, _animationEvent;
-
- var delay = _ref.delay,
- isRunning = _ref.isRunning,
- closeToast = _ref.closeToast,
- type = _ref.type,
- hide = _ref.hide,
- className = _ref.className,
- userStyle = _ref.style,
- controlledProgress = _ref.controlledProgress,
- progress = _ref.progress,
- rtl = _ref.rtl,
- isIn = _ref.isIn,
- theme = _ref.theme;
-
- var style = _extends({}, userStyle, {
- animationDuration: delay + "ms",
- animationPlayState: isRunning ? 'running' : 'paused',
- opacity: hide ? 0 : 1
- });
-
- if (controlledProgress) style.transform = "scaleX(" + progress + ")";
- var defaultClassName = (0,clsx__WEBPACK_IMPORTED_MODULE_1__.default)("Toastify"
- /* CSS_NAMESPACE */
- + "__progress-bar", controlledProgress ? "Toastify"
- /* CSS_NAMESPACE */
- + "__progress-bar--controlled" : "Toastify"
- /* CSS_NAMESPACE */
- + "__progress-bar--animated", "Toastify"
- /* CSS_NAMESPACE */
- + "__progress-bar-theme--" + theme, "Toastify"
- /* CSS_NAMESPACE */
- + "__progress-bar--" + type, (_cx = {}, _cx["Toastify"
- /* CSS_NAMESPACE */
- + "__progress-bar--rtl"] = rtl, _cx));
- var classNames = isFn(className) ? className({
- rtl: rtl,
- type: type,
- defaultClassName: defaultClassName
- }) : (0,clsx__WEBPACK_IMPORTED_MODULE_1__.default)(defaultClassName, className); // 🧐 controlledProgress is derived from progress
- // so if controlledProgress is set
- // it means that this is also the case for progress
-
- var animationEvent = (_animationEvent = {}, _animationEvent[controlledProgress && progress >= 1 ? 'onTransitionEnd' : 'onAnimationEnd'] = controlledProgress && progress < 1 ? null : function () {
- isIn && closeToast();
- }, _animationEvent); // TODO: add aria-valuenow, aria-valuemax, aria-valuemin
-
- return (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", Object.assign({
- role: "progressbar",
- "aria-hidden": hide ? 'true' : 'false',
- "aria-label": "notification timer",
- className: classNames,
- style: style
- }, animationEvent));
-}
-ProgressBar.defaultProps = {
- type: TYPE.DEFAULT,
- hide: false
-};
-
-var _excluded$1 = ["theme", "type"];
-
-var Svg = function Svg(_ref) {
- var theme = _ref.theme,
- type = _ref.type,
- rest = _objectWithoutPropertiesLoose(_ref, _excluded$1);
-
- return react__WEBPACK_IMPORTED_MODULE_0__.createElement("svg", Object.assign({
- viewBox: "0 0 24 24",
- width: "100%",
- height: "100%",
- fill: theme === 'colored' ? 'currentColor' : "var(--toastify-icon-color-" + type + ")"
- }, rest));
-};
-
-function Warning(props) {
- return react__WEBPACK_IMPORTED_MODULE_0__.createElement(Svg, Object.assign({}, props), react__WEBPACK_IMPORTED_MODULE_0__.createElement("path", {
- d: "M23.32 17.191L15.438 2.184C14.728.833 13.416 0 11.996 0c-1.42 0-2.733.833-3.443 2.184L.533 17.448a4.744 4.744 0 000 4.368C1.243 23.167 2.555 24 3.975 24h16.05C22.22 24 24 22.044 24 19.632c0-.904-.251-1.746-.68-2.44zm-9.622 1.46c0 1.033-.724 1.823-1.698 1.823s-1.698-.79-1.698-1.822v-.043c0-1.028.724-1.822 1.698-1.822s1.698.79 1.698 1.822v.043zm.039-12.285l-.84 8.06c-.057.581-.408.943-.897.943-.49 0-.84-.367-.896-.942l-.84-8.065c-.057-.624.25-1.095.779-1.095h1.91c.528.005.84.476.784 1.1z"
- }));
-}
-
-function Info(props) {
- return react__WEBPACK_IMPORTED_MODULE_0__.createElement(Svg, Object.assign({}, props), react__WEBPACK_IMPORTED_MODULE_0__.createElement("path", {
- d: "M12 0a12 12 0 1012 12A12.013 12.013 0 0012 0zm.25 5a1.5 1.5 0 11-1.5 1.5 1.5 1.5 0 011.5-1.5zm2.25 13.5h-4a1 1 0 010-2h.75a.25.25 0 00.25-.25v-4.5a.25.25 0 00-.25-.25h-.75a1 1 0 010-2h1a2 2 0 012 2v4.75a.25.25 0 00.25.25h.75a1 1 0 110 2z"
- }));
-}
-
-function Success(props) {
- return react__WEBPACK_IMPORTED_MODULE_0__.createElement(Svg, Object.assign({}, props), react__WEBPACK_IMPORTED_MODULE_0__.createElement("path", {
- d: "M12 0a12 12 0 1012 12A12.014 12.014 0 0012 0zm6.927 8.2l-6.845 9.289a1.011 1.011 0 01-1.43.188l-4.888-3.908a1 1 0 111.25-1.562l4.076 3.261 6.227-8.451a1 1 0 111.61 1.183z"
- }));
-}
-
-function Error(props) {
- return react__WEBPACK_IMPORTED_MODULE_0__.createElement(Svg, Object.assign({}, props), react__WEBPACK_IMPORTED_MODULE_0__.createElement("path", {
- d: "M11.983 0a12.206 12.206 0 00-8.51 3.653A11.8 11.8 0 000 12.207 11.779 11.779 0 0011.8 24h.214A12.111 12.111 0 0024 11.791 11.766 11.766 0 0011.983 0zM10.5 16.542a1.476 1.476 0 011.449-1.53h.027a1.527 1.527 0 011.523 1.47 1.475 1.475 0 01-1.449 1.53h-.027a1.529 1.529 0 01-1.523-1.47zM11 12.5v-6a1 1 0 012 0v6a1 1 0 11-2 0z"
- }));
-}
-
-function Spinner() {
- return react__WEBPACK_IMPORTED_MODULE_0__.createElement("div", {
- className: "Toastify"
- /* CSS_NAMESPACE */
- + "__spinner"
- });
-}
-
-var Icons = {
- info: Info,
- warning: Warning,
- success: Success,
- error: Error,
- spinner: Spinner
-};
-
-var Toast = function Toast(props) {
- var _cx, _cx2;
-
- var _useToast = useToast(props),
- isRunning = _useToast.isRunning,
- preventExitTransition = _useToast.preventExitTransition,
- toastRef = _useToast.toastRef,
- eventHandlers = _useToast.eventHandlers;
-
- var closeButton = props.closeButton,
- children = props.children,
- autoClose = props.autoClose,
- onClick = props.onClick,
- type = props.type,
- hideProgressBar = props.hideProgressBar,
- closeToast = props.closeToast,
- Transition = props.transition,
- position = props.position,
- className = props.className,
- style = props.style,
- bodyClassName = props.bodyClassName,
- bodyStyle = props.bodyStyle,
- progressClassName = props.progressClassName,
- progressStyle = props.progressStyle,
- updateId = props.updateId,
- role = props.role,
- progress = props.progress,
- rtl = props.rtl,
- toastId = props.toastId,
- deleteToast = props.deleteToast,
- isIn = props.isIn,
- isLoading = props.isLoading,
- icon = props.icon,
- theme = props.theme;
- var defaultClassName = (0,clsx__WEBPACK_IMPORTED_MODULE_1__.default)("Toastify"
- /* CSS_NAMESPACE */
- + "__toast", "Toastify"
- /* CSS_NAMESPACE */
- + "__toast-theme--" + theme, "Toastify"
- /* CSS_NAMESPACE */
- + "__toast--" + type, (_cx = {}, _cx["Toastify"
- /* CSS_NAMESPACE */
- + "__toast--rtl"] = rtl, _cx));
- var cssClasses = isFn(className) ? className({
- rtl: rtl,
- position: position,
- type: type,
- defaultClassName: defaultClassName
- }) : (0,clsx__WEBPACK_IMPORTED_MODULE_1__.default)(defaultClassName, className);
- var isProgressControlled = !!progress;
- var maybeIcon = Icons[type];
- var iconProps = {
- theme: theme,
- type: type
- };
- var Icon = maybeIcon && maybeIcon(iconProps);
-
- if (icon === false) {
- Icon = void 0;
- } else if (isFn(icon)) {
- Icon = icon(iconProps);
- } else if ((0,react__WEBPACK_IMPORTED_MODULE_0__.isValidElement)(icon)) {
- Icon = (0,react__WEBPACK_IMPORTED_MODULE_0__.cloneElement)(icon, iconProps);
- } else if (isStr(icon)) {
- Icon = icon;
- } else if (isLoading) {
- Icon = Icons.spinner();
- }
-
- function renderCloseButton(closeButton) {
- if (!closeButton) return;
- var props = {
- closeToast: closeToast,
- type: type,
- theme: theme
- };
- if (isFn(closeButton)) return closeButton(props);
- if ((0,react__WEBPACK_IMPORTED_MODULE_0__.isValidElement)(closeButton)) return (0,react__WEBPACK_IMPORTED_MODULE_0__.cloneElement)(closeButton, props);
- }
-
- return (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)(Transition, {
- isIn: isIn,
- done: deleteToast,
- position: position,
- preventExitTransition: preventExitTransition,
- nodeRef: toastRef
- }, (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", Object.assign({
- id: toastId,
- onClick: onClick,
- className: cssClasses
- }, eventHandlers, {
- style: style,
- ref: toastRef
- }), (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", Object.assign({}, isIn && {
- role: role
- }, {
- className: isFn(bodyClassName) ? bodyClassName({
- type: type
- }) : (0,clsx__WEBPACK_IMPORTED_MODULE_1__.default)("Toastify"
- /* CSS_NAMESPACE */
- + "__toast-body", bodyClassName),
- style: bodyStyle
- }), Icon && (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", {
- className: (0,clsx__WEBPACK_IMPORTED_MODULE_1__.default)("Toastify"
- /* CSS_NAMESPACE */
- + "__toast-icon", (_cx2 = {}, _cx2["Toastify"
- /* CSS_NAMESPACE */
- + "--animate-icon " + "Toastify"
- /* CSS_NAMESPACE */
- + "__zoom-enter"] = !isLoading, _cx2))
- }, Icon), (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", null, children)), renderCloseButton(closeButton), (autoClose || isProgressControlled) && (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)(ProgressBar, Object.assign({}, updateId && !isProgressControlled ? {
- key: "pb-" + updateId
- } : {}, {
- rtl: rtl,
- theme: theme,
- delay: autoClose,
- isRunning: isRunning,
- isIn: isIn,
- closeToast: closeToast,
- hide: hideProgressBar,
- type: type,
- style: progressStyle,
- className: progressClassName,
- controlledProgress: isProgressControlled,
- progress: progress
- }))));
-};
-
-var Bounce = /*#__PURE__*/cssTransition({
- enter: "Toastify"
- /* CSS_NAMESPACE */
- + "--animate " + "Toastify"
- /* CSS_NAMESPACE */
- + "__bounce-enter",
- exit: "Toastify"
- /* CSS_NAMESPACE */
- + "--animate " + "Toastify"
- /* CSS_NAMESPACE */
- + "__bounce-exit",
- appendPosition: true
-});
-var Slide = /*#__PURE__*/cssTransition({
- enter: "Toastify"
- /* CSS_NAMESPACE */
- + "--animate " + "Toastify"
- /* CSS_NAMESPACE */
- + "__slide-enter",
- exit: "Toastify"
- /* CSS_NAMESPACE */
- + "--animate " + "Toastify"
- /* CSS_NAMESPACE */
- + "__slide-exit",
- appendPosition: true
-});
-var Zoom = /*#__PURE__*/cssTransition({
- enter: "Toastify"
- /* CSS_NAMESPACE */
- + "--animate " + "Toastify"
- /* CSS_NAMESPACE */
- + "__zoom-enter",
- exit: "Toastify"
- /* CSS_NAMESPACE */
- + "--animate " + "Toastify"
- /* CSS_NAMESPACE */
- + "__zoom-exit"
-});
-var Flip = /*#__PURE__*/cssTransition({
- enter: "Toastify"
- /* CSS_NAMESPACE */
- + "--animate " + "Toastify"
- /* CSS_NAMESPACE */
- + "__flip-enter",
- exit: "Toastify"
- /* CSS_NAMESPACE */
- + "--animate " + "Toastify"
- /* CSS_NAMESPACE */
- + "__flip-exit"
-});
-
-var ToastContainer = function ToastContainer(props) {
- var _useToastContainer = useToastContainer(props),
- getToastToRender = _useToastContainer.getToastToRender,
- containerRef = _useToastContainer.containerRef,
- isToastActive = _useToastContainer.isToastActive;
-
- var className = props.className,
- style = props.style,
- rtl = props.rtl,
- containerId = props.containerId;
-
- function getClassName(position) {
- var _cx;
-
- var defaultClassName = (0,clsx__WEBPACK_IMPORTED_MODULE_1__.default)("Toastify"
- /* CSS_NAMESPACE */
- + "__toast-container", "Toastify"
- /* CSS_NAMESPACE */
- + "__toast-container--" + position, (_cx = {}, _cx["Toastify"
- /* CSS_NAMESPACE */
- + "__toast-container--rtl"] = rtl, _cx));
- return isFn(className) ? className({
- position: position,
- rtl: rtl,
- defaultClassName: defaultClassName
- }) : (0,clsx__WEBPACK_IMPORTED_MODULE_1__.default)(defaultClassName, parseClassName(className));
- }
-
- return (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", {
- ref: containerRef,
- className: "Toastify"
- /* CSS_NAMESPACE */
- ,
- id: containerId
- }, getToastToRender(function (position, toastList) {
- var containerStyle = toastList.length === 0 ? _extends({}, style, {
- pointerEvents: 'none'
- }) : _extends({}, style);
- return (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", {
- className: getClassName(position),
- style: containerStyle,
- key: "container-" + position
- }, toastList.map(function (_ref) {
- var content = _ref.content,
- toastProps = _ref.props;
- return (0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)(Toast, Object.assign({}, toastProps, {
- isIn: isToastActive(toastProps.toastId),
- key: "toast-" + toastProps.key,
- closeButton: toastProps.closeButton === true ? CloseButton : toastProps.closeButton
- }), content);
- }));
- }));
-};
-ToastContainer.defaultProps = {
- position: POSITION.TOP_RIGHT,
- transition: Bounce,
- rtl: false,
- autoClose: 5000,
- hideProgressBar: false,
- closeButton: CloseButton,
- pauseOnHover: true,
- pauseOnFocusLoss: true,
- closeOnClick: true,
- newestOnTop: false,
- draggable: true,
- draggablePercent: 80
- /* DRAGGABLE_PERCENT */
- ,
- draggableDirection: "x"
- /* X */
- ,
- role: 'alert',
- theme: 'light'
-};
-
-var containers = /*#__PURE__*/new Map();
-var latestInstance;
-var containerDomNode;
-var containerConfig;
-var queue = [];
-var lazy = false;
-/**
- * Check whether any container is currently mounted in the DOM
- */
-
-function isAnyContainerMounted() {
- return containers.size > 0;
-}
-/**
- * Get the toast by id, given it's in the DOM, otherwise returns null
- */
-
-
-function getToast(toastId, _ref) {
- var containerId = _ref.containerId;
- var container = containers.get(containerId || latestInstance);
- if (!container) return null;
- return container.getToast(toastId);
-}
-/**
- * Generate a random toastId
- */
-
-
-function generateToastId() {
- return Math.random().toString(36).substr(2, 9);
-}
-/**
- * Generate a toastId or use the one provided
- */
-
-
-function getToastId(options) {
- if (options && (isStr(options.toastId) || isNum(options.toastId))) {
- return options.toastId;
- }
-
- return generateToastId();
-}
-/**
- * If the container is not mounted, the toast is enqueued and
- * the container lazy mounted
- */
-
-
-function dispatchToast(content, options) {
- if (isAnyContainerMounted()) {
- eventManager.emit(0
- /* Show */
- , content, options);
- } else {
- queue.push({
- content: content,
- options: options
- });
-
- if (lazy && canUseDom) {
- lazy = false;
- containerDomNode = document.createElement('div');
- document.body.appendChild(containerDomNode);
- (0,react_dom__WEBPACK_IMPORTED_MODULE_2__.render)((0,react__WEBPACK_IMPORTED_MODULE_0__.createElement)(ToastContainer, Object.assign({}, containerConfig)), containerDomNode);
- }
- }
-
- return options.toastId;
-}
-/**
- * Merge provided options with the defaults settings and generate the toastId
- */
-
-
-function mergeOptions(type, options) {
- return _extends({}, options, {
- type: options && options.type || type,
- toastId: getToastId(options)
- });
-}
-
-var createToastByType = function createToastByType(type) {
- return function (content, options) {
- return dispatchToast(content, mergeOptions(type, options));
- };
-};
-
-var toast = function toast(content, options) {
- return dispatchToast(content, mergeOptions(TYPE.DEFAULT, options));
-};
-
-toast.loading = function (content, options) {
- return dispatchToast(content, mergeOptions(TYPE.DEFAULT, _extends({
- isLoading: true,
- autoClose: false,
- closeOnClick: false,
- closeButton: false,
- draggable: false
- }, options)));
-};
-
-function handlePromise(promise, _ref2, options) {
- var pending = _ref2.pending,
- error = _ref2.error,
- success = _ref2.success;
- var id = isStr(pending) ? toast.loading(pending, options) : toast.loading(pending.render, _extends({}, options, pending));
- var resetParams = {
- isLoading: null,
- autoClose: null,
- closeOnClick: null,
- closeButton: null,
- draggable: null
- };
-
- var resolver = function resolver(type, input, result) {
- var params = isStr(input) ? {
- render: input
- } : input;
- toast.update(id, _extends({
- type: type
- }, resetParams, options, params, {
- data: result
- }));
- return result;
- };
-
- var p = isFn(promise) ? promise() : promise;
- p.then(function (result) {
- return resolver('success', success, result);
- })["catch"](function (err) {
- return resolver('error', error, err);
- });
- return p;
-}
-
-toast.promise = handlePromise;
-toast.success = /*#__PURE__*/createToastByType(TYPE.SUCCESS);
-toast.info = /*#__PURE__*/createToastByType(TYPE.INFO);
-toast.error = /*#__PURE__*/createToastByType(TYPE.ERROR);
-toast.warning = /*#__PURE__*/createToastByType(TYPE.WARNING);
-toast.warn = toast.warning;
-
-toast.dark = function (content, options) {
- return dispatchToast(content, mergeOptions(TYPE.DEFAULT, _extends({
- theme: 'dark'
- }, options)));
-};
-/**
- * Remove toast programmaticaly
- */
-
-
-toast.dismiss = function (id) {
- return eventManager.emit(1
- /* Clear */
- , id);
-};
-/**
- * Clear waiting queue when limit is used
- */
-
-
-toast.clearWaitingQueue = function (params) {
- if (params === void 0) {
- params = {};
- }
-
- return eventManager.emit(5
- /* ClearWaitingQueue */
- , params);
-};
-/**
- * return true if one container is displaying the toast
- */
-
-
-toast.isActive = function (id) {
- var isToastActive = false;
- containers.forEach(function (container) {
- if (container.isToastActive && container.isToastActive(id)) {
- isToastActive = true;
- }
- });
- return isToastActive;
-};
-
-toast.update = function (toastId, options) {
- if (options === void 0) {
- options = {};
- }
-
- // if you call toast and toast.update directly nothing will be displayed
- // this is why I defered the update
- setTimeout(function () {
- var toast = getToast(toastId, options);
-
- if (toast) {
- var oldOptions = toast.props,
- oldContent = toast.content;
-
- var nextOptions = _extends({}, oldOptions, options, {
- toastId: options.toastId || toastId,
- updateId: generateToastId()
- });
-
- if (nextOptions.toastId !== toastId) nextOptions.staleId = toastId;
- var content = nextOptions.render || oldContent;
- delete nextOptions.render;
- dispatchToast(content, nextOptions);
- }
- }, 0);
-};
-/**
- * Used for controlled progress bar.
- */
-
-
-toast.done = function (id) {
- toast.update(id, {
- progress: 1
- });
-};
-/**
- * Track changes. The callback get the number of toast displayed
- *
- */
-
-
-toast.onChange = function (callback) {
- if (isFn(callback)) {
- eventManager.on(4
- /* Change */
- , callback);
- }
-
- return function () {
- isFn(callback) && eventManager.off(4
- /* Change */
- , callback);
- };
-};
-/**
- * Configure the ToastContainer when lazy mounted
- */
-
-
-toast.configure = function (config) {
- if (config === void 0) {
- config = {};
- }
-
- lazy = true;
- containerConfig = config;
-};
-
-toast.POSITION = POSITION;
-toast.TYPE = TYPE;
-/**
- * Wait until the ToastContainer is mounted to dispatch the toast
- * and attach isActive method
- */
-
-eventManager.on(2
-/* DidMount */
-, function (containerInstance) {
- latestInstance = containerInstance.containerId || containerInstance;
- containers.set(latestInstance, containerInstance);
- queue.forEach(function (item) {
- eventManager.emit(0
- /* Show */
- , item.content, item.options);
- });
- queue = [];
-}).on(3
-/* WillUnmount */
-, function (containerInstance) {
- containers["delete"](containerInstance.containerId || containerInstance);
-
- if (containers.size === 0) {
- eventManager.off(0
- /* Show */
- ).off(1
- /* Clear */
- ).off(5
- /* ClearWaitingQueue */
- );
- }
-
- if (canUseDom && containerDomNode) {
- document.body.removeChild(containerDomNode);
- }
-});
-
-
-//# sourceMappingURL=react-toastify.esm.js.map
-
-
/***/ }),
/***/ "./node_modules/react-transition-group/esm/Transition.js":
diff --git a/backend/resources/js/child/meeting/detail.jsx b/backend/resources/js/child/meeting/detail.jsx
index 9baf08da..db5217b0 100644
--- a/backend/resources/js/child/meeting/detail.jsx
+++ b/backend/resources/js/child/meeting/detail.jsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import axios from 'axios';
-import { Link } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
import { CircularProgress } from '@material-ui/core';
import Notification from '../notification';
@@ -12,6 +12,7 @@ import ModalConfirm from '../../component/modal_confirm';
const MeetingDetail = (props) => {
+ const history = useHistory();
const [notice, setNotice] = useState(localStorage.getItem('notice'));
const [loaded, setLoaded] = useState(false);
const [meeting, setMeeting] = useState(null);
@@ -23,6 +24,7 @@ const MeetingDetail = (props) => {
const [show_confirm_modal, setShowConfirmMoal] = useState(false);
const [submit, setSubmit] = useState(false);
const [_400error, set400Error] = useState('');
+ const [_404error, set404Error] = useState('');
const [_success, setSuccess] = useState('');
useEffect(() => {
@@ -45,6 +47,13 @@ const MeetingDetail = (props) => {
set400Error("失敗しました。");
}
})
+ .catch(err=>{
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+ if(err.response.status==404){
+ set404Error(err.response.data.message);
+ }
+ })
},[]);
@@ -192,8 +201,18 @@ const MeetingDetail = (props) => {
handleClose={()=>setShowConfirmMoal(false)}
handleAccept={handleApprovalRegister}
loading={submit}/>
- { _400error && set400Error('')}>{_400error} }
{ _success && setSuccess('')}>{_success} }
+ { _400error && set400Error('')}>{_400error} }
+ { _404error &&
+ {
+ set404Error('');
+ history.push({
+ pathname: "/c-account/meeting"
+ });
+ }}>
+ {_404error}
+
+ }
)
diff --git a/backend/resources/js/child/profile/edit.jsx b/backend/resources/js/child/profile/edit.jsx
index 8f0eca08..7945afe5 100644
--- a/backend/resources/js/child/profile/edit.jsx
+++ b/backend/resources/js/child/profile/edit.jsx
@@ -29,8 +29,9 @@ const ProfileEdit = () => {
tel:'',
company:''
})
- const [_400error, set400Error] = useState('');
const [_success, setSuccess] = useState('');
+ const [_400error, set400Error] = useState('');
+ const [_404error, set404Error] = useState('');
const [submit, setSubmit] = useState(false);
const [loaded, setLoaded] = useState(false);
@@ -56,6 +57,13 @@ const ProfileEdit = () => {
set400Error("失敗しました。");
}
})
+ .catch(err=>{
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+ if(err.response.status==404){
+ set404Error(err.response.data.message);
+ }
+ })
},[]);
@@ -209,6 +217,15 @@ const ProfileEdit = () => {
}
{ _400error && set400Error('')}>{_400error} }
{ _success && setSuccess('')}>{_success} }
+ { _404error &&
+ {
+ history.push({
+ pathname: "/c-account/profile"
+ });
+ }}>
+ {_404error}
+
+ }
diff --git a/backend/resources/js/child/profile/index.jsx b/backend/resources/js/child/profile/index.jsx
index eb504adf..e2f401b5 100644
--- a/backend/resources/js/child/profile/index.jsx
+++ b/backend/resources/js/child/profile/index.jsx
@@ -10,12 +10,14 @@ import Notification from '../notification';
const Profile = (props) => {
+ const history = useHistory();
const [notice, setNotice] = useState(localStorage.getItem('notice'));
-
+
const [image, setImage] = useState('');
const [profile, setProfile] = useState(null)
const [loaded, setLoaded] = useState(false);
const [_400error, set400Error] = useState('');
+ const [_404error, set404Error] = useState('');
const [_422errors, set422Errors] = useState({ image: '' });
const [_success, setSuccess] = useState(props.history.location.state);
@@ -27,12 +29,20 @@ const Profile = (props) => {
.then(response => {
setLoaded(true);
setNotice(response.data.notice);
- if(response.data.status_code==200){
- setProfile(response.data.params);
- setImage(response.data.params.image);
+ switch(response.data.status_code){
+ case 200:{
+ setProfile(response.data.params);
+ setImage(response.data.params.image);
+ break;
+ }
+ case 400: set400Error("失敗しました。"); break;
}
- else {
- set400Error("失敗しました。");
+ })
+ .catch(err=>{
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+ if(err.response.status==404){
+ set404Error(err.response.data.message);
}
})
},[]);
@@ -173,8 +183,17 @@ const Profile = (props) => {
}
- { _400error && set400Error('')}>{_400error} }
{ _success && setSuccess('')}>{_success} }
+ { _400error && set400Error('')}>{_400error} }
+ { _404error &&
+ {
+ history.push({
+ pathname: "/c-account/profile"
+ });
+ }}>
+ {_404error}
+
+ }
diff --git a/backend/resources/js/parent/meeting/add.jsx b/backend/resources/js/parent/meeting/add.jsx
index e40b389d..3ca4722e 100644
--- a/backend/resources/js/parent/meeting/add.jsx
+++ b/backend/resources/js/parent/meeting/add.jsx
@@ -35,7 +35,6 @@ const MeetingAdd = (props) => {
setLoaded(false);
const state = props.history.location.state;
if(state){
- console.log(state);
setLoaded(true);
setTitle(state?.title);
setMemo(state?.memo);
diff --git a/backend/resources/js/parent/meeting/detail.jsx b/backend/resources/js/parent/meeting/detail.jsx
index 5dab6bd3..d588f99c 100644
--- a/backend/resources/js/parent/meeting/detail.jsx
+++ b/backend/resources/js/parent/meeting/detail.jsx
@@ -1,7 +1,6 @@
import React, { useEffect, useState } from 'react';
import moment from 'moment';
import axios from 'axios';
-import { ToastContainer, toast } from 'react-toastify';
import { useHistory, Link } from 'react-router-dom';
import { CircularProgress } from '@material-ui/core';
@@ -22,6 +21,7 @@ const MeetingDetail = (props) => {
const [notice, setNotice] = useState(localStorage.getItem('notice'));
const [_success, setSuccess] = useState(props.history.location.state);
const [_400error, set400Error] = useState('');
+ const [_404error, set404Error] = useState('');
const [show_delete_modal, setShowDeleteModal] = useState(false);
const [show_notify_all_modal, setShowNotifyAllModal] = useState(false);
@@ -53,7 +53,14 @@ const MeetingDetail = (props) => {
else {
set400Error("失敗しました。");
}
- });
+ })
+ .catch(err=>{
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+ if(err.response.status==404){
+ set404Error(err.response.data.message);
+ }
+ })
}, []);
//-------------------------------------------------------------
@@ -283,6 +290,16 @@ const MeetingDetail = (props) => {
{ _400error && set400Error('')}>{_400error} }
{ _success && setSuccess('')}>{_success} }
+ { _404error &&
+ {
+ set404Error('');
+ history.push({
+ pathname: "/p-account/meeting"
+ });
+ }}>
+ {_404error}
+
+ }
)
}
diff --git a/backend/resources/js/parent/meeting/edit.jsx b/backend/resources/js/parent/meeting/edit.jsx
index 815101c9..f54fd590 100644
--- a/backend/resources/js/parent/meeting/edit.jsx
+++ b/backend/resources/js/parent/meeting/edit.jsx
@@ -30,6 +30,7 @@ const MeetingEdit = (props) => {
const [_422errors, set422Errors] = useState({title:'', text:'', memo:'', pdf:'', image:''})
const [_400error, set400Error] = useState('');
+ const [_404error, set404Error] = useState('');
const [_success, setSuccess] = useState('');
const [loaded, setLoaded] = useState(false);
@@ -68,7 +69,14 @@ const MeetingEdit = (props) => {
else{
set400Error("失敗しました。");
}
- });
+ })
+ .catch(err=>{
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+ if(err.response.status==404){
+ set404Error(err.response.data.message);
+ }
+ })
}, []);
//-------------------------------------------------------------
@@ -393,6 +401,16 @@ useEffect(()=>{
{ _400error && set400Error('')}>{_400error} }
{ _success && setSuccess('')}>{_success} }
+ { _404error &&
+ {
+ set404Error('');
+ history.push({
+ pathname: "/p-account/meeting"
+ });
+ }}>
+ {_404error}
+
+ }
diff --git a/backend/resources/js/parent/profile/edit.jsx b/backend/resources/js/parent/profile/edit.jsx
index dea9305f..3c64b120 100644
--- a/backend/resources/js/parent/profile/edit.jsx
+++ b/backend/resources/js/parent/profile/edit.jsx
@@ -19,6 +19,7 @@ const ProfileEdit = () => {
const [_success, setSuccess] = useState('');
const [_400error, set400Error] = useState('');
+ const [_404error, set404Error] = useState('');
const [_422errors, set422Errors] = useState({
company: '',
email:'',
@@ -44,7 +45,14 @@ const ProfileEdit = () => {
else {
set400Error("失敗しました。");
}
- });
+ })
+ .catch(err=>{
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+ if(err.response.status==404){
+ set404Error(err.response.data.message);
+ }
+ })
}, []);
const handleSubmit = (e) => {
@@ -161,6 +169,16 @@ const ProfileEdit = () => {
}
{ _400error && set400Error('')}>{_400error} }
{ _success && setSuccess('') }>{_success} }
+ { _404error &&
+ {
+ set404Error('');
+ history.push({
+ pathname: "/p-account/profile"
+ });
+ }}>
+ {_404error}
+
+ }
diff --git a/backend/resources/js/parent/profile/index.jsx b/backend/resources/js/parent/profile/index.jsx
index 98c84e1a..fc1faf1e 100644
--- a/backend/resources/js/parent/profile/index.jsx
+++ b/backend/resources/js/parent/profile/index.jsx
@@ -9,32 +9,40 @@ import Alert from '../../component/alert';
import Notification from '../notification';
const Profile = (props) => {
-
+ const history = useHistory();
const [notice, setNotice] = useState(localStorage.getItem('notice'));
const [image, setImage] = useState('');
const [profile, setProfile] = useState({});
const [loaded, setLoaded] = useState(false);
const [_400error, set400Error] = useState('');
+ const [_404error, set404Error] = useState('');
const [_422errors, set422Errors] = useState({ image: '' });
const [_success, setSuccess] = useState(props.history.location.state);
const father_id = document.getElementById('father_id').value;
useEffect(() => {
- setLoaded(false);
- axios.get('/api/fathers/detail/'+father_id)
- .then(response => {
- setLoaded(true);
- setNotice(response.data.notice);
- if(response.data.status_code==200){
- setProfile(response.data.params);
- setImage(response.data.params.image);
- }
- else {
- set400Error("失敗しました。");
- }
- })
+ setLoaded(false);
+ axios.get('/api/fathers/detail/'+father_id)
+ .then(response => {
+ setLoaded(true);
+ setNotice(response.data.notice);
+ if(response.data.status_code==200){
+ setProfile(response.data.params);
+ setImage(response.data.params.image);
+ }
+ else {
+ set400Error("失敗しました。");
+ }
+ })
+ .catch(err=>{
+ setLoaded(true);
+ setNotice(err.response.data.notice);
+ if(err.response.status==404){
+ set404Error(err.response.data.message);
+ }
+ })
},[]);
useEffect(() => {
@@ -166,6 +174,16 @@ const Profile = (props) => {
}
{ _400error && set400Error('')}>{_400error} }
{ _success && setSuccess('') }>{_success} }
+ { _404error &&
+ {
+ set404Error('');
+ history.push({
+ pathname: "/p-account/profile"
+ });
+ }}>
+ {_404error}
+
+ }