diff --git a/backend/public/css/app.css b/backend/public/css/app.css index 851ff8ac..066d606d 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -11268,10 +11268,22 @@ input[type=date].hide-calender::-webkit-inner-spin-button, input[type=date].hide font-size: 20px !important; } +.ft-25 { + font-size: 25px !important; +} + .ft-30 { font-size: 30px !important; } +.ft-35 { + font-size: 35px !important; +} + +.ft-40 { + font-size: 40px !important; +} + @media (max-width: 991.98px) { .ft-md-12 { font-size: 12px !important; @@ -12045,7 +12057,6 @@ a { } } .input-default { - border-radius: 18px !important; height: 50px; font-size: 18px; } @@ -12080,3 +12091,8 @@ a { .btn-shadow { box-shadow: 0 1px 8px rgba(0, 0, 0, 0.3) !important; } + +.btn-disabled { + background-color: #eaeff2; + color: #6f7372; +} diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 5a3b1669..9fee1699 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -15297,10 +15297,11 @@ __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 _login__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./login */ "./resources/js/admin/login/index.jsx"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.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 _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"); 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"); } } @@ -15328,6 +15329,8 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g + + var AdminApp = /*#__PURE__*/function (_Component) { _inherits(AdminApp, _Component); @@ -15342,13 +15345,16 @@ var AdminApp = /*#__PURE__*/function (_Component) { _createClass(AdminApp, [{ key: "render", value: function render() { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.BrowserRouter, { - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Switch, { - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Route, { - exact: true, - path: "/login/admin", - component: _login__WEBPACK_IMPORTED_MODULE_1__.default - }) + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.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, { + 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, {})] }) }); } @@ -15391,15 +15397,13 @@ if (document.getElementById('admin-app')) { "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 react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); -/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/Button/Button.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_4__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); +/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-dom */ "./node_modules/react-dom/index.js"); +/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/Button/Button.js"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(axios__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 react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); } function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } @@ -15419,7 +15423,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } -var Login = function Login() { + +var AdminLogin = function AdminLogin() { var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState2 = _slicedToArray(_useState, 2), email = _useState2[0], @@ -15455,7 +15460,7 @@ var Login = function Login() { var formdata = new FormData(); formdata.append('email', email); formdata.append('password', password); - axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/admin/login', formdata).then(function (response) { + axios__WEBPACK_IMPORTED_MODULE_2___default().post('/api/admin/login', formdata).then(function (response) { if (response.data.status_code == 200) { window.location.href = ''; } else if (response.data.status_code == 422) { @@ -15470,22 +15475,22 @@ var Login = function Login() { }); }; - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("form", { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("form", { onSubmit: handleSubmit, noValidate: true, - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("p", { - className: "text-center font-weight-bold ft-20 pb-40-px", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("h1", { + className: "text-center font-weight-bold ft-25 pb-40-px", children: "\u7BA1\u7406\u8005\u30ED\u30B0\u30A4\u30F3" - }), _400error.length != 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("span", { + }), _400error.length != 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { className: "l-alert__text--error ft-16 ft-md-14", children: _400error - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { className: "edit-set", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("label", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("label", { htmlFor: "email", className: "control-label ft-md-12", children: "\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("input", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("input", { type: "email", name: "email", id: "email", @@ -15495,17 +15500,17 @@ var Login = function Login() { return setEmail(e.target.value); }, autoFocus: true - }), _422errors.email && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("span", { + }), _422errors.email && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { className: "l-alert__text--error ft-16 ft-md-14", children: _422errors.email })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { className: "edit-set", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("label", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("label", { htmlFor: "password", className: "control-label ft-14 ft-md-12", children: " \u30D1\u30B9\u30EF\u30FC\u30C9 " - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("input", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("input", { type: "password", name: "password", id: "password", @@ -15515,30 +15520,385 @@ var Login = function Login() { return setPassword(e.target.value); }, autoFocus: true - }), _422errors.password && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("span", { + }), _422errors.password && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { className: "l-alert__text--error ft-16 ft-md-14", children: _422errors.password })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "mt-5", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_3__.default, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_4__.default, { type: "submit", fullWidth: true, className: "p-4 rounded-20 ft-15 font-weight-bold text-black bg-color-2", children: " \u30ED\u30B0\u30A4\u30F3 " }) - }), loading && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", { + }), loading && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { style: { position: 'fixed', left: 'calc( 50% - 20px)', top: '45%' }, - children: [" ", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_4__.default, {})] + children: [" ", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_5__.default, {})] + })] + }); +}; // ---------------------------------------------------------------------- + + +if (document.getElementById('admin-login')) { + react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(AdminLogin, {}), document.getElementById('admin-login')); +} + +/***/ }), + +/***/ "./resources/js/admin/meeting/index.jsx": +/*!**********************************************!*\ + !*** ./resources/js/admin/meeting/index.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 react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.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 moment__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! moment */ "./node_modules/moment/moment.js"); +/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_1__); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_2__); +/* 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 _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"); +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 Meeting = function Meeting() { + var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_5__.useHistory)(); + + var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), + _useState2 = _slicedToArray(_useState, 2), + keyword = _useState2[0], + setKeyword = _useState2[1]; + + var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(true), + _useState4 = _slicedToArray(_useState3, 2), + loading = _useState4[0], + setLoading = _useState4[1]; + + var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false), + _useState6 = _slicedToArray(_useState5, 2), + finish = _useState6[0], + setFinish = _useState6[1]; + + var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null), + _useState8 = _slicedToArray(_useState7, 2), + completeOfFather = _useState8[0], + setCompleteOfFather = _useState8[1]; + + var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null), + _useState10 = _slicedToArray(_useState9, 2), + inCompleteOfFather = _useState10[0], + setInCompleteOfFather = _useState10[1]; + + (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { + axios__WEBPACK_IMPORTED_MODULE_2___default().get('/api/meetings/listOfCompleteOfFather', { + params: { + father_id: 1 + } + }).then(function (response) { + if (response.data.status_code == 200) { + console.log(response.data.params); + } else if (response.data.status_code == 400) {//TODO + } + + setCompleteOfFather(response.data.params); + }); + }, []); + (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { + axios__WEBPACK_IMPORTED_MODULE_2___default().get('/api/meetings/listOfIncompleteOfFather', { + params: { + father_id: 1 + } + }).then(function (response) { + if (response.data.status_code == 200) { + console.log(response.data.params); + setInCompleteOfFather(response.data.params); + setLoading(false); + } else if (response.data.status_code == 400) {//TODO + } + }); + }, []); + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { + className: "l-content", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { + className: "l-content__ttl", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "l-content__ttl__left", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.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", { + className: "l-content-wrap", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "meeting-tab-container", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { + className: "meeting-tab-wrap", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "meeting-head", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("form", { + action: "", + className: "meeting-form", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", { + className: "control-label", + htmlFor: "keyword", + children: "\u30AD\u30FC\u30EF\u30FC\u30C9" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", { + type: "search", + name: "keyword", + className: "input-default input-keyword input-w380", + id: "keyword", + value: keyword, + onChange: function onChange(e) { + return setKeyword(e.target.value); + } + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("i", { + className: "icon icon-search" + })] + }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "meeting-content", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "meeting-content-wrap ".concat(!finish ? "is-active" : ""), + id: "item01", + children: !loading ? inCompleteOfFather === null || inCompleteOfFather === void 0 ? void 0 : inCompleteOfFather.map(function (item, i) { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "meeting-item", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("a", { + className: "meeting-link", + onClick: function onClick(e) { + e.preventDefault(); + history.push({ + pathname: "/p-account/meeting/detail/".concat(item.id), + state: {} + }); + }, + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("h3", { + className: "meeting-ttl", + children: item.title + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", { + className: "meeting-txt", + children: item.text + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("time", { + dateTime: "2021-07-30", + className: "meeting-time", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { + className: "meeting-date", + children: moment__WEBPACK_IMPORTED_MODULE_1___default()(item.updated_at).format('YYYY/MM/DD') || '' + }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "meeting-member", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "meeting-member-wrap", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { + "data-url": "login.html", + className: "meeting-member-link", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("ul", { + className: "meeting-member-count", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("li", { + className: "numerator", + children: "3" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("li", { + className: "denominator", + children: "4" + })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("ul", { + className: "meeting-member-list", + role: "list", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("li", { + className: "meeting-member__item", + role: "listitem", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "avatar", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", { + alt: "name", + className: "avatar-img", + src: "../assets/img/avatar/avatar-sample01@2x.png" + }) + }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("li", { + className: "meeting-member__item", + role: "listitem", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "avatar", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", { + alt: "name", + className: "avatar-img", + src: "../assets/img/avatar/avatar-sample02@2x.png" + }) + }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("li", { + className: "meeting-member__item", + role: "listitem", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "avatar", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", { + alt: "name", + className: "avatar-img", + src: "../assets/img/avatar/avatar-sample03@2x.png" + }) + }) + })] + })] + }) + }) + })] + }) + }, i); + }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {}) + }) + })] + }) + }) })] }); }; -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Login); +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Meeting); + +/***/ }), + +/***/ "./resources/js/admin/side.jsx": +/*!*************************************!*\ + !*** ./resources/js/admin/side.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": () => (/* binding */ Side) +/* 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_2__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); +/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __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."); } + +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; } + + + + + +function Side() { + var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), + _useState2 = _slicedToArray(_useState, 2), + selected = _useState2[0], + setSelected = _useState2[1]; + + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { + className: "l-side", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { + className: "l-side-logo", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("a", { + href: "", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("img", { + src: "/assets/img/common/logo.svg", + alt: "\u30ED\u30B4" + }) + }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("nav", { + className: "mypage-nav", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("ul", { + className: "mypage-nav-list", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("li", { + className: "mypage-nav-list__item -meeting ".concat((selected == 'meeting' || selected == '' && document.getElementById('admin_router').value == 'meeting') && "nav-active"), + onClick: function onClick(e) { + e.preventDefault(); + setSelected('meeting'); + }, + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { + className: "mypage-nav-list__link", + to: "/admin/meeting", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { + className: "icon meeting" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", { + children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0" + })] + }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("li", { + className: "mypage-nav-list__item -childinfo ".concat((selected == 'child' || selected == '' && document.getElementById('admin_router').value == 'child') && "nav-active"), + onClick: function onClick(e) { + e.preventDefault(); + setSelected('parent'); + }, + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { + className: "mypage-nav-list__link", + to: "/admin/child", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { + className: "icon parents" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", { + children: "\u5B50\u60C5\u5831" + })] + }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("li", { + className: "mypage-nav-list__item -parentinfo ".concat((selected == 'parent' || selected == '' && document.getElementById('admin_router').value == 'parent') && "nav-active"), + onClick: function onClick(e) { + e.preventDefault(); + setSelected('parent'); + }, + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { + className: "mypage-nav-list__link", + to: "/admin/parent", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { + className: "icon parents" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", { + children: "\u89AA\u60C5\u5831" + })] + }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("li", { + className: "mypage-nav-list__item -logout", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("a", { + href: "", + className: "mypage-nav-list__link", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { + className: "icon log-out" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", { + children: "\u30ED\u30B0\u30A2\u30A6\u30C8" + })] + }) + })] + }) + })] + }); +} /***/ }), @@ -15563,6 +15923,8 @@ __webpack_require__(/*! ./child/auth */ "./resources/js/child/auth/index.js"); __webpack_require__(/*! ./admin */ "./resources/js/admin/index.jsx"); +__webpack_require__(/*! ./admin/login */ "./resources/js/admin/login/index.jsx"); + /***/ }), /***/ "./resources/js/bootstrap.js": @@ -16458,43 +16820,49 @@ var SignUp = function SignUp() { var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState6 = _slicedToArray(_useState5, 2), - email = _useState6[0], - setEmail = _useState6[1]; + identify = _useState6[0], + setIdentify = _useState6[1]; var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState8 = _slicedToArray(_useState7, 2), - password = _useState8[0], - setPassword = _useState8[1]; + email = _useState8[0], + setEmail = _useState8[1]; var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState10 = _slicedToArray(_useState9, 2), - company = _useState10[0], - setCompany = _useState10[1]; + password = _useState10[0], + setPassword = _useState10[1]; var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState12 = _slicedToArray(_useState11, 2), - image = _useState12[0], - setImage = _useState12[1]; + company = _useState12[0], + setCompany = _useState12[1]; - var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({ + var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), + _useState14 = _slicedToArray(_useState13, 2), + image = _useState14[0], + setImage = _useState14[1]; + + var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({ first_name: '', last_name: '', + identify: '', email: '', password: '', image: '', company: '' }), - _useState14 = _slicedToArray(_useState13, 2), - errors = _useState14[0], - setErrors = _useState14[1]; + _useState16 = _slicedToArray(_useState15, 2), + errors = _useState16[0], + setErrors = _useState16[1]; - var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({ + var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({ status: '', msg: '' }), - _useState16 = _slicedToArray(_useState15, 2), - err_msg = _useState16[0], - setErrMsg = _useState16[1]; + _useState18 = _slicedToArray(_useState17, 2), + err_msg = _useState18[0], + setErrMsg = _useState18[1]; var handleSubmit = function handleSubmit(e) { e.preventDefault(); @@ -16506,6 +16874,7 @@ var SignUp = function SignUp() { var formdata = new FormData(); formdata.append('first_name', first_name); formdata.append('last_name', last_name); + formdata.append('identify', identify); formdata.append('email', email); formdata.append('password', password); formdata.append('company', company); @@ -16558,6 +16927,11 @@ var SignUp = function SignUp() { errors['last_name'] = 'Required'; } else errors['last_name'] = ''; + if (identify.length == 0) { + formIsValid = false; + errors['identify'] = 'Required'; + } else errors['identify'] = ''; + if (password.length < 8) { formIsValid = false; errors['password'] = 'Required'; @@ -16670,6 +17044,25 @@ var SignUp = function SignUp() { className: "l-alert__text--error ft-16 ft-md-14", children: errors['last_name'] })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { + className: "edit-set", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("label", { + htmlFor: "identify", + className: "control-label ft-12", + children: " ID " + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("input", { + type: "text", + name: "identify", + id: "identify", + className: "input-default input-nameSei ".concat(errors['identify'].length != 0 && "is-invalid c-input__target"), + value: identify, + onChange: function onChange(e) { + return setIdentify(e.target.value); + } + }), errors['identify'].length != 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { + className: "l-alert__text--error ft-16 ft-md-14", + children: errors['identify'] + })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { className: "edit-set", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("label", { @@ -17266,19 +17659,29 @@ var MeetingDetail = function MeetingDetail(props) { }) })] })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", { className: "p-article__pdf", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { + className: "p-article__pdf__btn mr-2", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("a", { + href: "/assets/img/dummy/sample.pdf", + className: "btn-default btn-disabled btn-pdf btn-r8 btn-h60 h-xs-45-px", + target: "_blank", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { + children: "PDF\u3092\u78BA\u8A8D\u3059\u308B" + }) + }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { className: "p-article__pdf__btn mr-0", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("a", { href: "/assets/img/dummy/sample.pdf", className: "btn-default btn-yellow btn-pdf btn-r8 btn-h60 h-xs-45-px", target: "_blank", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { - children: "PDF\u3092\u78BA\u8A8D\u3059\u308B" + children: "\u30E1\u30E2\u3092\u78BA\u8A8D\u3059\u308B" }) }) - }) + })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", { className: "p-article__txt", children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u8A73\u7D30\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u8A73\u7D30\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u8A73\u7D30\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u8A73\u7D30\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u8A73\u7D30\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u8A73\u7D30\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u3002" @@ -18132,48 +18535,54 @@ var ProfileEdit = function ProfileEdit() { var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState6 = _slicedToArray(_useState5, 2), - email = _useState6[0], - setEmail = _useState6[1]; + identify = _useState6[0], + setIdentify = _useState6[1]; var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState8 = _slicedToArray(_useState7, 2), - password = _useState8[0], - setPassword = _useState8[1]; + email = _useState8[0], + setEmail = _useState8[1]; var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState10 = _slicedToArray(_useState9, 2), - company = _useState10[0], - setCompany = _useState10[1]; + password = _useState10[0], + setPassword = _useState10[1]; var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState12 = _slicedToArray(_useState11, 2), - image = _useState12[0], - setImage = _useState12[1]; + company = _useState12[0], + setCompany = _useState12[1]; - var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({ + var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), + _useState14 = _slicedToArray(_useState13, 2), + image = _useState14[0], + setImage = _useState14[1]; + + var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({ first_name: '', last_name: '', + identify: '', email: '', password: '', image: '', company: '' }), - _useState14 = _slicedToArray(_useState13, 2), - errors = _useState14[0], - setErrors = _useState14[1]; + _useState16 = _slicedToArray(_useState15, 2), + errors = _useState16[0], + setErrors = _useState16[1]; - var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({ + var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({ status: '', msg: '' }), - _useState16 = _slicedToArray(_useState15, 2), - err_msg = _useState16[0], - setErrMsg = _useState16[1]; - - var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState18 = _slicedToArray(_useState17, 2), - submitStatus = _useState18[0], - setSubmitStatus = _useState18[1]; + err_msg = _useState18[0], + setErrMsg = _useState18[1]; + + var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), + _useState20 = _slicedToArray(_useState19, 2), + submitStatus = _useState20[0], + setSubmitStatus = _useState20[1]; var validateForm = function validateForm() { var errors = {}; @@ -18204,6 +18613,11 @@ var ProfileEdit = function ProfileEdit() { errors['first_name'] = 'Required'; } else errors['first_name'] = ''; + if (identify.length == 0) { + formIsValid = false; + errors['identify'] = 'Required'; + } else errors['identify'] = ''; + if (last_name.length == 0) { formIsValid = false; errors['last_name'] = 'Required'; @@ -18233,10 +18647,11 @@ var ProfileEdit = function ProfileEdit() { var formdata = new FormData(); formdata.append('first_name', first_name); formdata.append('last_name', last_name); + formdata.append('identify', identify); formdata.append('email', email); formdata.append('password', password); formdata.append('company', company); - formdata.append('image', image); // axios.post('/api/children/updateProfile/{child_id}', formdata) + formdata.append('image', image); // axios.post('/api/children/updateProfile/{identify}', formdata) // .then(response => { // if(response.data.status_code==200){ // setSubmitStatus('success); @@ -18309,6 +18724,25 @@ var ProfileEdit = function ProfileEdit() { className: "l-alert__text--error ft-16 ft-md-14", children: errors['last_name'] })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { + className: "edit-set", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", { + htmlFor: "identify", + className: "control-label ft-12", + children: " ID " + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", { + type: "text", + name: "identify", + id: "identify", + className: "input-default input-nameSei ".concat(errors['identify'].length != 0 && "is-invalid c-input__target"), + value: identify, + onChange: function onChange(e) { + return setIdentify(e.target.value); + } + }), errors['identify'].length != 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { + className: "l-alert__text--error ft-16 ft-md-14", + children: errors['identify'] + })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { className: "edit-set", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", { @@ -18444,6 +18878,7 @@ var Profile = function Profile() { var profile = { id: 1, name: '田中 達也', + username: 'chankan', tel: '08012927104', email: 'chankan07@gmail.com', company: '株式会社ZOTMAN', @@ -18539,6 +18974,18 @@ var Profile = function Profile() { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { className: "profile-info ft-xs-14", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { + className: "profile-info__item", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("p", { + className: "profile-info__icon", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("img", { + src: "/assets/img/icon/mail.svg", + alt: "\u30E1\u30FC\u30EB" + }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("p", { + className: "txt", + children: profile.username + })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", { className: "profile-info__item", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("p", { className: "profile-info__icon", @@ -18578,8 +19025,14 @@ var Profile = function Profile() { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "p-profile-btn", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("a", { - href: "/c-account/profile/edit/".concat(profile.id), className: "btn-default btn-yellow btn-profile btn-r8 btn-h52 h-xs-45-px", + onClick: function onClick(e) { + e.preventDefault(); + history.push({ + pathname: "/c-account/profile/edit/".concat(profile.id), + state: {} + }); + }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { className: "ft-xs-14", children: "\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u3092\u5909\u66F4\u3059\u308B" @@ -18588,8 +19041,14 @@ var Profile = function Profile() { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "p-profile-btn", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("a", { - href: "/c-account/profile/password-edit/".concat(profile.id), className: "btn-default btn-yellow btn-password btn-r8 btn-h52 h-xs-45-px", + onClick: function onClick(e) { + e.preventDefault(); + history.push({ + pathname: "/c-account/profile/password-edit/".concat(profile.id), + state: {} + }); + }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { className: "ft-xs-14", children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3059\u308B" @@ -18607,7 +19066,13 @@ var Profile = function Profile() { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "p-profile-txtLink", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("a", { - href: "/c-account/profile/withdrawal", + onClick: function onClick(e) { + e.preventDefault(); + history.push({ + pathname: "/c-account/profile/withdrawal", + state: {} + }); + }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { className: "ft-xs-14", children: "\u9000\u4F1A\u3059\u308B" @@ -18638,13 +19103,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_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-dom */ "./node_modules/react-dom/index.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 _material_ui_lab__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.js"); -/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); -/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var _component_notification__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../component/notification */ "./resources/js/component/notification.jsx"); -/* 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"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__); +/* harmony import */ var _component_notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../component/notification */ "./resources/js/component/notification.jsx"); +/* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx"); +/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); 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."); } @@ -18667,7 +19132,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } var ProfilePasswordEdit = function ProfilePasswordEdit() { - var history = useHistory(); + var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_5__.useHistory)(); var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState2 = _slicedToArray(_useState, 2), @@ -18743,36 +19208,36 @@ var ProfilePasswordEdit = function ProfilePasswordEdit() { // .catch(err=>console.log(err)) }; - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "l-content", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { className: "l-content-w560", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { className: "l-content__ttl", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "l-content__ttl__left", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("h2", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("h2", { children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u7DE8\u96C6" }) - }), /*#__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", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_notification__WEBPACK_IMPORTED_MODULE_2__.default, {})] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "l-content-wrap", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("section", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("section", { className: "profile-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "profile-wrap", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "profile-content", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("form", { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("form", { onSubmit: handleSubmit, noValidate: true, - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { className: "edit-set", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("label", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", { htmlFor: "pwd", className: "control-label ft-14 ft-md-12", children: "\u65B0\u3057\u3044\u30D1\u30B9\u30EF\u30FC\u30C9" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", { type: "password", name: "pwd", id: "pwd", @@ -18782,17 +19247,17 @@ var ProfilePasswordEdit = function ProfilePasswordEdit() { return setPwd(e.target.value); }, autoFocus: true - }), errors['pwd'].length != 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { + }), errors['pwd'].length != 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { className: "l-alert__text--error ft-16 ft-md-14", children: errors['pwd'] })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", { className: "edit-set", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("label", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", { htmlFor: "confirm_pwd", className: "control-label ft-14 ft-md-12", children: "\u78BA\u8A8D\u7528\u65B0\u3057\u3044\u30D1\u30B9\u30EF\u30FC\u30C9" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", { type: "password", name: "confirm_pwd", id: "confirm_pwd", @@ -18801,24 +19266,24 @@ var ProfilePasswordEdit = function ProfilePasswordEdit() { onChange: function onChange(e) { return setConfirmPwd(e.target.value); } - }), errors['confirm_pwd'].length != 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { + }), errors['confirm_pwd'].length != 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { className: "l-alert__text--error ft-16 ft-md-14", children: errors['confirm_pwd'] })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "mt-5", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_6__.default, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_6__.default, { type: "submit", fullWidth: true, - className: "p-4 rounded-20 ft-15 font-weight-bold text-black bg-color-2", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { + className: "p-4 rounded-20 ft-15 ft-xs-13 font-weight-bold text-black bg-color-2", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u66F4\u65B0" }) }) - }), submitStatus == 'success' && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, { + }), submitStatus == 'success' && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, { type: "success", children: "Submit Success!" - }), submitStatus == 'fail' && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, { + }), submitStatus == 'fail' && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, { type: "fail", children: "Submit Failed!" })] @@ -18902,7 +19367,7 @@ var ProfileWithdrawal = function ProfileWithdrawal() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("button", { type: "submit", - className: "btn-edit btn-default btn-h70 btn-r14 btn-yellow ft-xs-15", + className: "btn-edit btn-default btn-h70 btn-r20 btn-yellow ft-xs-15", children: "\u9000\u4F1A\u3059\u308B" })] }) @@ -19289,7 +19754,7 @@ function Side() { setSelected('profile'); }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { - className: "user-icon mypage-nav-list__link ", + className: "user-icon mypage-nav-list__link", to: "/c-account/profile", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("figure", { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { diff --git a/backend/resources/js/admin/admin.js b/backend/resources/js/admin/admin.js index 5846e706..0af821a7 100644 --- a/backend/resources/js/admin/admin.js +++ b/backend/resources/js/admin/admin.js @@ -1,19 +1,21 @@ import React, { Component } from 'react'; -import Login from './login'; - import { BrowserRouter, Route, Switch } from 'react-router-dom'; +import Meeting from './meeting'; +import Side from './side'; export default class AdminApp extends Component { render() { return ( +
- - + + +
); } } diff --git a/backend/resources/js/admin/login/index.jsx b/backend/resources/js/admin/login/index.jsx index 6ed059d4..794ad4a2 100644 --- a/backend/resources/js/admin/login/index.jsx +++ b/backend/resources/js/admin/login/index.jsx @@ -1,11 +1,12 @@ import React, { useState } from 'react'; +import ReactDOM from 'react-dom'; import { Button } from '@material-ui/core'; import axios from 'axios'; import { CircularProgress } from '@material-ui/core'; -const Login = () => { +const AdminLogin = () => { const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); @@ -40,7 +41,7 @@ const Login = () => { return (
-

管理者ログイン

+

管理者ログイン

{ _400error.length != 0 && {_400error} @@ -79,4 +80,10 @@ const Login = () => { } -export default Login; \ No newline at end of file +// ---------------------------------------------------------------------- +if(document.getElementById('admin-login')){ + ReactDOM.render( + , + document.getElementById('admin-login') + ) +} \ No newline at end of file diff --git a/backend/resources/js/admin/meeting/index.jsx b/backend/resources/js/admin/meeting/index.jsx new file mode 100644 index 00000000..6b90db8e --- /dev/null +++ b/backend/resources/js/admin/meeting/index.jsx @@ -0,0 +1,124 @@ +import React, { useEffect, useState } from 'react'; +import { CircularProgress } from '@material-ui/core'; +import moment from 'moment'; +import axios from 'axios'; +import { useHistory } from 'react-router-dom' + +import Notification from '../../component/notification'; + + + +const Meeting = () => { + + + const history = useHistory(); + const [keyword, setKeyword] = useState('') + const [loading, setLoading] = useState(true); + const [finish, setFinish] = useState(false); + const [completeOfFather, setCompleteOfFather ] = useState(null); + const [inCompleteOfFather, setInCompleteOfFather ] = useState(null); + useEffect(() => { + axios.get('/api/meetings/listOfCompleteOfFather', {params: { father_id: 1 }}).then((response) => { + if(response.data.status_code==200){ + console.log(response.data.params); + } else if(response.data.status_code==400){ + //TODO + } + setCompleteOfFather(response.data.params); + }); + }, []); + + useEffect(() => { + axios.get('/api/meetings/listOfIncompleteOfFather', {params: { father_id: 1 }}).then((response) => { + if(response.data.status_code==200){ + console.log(response.data.params); + setInCompleteOfFather(response.data.params); + setLoading(false); + } else if(response.data.status_code==400){ + //TODO + } + }); + }, []); + + return ( +
+
+
+

ミーティング一覧

+
+ +
+ +
+
+ +
+
+
+ ) +} + +export default Meeting; \ No newline at end of file diff --git a/backend/resources/js/admin/side.jsx b/backend/resources/js/admin/side.jsx new file mode 100644 index 00000000..7321968b --- /dev/null +++ b/backend/resources/js/admin/side.jsx @@ -0,0 +1,58 @@ +import React, { useEffect, useState } from 'react'; +import { Link } from 'react-router-dom' + +export default function Side() { + const [selected, setSelected] = useState(''); + + return ( +
+
+ ロゴ +
+ +
+ ); +} \ No newline at end of file diff --git a/backend/resources/js/app.js b/backend/resources/js/app.js index 107032aa..0b76c7f8 100644 --- a/backend/resources/js/app.js +++ b/backend/resources/js/app.js @@ -9,3 +9,4 @@ require('./pages/pages'); require('./child'); require('./child/auth'); require('./admin'); +require('./admin/login'); diff --git a/backend/resources/js/child/auth/register/index.jsx b/backend/resources/js/child/auth/register/index.jsx index 87d3ebaa..009ba57f 100644 --- a/backend/resources/js/child/auth/register/index.jsx +++ b/backend/resources/js/child/auth/register/index.jsx @@ -10,6 +10,7 @@ import IconButton from "@material-ui/core/IconButton"; const SignUp = () => { const [first_name, setFirstName] = useState(''); const [last_name, setLastName] = useState(''); + const [identify, setIdentify] = useState(''); const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); const [company, setCompany] = useState(''); @@ -18,6 +19,7 @@ const SignUp = () => { const [errors, setErrors] = useState({ first_name:'', last_name:'', + identify:'', email:'', password:'', image:'', @@ -34,6 +36,7 @@ const SignUp = () => { const formdata = new FormData(); formdata.append('first_name', first_name); formdata.append('last_name', last_name); + formdata.append('identify', identify); formdata.append('email', email); formdata.append('password', password); formdata.append('company', company); @@ -79,6 +82,9 @@ const SignUp = () => { if(last_name.length == 0){ formIsValid = false; errors['last_name'] = 'Required'; } else errors['last_name'] = ''; + if(identify.length == 0){ formIsValid = false; errors['identify'] = 'Required'; } + else errors['identify'] = ''; + if(password.length < 8){ formIsValid = false; errors['password'] = 'Required'; } else errors['password'] = ''; @@ -154,6 +160,17 @@ const SignUp = () => { } +
+ + setIdentify(e.target.value)}/> + { + errors['identify'].length != 0 && + + {errors['identify']} + + } +
+
setEmail(e.target.value)}/> diff --git a/backend/resources/js/child/meeting/detail.jsx b/backend/resources/js/child/meeting/detail.jsx index 2773a969..58465e1f 100644 --- a/backend/resources/js/child/meeting/detail.jsx +++ b/backend/resources/js/child/meeting/detail.jsx @@ -111,9 +111,14 @@ const MeetingDetail = (props) => {
+
+ + PDFを確認する + +
- PDFを確認する + メモを確認する
diff --git a/backend/resources/js/child/profile/edit.jsx b/backend/resources/js/child/profile/edit.jsx index 165d6105..f9371f30 100644 --- a/backend/resources/js/child/profile/edit.jsx +++ b/backend/resources/js/child/profile/edit.jsx @@ -13,6 +13,7 @@ const ProfileEdit = () => { const [first_name, setFirstName] = useState(''); const [last_name, setLastName] = useState(''); + const [identify, setIdentify] = useState(''); const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); const [company, setCompany] = useState(''); @@ -21,6 +22,7 @@ const ProfileEdit = () => { const [errors, setErrors] = useState({ first_name:'', last_name:'', + identify:'', email:'', password:'', image:'', @@ -54,6 +56,9 @@ const ProfileEdit = () => { if(first_name.length == 0){ formIsValid = false; errors['first_name'] = 'Required'; } else errors['first_name'] = ''; + if(identify.length == 0){ formIsValid = false; errors['identify'] = 'Required'; } + else errors['identify'] = ''; + if(last_name.length == 0){ formIsValid = false; errors['last_name'] = 'Required'; } else errors['last_name'] = ''; @@ -77,11 +82,12 @@ const ProfileEdit = () => { const formdata = new FormData(); formdata.append('first_name', first_name); formdata.append('last_name', last_name); + formdata.append('identify', identify); formdata.append('email', email); formdata.append('password', password); formdata.append('company', company); formdata.append('image', image); - // axios.post('/api/children/updateProfile/{child_id}', formdata) + // axios.post('/api/children/updateProfile/{identify}', formdata) // .then(response => { // if(response.data.status_code==200){ // setSubmitStatus('success); @@ -133,6 +139,17 @@ const ProfileEdit = () => { } +
+ + setIdentify(e.target.value)}/> + { + errors['identify'].length != 0 && + + {errors['identify']} + + } +
+
setEmail(e.target.value)}/> diff --git a/backend/resources/js/child/profile/index.jsx b/backend/resources/js/child/profile/index.jsx index 3b9d4016..84792899 100644 --- a/backend/resources/js/child/profile/index.jsx +++ b/backend/resources/js/child/profile/index.jsx @@ -13,6 +13,7 @@ const Profile = () => { const profile = { id: 1, name: '田中 達也', + username:'chankan', tel:'08012927104', email:'chankan07@gmail.com', company:'株式会社ZOTMAN', @@ -87,6 +88,12 @@ const Profile = () => {

{profile.name}

+
+

+ メール +

+

{profile.username}

+

メール @@ -108,14 +115,30 @@ const Profile = () => {

- + { + e.preventDefault(); + history.push({ + pathname: `/c-account/profile/edit/${profile.id}`, + state: {} + }); + }} + > プロフィールを変更する
- - パスワードを変更する + { + e.preventDefault(); + history.push({ + pathname: `/c-account/profile/password-edit/${profile.id}`, + state: {} + }); + }} + > + パスワードを変更する
@@ -126,7 +149,14 @@ const Profile = () => {
- + { + e.preventDefault(); + history.push({ + pathname: `/c-account/profile/withdrawal`, + state: {} + }); + }} + > 退会する
diff --git a/backend/resources/js/child/profile/password_edit.jsx b/backend/resources/js/child/profile/password_edit.jsx index 22c1639d..ce5d609e 100644 --- a/backend/resources/js/child/profile/password_edit.jsx +++ b/backend/resources/js/child/profile/password_edit.jsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; +import { useHistory } from 'react-router-dom'; import { LoadingButton } from '@material-ui/lab'; import axios from 'axios'; @@ -109,7 +109,7 @@ const ProfilePasswordEdit = () => {
- + パスワードを更新
diff --git a/backend/resources/js/child/profile/withdrawal.jsx b/backend/resources/js/child/profile/withdrawal.jsx index 2fa5a2a8..370530cd 100644 --- a/backend/resources/js/child/profile/withdrawal.jsx +++ b/backend/resources/js/child/profile/withdrawal.jsx @@ -41,7 +41,7 @@ const ProfileWithdrawal = () => {

本当に退会してもよろしいでしょうか？

- + diff --git a/backend/resources/js/child/search/index.jsx b/backend/resources/js/child/search/index.jsx index 7bd4e112..25dc6832 100644 --- a/backend/resources/js/child/search/index.jsx +++ b/backend/resources/js/child/search/index.jsx @@ -59,7 +59,7 @@ const Search = () => { const history = useHistory(); - const [keyword, setKeyword] = useState('') + const [keyword, setKeyword] = useState(''); const [tab_status, setTabStatus] = useState(false); // const [meeting_list, setMettingList] = useState([]); diff --git a/backend/resources/js/child/side.jsx b/backend/resources/js/child/side.jsx index 036ae6b2..f59fedd8 100644 --- a/backend/resources/js/child/side.jsx +++ b/backend/resources/js/child/side.jsx @@ -42,15 +42,16 @@ export default function Side() { 親情報 +
  • { e.preventDefault(); setSelected('profile'); }}> - +
    - +
    プロフィール diff --git a/backend/resources/js/child/withdrawal/complete.jsx b/backend/resources/js/child/withdrawal/complete.jsx index 5ac30f74..e1ed7dd4 100644 --- a/backend/resources/js/child/withdrawal/complete.jsx +++ b/backend/resources/js/child/withdrawal/complete.jsx @@ -12,6 +12,9 @@ const WithdrawalComplete = () => { 退会完了しました。
    今後とも、危機管理をよろしくお願いいたします。 +
    + トップページへ戻る +
    diff --git a/backend/resources/sass/base/_font.scss b/backend/resources/sass/base/_font.scss index 98990947..cb525769 100644 --- a/backend/resources/sass/base/_font.scss +++ b/backend/resources/sass/base/_font.scss @@ -9,8 +9,10 @@ .ft-18{ font-size: 18px !important; } .ft-19{ font-size: 19px !important; } .ft-20{ font-size: 20px !important; } - +.ft-25{ font-size: 25px !important; } .ft-30{ font-size: 30px !important; } +.ft-35{ font-size: 35px !important; } +.ft-40{ font-size: 40px !important; } .ft-md-12{ @include media-breakpoint-down(md){ font-size: 12px !important; } } diff --git a/backend/resources/sass/layouts/_main.scss b/backend/resources/sass/layouts/_main.scss index b65c25fe..89afedfd 100644 --- a/backend/resources/sass/layouts/_main.scss +++ b/backend/resources/sass/layouts/_main.scss @@ -100,7 +100,7 @@ a{ .input-default{ - border-radius: 18px !important; + // border-radius: 18px !important; height: 50px; font-size: 18px; } @@ -134,3 +134,8 @@ a{ .btn-shadow{ box-shadow: 0 1px 8px rgb(0 0 0 / 30%) !important; } + +.btn-disabled{ + background-color: #eaeff2; + color: #6f7372; +} \ No newline at end of file diff --git a/backend/resources/views/admin/layout.blade.php b/backend/resources/views/admin/layout.blade.php new file mode 100644 index 00000000..2fc1fc93 --- /dev/null +++ b/backend/resources/views/admin/layout.blade.php @@ -0,0 +1,25 @@ + + + + + + + @yield('title') + + + + + + + + + + + + @yield('content') + + + + + @stack('js') + diff --git a/backend/resources/views/admin/login/index.blade.php b/backend/resources/views/admin/login/index.blade.php index 032587a5..f9df7ae1 100644 --- a/backend/resources/views/admin/login/index.blade.php +++ b/backend/resources/views/admin/login/index.blade.php @@ -3,5 +3,5 @@ @section('title', '管理者ログイン') @section('content') -
    +
    @endsection \ No newline at end of file diff --git a/backend/resources/views/admin/meeting/index.blade.php b/backend/resources/views/admin/meeting/index.blade.php index e69de29b..8e7595ae 100644 --- a/backend/resources/views/admin/meeting/index.blade.php +++ b/backend/resources/views/admin/meeting/index.blade.php @@ -0,0 +1,8 @@ +@extends('admin.layout') + +@section('title', 'ミーティング一覧') + +@section('content') +
    + +@endsection diff --git a/backend/resources/views/c_account/withdrawal/complete.blade.php b/backend/resources/views/c_account/withdrawal/complete.blade.php index 1925fd8c..1be9c56a 100644 --- a/backend/resources/views/c_account/withdrawal/complete.blade.php +++ b/backend/resources/views/c_account/withdrawal/complete.blade.php @@ -48,6 +48,9 @@ 退会完了しました。
    今後とも、危機管理をよろしくお願いいたします。 +
    + トップページへ戻る +
    diff --git a/backend/routes/web.php b/backend/routes/web.php index da62d3f1..83a26d76 100644 --- a/backend/routes/web.php +++ b/backend/routes/web.php @@ -49,3 +49,4 @@ 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'); });