diff --git a/backend/public/css/app.css b/backend/public/css/app.css index cccb0b01..d6174d24 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -12956,7 +12956,7 @@ categories: [project] @font-face { font-family: "iconfont"; src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2); - src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?d812f238f7ec32f5cb5ebd322f320a02) format("svg"); + src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?9e48c54f8bbb472c1c286234fdd6636f) format("svg"); font-weight: normal; font-style: normal; } diff --git a/backend/public/js/app.js b/backend/public/js/app.js index cbf17ea2..837fcf92 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -35521,8 +35521,8 @@ __webpack_require__.r(__webpack_exports__); /* 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_17__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); /* harmony import */ var _meeting__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./meeting */ "./resources/js/admin/meeting/index.jsx"); /* harmony import */ var _meeting_detail__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./meeting/detail */ "./resources/js/admin/meeting/detail.jsx"); /* harmony import */ var _meeting_edit__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./meeting/edit */ "./resources/js/admin/meeting/edit.jsx"); @@ -35537,7 +35537,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _parent_register__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./parent/register */ "./resources/js/admin/parent/register.jsx"); /* harmony import */ var _side__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./side */ "./resources/js/admin/side.jsx"); /* harmony import */ var _component_page_change_handler__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../component/page_change_handler */ "./resources/js/component/page_change_handler.jsx"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); +/* harmony import */ var _component_scroll_top__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../component/scroll_top */ "./resources/js/component/scroll_top.jsx"); +/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__ = __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); } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -35578,6 +35579,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g + var AdminApp = /*#__PURE__*/function (_Component) { @@ -35594,60 +35596,60 @@ var AdminApp = /*#__PURE__*/function (_Component) { _createClass(AdminApp, [{ key: "render", value: function render() { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)("main", { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)("main", { className: "l-container meeting-consent", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_17__.BrowserRouter, { - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(_component_page_change_handler__WEBPACK_IMPORTED_MODULE_15__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Switch, { - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.BrowserRouter, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(_component_scroll_top__WEBPACK_IMPORTED_MODULE_16__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(_component_page_change_handler__WEBPACK_IMPORTED_MODULE_15__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Switch, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/meeting", component: _meeting__WEBPACK_IMPORTED_MODULE_2__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/meeting/detail/:meeting_id", component: _meeting_detail__WEBPACK_IMPORTED_MODULE_3__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/meeting/edit/:meeting_id", component: _meeting_edit__WEBPACK_IMPORTED_MODULE_4__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/child", component: _child__WEBPACK_IMPORTED_MODULE_5__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/child/detail/:child_id", component: _child_detail__WEBPACK_IMPORTED_MODULE_6__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/child/edit/:child_id", component: _child_edit__WEBPACK_IMPORTED_MODULE_7__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/child/edit/password/:child_id", component: _child_password_edit__WEBPACK_IMPORTED_MODULE_8__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/parent", component: _parent__WEBPACK_IMPORTED_MODULE_9__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/parent/detail/:father_id", component: _parent_detail__WEBPACK_IMPORTED_MODULE_10__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/parent/edit/:father_id", component: _parent_edit__WEBPACK_IMPORTED_MODULE_11__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/parent/edit/password/:father_id", component: _parent_password_edit__WEBPACK_IMPORTED_MODULE_12__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.Route, { exact: true, path: "/admin/parent/register", component: _parent_register__WEBPACK_IMPORTED_MODULE_13__["default"] })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(_side__WEBPACK_IMPORTED_MODULE_14__["default"], {})] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(_side__WEBPACK_IMPORTED_MODULE_14__["default"], {})] }) }); } @@ -35659,7 +35661,7 @@ var AdminApp = /*#__PURE__*/function (_Component) { if (document.getElementById('admin-app')) { - react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)(AdminApp, {}), document.getElementById('admin-app')); + react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)(AdminApp, {}), document.getElementById('admin-app')); } /***/ }), @@ -35768,6 +35770,7 @@ var AdminLogin = function AdminLogin() { case 200: { localStorage.setItem("from_login", true); + localStorage.setItem('kiki_acc_type', 'admin'); window.location.href = "/admin/meeting"; break; } @@ -39060,7 +39063,7 @@ function Side() { case 0: _context.next = 2; return axios.get('/admin/logout').then(function () { - return location.href = '/admin/login'; + location.href = '/admin/login'; }); case 2: @@ -39632,7 +39635,7 @@ __webpack_require__.r(__webpack_exports__); /* 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_page_change_handler__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../component/page_change_handler */ "./resources/js/component/page_change_handler.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); } @@ -39693,7 +39696,7 @@ var ChildAuth = /*#__PURE__*/function (_Component) { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)("div", { className: "l-centeringbox-wrap", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.BrowserRouter, { - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(_component_page_change_handler__WEBPACK_IMPORTED_MODULE_11__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Switch, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsx)(_component_scroll_top__WEBPACK_IMPORTED_MODULE_11__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_12__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Switch, { 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", @@ -39847,6 +39850,7 @@ var ChildLogin = function ChildLogin(props) { case 200: { localStorage.setItem("from_login", true); + localStorage.setItem('kiki_acc_type', 'c-account'); window.location.href = '/c-account/meeting'; break; } @@ -40655,10 +40659,11 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _profile_password_edit__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./profile/password_edit */ "./resources/js/child/profile/password_edit.jsx"); /* harmony import */ var _profile_withdrawal__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./profile/withdrawal */ "./resources/js/child/profile/withdrawal.jsx"); /* harmony import */ var _search__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./search */ "./resources/js/child/search/index.jsx"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); /* harmony import */ var _component_page_change_handler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../component/page_change_handler */ "./resources/js/component/page_change_handler.jsx"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); +/* harmony import */ var _component_scroll_top__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../component/scroll_top */ "./resources/js/component/scroll_top.jsx"); +/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__ = __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); } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -40698,6 +40703,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g + var ChildApp = /*#__PURE__*/function (_Component) { _inherits(ChildApp, _Component); @@ -40712,48 +40718,48 @@ var ChildApp = /*#__PURE__*/function (_Component) { _createClass(ChildApp, [{ key: "render", value: function render() { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)("main", { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)("main", { className: "l-container meeting-consent", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.BrowserRouter, { - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(_component_page_change_handler__WEBPACK_IMPORTED_MODULE_12__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.Switch, { - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.Route, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.BrowserRouter, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(_component_page_change_handler__WEBPACK_IMPORTED_MODULE_12__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(_component_scroll_top__WEBPACK_IMPORTED_MODULE_13__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_16__.Switch, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_16__.Route, { exact: true, path: "/c-account/meeting", component: _meeting__WEBPACK_IMPORTED_MODULE_3__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_16__.Route, { exact: true, path: "/c-account/meeting/detail/:meeting_id", component: _meeting_detail__WEBPACK_IMPORTED_MODULE_4__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_16__.Route, { exact: true, path: "/c-account/search", component: _search__WEBPACK_IMPORTED_MODULE_11__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_16__.Route, { exact: true, path: "/c-account/parent", component: _parent__WEBPACK_IMPORTED_MODULE_5__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_16__.Route, { exact: true, path: "/c-account/parent/detail/:father_id", component: _parent_detail__WEBPACK_IMPORTED_MODULE_6__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_16__.Route, { exact: true, path: "/c-account/profile", component: _profile__WEBPACK_IMPORTED_MODULE_7__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_16__.Route, { exact: true, path: "/c-account/profile/edit/:child_id", component: _profile_edit__WEBPACK_IMPORTED_MODULE_8__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_16__.Route, { exact: true, path: "/c-account/profile/password-edit/:child_id", component: _profile_password_edit__WEBPACK_IMPORTED_MODULE_9__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_15__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_16__.Route, { exact: true, path: "/c-account/profile/withdrawal", component: _profile_withdrawal__WEBPACK_IMPORTED_MODULE_10__["default"] })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(_side__WEBPACK_IMPORTED_MODULE_2__["default"], {})] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(_side__WEBPACK_IMPORTED_MODULE_2__["default"], {})] }) }); } @@ -40765,7 +40771,7 @@ var ChildApp = /*#__PURE__*/function (_Component) { if (document.getElementById('c-app')) { - react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_13__.jsx)(ChildApp, {}), document.getElementById('c-app')); + react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(ChildApp, {}), document.getElementById('c-app')); } /***/ }), @@ -42690,7 +42696,7 @@ var Profile = function Profile(props) { case 0: _context2.next = 2; return axios.get('/c-account/logout').then(function () { - return location.href = '/c-account/login'; + location.href = '/c-account/login'; }); case 2: @@ -43875,7 +43881,7 @@ function Side() { case 0: _context.next = 2; return axios.get('/c-account/logout').then(function () { - return location.href = '/c-account/login'; + location.href = '/c-account/login'; }); case 2: @@ -44708,8 +44714,15 @@ function PageChangeHandler() { pathname = _useLocation.pathname; (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { - window.scrollTo(0, 0); + loginCheck(); }, [pathname]); + + var loginCheck = function loginCheck() { + var acc = pathname.split('/')[1]; + console.log(localStorage.getItem('kiki_acc_type'), acc); + if (localStorage.getItem('kiki_acc_type') && acc != localStorage.getItem('kiki_acc_type')) location.reload(); + }; + return null; } @@ -45191,6 +45204,33 @@ var SignUpError = function SignUpError(props) { /***/ }), +/***/ "./resources/js/component/scroll_top.jsx": +/*!***********************************************!*\ + !*** ./resources/js/component/scroll_top.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 */ ScrollToTop) +/* 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_1__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); + + +function ScrollToTop() { + var _useLocation = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_1__.useLocation)(), + pathname = _useLocation.pathname; + + (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { + window.scrollTo(0, 0); + }, [pathname]); + return null; +} + +/***/ }), + /***/ "./resources/js/component/thumbnail.jsx": /*!**********************************************!*\ !*** ./resources/js/component/thumbnail.jsx ***! @@ -46410,7 +46450,7 @@ __webpack_require__.r(__webpack_exports__); /* 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_page_change_handler__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../component/page_change_handler */ "./resources/js/component/page_change_handler.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); } @@ -46470,7 +46510,7 @@ var ParentAuth = /*#__PURE__*/function (_Component) { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", { className: "l-centeringbox-wrap", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_12__.BrowserRouter, { - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_page_change_handler__WEBPACK_IMPORTED_MODULE_10__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Switch, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_scroll_top__WEBPACK_IMPORTED_MODULE_10__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_13__.Switch, { 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", @@ -46620,6 +46660,7 @@ var ParentLogin = function ParentLogin(props) { case 200: { localStorage.setItem("from_login", true); + localStorage.setItem('kiki_acc_type', 'p-account'); window.location.href = '/p-account/meeting'; break; } @@ -48900,10 +48941,12 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _profile_edit__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./profile/edit */ "./resources/js/parent/profile/edit.jsx"); /* harmony import */ var _profile_password_edit__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./profile/password_edit */ "./resources/js/parent/profile/password_edit.jsx"); /* harmony import */ var _profile_withdrawal__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./profile/withdrawal */ "./resources/js/parent/profile/withdrawal.jsx"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); /* harmony import */ var _component_page_change_handler__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../component/page_change_handler */ "./resources/js/component/page_change_handler.jsx"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); +/* harmony import */ var _component_scroll_top__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../component/scroll_top */ "./resources/js/component/scroll_top.jsx"); +/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); + @@ -48926,78 +48969,78 @@ __webpack_require__.r(__webpack_exports__); var App = function App() { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)("main", { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)("main", { className: "l-container", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_19__.BrowserRouter, { - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(_component_page_change_handler__WEBPACK_IMPORTED_MODULE_17__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Switch, { - children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.BrowserRouter, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(_component_scroll_top__WEBPACK_IMPORTED_MODULE_18__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(_component_page_change_handler__WEBPACK_IMPORTED_MODULE_17__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Switch, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account", component: _meeting__WEBPACK_IMPORTED_MODULE_3__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/meeting", component: _meeting__WEBPACK_IMPORTED_MODULE_3__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/meeting/detail/:meeting_id", component: _meeting_detail__WEBPACK_IMPORTED_MODULE_4__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/meeting/new", component: _meeting_add__WEBPACK_IMPORTED_MODULE_5__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/meeting/edit/:meeting_id", component: _meeting_edit__WEBPACK_IMPORTED_MODULE_6__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/favorite", component: _favorite__WEBPACK_IMPORTED_MODULE_7__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/search", component: _search__WEBPACK_IMPORTED_MODULE_8__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/child", component: _child__WEBPACK_IMPORTED_MODULE_9__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/child/add", component: _child_add__WEBPACK_IMPORTED_MODULE_10__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/child/edit/hire-date/:child_id", component: _child_edit__WEBPACK_IMPORTED_MODULE_11__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/child/detail/:child_id", component: _child_detail__WEBPACK_IMPORTED_MODULE_12__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/profile", component: _profile__WEBPACK_IMPORTED_MODULE_13__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/profile/edit/:father_id", component: _profile_edit__WEBPACK_IMPORTED_MODULE_14__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/profile/edit/password/:father_id", component: _profile_password_edit__WEBPACK_IMPORTED_MODULE_15__["default"] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_20__.Route, { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_21__.Route, { exact: true, path: "/p-account/profile/withdrawal", component: _profile_withdrawal__WEBPACK_IMPORTED_MODULE_16__["default"] })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(_side__WEBPACK_IMPORTED_MODULE_2__["default"], {})] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(_side__WEBPACK_IMPORTED_MODULE_2__["default"], {})] }) }); }; if (document.getElementById('p-app')) { - react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_18__.jsx)(App, {}), document.getElementById('p-app')); + react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_19__.jsx)(App, {}), document.getElementById('p-app')); } /***/ }), @@ -52267,7 +52310,7 @@ var Profile = function Profile(props) { case 0: _context2.next = 2; return axios.get('/p-account/logout').then(function () { - return location.href = '/p-account/login'; + location.href = '/p-account/login'; }); case 2: @@ -53583,7 +53626,7 @@ function Side() { case 0: _context.next = 2; return axios.get('/p-account/logout').then(function () { - return location.href = '/p-account/login'; + location.href = '/p-account/login'; }); case 2: diff --git a/backend/resources/js/admin/index.js b/backend/resources/js/admin/index.js index cf7c9d87..ca15386a 100644 --- a/backend/resources/js/admin/index.js +++ b/backend/resources/js/admin/index.js @@ -19,12 +19,14 @@ import ParentRegister from './parent/register'; import Side from './side'; import PageChangeHandler from '../component/page_change_handler'; +import ScrollToTop from '../component/scroll_top'; 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 12d87a64..45147950 100644 --- a/backend/resources/js/admin/login/index.jsx +++ b/backend/resources/js/admin/login/index.jsx @@ -35,6 +35,7 @@ const AdminLogin = () => { switch(response.data.status_code){ case 200: { localStorage.setItem("from_login", true); + localStorage.setItem('kiki_acc_type', 'admin'); window.location.href = "/admin/meeting"; break; } diff --git a/backend/resources/js/admin/side.jsx b/backend/resources/js/admin/side.jsx index 6fd3674a..12fd9f07 100644 --- a/backend/resources/js/admin/side.jsx +++ b/backend/resources/js/admin/side.jsx @@ -6,7 +6,9 @@ export default function Side() { const handleLogout = async () => { await axios.get('/admin/logout') - .then(() => location.href = '/admin/login') + .then(() => { + location.href = '/admin/login'; + }) } return ( diff --git a/backend/resources/js/child/auth/index.js b/backend/resources/js/child/auth/index.js index bd5b37d1..332d7bb6 100644 --- a/backend/resources/js/child/auth/index.js +++ b/backend/resources/js/child/auth/index.js @@ -12,7 +12,7 @@ import SignUpComplete from '../../component/register/complete'; import SignUpError from '../../component/register/error'; import WithdrawalComplete from '../../component/withdrawal_complete'; -import PageChangeHandler from '../../component/page_change_handler'; +import ScrollToTop from '../../component/scroll_top'; export default class ChildAuth extends Component { render() { @@ -21,7 +21,7 @@ export default class ChildAuth extends Component {
- + diff --git a/backend/resources/js/child/auth/login/index.jsx b/backend/resources/js/child/auth/login/index.jsx index f333407b..fc78cde2 100644 --- a/backend/resources/js/child/auth/login/index.jsx +++ b/backend/resources/js/child/auth/login/index.jsx @@ -30,6 +30,7 @@ const ChildLogin = (props) => { switch(response.data.status_code){ case 200:{ localStorage.setItem("from_login", true); + localStorage.setItem('kiki_acc_type', 'c-account'); window.location.href = '/c-account/meeting'; break; } diff --git a/backend/resources/js/child/index.js b/backend/resources/js/child/index.js index 8fdf6434..02ccdde0 100644 --- a/backend/resources/js/child/index.js +++ b/backend/resources/js/child/index.js @@ -17,13 +17,16 @@ import Search from './search'; import { BrowserRouter, Route, Switch } from 'react-router-dom'; import PageChangeHandler from '../component/page_change_handler'; +import ScrollToTop from '../component/scroll_top'; + export default class ChildApp extends Component { render() { return (
- + + diff --git a/backend/resources/js/child/profile/index.jsx b/backend/resources/js/child/profile/index.jsx index 2394d720..9f183829 100644 --- a/backend/resources/js/child/profile/index.jsx +++ b/backend/resources/js/child/profile/index.jsx @@ -58,7 +58,9 @@ const Profile = (props) => { const handleLogout = async () => { await axios.get('/c-account/logout') - .then(() => location.href = '/c-account/login') + .then(() => { + location.href = '/c-account/login'; + }) } const handleImageChange = (e) => { diff --git a/backend/resources/js/child/side.jsx b/backend/resources/js/child/side.jsx index dc1c189b..d5746772 100644 --- a/backend/resources/js/child/side.jsx +++ b/backend/resources/js/child/side.jsx @@ -8,7 +8,10 @@ export default function Side() { const handleLogout = async () => { await axios.get('/c-account/logout') - .then(() => location.href = '/c-account/login') + .then(() => { + location.href = '/c-account/login'; + }) + } const handleSelected = (id) => { diff --git a/backend/resources/js/component/page_change_handler.jsx b/backend/resources/js/component/page_change_handler.jsx index d629ad31..6efb4d21 100644 --- a/backend/resources/js/component/page_change_handler.jsx +++ b/backend/resources/js/component/page_change_handler.jsx @@ -5,8 +5,15 @@ export default function PageChangeHandler() { const { pathname } = useLocation(); useEffect(() => { - window.scrollTo(0, 0); + loginCheck(); }, [pathname]); + const loginCheck = () => { + let acc = pathname.split('/')[1]; + console.log(localStorage.getItem('kiki_acc_type'), acc); + if(localStorage.getItem('kiki_acc_type') && (acc != localStorage.getItem('kiki_acc_type'))) + location.reload(); + } + return null; } diff --git a/backend/resources/js/component/scroll_top.jsx b/backend/resources/js/component/scroll_top.jsx new file mode 100644 index 00000000..d1adaa13 --- /dev/null +++ b/backend/resources/js/component/scroll_top.jsx @@ -0,0 +1,12 @@ +import { useEffect } from "react"; +import { useLocation } from "react-router-dom"; + +export default function ScrollToTop() { + const { pathname } = useLocation(); + + useEffect(() => { + window.scrollTo(0, 0); + }, [pathname]); + + return null; +} diff --git a/backend/resources/js/parent/auth/index.js b/backend/resources/js/parent/auth/index.js index fd18af29..b5d38fa8 100644 --- a/backend/resources/js/parent/auth/index.js +++ b/backend/resources/js/parent/auth/index.js @@ -11,7 +11,7 @@ import SignUpComplete from '../../component/register/complete'; import SignUpError from '../../component/register/error'; import WithdrawalComplete from '../../component/withdrawal_complete'; -import PageChangeHandler from '../../component/page_change_handler'; +import ScrollToTop from '../../component/scroll_top'; export default class ParentAuth extends Component { render() { @@ -20,7 +20,7 @@ export default class ParentAuth extends Component {
- + diff --git a/backend/resources/js/parent/auth/login/index.jsx b/backend/resources/js/parent/auth/login/index.jsx index e198ed6b..eb31ee45 100644 --- a/backend/resources/js/parent/auth/login/index.jsx +++ b/backend/resources/js/parent/auth/login/index.jsx @@ -30,6 +30,7 @@ const ParentLogin = (props) => { switch(response.data.status_code){ case 200:{ localStorage.setItem("from_login", true); + localStorage.setItem('kiki_acc_type', 'p-account'); window.location.href = '/p-account/meeting'; break; } diff --git a/backend/resources/js/parent/index.js b/backend/resources/js/parent/index.js index e417cce5..4aac957d 100644 --- a/backend/resources/js/parent/index.js +++ b/backend/resources/js/parent/index.js @@ -22,11 +22,13 @@ import ProfileWithdrawal from './profile/withdrawal'; import { BrowserRouter, Route, Switch } from 'react-router-dom'; import PageChangeHandler from '../component/page_change_handler'; +import ScrollToTop from '../component/scroll_top'; export const App = () => { return (
+ diff --git a/backend/resources/js/parent/profile/index.jsx b/backend/resources/js/parent/profile/index.jsx index efb01819..f8bfad2c 100644 --- a/backend/resources/js/parent/profile/index.jsx +++ b/backend/resources/js/parent/profile/index.jsx @@ -56,7 +56,9 @@ const Profile = (props) => { const handleLogout = async () => { await axios.get('/p-account/logout') - .then(() => location.href = '/p-account/login') + .then(() => { + location.href = '/p-account/login'; + }) } const handleImageChange = (e) => { diff --git a/backend/resources/js/parent/side.jsx b/backend/resources/js/parent/side.jsx index bd67f08e..0963dd68 100644 --- a/backend/resources/js/parent/side.jsx +++ b/backend/resources/js/parent/side.jsx @@ -8,7 +8,9 @@ export default function Side() { const handleLogout = async () => { await axios.get('/p-account/logout') - .then(() => location.href = '/p-account/login') + .then(() => { + location.href = '/p-account/login'; + }) } const handleSelected = (id) => {