add login-success-alert in c-acount/meeting
このコミットが含まれているのは:
コミット
dd8018c2ff
|
@ -40920,7 +40920,7 @@ var ChildLogin = function ChildLogin() {
|
|||
_422errors = _useState8[0],
|
||||
set422Errors = _useState8[1];
|
||||
|
||||
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
|
||||
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
|
||||
_useState10 = _slicedToArray(_useState9, 2),
|
||||
_400error = _useState10[0],
|
||||
set400Error = _useState10[1];
|
||||
|
@ -40951,7 +40951,7 @@ var ChildLogin = function ChildLogin() {
|
|||
break;
|
||||
|
||||
case 400:
|
||||
set400Error(response.data.error_messages);
|
||||
set400Error(response.data.error_message[0]);
|
||||
break;
|
||||
}
|
||||
})["catch"](function (err) {
|
||||
|
@ -41046,7 +41046,7 @@ var ChildLogin = function ChildLogin() {
|
|||
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
|
||||
type: "fail",
|
||||
hide: function hide() {
|
||||
return set400Error('');
|
||||
return set400Error(null);
|
||||
},
|
||||
children: _400error
|
||||
})]
|
||||
|
@ -42254,12 +42254,13 @@ __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_6__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
|
||||
/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
|
||||
/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! moment */ "./node_modules/moment/moment.js");
|
||||
/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_2__);
|
||||
/* 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 _material_ui_core__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js");
|
||||
/* harmony import */ var _component_notification__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../component/notification */ "./resources/js/component/notification.jsx");
|
||||
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
|
||||
/* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx");
|
||||
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
|
||||
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
||||
|
||||
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
||||
|
@ -42281,6 +42282,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|||
|
||||
|
||||
|
||||
|
||||
var Meeting = function Meeting() {
|
||||
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
|
||||
_useState2 = _slicedToArray(_useState, 2),
|
||||
|
@ -42302,6 +42304,17 @@ var Meeting = function Meeting() {
|
|||
meeting_list_approval = _useState8[0],
|
||||
setMettingListApproval = _useState8[1];
|
||||
|
||||
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
|
||||
_useState10 = _slicedToArray(_useState9, 2),
|
||||
_success = _useState10[0],
|
||||
setSuccess = _useState10[1];
|
||||
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
if (localStorage.getItem("from_login")) {
|
||||
setSuccess("ログインに成功しました!");
|
||||
localStorage.removeItem("from_login");
|
||||
}
|
||||
}, []);
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
setLoaded(false);
|
||||
var child_id = document.getElementById('child_id').value;
|
||||
|
@ -42336,60 +42349,60 @@ var Meeting = function Meeting() {
|
|||
return console.log(err);
|
||||
});
|
||||
}, []);
|
||||
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
|
||||
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
|
||||
className: "l-content",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
|
||||
className: "l-content__ttl",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
|
||||
className: "l-content__ttl__left",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("h2", {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("h2", {
|
||||
children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u4E00\u89A7"
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_notification__WEBPACK_IMPORTED_MODULE_3__.default, {})]
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_notification__WEBPACK_IMPORTED_MODULE_3__.default, {})]
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
|
||||
className: "l-content-wrap",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("section", {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("section", {
|
||||
className: "meeting-tab-container position-relative",
|
||||
style: {
|
||||
minHeight: '250px'
|
||||
},
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
|
||||
className: "meeting-tab-wrap",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
|
||||
className: "meeting-head",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", {
|
||||
className: "tab-switch",
|
||||
id: "tab-01",
|
||||
type: "radio",
|
||||
name: "tab_btn"
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", {
|
||||
className: "tab-switch",
|
||||
id: "tab-02",
|
||||
type: "radio",
|
||||
name: "tab_btn"
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
|
||||
className: "meeting-tab",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("label", {
|
||||
className: "tab-label ".concat(!tab_status && 'is-active', " "),
|
||||
htmlFor: "tab-01",
|
||||
onClick: function onClick() {
|
||||
return setTabStatus(false);
|
||||
},
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
|
||||
children: "\u672A\u627F\u77E5"
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("label", {
|
||||
className: "tab-label ".concat(tab_status && 'is-active', " "),
|
||||
htmlFor: "tab-02",
|
||||
onClick: function onClick() {
|
||||
return setTabStatus(true);
|
||||
},
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
|
||||
children: "\u627F\u77E5\u6E08\u307F"
|
||||
})
|
||||
})]
|
||||
})]
|
||||
}), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_5__.default, {
|
||||
}), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
|
||||
color: "secondary",
|
||||
style: {
|
||||
top: 'calc(50% - 22px)',
|
||||
|
@ -42397,63 +42410,63 @@ var Meeting = function Meeting() {
|
|||
color: 'green',
|
||||
position: 'absolute'
|
||||
}
|
||||
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
|
||||
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
|
||||
className: "meeting-content",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
|
||||
className: "meeting-content-wrap ".concat(!tab_status && 'is-active'),
|
||||
id: "item01",
|
||||
children: meeting_list_non_approval === null || meeting_list_non_approval === void 0 ? void 0 : meeting_list_non_approval.map(function (item, id) {
|
||||
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
|
||||
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
|
||||
className: "meeting-item",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
|
||||
className: "user-wrap user-sm",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_6__.Link, {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_7__.Link, {
|
||||
to: {
|
||||
pathname: "/c-account/parent/detail/".concat(item.father_id),
|
||||
state: {
|
||||
tab_status: true
|
||||
}
|
||||
},
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
|
||||
className: "user-avatar",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("img", {
|
||||
alt: "name",
|
||||
className: "father-img",
|
||||
src: item.fathers.image
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
|
||||
className: "user-name",
|
||||
children: item.fathers.company
|
||||
})]
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_6__.Link, {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_7__.Link, {
|
||||
to: "/c-account/meeting/detail/".concat(item.id),
|
||||
className: "meeting-link",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("h3", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("h3", {
|
||||
className: "meeting-ttl",
|
||||
children: item.title
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
|
||||
className: "meeting-txt",
|
||||
children: item.text
|
||||
})]
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
|
||||
className: "user-date",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("time", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("time", {
|
||||
dateTime: "2021-07-30",
|
||||
className: "user-updated-time",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("span", {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("span", {
|
||||
className: "user-updated",
|
||||
children: ["\u6700\u7D42\u66F4\u65B0\u65E5\uFF1A", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
|
||||
children: ["\u6700\u7D42\u66F4\u65B0\u65E5\uFF1A", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
|
||||
className: "date",
|
||||
children: moment__WEBPACK_IMPORTED_MODULE_2___default()(item.updated_at).format('YYYY/MM/DD')
|
||||
})]
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("time", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("time", {
|
||||
dateTime: "2021-07-30",
|
||||
className: "user-awareness-time",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("span", {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("span", {
|
||||
className: "user-awareness",
|
||||
children: ["\u627F\u77E5\u65E5\uFF1A", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
|
||||
children: ["\u627F\u77E5\u65E5\uFF1A", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
|
||||
className: "date"
|
||||
})]
|
||||
})
|
||||
|
@ -42461,56 +42474,56 @@ var Meeting = function Meeting() {
|
|||
})]
|
||||
}, id);
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
|
||||
className: "meeting-content-wrap ".concat(tab_status && 'is-active'),
|
||||
id: "item02",
|
||||
children: meeting_list_approval === null || meeting_list_approval === void 0 ? void 0 : meeting_list_approval.map(function (item, id) {
|
||||
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
|
||||
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
|
||||
className: "meeting-item",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
|
||||
className: "user-wrap user-sm",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_6__.Link, {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_7__.Link, {
|
||||
to: "/c-account/parent/detail/".concat(item.father_id),
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
|
||||
className: "user-avatar",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("img", {
|
||||
alt: "name",
|
||||
className: "father-img",
|
||||
src: item.fathers.image
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
|
||||
className: "user-name",
|
||||
children: item.fathers.company
|
||||
})]
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_6__.Link, {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_7__.Link, {
|
||||
to: "/c-account/meeting/detail/".concat(item.id),
|
||||
className: "meeting-link",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("h3", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("h3", {
|
||||
className: "meeting-ttl",
|
||||
children: item.title
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
|
||||
className: "meeting-txt",
|
||||
children: item.text
|
||||
})]
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
|
||||
className: "user-date",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("time", {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("time", {
|
||||
dateTime: "2021-07-30",
|
||||
className: "user-updated-time",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("span", {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("span", {
|
||||
className: "user-updated",
|
||||
children: ["\u6700\u7D42\u66F4\u65B0\u65E5\uFF1A", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
|
||||
children: ["\u6700\u7D42\u66F4\u65B0\u65E5\uFF1A", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
|
||||
className: "date",
|
||||
children: moment__WEBPACK_IMPORTED_MODULE_2___default()(item.updated_at).format('YYYY/MM/DD')
|
||||
})]
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("time", {
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("time", {
|
||||
dateTime: "2021-07-30",
|
||||
className: "user-awareness-time",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("span", {
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("span", {
|
||||
className: "user-awareness",
|
||||
children: ["\u627F\u77E5\u65E5\uFF1A", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
|
||||
children: ["\u627F\u77E5\u65E5\uFF1A", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
|
||||
className: "date",
|
||||
children: item.meeting_approvals && moment__WEBPACK_IMPORTED_MODULE_2___default()(item.meeting_approvals[0].approval_at).format('YYYY/MM/DD')
|
||||
})]
|
||||
|
@ -42521,11 +42534,14 @@ var Meeting = function Meeting() {
|
|||
})
|
||||
})]
|
||||
})]
|
||||
}), loaded && (meeting_list_non_approval.length == 0 && !tab_status || meeting_list_approval.length == 0 && tab_status) && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
|
||||
}), loaded && (meeting_list_non_approval.length == 0 && !tab_status || meeting_list_approval.length == 0 && tab_status) && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
|
||||
className: "text-center mt-5 ft-18",
|
||||
children: "\u30C7\u30FC\u30BF\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002"
|
||||
})]
|
||||
})
|
||||
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
|
||||
type: "success",
|
||||
children: _success
|
||||
})]
|
||||
});
|
||||
};
|
||||
|
|
|
@ -13,7 +13,7 @@ const ChildLogin = () => {
|
|||
const [password, setPassword] = useState('');
|
||||
|
||||
const [_422errors, set422Errors] = useState({tel: '', password: ''});
|
||||
const [_400error, set400Error] = useState('');
|
||||
const [_400error, set400Error] = useState(null);
|
||||
|
||||
|
||||
const handleSubmit = (e) => {
|
||||
|
@ -34,7 +34,7 @@ const ChildLogin = () => {
|
|||
break;
|
||||
}
|
||||
case 422: set422Errors(response.data.error_messages); break;
|
||||
case 400: set400Error(response.data.error_messages); break;
|
||||
case 400: set400Error(response.data.error_message[0]); break;
|
||||
}
|
||||
})
|
||||
.catch(err=>console.log(err))
|
||||
|
@ -95,7 +95,7 @@ const ChildLogin = () => {
|
|||
</Link>
|
||||
</div>
|
||||
{
|
||||
_400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert>
|
||||
_400error && <Alert type="fail" hide={()=>set400Error(null)}>{_400error}</Alert>
|
||||
}
|
||||
</form>
|
||||
)
|
||||
|
|
|
@ -5,6 +5,7 @@ import moment from 'moment';
|
|||
import { CircularProgress } from '@material-ui/core';
|
||||
|
||||
import Notification from '../../component/notification';
|
||||
import Alert from '../../component/alert';
|
||||
|
||||
|
||||
const Meeting = () => {
|
||||
|
@ -13,6 +14,15 @@ const Meeting = () => {
|
|||
const [loaded, setLoaded] = useState(false);
|
||||
const [meeting_list_non_approval, setMettingListNonApproval] = useState([]);
|
||||
const [meeting_list_approval, setMettingListApproval] = useState([]);
|
||||
const [_success, setSuccess] = useState('');
|
||||
|
||||
|
||||
useEffect(()=>{
|
||||
if(localStorage.getItem("from_login")){
|
||||
setSuccess("ログインに成功しました!");
|
||||
localStorage.removeItem("from_login");
|
||||
}
|
||||
},[]);
|
||||
|
||||
|
||||
useEffect(
|
||||
|
@ -152,6 +162,9 @@ const Meeting = () => {
|
|||
}
|
||||
</section>
|
||||
</div>
|
||||
{
|
||||
_success && <Alert type="success">{_success}</Alert>
|
||||
}
|
||||
</div>
|
||||
|
||||
)
|
||||
|
|
新しいイシューから参照