diff --git a/backend/public/js/app.js b/backend/public/js/app.js
index 9fee1699..224ca0d9 100644
--- a/backend/public/js/app.js
+++ b/backend/public/js/app.js
@@ -15297,11 +15297,12 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export */ "default": () => (/* binding */ AdminApp)
/* 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_4__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.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_5__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js");
/* harmony import */ var _meeting__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./meeting */ "./resources/js/admin/meeting/index.jsx");
-/* harmony import */ var _side__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./side */ "./resources/js/admin/side.jsx");
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
+/* harmony import */ var _meeting_detail__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./meeting/detail */ "./resources/js/admin/meeting/detail.jsx");
+/* harmony import */ var _side__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./side */ "./resources/js/admin/side.jsx");
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -15331,6 +15332,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
+
var AdminApp = /*#__PURE__*/function (_Component) {
_inherits(AdminApp, _Component);
@@ -15345,16 +15347,20 @@ var AdminApp = /*#__PURE__*/function (_Component) {
_createClass(AdminApp, [{
key: "render",
value: function render() {
- return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("main", {
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("main", {
className: "l-container meeting-consent",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.BrowserRouter, {
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Switch, {
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Route, {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.BrowserRouter, {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_6__.Switch, {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_6__.Route, {
exact: true,
path: "/admin/meeting",
component: _meeting__WEBPACK_IMPORTED_MODULE_1__.default
- })
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_side__WEBPACK_IMPORTED_MODULE_2__.default, {})]
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_6__.Route, {
+ exact: true,
+ path: "/admin/meeting/detail/:meeting_id",
+ component: _meeting_detail__WEBPACK_IMPORTED_MODULE_2__.default
+ })]
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_side__WEBPACK_IMPORTED_MODULE_3__.default, {})]
})
});
}
@@ -15550,6 +15556,560 @@ if (document.getElementById('admin-login')) {
/***/ }),
+/***/ "./resources/js/admin/meeting/detail.jsx":
+/*!***********************************************!*\
+ !*** ./resources/js/admin/meeting/detail.jsx ***!
+ \***********************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+/* harmony import */ var _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/regenerator */ "./node_modules/@babel/runtime/regenerator/index.js");
+/* harmony import */ var _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ "./node_modules/react/index.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 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 _component_modal_confirm__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../component/modal_confirm */ "./resources/js/component/modal_confirm.jsx");
+/* harmony import */ var _component_modal_alert__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../component/modal_alert */ "./resources/js/component/modal_alert.jsx");
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js");
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__ = __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); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+
+
+
+
+
+
+
+
+
+var MeetingDetail = function MeetingDetail(props) {
+ var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_7__.useHistory)();
+
+ var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
+ _useState2 = _slicedToArray(_useState, 2),
+ show = _useState2[0],
+ setShow = _useState2[1];
+
+ var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
+ _useState4 = _slicedToArray(_useState3, 2),
+ showAlert = _useState4[0],
+ setShowAlert = _useState4[1];
+
+ var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
+ _useState6 = _slicedToArray(_useState5, 2),
+ messageAlert = _useState6[0],
+ setMessageAlert = _useState6[1];
+
+ var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
+ _useState8 = _slicedToArray(_useState7, 2),
+ typeAlert = _useState8[0],
+ setTypeAlert = _useState8[1];
+
+ var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
+ _useState10 = _slicedToArray(_useState9, 2),
+ meeting = _useState10[0],
+ setMeeting = _useState10[1];
+
+ (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
+ var _props$match$params;
+
+ axios__WEBPACK_IMPORTED_MODULE_3___default().get("/api/meetings/detail/".concat((_props$match$params = props.match.params) === null || _props$match$params === void 0 ? void 0 : _props$match$params.id), {
+ params: {
+ father_id: 1
+ }
+ }).then(function (response) {
+ if (response.data.status_code == 200) {
+ console.log(response.data.params[0]);
+ setMeeting(response.data.params[0]);
+ } else if (response.data.status_code == 400) {//TODO
+ }
+ });
+ }, []);
+
+ function showModal() {
+ return _showModal.apply(this, arguments);
+ }
+
+ function _showModal() {
+ _showModal = _asyncToGenerator( /*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default().mark(function _callee() {
+ return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default().wrap(function _callee$(_context) {
+ while (1) {
+ switch (_context.prev = _context.next) {
+ case 0:
+ setShow(true);
+
+ case 1:
+ case "end":
+ return _context.stop();
+ }
+ }
+ }, _callee);
+ }));
+ return _showModal.apply(this, arguments);
+ }
+
+ ;
+
+ function handleClose() {
+ return _handleClose.apply(this, arguments);
+ }
+
+ function _handleClose() {
+ _handleClose = _asyncToGenerator( /*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default().mark(function _callee2() {
+ return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default().wrap(function _callee2$(_context2) {
+ while (1) {
+ switch (_context2.prev = _context2.next) {
+ case 0:
+ setShow(false);
+
+ case 1:
+ case "end":
+ return _context2.stop();
+ }
+ }
+ }, _callee2);
+ }));
+ return _handleClose.apply(this, arguments);
+ }
+
+ ;
+
+ function handleAccept() {
+ return _handleAccept.apply(this, arguments);
+ }
+
+ function _handleAccept() {
+ _handleAccept = _asyncToGenerator( /*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default().mark(function _callee3() {
+ var _props$match$params3;
+
+ return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default().wrap(function _callee3$(_context3) {
+ while (1) {
+ switch (_context3.prev = _context3.next) {
+ case 0:
+ try {
+ axios__WEBPACK_IMPORTED_MODULE_3___default().delete("/api/meetings/delete/".concat((_props$match$params3 = props.match.params) === null || _props$match$params3 === void 0 ? void 0 : _props$match$params3.id)).then(function (response) {
+ if (response.data.status_code == 200) {
+ var _props$match$params4, _props$match$params5;
+
+ axios__WEBPACK_IMPORTED_MODULE_3___default().delete("/api/meeting-images/deleteRelationMeeting/".concat((_props$match$params4 = props.match.params) === null || _props$match$params4 === void 0 ? void 0 : _props$match$params4.id)).then(function (response) {});
+ axios__WEBPACK_IMPORTED_MODULE_3___default().delete("/api/meeting-approvals/deleteRelationMeeting/".concat((_props$match$params5 = props.match.params) === null || _props$match$params5 === void 0 ? void 0 : _props$match$params5.id)).then(function (response) {
+ setMessageAlert("ミーティングの削除に成功しました！");
+ setTypeAlert("success");
+ });
+ } else {
+ setMessageAlert("ミーティングの削除に失敗しました。");
+ setTypeAlert("danger");
+ }
+
+ setShowAlert(true);
+ });
+ setShow(false);
+ } catch (error) {
+ console.log('error', error);
+ }
+
+ case 1:
+ case "end":
+ return _context3.stop();
+ }
+ }
+ }, _callee3);
+ }));
+ return _handleAccept.apply(this, arguments);
+ }
+
+ ;
+
+ function handleCloseAlert() {
+ return _handleCloseAlert.apply(this, arguments);
+ }
+
+ function _handleCloseAlert() {
+ _handleCloseAlert = _asyncToGenerator( /*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default().mark(function _callee4() {
+ return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default().wrap(function _callee4$(_context4) {
+ while (1) {
+ switch (_context4.prev = _context4.next) {
+ case 0:
+ setShowAlert(false);
+
+ case 1:
+ case "end":
+ return _context4.stop();
+ }
+ }
+ }, _callee4);
+ }));
+ return _handleCloseAlert.apply(this, arguments);
+ }
+
+ ;
+ if (!meeting) return null;
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
+ className: "l-content",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
+ className: "l-content-w560",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
+ className: "l-content__ttl",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "l-content__ttl__left",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("h2", {
+ children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u8A73\u7D30"
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "p-notification",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "p-notification-icon",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
+ className: "p-notification-icon-wrap",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "count",
+ children: "1"
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "p-notification-icon-bg"
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("svg", {
+ xmlns: "http://www.w3.org/2000/svg",
+ viewBox: "0 0 22.742 19.855",
+ className: "icon svg-icon svg-fill svg-y50",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("g", {
+ fill: "none",
+ stroke: "#080808",
+ strokeLinecap: "round",
+ strokeLinejoin: "round",
+ strokeWidth: "1.5",
+ "data-name": "Icon feather-alert-triangle",
+ transform: "translate(0.777 0.75)",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("path", {
+ d: "M11.188,5.322,2.6,19.659A2.028,2.028,0,0,0,4.334,22.7H21.51a2.028,2.028,0,0,0,1.734-3.042L14.656,5.322a2.028,2.028,0,0,0-3.468,0Z",
+ "data-name": "\u30D1\u30B9 3",
+ transform: "translate(-2.328 -4.346)"
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("path", {
+ d: "M18,13.5v6.91",
+ "data-name": "\u30D1\u30B9 4",
+ transform: "translate(-7.406 -8.547)"
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("path", {
+ d: "M18,25.5h0",
+ "data-name": "\u30D1\u30B9 5",
+ transform: "translate(-7.406 -11.2)"
+ })]
+ })
+ })]
+ })
+ })
+ })]
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "l-content-wrap",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "p-article",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "p-article-wrap",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("article", {
+ className: "p-article__body",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
+ className: "p-article__content",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "meeting-member",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "meeting-member-wrap",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
+ "data-url": "login.html",
+ className: "meeting-member-link",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("ul", {
+ className: "meeting-member-count",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "numerator",
+ children: "3"
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "denominator",
+ children: "4"
+ })]
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("ul", {
+ className: "meeting-member-list",
+ role: "list",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "meeting-member__item",
+ role: "listitem",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "avatar",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ alt: "name",
+ className: "avatar-img",
+ src: "../../../assets/img/avatar/avatar-sample01@2x.png"
+ })
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "meeting-member__item",
+ role: "listitem",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "avatar",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ alt: "name",
+ className: "avatar-img",
+ src: "../../../assets/img/avatar/avatar-sample02@2x.png"
+ })
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "meeting-member__item",
+ role: "listitem",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "avatar",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ alt: "name",
+ className: "avatar-img",
+ src: "../../../assets/img/avatar/avatar-sample03@2x.png"
+ })
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "meeting-member__item",
+ role: "listitem",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "avatar",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ alt: "name",
+ className: "avatar-img",
+ src: "../../../assets/img/avatar/avatar-sample01@2x.png"
+ })
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "meeting-member__item",
+ role: "listitem",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "avatar",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ alt: "name",
+ className: "avatar-img",
+ src: "../../../assets/img/avatar/avatar-sample02@2x.png"
+ })
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "meeting-member__item",
+ role: "listitem",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "avatar",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ alt: "name",
+ className: "avatar-img",
+ src: "../../../assets/img/avatar/avatar-sample03@2x.png"
+ })
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "meeting-member__item",
+ role: "listitem",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "avatar",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ alt: "name",
+ className: "avatar-img",
+ src: "../../../assets/img/avatar/avatar-sample01@2x.png"
+ })
+ })
+ })]
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "meeting-member__read",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("p", {
+ children: "3\u4EBA\u65E2\u8AAD"
+ })
+ })]
+ })
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("h3", {
+ className: "meeting-ttl",
+ children: meeting.title
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("time", {
+ dateTime: "2021-07-30",
+ className: "meeting-time",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("span", {
+ className: "meeting-date",
+ children: moment__WEBPACK_IMPORTED_MODULE_2___default()(meeting.updated_at).format('YYYY/MM/DD HH:mm') || ''
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("ul", {
+ className: "p-article-btn-list",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "p-article-btn__item",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("a", {
+ onClick: function onClick(e) {
+ var _props$match$params2;
+
+ e.preventDefault();
+ history.push({
+ pathname: "/p-account/meeting/edit/".concat((_props$match$params2 = props.match.params) === null || _props$match$params2 === void 0 ? void 0 : _props$match$params2.id),
+ state: {}
+ });
+ },
+ className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48",
+ children: "\u7DE8\u96C6"
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "p-article-btn__item",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("a", {
+ onClick: showModal,
+ className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48",
+ children: "\u524A\u9664"
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "p-article-btn__item",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("a", {
+ href: "",
+ className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48",
+ children: "\u8907\u88FD"
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("li", {
+ className: "p-article-btn__item",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("a", {
+ href: "",
+ className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48",
+ children: "\u518D\u901A\u77E5"
+ })
+ })]
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
+ className: "p-article__context",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
+ className: "p-file-list",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "p-file-for",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy01.jpg",
+ alt: ""
+ })
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
+ className: "p-file-nav",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy01.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy02.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy03.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy04.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy05.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy01.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy02.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy03.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy04.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy05.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy03.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy04.jpg",
+ alt: ""
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("figure", {
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("img", {
+ src: "../../../assets/img/dummy/post-dummy05.jpg",
+ alt: ""
+ })
+ })]
+ })]
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
+ className: "p-article__pdf",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
+ className: "p-article__pdf__btn",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("a", {
+ "data-v-ade1d018": "",
+ className: "btn-default btn-yellow btn-pdf btn-r8 btn-h52",
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("span", {
+ children: "PDF\u3092\u78BA\u8A8D\u3059\u308B"
+ })
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.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-star icon-star-wrap a-icon-size_medium"
+ })]
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("p", {
+ className: "p-article__txt",
+ children: meeting.text
+ })]
+ })]
+ })
+ })
+ })
+ })
+ })]
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_component_modal_confirm__WEBPACK_IMPORTED_MODULE_4__.default, {
+ show: show,
+ message: "本当に削除しても\nよろしいでしょうか？",
+ handleClose: handleClose,
+ handleAccept: handleAccept
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_component_modal_alert__WEBPACK_IMPORTED_MODULE_5__.default, {
+ show: showAlert,
+ message: messageAlert,
+ type: typeAlert,
+ handleClose: handleCloseAlert
+ })]
+ });
+};
+
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (MeetingDetail);
+
+/***/ }),
+
/***/ "./resources/js/admin/meeting/index.jsx":
/*!**********************************************!*\
!*** ./resources/js/admin/meeting/index.jsx ***!
@@ -15698,7 +16258,7 @@ var Meeting = function Meeting() {
onClick: function onClick(e) {
e.preventDefault();
history.push({
- pathname: "/p-account/meeting/detail/".concat(item.id),
+ pathname: "/admin/meeting/detail/".concat(item.id),
state: {}
});
},
@@ -15774,7 +16334,14 @@ var Meeting = function Meeting() {
})]
})
}, i);
- }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {})
+ }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
+ style: {
+ position: 'fixed',
+ left: 'calc( 50% - 20px)',
+ top: '45%'
+ },
+ children: [" ", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {})]
+ })
})
})]
})
diff --git a/backend/resources/js/admin/admin.js b/backend/resources/js/admin/admin.js
index 0af821a7..f80db516 100644
--- a/backend/resources/js/admin/admin.js
+++ b/backend/resources/js/admin/admin.js
@@ -3,6 +3,8 @@ import React, { Component } from 'react';
import { BrowserRouter, Route, Switch } from 'react-router-dom';
import Meeting from './meeting';
+import MeetingDetail from './meeting/detail';
+
import Side from './side';
export default class AdminApp extends Component {
@@ -12,6 +14,17 @@ export default class AdminApp extends Component {
+
+ {/*
+
+
+
+
+
+
+
+
+ */}
diff --git a/backend/resources/js/admin/meeting/detail.jsx b/backend/resources/js/admin/meeting/detail.jsx
new file mode 100644
index 00000000..354a74b6
--- /dev/null
+++ b/backend/resources/js/admin/meeting/detail.jsx
@@ -0,0 +1,225 @@
+import React, { useEffect, useState } from 'react';
+import moment from 'moment';
+import axios from 'axios';
+import ModalConfirm from '../../component/modal_confirm';
+import ModalAlert from '../../component/modal_alert';
+import { useHistory } from 'react-router-dom'
+
+const MeetingDetail = (props) => {
+ const history = useHistory();
+ const [show, setShow] = useState(false);
+ const [showAlert, setShowAlert] = useState(false);
+ const [messageAlert, setMessageAlert] = useState(null);
+ const [typeAlert, setTypeAlert] = useState(null);
+ const [meeting, setMeeting] = useState(null);
+ useEffect(() => {
+ axios.get(`/api/meetings/detail/${props.match.params?.id}`, {params: { father_id: 1 }}).then((response) => {
+ if(response.data.status_code==200){
+ console.log(response.data.params[0]);
+ setMeeting(response.data.params[0]);
+ } else if(response.data.status_code==400){
+ //TODO
+ }
+
+ });
+ }, []);
+
+ async function showModal() {
+ setShow(true);
+ };
+
+ async function handleClose() {
+ setShow(false);
+ };
+
+ async function handleAccept() {
+ try {
+ axios.delete(`/api/meetings/delete/${props.match.params?.id}`)
+ .then(response => {
+ if(response.data.status_code == 200){
+ axios.delete(`/api/meeting-images/deleteRelationMeeting/${props.match.params?.id}`)
+ .then(response => {});
+ axios.delete(`/api/meeting-approvals/deleteRelationMeeting/${props.match.params?.id}`)
+ .then(response => {
+ setMessageAlert("ミーティングの削除に成功しました！");
+ setTypeAlert("success");
+ });
+ } else {
+ setMessageAlert("ミーティングの削除に失敗しました。");
+ setTypeAlert("danger");
+ }
+ setShowAlert(true);
+ });
+ setShow(false);
+ } catch (error) {
+ console.log('error', error);
+ }
+ };
+
+ async function handleCloseAlert() {
+ setShowAlert(false);
+ };
+
+ if (!meeting) return null;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
{ meeting.title }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{ meeting.text }
+
+
+
+
+
+
+
+
+
}
diff --git a/backend/resources/views/admin/parent/new.blade.php b/backend/resources/views/admin/child/edit_password.blade.php
similarity index 100%
rename from backend/resources/views/admin/parent/new.blade.php
rename to backend/resources/views/admin/child/edit_password.blade.php
diff --git a/backend/resources/views/admin/meeting/detail.blade.php b/backend/resources/views/admin/meeting/detail.blade.php
index e69de29b..8e7595ae 100644
--- a/backend/resources/views/admin/meeting/detail.blade.php
+++ b/backend/resources/views/admin/meeting/detail.blade.php
@@ -0,0 +1,8 @@
+@extends('admin.layout')
+
+@section('title', 'ミーティング一覧')
+
+@section('content')
+
+
+@endsection
diff --git a/backend/resources/views/admin/meeting/edit.blade.php b/backend/resources/views/admin/meeting/edit.blade.php
index e69de29b..3678602f 100644
--- a/backend/resources/views/admin/meeting/edit.blade.php
+++ b/backend/resources/views/admin/meeting/edit.blade.php
@@ -0,0 +1,8 @@
+@extends('admin.layout')
+
+@section('title', 'ミーティング編集')
+
+@section('content')
+
+
+@endsection
diff --git a/backend/resources/views/admin/parent/edit_password.blade.php b/backend/resources/views/admin/parent/edit_password.blade.php
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/resources/views/admin/parent/register.blade.php b/backend/resources/views/admin/parent/register.blade.php
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/routes/web.php b/backend/routes/web.php
index 83a26d76..d34221dd 100644
--- a/backend/routes/web.php
+++ b/backend/routes/web.php
@@ -29,7 +29,7 @@ Route::get('/register/c-account/complete', function () { return vi
Route::get('/register/c-account/error', function () { return view('c_account.auth.register.error'); });
Route::get('/login/c-account', function () { return view('c_account.auth.login.index'); });
Route::get('/forgot-password/c-account', function () { return view('c_account.auth.forgot_password.index'); });
-Route::get('/forgot-password/c-account/reset', function () { return view('c_account.auth.forgot_password.reset'); });
+Route::get('/forgot-password/c-account/reset/{token}', function () { return view('c_account.auth.forgot_password.reset'); });
Route::get('/forgot-password/c-account/complete', function () { return view('c_account.auth.forgot_password.complete'); });
Route::get('/c-account/meeting', function () { return view('c_account.meeting.index'); });
@@ -48,5 +48,20 @@ Route::get('/withdrawal/complete', function () { return view
//--------------------------Admin Account----------------------------------------//
-Route::get('/login/admin', function () { return view('admin.login.index'); });
-Route::get('/admin/meeting', function () { return view('admin.meeting.index'); });
+Route::get('/login/admin', function () { return view('admin.login.index'); });
+Route::get('/admin/meeting', function () { return view('admin.meeting.index'); });
+Route::get('/admin/meeting/detail/{meeting_id}', function () { return view('admin.meeting.detail'); });
+Route::get('/admin/meeting/edit/{meeting_id}', function () { return view('admin.meeting.edit'); });
+
+Route::get('/admin/parent', function () { return view('admin.parent.index'); });
+Route::get('/admin/parent/detail/{father_id}', function () { return view('admin.parent.detail'); });
+Route::get('/admin/parent/edit/{father_id}', function () { return view('admin.parent.edit'); });
+Route::get('/admin/parent/edit/password/{father_id}', function () { return view('admin.parent.edit_password'); });
+Route::get('/admin/parent/register', function () { return view('admin.parent.register'); });
+
+Route::get('/admin/child', function () { return view('admin.child.index'); });
+Route::get('/admin/child/detail/{child_id}', function () { return view('admin.child.detail'); });
+Route::get('/admin/child/edit/{child_id}', function () { return view('admin.child.edit'); });
+Route::get('/admin/child/edit/password/{child_id}', function () { return view('admin.child.edit_password'); });
+
+