From d295300ac696f905f0c186ded12d409226151d44 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Wed, 29 Dec 2021 02:18:52 -0800 Subject: [PATCH] =?UTF-8?q?=E7=B9=B0=E3=82=8A=E8=BF=94=E3=81=97=E3=83=9A?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=81=A6?= =?UTF-8?q?component=E3=81=AB=E8=BF=BD=E5=8A=A0(auth)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/public/js/app.js | 776 +++++++----------- backend/resources/js/child/auth/index.js | 17 +- .../js/child/auth/withdrawal_complete.jsx | 21 - .../password_reset_complete.jsx} | 13 +- .../auth => component}/register/complete.jsx | 16 +- .../auth => component}/register/error.jsx | 8 +- .../withdrawal_complete.jsx | 14 +- backend/resources/js/pages/PDFView.jsx | 4 +- .../parent/auth/forgot_password/complete.jsx | 35 - backend/resources/js/parent/auth/index.js | 17 +- .../js/parent/auth/register/complete.jsx | 35 - .../js/parent/auth/register/error.jsx | 23 - backend/resources/views/pages/pdf.blade.php | 2 +- 13 files changed, 335 insertions(+), 646 deletions(-) delete mode 100644 backend/resources/js/child/auth/withdrawal_complete.jsx rename backend/resources/js/{child/auth/forgot_password/complete.jsx => component/password_reset_complete.jsx} (72%) rename backend/resources/js/{child/auth => component}/register/complete.jsx (69%) rename backend/resources/js/{child/auth => component}/register/error.jsx (78%) rename backend/resources/js/{parent/auth => component}/withdrawal_complete.jsx (57%) delete mode 100644 backend/resources/js/parent/auth/forgot_password/complete.jsx delete mode 100644 backend/resources/js/parent/auth/register/complete.jsx delete mode 100644 backend/resources/js/parent/auth/register/error.jsx diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 82329bf1..f124f606 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -38819,68 +38819,6 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; /***/ }), -/***/ "./resources/js/child/auth/forgot_password/complete.jsx": -/*!**************************************************************!*\ - !*** ./resources/js/child/auth/forgot_password/complete.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_3__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/Button/Button.js"); -/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router */ "./node_modules/react-router/esm/react-router.js"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); - - - - - - -var ChildForgotPasswordComplete = function ChildForgotPasswordComplete() { - var history = (0,react_router__WEBPACK_IMPORTED_MODULE_2__.useHistory)(); - - var gotoLogin = function gotoLogin() { - history.push({ - pathname: '/c-account/login', - state: '' - }); - }; - - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "l-single-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { - className: "l-single-inner", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("p", { - className: "text-center font-weight-bold ft-25", - children: "\u767B\u9332\u5B8C\u4E86" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("span", { - className: "mt-80-px ft-18 ft-xs-16 l-alert__text--success", - children: ["\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u66F4\u65B0\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("br", {}), "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u306B\u9077\u79FB\u3057\u3066\u3001\u65B0\u3057\u3044\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u3054\u5229\u7528\u304F\u3060\u3055\u3044\u3002"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "mt-5", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_3__["default"], { - type: "submit", - fullWidth: true, - className: "btn-edit btn-default btn-h75 bg-yellow rounded-20", - onClick: gotoLogin, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", { - className: "ft-16 font-weight-bold text-black", - children: "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u3078" - }) - }) - })] - }) - }); -}; - -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ChildForgotPasswordComplete); - -/***/ }), - /***/ "./resources/js/child/auth/forgot_password/index.jsx": /*!***********************************************************!*\ !*** ./resources/js/child/auth/forgot_password/index.jsx ***! @@ -39241,14 +39179,14 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); /* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); /* harmony import */ var _forgot_password__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./forgot_password */ "./resources/js/child/auth/forgot_password/index.jsx"); -/* harmony import */ var _forgot_password_complete__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./forgot_password/complete */ "./resources/js/child/auth/forgot_password/complete.jsx"); -/* harmony import */ var _forgot_password_reset__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./forgot_password/reset */ "./resources/js/child/auth/forgot_password/reset.jsx"); -/* harmony import */ var _login__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./login */ "./resources/js/child/auth/login/index.jsx"); -/* harmony import */ var _register_temporary__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./register/temporary */ "./resources/js/child/auth/register/temporary.jsx"); -/* harmony import */ var _register__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./register */ "./resources/js/child/auth/register/index.jsx"); -/* harmony import */ var _register_complete__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./register/complete */ "./resources/js/child/auth/register/complete.jsx"); -/* harmony import */ var _register_error__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./register/error */ "./resources/js/child/auth/register/error.jsx"); -/* harmony import */ var _withdrawal_complete__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./withdrawal_complete */ "./resources/js/child/auth/withdrawal_complete.jsx"); +/* harmony import */ var _forgot_password_reset__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./forgot_password/reset */ "./resources/js/child/auth/forgot_password/reset.jsx"); +/* harmony import */ var _login__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./login */ "./resources/js/child/auth/login/index.jsx"); +/* harmony import */ var _register_temporary__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./register/temporary */ "./resources/js/child/auth/register/temporary.jsx"); +/* harmony import */ var _register__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./register */ "./resources/js/child/auth/register/index.jsx"); +/* harmony import */ var _component_password_reset_complete__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../component/password_reset_complete */ "./resources/js/component/password_reset_complete.jsx"); +/* harmony import */ var _component_register_complete__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../component/register/complete */ "./resources/js/component/register/complete.jsx"); +/* harmony import */ var _component_register_error__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../component/register/error */ "./resources/js/component/register/error.jsx"); +/* harmony import */ var _component_withdrawal_complete__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../component/withdrawal_complete */ "./resources/js/component/withdrawal_complete.jsx"); /* harmony import */ var _component_scroll_top__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../component/scroll_top */ "./resources/js/component/scroll_top.jsx"); /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); } @@ -39314,19 +39252,19 @@ var ChildAuth = /*#__PURE__*/function (_Component) { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Route, { exact: true, path: "/c-account/register-temporary", - component: _register_temporary__WEBPACK_IMPORTED_MODULE_6__["default"] + component: _register_temporary__WEBPACK_IMPORTED_MODULE_5__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Route, { exact: true, path: "/c-account/register/:token", - component: _register__WEBPACK_IMPORTED_MODULE_7__["default"] + component: _register__WEBPACK_IMPORTED_MODULE_6__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Route, { exact: true, path: "/c-account/register/complete/:token", - component: _register_complete__WEBPACK_IMPORTED_MODULE_8__["default"] + component: _component_register_complete__WEBPACK_IMPORTED_MODULE_8__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Route, { exact: true, path: "/c-account/register/error/:token", - component: _register_error__WEBPACK_IMPORTED_MODULE_9__["default"] + component: _component_register_error__WEBPACK_IMPORTED_MODULE_9__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Route, { exact: true, path: "/c-account/forgot-password", @@ -39334,19 +39272,19 @@ var ChildAuth = /*#__PURE__*/function (_Component) { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Route, { exact: true, path: "/c-account/forgot-password/reset/:token", - component: _forgot_password_reset__WEBPACK_IMPORTED_MODULE_4__["default"] + component: _forgot_password_reset__WEBPACK_IMPORTED_MODULE_3__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Route, { exact: true, path: "/c-account/forgot-password/complete", - component: _forgot_password_complete__WEBPACK_IMPORTED_MODULE_3__["default"] + component: _component_password_reset_complete__WEBPACK_IMPORTED_MODULE_7__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Route, { exact: true, path: "/c-account/login", - component: _login__WEBPACK_IMPORTED_MODULE_5__["default"] + component: _login__WEBPACK_IMPORTED_MODULE_4__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Route, { exact: true, path: "/c-account/withdrawal/complete", - component: _withdrawal_complete__WEBPACK_IMPORTED_MODULE_10__["default"] + component: _component_withdrawal_complete__WEBPACK_IMPORTED_MODULE_10__["default"] })] })] }) @@ -39572,130 +39510,6 @@ var ChildLogin = function ChildLogin(props) { /***/ }), -/***/ "./resources/js/child/auth/register/complete.jsx": -/*!*******************************************************!*\ - !*** ./resources/js/child/auth/register/complete.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_3__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/Button/Button.js"); -/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router */ "./node_modules/react-router/esm/react-router.js"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); - - - - - - -var ChildSignUpComplete = function ChildSignUpComplete() { - var history = (0,react_router__WEBPACK_IMPORTED_MODULE_2__.useHistory)(); - - var gotoLogin = function gotoLogin() { - history.push({ - pathname: '/c-account/login', - state: '' - }); - }; - - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "l-single-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { - className: "l-single-inner", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("p", { - className: "text-center font-weight-bold ft-25", - children: "\u672C\u767B\u9332\u5B8C\u4E86" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("span", { - className: "mt-80-px ft-18 ft-md-16 l-alert__text--success", - children: ["\u672C\u767B\u9332\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("br", {}), "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u3088\u308A\u3001\u30ED\u30B0\u30A4\u30F3\u3092\u884C\u3063\u3066\u304F\u3060\u3055\u3044\u3002"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "mt-5", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_3__["default"], { - type: "submit", - fullWidth: true, - className: "btn-edit btn-default btn-h75 bg-yellow rounded-20", - onClick: gotoLogin, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", { - className: "ft-16 font-weight-bold text-black", - children: "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u3078" - }) - }) - })] - }) - }); -}; - -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ChildSignUpComplete); - -/***/ }), - -/***/ "./resources/js/child/auth/register/error.jsx": -/*!****************************************************!*\ - !*** ./resources/js/child/auth/register/error.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 _component_alert__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../component/alert */ "./resources/js/component/alert.jsx"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __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 ChildSignUpError = function ChildSignUpError(props) { - var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state), - _useState2 = _slicedToArray(_useState, 2), - _400error = _useState2[0], - set400Error = _useState2[1]; - - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", { - className: "l-single-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", { - className: "l-single-inner", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("p", { - className: "text-center font-weight-bold ft-25", - children: "\u672C\u767B\u9332\u30A8\u30E9\u30FC" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("span", { - className: "mt-80-px l-alert__text--error ft-18 ft-xs-16", - children: ["\u767B\u9332\u306E\u7D4C\u904E\u6642\u9593\u304C\u904E\u304E\u3066\u304A\u308A\u307E\u3059\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("br", {}), "\u304A\u624B\u6570\u3067\u3059\u304C\u518D\u5EA6\u62DB\u5F85\u30E6\u30FC\u30B6\u30FC\u306B\u9023\u7D61\u3057\u3001\u518D\u767B\u9332 \u306E\u624B\u7D9A\u304D\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002"] - }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_1__["default"], { - type: "fail", - hide: function hide() { - return set400Error(''); - }, - children: _400error - })] - }) - }); -}; - -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ChildSignUpError); - -/***/ }), - /***/ "./resources/js/child/auth/register/index.jsx": /*!****************************************************!*\ !*** ./resources/js/child/auth/register/index.jsx ***! @@ -40255,52 +40069,6 @@ var ChildSignUpTemporary = function ChildSignUpTemporary() { /***/ }), -/***/ "./resources/js/child/auth/withdrawal_complete.jsx": -/*!*********************************************************!*\ - !*** ./resources/js/child/auth/withdrawal_complete.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 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"); - - - - - -var ChildWithdrawal = function ChildWithdrawal() { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "l-single-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { - className: "l-single-inner", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("p", { - className: "text-center font-weight-bold ft-25", - children: "\u9000\u4F1A\u5B8C\u4E86" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { - className: "edit-set-bg u-mb30-lose u-mb25-gain ft-xs-16 mt-5", - children: ["\u9000\u4F1A\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("br", {}), "\u4ECA\u5F8C\u3068\u3082\u3001KIKI\u7BA1\u7406\u3092\u3088\u308D\u3057\u304F\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "text-center", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { - to: "/c-account/login", - className: "ft-xs-16", - children: "\u30C8\u30C3\u30D7\u30DA\u30FC\u30B8\u3078\u623B\u308B" - }) - })] - }) - }); -}; - -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ChildWithdrawal); - -/***/ }), - /***/ "./resources/js/child/child.js": /*!*************************************!*\ !*** ./resources/js/child/child.js ***! @@ -44088,6 +43856,73 @@ var PageLoader = function PageLoader() { /***/ }), +/***/ "./resources/js/component/password_reset_complete.jsx": +/*!************************************************************!*\ + !*** ./resources/js/component/password_reset_complete.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_3__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/Button/Button.js"); +/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router */ "./node_modules/react-router/esm/react-router.js"); +/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); + + + + + + +var PasswordResetComplete = function PasswordResetComplete() { + var history = (0,react_router__WEBPACK_IMPORTED_MODULE_2__.useHistory)(); + + var _useLocation = (0,react_router__WEBPACK_IMPORTED_MODULE_2__.useLocation)(), + pathname = _useLocation.pathname; + + var gotoLogin = function gotoLogin() { + var url; + if (pathname.includes('c-account')) url = '/c-account/login';else if (pathname.includes('p-account')) url = '/p-account/login'; + history.push({ + pathname: url, + state: '' + }); + }; + + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { + className: "l-single-container", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { + className: "l-single-inner", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("p", { + className: "text-center font-weight-bold ft-25", + children: "\u767B\u9332\u5B8C\u4E86" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("span", { + className: "mt-80-px ft-18 ft-xs-16 l-alert__text--success", + children: ["\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u66F4\u65B0\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("br", {}), "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u306B\u9077\u79FB\u3057\u3066\u3001\u65B0\u3057\u3044\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u3054\u5229\u7528\u304F\u3060\u3055\u3044\u3002"] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { + className: "mt-5", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_3__["default"], { + type: "submit", + fullWidth: true, + className: "btn-edit btn-default btn-h75 bg-yellow rounded-20", + onClick: gotoLogin, + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", { + className: "ft-16 font-weight-bold text-black", + children: "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u3078" + }) + }) + })] + }) + }); +}; + +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (PasswordResetComplete); + +/***/ }), + /***/ "./resources/js/component/pdf/modal_pdf.jsx": /*!**************************************************!*\ !*** ./resources/js/component/pdf/modal_pdf.jsx ***! @@ -44307,6 +44142,135 @@ var PreviewPDF = function PreviewPDF(_ref) { /***/ }), +/***/ "./resources/js/component/register/complete.jsx": +/*!******************************************************!*\ + !*** ./resources/js/component/register/complete.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_3__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/Button/Button.js"); +/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router */ "./node_modules/react-router/esm/react-router.js"); +/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); + + + + + + +var SignUpComplete = function SignUpComplete() { + var history = (0,react_router__WEBPACK_IMPORTED_MODULE_2__.useHistory)(); + + var _useLocation = (0,react_router__WEBPACK_IMPORTED_MODULE_2__.useLocation)(), + pathname = _useLocation.pathname; + + var gotoLogin = function gotoLogin() { + var url; + if (pathname.includes('c-account')) url = '/c-account/login';else if (pathname.includes('p-account')) url = '/p-account/login'; + history.push({ + pathname: url, + state: '' + }); + }; + + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { + className: "l-single-container", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { + className: "l-single-inner", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("p", { + className: "text-center font-weight-bold ft-25", + children: "\u672C\u767B\u9332\u5B8C\u4E86" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("span", { + className: "mt-80-px ft-18 ft-md-16 l-alert__text--success", + children: ["\u672C\u767B\u9332\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("br", {}), "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u3088\u308A\u3001\u30ED\u30B0\u30A4\u30F3\u3092\u884C\u3063\u3066\u304F\u3060\u3055\u3044\u3002"] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { + className: "mt-5", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_3__["default"], { + type: "submit", + fullWidth: true, + className: "btn-edit btn-default btn-h75 bg-yellow rounded-20", + onClick: gotoLogin, + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", { + className: "ft-16 font-weight-bold text-black", + children: "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u3078" + }) + }) + })] + }) + }); +}; + +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (SignUpComplete); + +/***/ }), + +/***/ "./resources/js/component/register/error.jsx": +/*!***************************************************!*\ + !*** ./resources/js/component/register/error.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 _alert__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../alert */ "./resources/js/component/alert.jsx"); +/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __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 SignUpError = function SignUpError(props) { + var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state), + _useState2 = _slicedToArray(_useState, 2), + _400error = _useState2[0], + set400Error = _useState2[1]; + + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", { + className: "l-single-container", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", { + className: "l-single-inner", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("p", { + className: "text-center font-weight-bold ft-25", + children: "\u672C\u767B\u9332\u30A8\u30E9\u30FC" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("span", { + className: "mt-80-px l-alert__text--error ft-18 ft-xs-16", + children: ["\u767B\u9332\u306E\u7D4C\u904E\u6642\u9593\u304C\u904E\u304E\u3066\u304A\u308A\u307E\u3059\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("br", {}), "\u304A\u624B\u6570\u3067\u3059\u304C\u518D\u5EA6\u62DB\u5F85\u30E6\u30FC\u30B6\u30FC\u306B\u9023\u7D61\u3057\u3001\u518D\u767B\u9332\u306E\u624B\u7D9A\u304D\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002"] + }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_alert__WEBPACK_IMPORTED_MODULE_1__["default"], { + type: "fail", + hide: function hide() { + return set400Error(''); + }, + children: _400error + })] + }) + }); +}; + +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (SignUpError); + +/***/ }), + /***/ "./resources/js/component/scroll_top.jsx": /*!***********************************************!*\ !*** ./resources/js/component/scroll_top.jsx ***! @@ -44398,6 +44362,58 @@ var Thumbnail = function Thumbnail(_ref) { /***/ }), +/***/ "./resources/js/component/withdrawal_complete.jsx": +/*!********************************************************!*\ + !*** ./resources/js/component/withdrawal_complete.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 react_router_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); +/* 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_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); + + + + + +var Withdrawal = function Withdrawal() { + var _useLocation = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_2__.useLocation)(), + pathname = _useLocation.pathname; + + var url; + if (pathname.includes('c-account')) url = '/c-account/login';else if (pathname.includes('p-account')) url = '/p-account/login'; + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { + className: "l-single-container", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { + className: "l-single-inner", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("p", { + className: "text-center font-weight-bold ft-25", + children: "\u9000\u4F1A\u5B8C\u4E86" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { + className: "edit-set-bg u-mb30-lose u-mb25-gain ft-xs-16 mt-5", + children: ["\u9000\u4F1A\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("br", {}), "\u4ECA\u5F8C\u3068\u3082\u3001KIKI\u7BA1\u7406\u3092\u3088\u308D\u3057\u304F\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002"] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { + className: "text-center", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + to: url, + className: "ft-xs-16", + children: "\u30C8\u30C3\u30D7\u30DA\u30FC\u30B8\u3078\u623B\u308B" + }) + })] + }) + }); +}; + +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Withdrawal); + +/***/ }), + /***/ "./resources/js/pages/PDFView.jsx": /*!****************************************!*\ !*** ./resources/js/pages/PDFView.jsx ***! @@ -44485,8 +44501,8 @@ var PDFViewer = function PDFViewer() { }); }; -if (document.getElementById('pdf-preview')) { - react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(PDFViewer, {}), document.getElementById('pdf-preview')); +if (document.getElementById('pdf')) { + react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(PDFViewer, {}), document.getElementById('pdf')); } /***/ }), @@ -45046,68 +45062,6 @@ if (document.getElementById('contact')) { /***/ }), -/***/ "./resources/js/parent/auth/forgot_password/complete.jsx": -/*!***************************************************************!*\ - !*** ./resources/js/parent/auth/forgot_password/complete.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_3__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/Button/Button.js"); -/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router */ "./node_modules/react-router/esm/react-router.js"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); - - - - - - -var ParentForgotPasswordComplete = function ParentForgotPasswordComplete() { - var history = (0,react_router__WEBPACK_IMPORTED_MODULE_2__.useHistory)(); - - var gotoLogin = function gotoLogin() { - history.push({ - pathname: '/p-account/login', - state: '' - }); - }; - - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "l-single-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { - className: "l-single-inner", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("p", { - className: "text-center font-weight-bold ft-25", - children: "\u767B\u9332\u5B8C\u4E86" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("span", { - className: "mt-80-px ft-18 ft-xs-16 l-alert__text--success", - children: ["\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u66F4\u65B0\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("br", {}), "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u306B\u9077\u79FB\u3057\u3066\u3001\u65B0\u3057\u3044\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u3054\u5229\u7528\u304F\u3060\u3055\u3044\u3002"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "mt-5", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_3__["default"], { - type: "submit", - fullWidth: true, - className: "btn-edit btn-default btn-h75 bg-yellow rounded-20", - onClick: gotoLogin, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", { - className: "ft-16 font-weight-bold text-black", - children: "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u3078" - }) - }) - })] - }) - }); -}; - -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ParentForgotPasswordComplete); - -/***/ }), - /***/ "./resources/js/parent/auth/forgot_password/index.jsx": /*!************************************************************!*\ !*** ./resources/js/parent/auth/forgot_password/index.jsx ***! @@ -45460,13 +45414,13 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); /* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); /* harmony import */ var _forgot_password__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./forgot_password */ "./resources/js/parent/auth/forgot_password/index.jsx"); -/* harmony import */ var _forgot_password_complete__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./forgot_password/complete */ "./resources/js/parent/auth/forgot_password/complete.jsx"); -/* harmony import */ var _forgot_password_reset__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./forgot_password/reset */ "./resources/js/parent/auth/forgot_password/reset.jsx"); -/* harmony import */ var _login__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./login */ "./resources/js/parent/auth/login/index.jsx"); -/* harmony import */ var _register__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./register */ "./resources/js/parent/auth/register/index.jsx"); -/* harmony import */ var _register_complete__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./register/complete */ "./resources/js/parent/auth/register/complete.jsx"); -/* harmony import */ var _register_error__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./register/error */ "./resources/js/parent/auth/register/error.jsx"); -/* harmony import */ var _withdrawal_complete__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./withdrawal_complete */ "./resources/js/parent/auth/withdrawal_complete.jsx"); +/* harmony import */ var _forgot_password_reset__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./forgot_password/reset */ "./resources/js/parent/auth/forgot_password/reset.jsx"); +/* harmony import */ var _login__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./login */ "./resources/js/parent/auth/login/index.jsx"); +/* harmony import */ var _register__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./register */ "./resources/js/parent/auth/register/index.jsx"); +/* harmony import */ var _component_password_reset_complete__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../component/password_reset_complete */ "./resources/js/component/password_reset_complete.jsx"); +/* harmony import */ var _component_register_complete__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../component/register/complete */ "./resources/js/component/register/complete.jsx"); +/* harmony import */ var _component_register_error__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../component/register/error */ "./resources/js/component/register/error.jsx"); +/* harmony import */ var _component_withdrawal_complete__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../component/withdrawal_complete */ "./resources/js/component/withdrawal_complete.jsx"); /* harmony import */ var _component_scroll_top__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../component/scroll_top */ "./resources/js/component/scroll_top.jsx"); /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); } @@ -45531,15 +45485,15 @@ var ParentAuth = /*#__PURE__*/function (_Component) { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Route, { exact: true, path: "/p-account/register/:token", - component: _register__WEBPACK_IMPORTED_MODULE_6__["default"] + component: _register__WEBPACK_IMPORTED_MODULE_5__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Route, { exact: true, path: "/p-account/register/complete/:token", - component: _register_complete__WEBPACK_IMPORTED_MODULE_7__["default"] + component: _component_register_complete__WEBPACK_IMPORTED_MODULE_7__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Route, { exact: true, path: "/p-account/register/error/:token", - component: _register_error__WEBPACK_IMPORTED_MODULE_8__["default"] + component: _component_register_error__WEBPACK_IMPORTED_MODULE_8__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Route, { exact: true, path: "/p-account/forgot-password", @@ -45547,19 +45501,19 @@ var ParentAuth = /*#__PURE__*/function (_Component) { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Route, { exact: true, path: "/p-account/forgot-password/reset/:token", - component: _forgot_password_reset__WEBPACK_IMPORTED_MODULE_4__["default"] + component: _forgot_password_reset__WEBPACK_IMPORTED_MODULE_3__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Route, { exact: true, path: "/p-account/forgot-password/complete", - component: _forgot_password_complete__WEBPACK_IMPORTED_MODULE_3__["default"] + component: _component_password_reset_complete__WEBPACK_IMPORTED_MODULE_6__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Route, { exact: true, path: "/p-account/login", - component: _login__WEBPACK_IMPORTED_MODULE_5__["default"] + component: _login__WEBPACK_IMPORTED_MODULE_4__["default"] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Route, { exact: true, path: "/p-account/withdrawal/complete", - component: _withdrawal_complete__WEBPACK_IMPORTED_MODULE_9__["default"] + component: _component_withdrawal_complete__WEBPACK_IMPORTED_MODULE_9__["default"] })] })] }) @@ -45785,130 +45739,6 @@ var ParentLogin = function ParentLogin(props) { /***/ }), -/***/ "./resources/js/parent/auth/register/complete.jsx": -/*!********************************************************!*\ - !*** ./resources/js/parent/auth/register/complete.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_3__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/Button/Button.js"); -/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router */ "./node_modules/react-router/esm/react-router.js"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); - - - - - - -var ParentSignUpComplete = function ParentSignUpComplete() { - var history = (0,react_router__WEBPACK_IMPORTED_MODULE_2__.useHistory)(); - - var gotoLogin = function gotoLogin() { - history.push({ - pathname: '/p-account/login', - state: '' - }); - }; - - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "l-single-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { - className: "l-single-inner", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("p", { - className: "text-center font-weight-bold ft-25", - children: "\u672C\u767B\u9332\u5B8C\u4E86" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("span", { - className: "mt-80-px ft-18 ft-md-16 l-alert__text--success", - children: ["\u672C\u767B\u9332\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("br", {}), "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u3088\u308A\u3001\u30ED\u30B0\u30A4\u30F3\u3092\u884C\u3063\u3066\u304F\u3060\u3055\u3044\u3002"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "mt-5", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_3__["default"], { - type: "submit", - fullWidth: true, - className: "btn-edit btn-default btn-h60 bg-yellow rounded-20 py-5", - onClick: gotoLogin, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", { - className: "ft-16 font-weight-bold text-black", - children: "\u30ED\u30B0\u30A4\u30F3\u753B\u9762\u3078" - }) - }) - })] - }) - }); -}; - -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ParentSignUpComplete); - -/***/ }), - -/***/ "./resources/js/parent/auth/register/error.jsx": -/*!*****************************************************!*\ - !*** ./resources/js/parent/auth/register/error.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 _component_alert__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../component/alert */ "./resources/js/component/alert.jsx"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __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 ParentSignUpError = function ParentSignUpError(props) { - var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state), - _useState2 = _slicedToArray(_useState, 2), - _400error = _useState2[0], - set400Error = _useState2[1]; - - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", { - className: "l-single-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", { - className: "l-single-inner", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("p", { - className: "text-center font-weight-bold ft-25", - children: "\u672C\u767B\u9332\u30A8\u30E9\u30FC" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("span", { - className: "mt-80-px l-alert__text--error ft-18 ft-xs-16", - children: ["\u767B\u9332\u306E\u7D4C\u904E\u6642\u9593\u304C\u904E\u304E\u3066\u304A\u308A\u307E\u3059\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("br", {}), "\u304A\u624B\u6570\u3067\u3059\u304C\u518D\u5EA6\u62DB\u5F85\u30E6\u30FC\u30B6\u30FC\u306B\u9023\u7D61\u3057\u3001\u518D\u767B\u9332 \u306E\u624B\u7D9A\u304D\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002"] - }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_1__["default"], { - type: "fail", - hide: function hide() { - return set400Error(''); - }, - children: _400error - })] - }) - }); -}; - -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ParentSignUpError); - -/***/ }), - /***/ "./resources/js/parent/auth/register/index.jsx": /*!*****************************************************!*\ !*** ./resources/js/parent/auth/register/index.jsx ***! @@ -46277,52 +46107,6 @@ var ParentSignUp = function ParentSignUp(props) { /***/ }), -/***/ "./resources/js/parent/auth/withdrawal_complete.jsx": -/*!**********************************************************!*\ - !*** ./resources/js/parent/auth/withdrawal_complete.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 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"); - - - - - -var ParentWithdrawalComplete = function ParentWithdrawalComplete() { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "l-single-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { - className: "l-single-inner", - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("p", { - className: "text-center font-weight-bold ft-25", - children: "\u9000\u4F1A\u5B8C\u4E86" - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { - className: "edit-set-bg u-mb30-lose u-mb25-gain ft-xs-16 mt-5", - children: ["\u9000\u4F1A\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("br", {}), "\u4ECA\u5F8C\u3068\u3082\u3001KIKI\u7BA1\u7406\u3092\u3088\u308D\u3057\u304F\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { - className: "text-center", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { - to: "/p-account/login", - className: "ft-xs-16", - children: "\u30C8\u30C3\u30D7\u30DA\u30FC\u30B8\u3078\u623B\u308B" - }) - })] - }) - }); -}; - -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ParentWithdrawalComplete); - -/***/ }), - /***/ "./resources/js/parent/child/add.jsx": /*!*******************************************!*\ !*** ./resources/js/parent/child/add.jsx ***! diff --git a/backend/resources/js/child/auth/index.js b/backend/resources/js/child/auth/index.js index ee64f92c..58dcfce6 100644 --- a/backend/resources/js/child/auth/index.js +++ b/backend/resources/js/child/auth/index.js @@ -2,14 +2,15 @@ import React, { Component } from 'react'; import ReactDOM from 'react-dom'; import { BrowserRouter, Route, Switch } from 'react-router-dom'; import ChildForgotPassword from './forgot_password'; -import ChildForgotPasswordComplete from './forgot_password/complete'; import ChildForgotPasswordReset from './forgot_password/reset'; import ChildLogin from './login'; import ChildSignUpTemporary from './register/temporary'; import ChildSignUp from './register'; -import ChildSignUpComplete from './register/complete'; -import ChildSignUpError from './register/error'; -import ChildWithdrawal from './withdrawal_complete'; + +import PasswordResetComplete from '../../component/password_reset_complete'; +import SignUpComplete from '../../component/register/complete'; +import SignUpError from '../../component/register/error'; +import Withdrawal from '../../component/withdrawal_complete'; import ScrollToTop from '../../component/scroll_top'; @@ -24,15 +25,15 @@ export default class ChildAuth extends Component { - - + + - + - + diff --git a/backend/resources/js/child/auth/withdrawal_complete.jsx b/backend/resources/js/child/auth/withdrawal_complete.jsx deleted file mode 100644 index be7bd37c..00000000 --- a/backend/resources/js/child/auth/withdrawal_complete.jsx +++ /dev/null @@ -1,21 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom'; - -const ChildWithdrawal = () => { - return ( -
-
-

退会完了

-
- 退会完了しました。
- 今後とも、KIKI管理をよろしくお願いいたします。 -
-
- トップページへ戻る -
-
-
- ) -} - -export default ChildWithdrawal; \ No newline at end of file diff --git a/backend/resources/js/child/auth/forgot_password/complete.jsx b/backend/resources/js/component/password_reset_complete.jsx similarity index 72% rename from backend/resources/js/child/auth/forgot_password/complete.jsx rename to backend/resources/js/component/password_reset_complete.jsx index f7c77a27..ef6f0540 100644 --- a/backend/resources/js/child/auth/forgot_password/complete.jsx +++ b/backend/resources/js/component/password_reset_complete.jsx @@ -1,13 +1,18 @@ import React, { useEffect, useState } from 'react'; import { Button } from '@material-ui/core'; -import { useHistory } from 'react-router'; +import { useHistory, useLocation } from 'react-router'; -const ChildForgotPasswordComplete = () => { +const PasswordResetComplete = () => { const history = useHistory(); + const { pathname } = useLocation(); const gotoLogin = () => { - history.push({pathname: '/c-account/login', state: ''}); + var url; + if(pathname.includes('c-account')) url = '/c-account/login'; + else if(pathname.includes('p-account')) url = '/p-account/login'; + + history.push({pathname: url, state: ''}); } return ( @@ -32,4 +37,4 @@ const ChildForgotPasswordComplete = () => { -export default ChildForgotPasswordComplete; \ No newline at end of file +export default PasswordResetComplete; \ No newline at end of file diff --git a/backend/resources/js/child/auth/register/complete.jsx b/backend/resources/js/component/register/complete.jsx similarity index 69% rename from backend/resources/js/child/auth/register/complete.jsx rename to backend/resources/js/component/register/complete.jsx index aef5d5b6..5b5b00d5 100644 --- a/backend/resources/js/child/auth/register/complete.jsx +++ b/backend/resources/js/component/register/complete.jsx @@ -1,13 +1,19 @@ -import React, { useEffect, useState } from 'react'; +import React from 'react'; import { Button } from '@material-ui/core'; -import { useHistory } from 'react-router'; +import { useHistory, useLocation } from 'react-router'; -const ChildSignUpComplete = () => { +const SignUpComplete = () => { const history = useHistory(); + const { pathname } = useLocation(); + const gotoLogin = () => { - history.push({pathname: '/c-account/login', state: ''}); + var url; + if(pathname.includes('c-account')) url = '/c-account/login'; + else if(pathname.includes('p-account')) url = '/p-account/login'; + + history.push({pathname: url, state: ''}); } return ( @@ -32,4 +38,4 @@ const ChildSignUpComplete = () => { -export default ChildSignUpComplete; \ No newline at end of file +export default SignUpComplete; \ No newline at end of file diff --git a/backend/resources/js/child/auth/register/error.jsx b/backend/resources/js/component/register/error.jsx similarity index 78% rename from backend/resources/js/child/auth/register/error.jsx rename to backend/resources/js/component/register/error.jsx index a156792a..65a40159 100644 --- a/backend/resources/js/child/auth/register/error.jsx +++ b/backend/resources/js/component/register/error.jsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; -import Alert from '../../../component/alert'; +import Alert from '../alert'; -const ChildSignUpError = (props) => { +const SignUpError = (props) => { const [_400error, set400Error] = useState(props.history.location.state); return (
@@ -9,7 +9,7 @@ const ChildSignUpError = (props) => {

本登録エラー

登録の経過時間が過ぎております。
- お手数ですが再度招待ユーザーに連絡し、再登録 の手続きをお願いいたします。 + お手数ですが再度招待ユーザーに連絡し、再登録の手続きをお願いいたします。 { _400error && set400Error('')}>{_400error} }
@@ -17,4 +17,4 @@ const ChildSignUpError = (props) => { ) } -export default ChildSignUpError; \ No newline at end of file +export default SignUpError; \ No newline at end of file diff --git a/backend/resources/js/parent/auth/withdrawal_complete.jsx b/backend/resources/js/component/withdrawal_complete.jsx similarity index 57% rename from backend/resources/js/parent/auth/withdrawal_complete.jsx rename to backend/resources/js/component/withdrawal_complete.jsx index 0d05e216..05ab25f5 100644 --- a/backend/resources/js/parent/auth/withdrawal_complete.jsx +++ b/backend/resources/js/component/withdrawal_complete.jsx @@ -1,7 +1,13 @@ import React from 'react'; -import { Link } from 'react-router-dom'; +import { Link, useLocation } from 'react-router-dom'; -const ParentWithdrawalComplete = () => { +const Withdrawal = () => { + const { pathname } = useLocation(); + var url; + + if(pathname.includes('c-account')) url = '/c-account/login'; + else if(pathname.includes('p-account')) url = '/p-account/login'; + return (
@@ -11,11 +17,11 @@ const ParentWithdrawalComplete = () => { 今後とも、KIKI管理をよろしくお願いいたします。
- トップページへ戻る + トップページへ戻る
) } -export default ParentWithdrawalComplete; \ No newline at end of file +export default Withdrawal; \ No newline at end of file diff --git a/backend/resources/js/pages/PDFView.jsx b/backend/resources/js/pages/PDFView.jsx index bc518b96..6010238d 100644 --- a/backend/resources/js/pages/PDFView.jsx +++ b/backend/resources/js/pages/PDFView.jsx @@ -63,9 +63,9 @@ const PDFViewer = () => { ); } -if(document.getElementById('pdf-preview')){ +if(document.getElementById('pdf')){ ReactDOM.render( , - document.getElementById('pdf-preview') + document.getElementById('pdf') ) } \ No newline at end of file diff --git a/backend/resources/js/parent/auth/forgot_password/complete.jsx b/backend/resources/js/parent/auth/forgot_password/complete.jsx deleted file mode 100644 index 7f489644..00000000 --- a/backend/resources/js/parent/auth/forgot_password/complete.jsx +++ /dev/null @@ -1,35 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import { Button } from '@material-ui/core'; -import { useHistory } from 'react-router'; - -const ParentForgotPasswordComplete = () => { - - const history = useHistory(); - - const gotoLogin = () => { - history.push({pathname: '/p-account/login', state: ''}); - } - - return ( -
-
-

登録完了

- - パスワードの更新が完了しました。
- ログイン画面に遷移して、新しいパスワードをご利用ください。 - -
- -
-
-
- ) -} - - - -export default ParentForgotPasswordComplete; \ No newline at end of file diff --git a/backend/resources/js/parent/auth/index.js b/backend/resources/js/parent/auth/index.js index bb758291..8db6d9eb 100644 --- a/backend/resources/js/parent/auth/index.js +++ b/backend/resources/js/parent/auth/index.js @@ -2,13 +2,14 @@ import React, { Component } from 'react'; import ReactDOM from 'react-dom'; import { BrowserRouter, Route, Switch } from 'react-router-dom'; import ParentForgotPassword from './forgot_password'; -import ParentForgotPasswordComplete from './forgot_password/complete'; import ParentForgotPasswordReset from './forgot_password/reset'; import ParentLogin from './login'; import ParentSignUp from './register'; -import ParentSignUpComplete from './register/complete'; -import ParentSignUpError from './register/error'; -import ParentWithdrawalComplete from './withdrawal_complete'; + +import PasswordResetComplete from '../../component/password_reset_complete'; +import SignUpComplete from '../../component/register/complete'; +import SignUpError from '../../component/register/error'; +import Withdrawal from '../../component/withdrawal_complete'; import ScrollToTop from '../../component/scroll_top'; @@ -22,15 +23,15 @@ export default class ParentAuth extends Component { - - + + - + - + diff --git a/backend/resources/js/parent/auth/register/complete.jsx b/backend/resources/js/parent/auth/register/complete.jsx deleted file mode 100644 index 58285322..00000000 --- a/backend/resources/js/parent/auth/register/complete.jsx +++ /dev/null @@ -1,35 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import { Button } from '@material-ui/core'; -import { useHistory } from 'react-router'; - -const ParentSignUpComplete = () => { - - const history = useHistory(); - - const gotoLogin = () => { - history.push({pathname: '/p-account/login', state:''}); - } - - return ( -
-
-

本登録完了

- - 本登録が完了しました。
- ログイン画面より、ログインを行ってください。 - -
- -
-
-
- ) -} - - - -export default ParentSignUpComplete; \ No newline at end of file diff --git a/backend/resources/js/parent/auth/register/error.jsx b/backend/resources/js/parent/auth/register/error.jsx deleted file mode 100644 index 45784a20..00000000 --- a/backend/resources/js/parent/auth/register/error.jsx +++ /dev/null @@ -1,23 +0,0 @@ -import React, { useState } from 'react'; -import Alert from '../../../component/alert'; - -const ParentSignUpError = (props) => { - - const [_400error, set400Error] = useState(props.history.location.state); - return ( -
-
-

本登録エラー

- - 登録の経過時間が過ぎております。
- お手数ですが再度招待ユーザーに連絡し、再登録 の手続きをお願いいたします。 - - { _400error && set400Error('')}>{_400error} } -
-
- ) -} - - - -export default ParentSignUpError; \ No newline at end of file diff --git a/backend/resources/views/pages/pdf.blade.php b/backend/resources/views/pages/pdf.blade.php index a71531ea..c0f97457 100644 --- a/backend/resources/views/pages/pdf.blade.php +++ b/backend/resources/views/pages/pdf.blade.php @@ -3,6 +3,6 @@ @section('title', 'KIKI｜PDF') @section('content') -
+
@endsection \ No newline at end of file