From cf6c37b62037e70b89f4fdcfe5f1ae7aab098e09 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Fri, 28 Jan 2022 01:06:26 -0800 Subject: [PATCH] fixed login --- backend/public/js/index.js | 262 ++++-------------- backend/resources/js/admin/login/index.jsx | 12 +- backend/resources/js/admin/side.jsx | 3 - .../resources/js/child/auth/login/index.jsx | 5 - backend/resources/js/child/profile/index.jsx | 3 - backend/resources/js/child/side.jsx | 3 - .../resources/js/parent/auth/login/index.jsx | 5 - backend/resources/js/parent/profile/index.jsx | 3 - backend/resources/js/parent/side.jsx | 3 - 9 files changed, 58 insertions(+), 241 deletions(-) diff --git a/backend/public/js/index.js b/backend/public/js/index.js index adf92bfa..aed6c08b 100644 --- a/backend/public/js/index.js +++ b/backend/public/js/index.js @@ -27378,9 +27378,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__) /* harmony export */ }); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js"); -/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.js"); -/* harmony import */ var react_cookie__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js"); +/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.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(); } @@ -27402,14 +27401,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - var AdminLogin = function AdminLogin() { - var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_3__["default"])(['user']), - _useCookies2 = _slicedToArray(_useCookies, 2), - cookies = _useCookies2[0], - setCookie = _useCookies2[1]; - - var location = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_4__.useLocation)(); + var location = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_3__.useLocation)(); + var navigator = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_3__.useNavigate)(); var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState2 = _slicedToArray(_useState, 2), @@ -27454,10 +27448,7 @@ var AdminLogin = function AdminLogin() { case 200: { localStorage.setItem('kiki_login_flag', true); - localStorage.setItem('kiki_acc_type', 'admin'); - localStorage.setItem('kiki_acc_id', response.data.params.id); - setCookie('logged', 'success'); - if (location.search == '') window.location.href = "/admin/meeting";else window.location.href = location.search.replace('?redirect_to=', ''); + if (location.search == '') windows.location.href = '/admin/meeting';else window.location.href = location.search.replace('?redirect_to=', ''); break; } @@ -27494,8 +27485,6 @@ var AdminLogin = function AdminLogin() { case 200: { localStorage.setItem('kiki_login_flag', true); - localStorage.setItem('kiki_acc_type', 'admin'); - setCookie('logged', 'success'); if (location.search == '') window.location.href = "/admin/meeting";else window.location.href = location.search.replace('?redirect_to=', ''); break; } @@ -27579,7 +27568,7 @@ var AdminLogin = function AdminLogin() { })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", { className: "mt-5", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_5__["default"], { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_4__["default"], { type: "submit", loading: submit, fullWidth: true, @@ -30392,8 +30381,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ "default": () => (/* binding */ AdminSide) /* 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_3__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); -/* harmony import */ var react_cookie__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); } @@ -30411,21 +30399,14 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - function AdminSide() { var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState2 = _slicedToArray(_useState, 2), selected = _useState2[0], setSelected = _useState2[1]; - var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_2__["default"])(['user']), - _useCookies2 = _slicedToArray(_useCookies, 2), - cookies = _useCookies2[0], - setCookie = _useCookies2[1]; - var handleLogout = function handleLogout() { axios.get('/admin/logout').then(function () { - setCookie('logged', null); window.location.href = '/admin/login'; }); }; @@ -30451,7 +30432,7 @@ function AdminSide() { e.preventDefault(); setSelected('meeting'); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", to: "/admin/meeting", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { @@ -30466,7 +30447,7 @@ function AdminSide() { e.preventDefault(); setSelected('child'); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", to: "/admin/child", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { @@ -30481,7 +30462,7 @@ function AdminSide() { e.preventDefault(); setSelected('parent'); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", to: "/admin/parent", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { @@ -30948,10 +30929,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__) /* harmony export */ }); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); -/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.js"); -/* harmony import */ var react_cookie__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); +/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.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(); } @@ -30973,14 +30953,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - var ChildLogin = function ChildLogin() { - var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_3__["default"])(['user']), - _useCookies2 = _slicedToArray(_useCookies, 2), - cookies = _useCookies2[0], - setCookie = _useCookies2[1]; - - var location = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_4__.useLocation)(); + var location = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_3__.useLocation)(); var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false), _useState2 = _slicedToArray(_useState, 2), @@ -31025,9 +30999,7 @@ var ChildLogin = function ChildLogin() { case 200: { localStorage.setItem('kiki_login_flag', true); - localStorage.setItem('kiki_acc_type', 'c-account'); localStorage.setItem('kiki_acc_id', response.data.params.id); - setCookie('logged', 'success'); if (location.search == '') window.location.href = "/c-account/meeting";else window.location.href = location.search.replace('?redirect_to=', ''); break; } @@ -31062,7 +31034,6 @@ var ChildLogin = function ChildLogin() { localStorage.setItem("kiki_login_flag", true); localStorage.setItem('kiki_acc_type', 'c-account'); localStorage.setItem('kiki_acc_id', response.data.params.id); - setCookie('logged', 'success'); if (location.search == '') window.location.href = "/c-account/meeting";else window.location.href = location.search.replace('?redirect_to=', ''); break; } @@ -31152,7 +31123,7 @@ var ChildLogin = function ChildLogin() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", { className: "mt-5", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_5__["default"], { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_4__["default"], { type: "submit", loading: submit, fullWidth: true, @@ -31164,7 +31135,7 @@ var ChildLogin = function ChildLogin() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", { className: "mt-5 text-center", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_6__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, { to: "/c-account/forgot-password", className: "ft-16 text-black text-decoration-none", children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u7D1B\u5931\u306E\u65B9\u306F\u30B3\u30C1\u30E9" @@ -33370,11 +33341,10 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__) /* harmony export */ }); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); -/* harmony import */ var _material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core/IconButton */ "./node_modules/@material-ui/core/IconButton/IconButton.js"); -/* harmony import */ var _mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @mui/icons-material/PhotoCameraOutlined */ "./node_modules/@mui/icons-material/PhotoCameraOutlined.js"); -/* harmony import */ var react_cookie__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); +/* harmony import */ var _material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/IconButton */ "./node_modules/@material-ui/core/IconButton/IconButton.js"); +/* harmony import */ var _mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @mui/icons-material/PhotoCameraOutlined */ "./node_modules/@mui/icons-material/PhotoCameraOutlined.js"); /* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx"); /* harmony import */ var _component_page_loader__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../component/page_loader */ "./resources/js/component/page_loader.jsx"); /* harmony import */ var _component_notification__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../component/notification */ "./resources/js/component/notification.jsx"); @@ -33401,14 +33371,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - var ChildProfileDetail = function ChildProfileDetail() { - var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_5__["default"])(['user']), - _useCookies2 = _slicedToArray(_useCookies, 2), - cookies = _useCookies2[0], - setCookie = _useCookies2[1]; - - var navigator = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_6__.useNavigate)(); + var navigator = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_5__.useNavigate)(); var child_id = localStorage.getItem('kiki_acc_id'); var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(localStorage.getItem('notice')), @@ -33495,7 +33459,6 @@ var ChildProfileDetail = function ChildProfileDetail() { var handleLogout = function handleLogout() { axios.get('/c-account/logout').then(function () { - setCookie('logged', null); window.location.href = '/c-account/login'; }); }; @@ -33579,12 +33542,12 @@ var ChildProfileDetail = function ChildProfileDetail() { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", { htmlFor: "avatar", className: "avatar-label", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_7__["default"], { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_6__["default"], { color: "primary", "aria-label": "upload picture", component: "span", className: "bg-yellow shadow-sm w-50-px h-50-px", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_8__["default"], { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_7__["default"], { style: { width: '25px', height: '25px', @@ -33667,7 +33630,7 @@ var ChildProfileDetail = function ChildProfileDetail() { })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "p-profile-btn", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { to: "/c-account/profile/edit/".concat(child_id), className: "btn-default btn-yellow btn-profile btn-r8 btn-h52", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { @@ -33677,7 +33640,7 @@ var ChildProfileDetail = function ChildProfileDetail() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "p-profile-btn", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { to: "/c-account/profile/password-edit/".concat(child_id), className: "btn-default btn-yellow btn-password btn-r8 btn-h52", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { @@ -33687,7 +33650,7 @@ var ChildProfileDetail = function ChildProfileDetail() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "p-profile-txtLink", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { to: "/terms", className: "btn-default btn-password btn-r8 btn-h30", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { @@ -33697,7 +33660,7 @@ var ChildProfileDetail = function ChildProfileDetail() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "p-profile-txtLink", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { to: "/privacy-policy", className: "btn-default btn-password btn-r8 btn-h30", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { @@ -33717,7 +33680,7 @@ var ChildProfileDetail = function ChildProfileDetail() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "p-profile-txtLink", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { to: "/c-account/profile/withdrawal", className: "btn-default btn-password btn-r8 btn-h30", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { @@ -34572,8 +34535,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ "default": () => (/* binding */ ChildSide) /* 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_3__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); -/* harmony import */ var react_cookie__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); } @@ -34591,23 +34553,16 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - function ChildSide() { var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState2 = _slicedToArray(_useState, 2), selected = _useState2[0], setSelected = _useState2[1]; - var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_2__["default"])(['user']), - _useCookies2 = _slicedToArray(_useCookies, 2), - cookies = _useCookies2[0], - setCookie = _useCookies2[1]; - var child_img = document.getElementById('child_image').value; var handleLogout = function handleLogout() { axios.get('/c-account/logout').then(function () { - setCookie('logged', null); window.location.href = '/c-account/login'; }); }; @@ -34643,7 +34598,7 @@ function ChildSide() { onClick: function onClick(e) { return handleSelected("-meeting"); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", to: "/c-account/meeting", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { @@ -34657,7 +34612,7 @@ function ChildSide() { onClick: function onClick(e) { return handleSelected("-search"); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", to: "/c-account/search", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { @@ -34671,7 +34626,7 @@ function ChildSide() { onClick: function onClick(e) { return handleSelected("-parentinfo"); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", to: "/c-account/parent", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { @@ -34685,7 +34640,7 @@ function ChildSide() { onClick: function onClick(e) { return handleSelected("-profile"); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "user-icon mypage-nav-list__link", to: "/c-account/profile", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("figure", { @@ -37442,10 +37397,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__) /* harmony export */ }); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); -/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.js"); -/* harmony import */ var react_cookie__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); +/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.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(); } @@ -37467,14 +37421,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - var ParentLogin = function ParentLogin() { - var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_3__["default"])(['user']), - _useCookies2 = _slicedToArray(_useCookies, 2), - cookies = _useCookies2[0], - setCookie = _useCookies2[1]; - - var location = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_4__.useLocation)(); + var location = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_3__.useLocation)(); var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false), _useState2 = _slicedToArray(_useState, 2), @@ -37519,9 +37467,7 @@ var ParentLogin = function ParentLogin() { case 200: { localStorage.setItem('kiki_login_flag', true); - localStorage.setItem('kiki_acc_type', 'p-account'); localStorage.setItem('kiki_acc_id', response.data.params.id); - setCookie('logged', 'success'); if (location.search == '') window.location.href = "/p-account/meeting";else window.location.href = location.search.replace('?redirect_to=', ''); break; } @@ -37556,7 +37502,6 @@ var ParentLogin = function ParentLogin() { localStorage.setItem('kiki_login_flag', true); localStorage.setItem('kiki_acc_type', 'p-account'); localStorage.setItem('kiki_acc_id', response.data.params.id); - setCookie('logged', 'success'); if (location.search == '') window.location.href = "/p-account/meeting";else window.location.href = location.search.replace('?redirect_to=', ''); break; } @@ -37646,7 +37591,7 @@ var ParentLogin = function ParentLogin() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", { className: "mt-5", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_5__["default"], { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_4__["default"], { type: "submit", loading: submit, fullWidth: true, @@ -37658,7 +37603,7 @@ var ParentLogin = function ParentLogin() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", { className: "mt-5 text-center", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_6__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, { to: "/p-account/forgot-password", className: "ft-16 text-black text-decoration-none", children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u7D1B\u5931\u306E\u65B9\u306F\u30B3\u30C1\u30E9" @@ -42553,10 +42498,9 @@ __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_router_dom__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js"); -/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); -/* harmony import */ var _material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core/IconButton */ "./node_modules/@material-ui/core/IconButton/IconButton.js"); -/* harmony import */ var _mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @mui/icons-material/PhotoCameraOutlined */ "./node_modules/@mui/icons-material/PhotoCameraOutlined.js"); -/* harmony import */ var react_cookie__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); +/* harmony import */ var _material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/IconButton */ "./node_modules/@material-ui/core/IconButton/IconButton.js"); +/* harmony import */ var _mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @mui/icons-material/PhotoCameraOutlined */ "./node_modules/@mui/icons-material/PhotoCameraOutlined.js"); /* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx"); /* harmony import */ var _component_page_loader__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../component/page_loader */ "./resources/js/component/page_loader.jsx"); /* harmony import */ var _component_notification__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../component/notification */ "./resources/js/component/notification.jsx"); @@ -42583,15 +42527,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - var ParentProfileDetail = function ParentProfileDetail() { var navigator = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_5__.useNavigate)(); - - var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_6__["default"])(['user']), - _useCookies2 = _slicedToArray(_useCookies, 2), - cookies = _useCookies2[0], - setCookie = _useCookies2[1]; - var father_id = localStorage.getItem('kiki_acc_id'); var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(localStorage.getItem('notice')), @@ -42683,7 +42620,6 @@ var ParentProfileDetail = function ParentProfileDetail() { var handleLogout = function handleLogout() { axios.get('/p-account/logout').then(function () { - setCookie('logged', null); window.location.href = '/p-account/login'; }); }; @@ -42767,12 +42703,12 @@ var ParentProfileDetail = function ParentProfileDetail() { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", { htmlFor: "avatar", className: "avatar-label", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_7__["default"], { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_6__["default"], { color: "primary", "aria-label": "upload picture", component: "span", className: "bg-yellow shadow-sm w-50-px h-50-px", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_8__["default"], { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_PhotoCameraOutlined__WEBPACK_IMPORTED_MODULE_7__["default"], { style: { width: '25px', height: '25px', @@ -42833,7 +42769,7 @@ var ParentProfileDetail = function ParentProfileDetail() { })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "p-profile-btn", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { to: "/p-account/profile/edit/".concat(father_id), className: "btn-default btn-yellow btn-profile btn-r8 btn-h52", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { @@ -42843,7 +42779,7 @@ var ParentProfileDetail = function ParentProfileDetail() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "p-profile-btn", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { to: "/p-account/profile/edit/password/".concat(father_id), className: "btn-default btn-yellow btn-password btn-r8 btn-h52", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { @@ -42853,7 +42789,7 @@ var ParentProfileDetail = function ParentProfileDetail() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "p-profile-txtLink", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { to: "/terms", className: "btn-default btn-password btn-r8 btn-h30", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { @@ -42863,7 +42799,7 @@ var ParentProfileDetail = function ParentProfileDetail() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "p-profile-txtLink", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { to: "/privacy-policy", className: "btn-default btn-password btn-r8 btn-h30", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { @@ -42883,7 +42819,7 @@ var ParentProfileDetail = function ParentProfileDetail() { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "p-profile-txtLink", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_9__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, { to: "/p-account/profile/withdrawal", className: "btn-default btn-password btn-r8 btn-h30", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { @@ -43872,8 +43808,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ "default": () => (/* binding */ ParentSide) /* 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_3__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); -/* harmony import */ var react_cookie__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js"); /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); } @@ -43891,23 +43826,16 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - function ParentSide() { var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState2 = _slicedToArray(_useState, 2), selected = _useState2[0], setSelected = _useState2[1]; - var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_2__["default"])(['user']), - _useCookies2 = _slicedToArray(_useCookies, 2), - cookies = _useCookies2[0], - setCookie = _useCookies2[1]; - var father_image = document.getElementById('father_image').value; var handleLogout = function handleLogout() { axios.get('/p-account/logout').then(function () { - setCookie('logged', null); window.location.href = '/p-account/login'; }); }; @@ -43943,7 +43871,7 @@ function ParentSide() { onClick: function onClick(e) { return handleSelected("-meeting"); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", to: "/p-account/meeting", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { @@ -43957,7 +43885,7 @@ function ParentSide() { onClick: function onClick(e) { return handleSelected("-favorite"); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", to: "/p-account/favorite", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { @@ -43971,7 +43899,7 @@ function ParentSide() { onClick: function onClick(e) { return handleSelected("-search"); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", to: "/p-account/search", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { @@ -43985,7 +43913,7 @@ function ParentSide() { onClick: function onClick(e) { return handleSelected("-child"); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", to: "/p-account/child", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("i", { @@ -43999,7 +43927,7 @@ function ParentSide() { onClick: function onClick(e) { return handleSelected("-profile"); }, - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Link, { + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "user-icon mypage-nav-list__link", to: "/p-account/profile", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("figure", { @@ -96793,86 +96721,6 @@ var CookiesProvider = /** @class */ (function (_super) { /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (CookiesProvider); -/***/ }), - -/***/ "./node_modules/react-cookie/es6/useCookies.js": -/*!*****************************************************!*\ - !*** ./node_modules/react-cookie/es6/useCookies.js ***! - \*****************************************************/ -/***/ ((__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 */ useCookies) -/* harmony export */ }); -/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); -/* harmony import */ var _CookiesContext__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./CookiesContext */ "./node_modules/react-cookie/es6/CookiesContext.js"); -/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./utils */ "./node_modules/react-cookie/es6/utils.js"); - - - -function useCookies(dependencies) { - var cookies = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_CookiesContext__WEBPACK_IMPORTED_MODULE_1__["default"]); - if (!cookies) { - throw new Error('Missing '); - } - var initialCookies = cookies.getAll(); - var _a = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(initialCookies), allCookies = _a[0], setCookies = _a[1]; - var previousCookiesRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(allCookies); - if ((0,_utils__WEBPACK_IMPORTED_MODULE_2__.isInBrowser)()) { - (0,react__WEBPACK_IMPORTED_MODULE_0__.useLayoutEffect)(function () { - function onChange() { - var newCookies = cookies.getAll(); - if (shouldUpdate(dependencies || null, newCookies, previousCookiesRef.current)) { - setCookies(newCookies); - } - previousCookiesRef.current = newCookies; - } - cookies.addChangeListener(onChange); - return function () { - cookies.removeChangeListener(onChange); - }; - }, [cookies]); - } - var setCookie = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () { return cookies.set.bind(cookies); }, [cookies]); - var removeCookie = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () { return cookies.remove.bind(cookies); }, [cookies]); - return [allCookies, setCookie, removeCookie]; -} -function shouldUpdate(dependencies, newCookies, oldCookies) { - if (!dependencies) { - return true; - } - for (var _i = 0, dependencies_1 = dependencies; _i < dependencies_1.length; _i++) { - var dependency = dependencies_1[_i]; - if (newCookies[dependency] !== oldCookies[dependency]) { - return true; - } - } - return false; -} - - -/***/ }), - -/***/ "./node_modules/react-cookie/es6/utils.js": -/*!************************************************!*\ - !*** ./node_modules/react-cookie/es6/utils.js ***! - \************************************************/ -/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export */ __webpack_require__.d(__webpack_exports__, { -/* harmony export */ "isInBrowser": () => (/* binding */ isInBrowser) -/* harmony export */ }); -function isInBrowser() { - return (typeof window !== 'undefined' && - typeof window.document !== 'undefined' && - typeof window.document.createElement !== 'undefined'); -} - - /***/ }), /***/ "./node_modules/react-datepicker/dist/react-datepicker.min.js": diff --git a/backend/resources/js/admin/login/index.jsx b/backend/resources/js/admin/login/index.jsx index 4f4ab403..7a98f101 100644 --- a/backend/resources/js/admin/login/index.jsx +++ b/backend/resources/js/admin/login/index.jsx @@ -1,14 +1,13 @@ import React, { useState, useRef, useEffect } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation, useNavigate } from 'react-router-dom'; import { LoadingButton } from '@material-ui/lab'; -import { useCookies } from 'react-cookie'; import Alert from '../../component/alert'; const AdminLogin = () => { - const [cookies, setCookie] = useCookies(['user']); const location = useLocation(); + const navigator = useNavigate(); const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); @@ -29,11 +28,8 @@ const AdminLogin = () => { switch (response.data.status_code) { case 200: { localStorage.setItem('kiki_login_flag', true); - localStorage.setItem('kiki_acc_type', 'admin'); - localStorage.setItem('kiki_acc_id', response.data.params.id); - setCookie('logged', 'success'); if (location.search == '') - window.location.href = "/admin/meeting"; + windows.location.href = '/admin/meeting'; else window.location.href = location.search.replace('?redirect_to=', ''); break; @@ -69,8 +65,6 @@ const AdminLogin = () => { switch(response.data.status_code){ case 200: { localStorage.setItem('kiki_login_flag', true); - localStorage.setItem('kiki_acc_type', 'admin'); - setCookie('logged', 'success'); if(location.search == '') window.location.href = "/admin/meeting"; else diff --git a/backend/resources/js/admin/side.jsx b/backend/resources/js/admin/side.jsx index 61dbe3d8..506e3e06 100644 --- a/backend/resources/js/admin/side.jsx +++ b/backend/resources/js/admin/side.jsx @@ -1,15 +1,12 @@ import React, { useState } from 'react'; import { Link } from 'react-router-dom'; -import { useCookies } from 'react-cookie'; export default function AdminSide() { const [selected, setSelected] = useState(''); - const [cookies, setCookie] = useCookies(['user']); const handleLogout = () => { axios.get('/admin/logout') .then(() => { - setCookie('logged', null); window.location.href = '/admin/login'; }) } diff --git a/backend/resources/js/child/auth/login/index.jsx b/backend/resources/js/child/auth/login/index.jsx index 54ac3af0..457edb59 100644 --- a/backend/resources/js/child/auth/login/index.jsx +++ b/backend/resources/js/child/auth/login/index.jsx @@ -1,13 +1,11 @@ import React, { useState, useRef, useEffect } from 'react'; import { Link, useLocation } from 'react-router-dom'; import { LoadingButton } from '@material-ui/lab'; -import { useCookies } from 'react-cookie'; import Alert from '../../../component/alert'; const ChildLogin = () => { - const [cookies, setCookie] = useCookies(['user']); const location = useLocation(); const [submit, setSubmit] = useState(false); @@ -29,9 +27,7 @@ const ChildLogin = () => { switch (response.data.status_code) { case 200: { localStorage.setItem('kiki_login_flag', true); - localStorage.setItem('kiki_acc_type', 'c-account'); localStorage.setItem('kiki_acc_id', response.data.params.id); - setCookie('logged', 'success'); if (location.search == '') window.location.href = "/c-account/meeting"; else @@ -67,7 +63,6 @@ const ChildLogin = () => { localStorage.setItem("kiki_login_flag", true); localStorage.setItem('kiki_acc_type', 'c-account'); localStorage.setItem('kiki_acc_id', response.data.params.id); - setCookie('logged', 'success'); if(location.search == '') window.location.href = "/c-account/meeting"; else diff --git a/backend/resources/js/child/profile/index.jsx b/backend/resources/js/child/profile/index.jsx index ca86edbb..df2b03af 100644 --- a/backend/resources/js/child/profile/index.jsx +++ b/backend/resources/js/child/profile/index.jsx @@ -2,7 +2,6 @@ import React, { useRef, useEffect, useState } from 'react'; import { Link, useNavigate } from 'react-router-dom'; import IconButton from "@material-ui/core/IconButton"; import PhotoCameraOutlinedIcon from '@mui/icons-material/PhotoCameraOutlined'; -import { useCookies } from 'react-cookie'; import Alert from '../../component/alert'; import PageLoader from '../../component/page_loader'; @@ -11,7 +10,6 @@ import Notification from '../../component/notification'; const ChildProfileDetail = () => { - const [cookies, setCookie] = useCookies(['user']); const navigator = useNavigate(); const child_id = localStorage.getItem('kiki_acc_id'); @@ -70,7 +68,6 @@ const ChildProfileDetail = () => { const handleLogout = () => { axios.get('/c-account/logout') .then(() => { - setCookie('logged', null); window.location.href = '/c-account/login'; }) } diff --git a/backend/resources/js/child/side.jsx b/backend/resources/js/child/side.jsx index d052741a..44759ce9 100644 --- a/backend/resources/js/child/side.jsx +++ b/backend/resources/js/child/side.jsx @@ -1,17 +1,14 @@ import React, { useState } from 'react'; import { Link } from 'react-router-dom'; -import { useCookies } from 'react-cookie'; export default function ChildSide() { const [selected, setSelected] = useState(''); - const [cookies, setCookie] = useCookies(['user']); const child_img = document.getElementById('child_image').value; const handleLogout = () => { axios.get('/c-account/logout') .then(() => { - setCookie('logged', null); window.location.href = '/c-account/login'; }) } diff --git a/backend/resources/js/parent/auth/login/index.jsx b/backend/resources/js/parent/auth/login/index.jsx index 6947d569..f2a19e09 100644 --- a/backend/resources/js/parent/auth/login/index.jsx +++ b/backend/resources/js/parent/auth/login/index.jsx @@ -1,14 +1,12 @@ import React, { useState, useRef, useEffect } from 'react'; import { Link, useLocation } from 'react-router-dom'; import { LoadingButton } from '@material-ui/lab'; -import { useCookies } from 'react-cookie'; import Alert from '../../../component/alert'; const ParentLogin = () => { - const [cookies, setCookie] = useCookies(['user']); const location = useLocation(); const [submit, setSubmit] = useState(false); @@ -31,9 +29,7 @@ const ParentLogin = () => { switch (response.data.status_code) { case 200: { localStorage.setItem('kiki_login_flag', true); - localStorage.setItem('kiki_acc_type', 'p-account'); localStorage.setItem('kiki_acc_id', response.data.params.id); - setCookie('logged', 'success'); if (location.search == '') window.location.href = "/p-account/meeting"; else @@ -69,7 +65,6 @@ const ParentLogin = () => { localStorage.setItem('kiki_login_flag', true); localStorage.setItem('kiki_acc_type', 'p-account'); localStorage.setItem('kiki_acc_id', response.data.params.id); - setCookie('logged', 'success'); if(location.search == '') window.location.href = "/p-account/meeting"; else diff --git a/backend/resources/js/parent/profile/index.jsx b/backend/resources/js/parent/profile/index.jsx index b705726e..a6133da7 100644 --- a/backend/resources/js/parent/profile/index.jsx +++ b/backend/resources/js/parent/profile/index.jsx @@ -2,7 +2,6 @@ import React, { useRef, useEffect, useState } from 'react'; import { useNavigate, Link } from 'react-router-dom'; import IconButton from "@material-ui/core/IconButton"; import PhotoCameraOutlinedIcon from '@mui/icons-material/PhotoCameraOutlined'; -import { useCookies } from 'react-cookie'; import Alert from '../../component/alert'; import PageLoader from '../../component/page_loader'; @@ -11,7 +10,6 @@ import Notification from '../../component/notification'; const ParentProfileDetail = () => { const navigator = useNavigate(); - const [cookies, setCookie] = useCookies(['user']); const father_id = localStorage.getItem('kiki_acc_id'); const [notice, setNotice] = useState(localStorage.getItem('notice')); @@ -69,7 +67,6 @@ const ParentProfileDetail = () => { const handleLogout = () => { axios.get('/p-account/logout') .then(() => { - setCookie('logged', null); window.location.href = '/p-account/login'; }) } diff --git a/backend/resources/js/parent/side.jsx b/backend/resources/js/parent/side.jsx index 88fd0ff7..6b244b4a 100644 --- a/backend/resources/js/parent/side.jsx +++ b/backend/resources/js/parent/side.jsx @@ -1,17 +1,14 @@ import React, { useState } from 'react'; import { Link } from 'react-router-dom'; -import { useCookies } from 'react-cookie'; export default function ParentSide() { const [selected, setSelected] = useState(''); - const [cookies, setCookie] = useCookies(['user']); const father_image = document.getElementById('father_image').value; const handleLogout = () => { axios.get('/p-account/logout') .then(() => { - setCookie('logged', null); window.location.href = '/p-account/login'; }) }