fixed context.js

このコミットが含まれているのは:
dragon1211 2022-02-02 09:33:22 -08:00
コミット bc5256e042
6個のファイルの変更107行の追加144行の削除

ファイルの表示

@ -30393,23 +30393,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_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 react_cookie__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js");
/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js");
/* harmony import */ var _context__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../context */ "./resources/js/context.js");
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
@ -30418,28 +30404,15 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
function AdminSide() {
var _useContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_context__WEBPACK_IMPORTED_MODULE_1__.HeaderContext),
selected_item_sidebar = _useContext.selected_item_sidebar,
SetSelectedItemOfSidebar = _useContext.SetSelectedItemOfSidebar;
SetSelectedItemOfSidebar = _useContext.SetSelectedItemOfSidebar,
handleLogout = _useContext.handleLogout;
var _useLocation = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_3__.useLocation)(),
pathname = _useLocation.pathname;
var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_4__["default"])(['user']),
_useCookies2 = _slicedToArray(_useCookies, 3),
cookies = _useCookies2[0],
setCookie = _useCookies2[1],
removeCookie = _useCookies2[2];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
SetSelectedItemOfSidebar(pathname.split('/')[2]);
}, []);
var handleLogout = function handleLogout() {
axios.get('/admin/logout').then(function () {
localStorage.removeItem('admin_token');
window.location.href = '/admin/login';
});
};
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", {
className: "l-side",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", {
@ -30460,7 +30433,7 @@ function AdminSide() {
onClick: function onClick(e) {
SetSelectedItemOfSidebar('meeting');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "mypage-nav-list__link",
to: "/admin/meeting",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("i", {
@ -30474,7 +30447,7 @@ function AdminSide() {
onClick: function onClick(e) {
SetSelectedItemOfSidebar('child');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "mypage-nav-list__link",
to: "/admin/child",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("i", {
@ -30488,7 +30461,7 @@ function AdminSide() {
onClick: function onClick(e) {
SetSelectedItemOfSidebar('parent');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "mypage-nav-list__link",
to: "/admin/parent",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("i", {
@ -30550,9 +30523,9 @@ var KIKIAPP = function KIKIAPP() {
};
if (document.getElementById('root')) {
react_dom__WEBPACK_IMPORTED_MODULE_0__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_context__WEBPACK_IMPORTED_MODULE_2__.HeaderContextProvider, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_cookie__WEBPACK_IMPORTED_MODULE_6__["default"], {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_7__.BrowserRouter, {
react_dom__WEBPACK_IMPORTED_MODULE_0__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_cookie__WEBPACK_IMPORTED_MODULE_6__["default"], {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_7__.BrowserRouter, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(_context__WEBPACK_IMPORTED_MODULE_2__.HeaderContextProvider, {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_scroll_top__WEBPACK_IMPORTED_MODULE_3__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(KIKIAPP, {})]
})
})
@ -34564,23 +34537,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_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 react_cookie__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js");
/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js");
/* harmony import */ var _context__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../context */ "./resources/js/context.js");
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
@ -34589,28 +34548,15 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
function ChildSide() {
var _useContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_context__WEBPACK_IMPORTED_MODULE_1__.HeaderContext),
selected_item_sidebar = _useContext.selected_item_sidebar,
SetSelectedItemOfSidebar = _useContext.SetSelectedItemOfSidebar;
SetSelectedItemOfSidebar = _useContext.SetSelectedItemOfSidebar,
handleLogout = _useContext.handleLogout;
var _useLocation = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_3__.useLocation)(),
pathname = _useLocation.pathname;
var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_4__["default"])(['user']),
_useCookies2 = _slicedToArray(_useCookies, 3),
cookies = _useCookies2[0],
setCookie = _useCookies2[1],
removeCookie = _useCookies2[2];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
SetSelectedItemOfSidebar(pathname.split('/')[2]);
}, []);
var handleLogout = function handleLogout() {
axios.get('/c-account/logout').then(function () {
localStorage.removeItem('c-account_token');
window.location.href = '/c-account/login';
});
};
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", {
className: "l-side",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", {
@ -34631,7 +34577,7 @@ function ChildSide() {
onClick: function onClick(e) {
return SetSelectedItemOfSidebar('meeting');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "mypage-nav-list__link",
to: "/c-account/meeting",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("i", {
@ -34645,7 +34591,7 @@ function ChildSide() {
onClick: function onClick(e) {
return SetSelectedItemOfSidebar('search');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "mypage-nav-list__link",
to: "/c-account/search",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("i", {
@ -34659,7 +34605,7 @@ function ChildSide() {
onClick: function onClick(e) {
return SetSelectedItemOfSidebar('parent');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "mypage-nav-list__link",
to: "/c-account/parent",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("i", {
@ -34673,7 +34619,7 @@ function ChildSide() {
onClick: function onClick(e) {
return SetSelectedItemOfSidebar('profile');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "user-icon mypage-nav-list__link",
to: "/c-account/profile",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("figure", {
@ -36278,6 +36224,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export */ "HeaderContextProvider": () => (/* binding */ HeaderContextProvider)
/* harmony export */ });
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js");
/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/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(); }
@ -36293,19 +36240,50 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
var HeaderContext = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.createContext)({});
var HeaderContextProvider = function HeaderContextProvider(_ref) {
var children = _ref.children;
var _useLocation = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_2__.useLocation)(),
pathname = _useLocation.pathname;
var navigator = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_2__.useNavigate)();
var acc_type = pathname.split('/')[1];
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState2 = _slicedToArray(_useState, 2),
selected_item_sidebar = _useState2[0],
SetSelectedItemOfSidebar = _useState2[1];
var handleLogout = function handleLogout() {
axios.get("/".concat(acc_type, "/logout")).then(function () {
localStorage.removeItem("".concat(acc_type, "_token"));
navigator("/".concat(acc_type, "/login"));
});
};
var isAuthenticate = function isAuthenticate() {
var token = localStorage.getItem("".concat(acc_type, "_token"));
if (!token) {
navigator("/".concat(acc_type, "/login"));
} else {
token = JSON.parse(token);
expires = token.expires;
if (new Date().getTime() >= expires) {
handleLogout();
}
}
};
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(HeaderContext.Provider, {
value: {
selected_item_sidebar: selected_item_sidebar,
SetSelectedItemOfSidebar: SetSelectedItemOfSidebar
SetSelectedItemOfSidebar: SetSelectedItemOfSidebar,
handleLogout: handleLogout,
isAuthenticate: isAuthenticate
},
children: children
});
@ -43999,23 +43977,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_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 react_cookie__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js");
/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/index.js");
/* harmony import */ var _context__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../context */ "./resources/js/context.js");
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
@ -44026,28 +43990,15 @@ function ParentSide() {
var _useContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_context__WEBPACK_IMPORTED_MODULE_1__.HeaderContext),
selected_item_sidebar = _useContext.selected_item_sidebar,
SetSelectedItemOfSidebar = _useContext.SetSelectedItemOfSidebar;
SetSelectedItemOfSidebar = _useContext.SetSelectedItemOfSidebar,
handleLogout = _useContext.handleLogout;
var _useLocation = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_3__.useLocation)(),
pathname = _useLocation.pathname;
var _useCookies = (0,react_cookie__WEBPACK_IMPORTED_MODULE_4__["default"])(['user']),
_useCookies2 = _slicedToArray(_useCookies, 3),
cookies = _useCookies2[0],
setCookie = _useCookies2[1],
removeCookie = _useCookies2[2];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
SetSelectedItemOfSidebar(pathname.split('/')[2]);
}, []);
var handleLogout = function handleLogout() {
axios.get('/p-account/logout').then(function () {
localStorage.removeItem('p-account_token');
window.location.href = '/p-account/login';
});
};
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", {
className: "l-side",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", {
@ -44068,7 +44019,7 @@ function ParentSide() {
onClick: function onClick(e) {
return SetSelectedItemOfSidebar('meeting');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "mypage-nav-list__link",
to: "/p-account/meeting",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("i", {
@ -44082,7 +44033,7 @@ function ParentSide() {
onClick: function onClick(e) {
return SetSelectedItemOfSidebar('favorite');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "mypage-nav-list__link",
to: "/p-account/favorite",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("i", {
@ -44096,7 +44047,7 @@ function ParentSide() {
onClick: function onClick(e) {
return SetSelectedItemOfSidebar('search');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "mypage-nav-list__link",
to: "/p-account/search",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("i", {
@ -44110,7 +44061,7 @@ function ParentSide() {
onClick: function onClick(e) {
return SetSelectedItemOfSidebar('child');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "mypage-nav-list__link",
to: "/p-account/child",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("i", {
@ -44124,7 +44075,7 @@ function ParentSide() {
onClick: function onClick(e) {
return SetSelectedItemOfSidebar('profile');
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_5__.Link, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
className: "user-icon mypage-nav-list__link",
to: "/p-account/profile",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("figure", {

ファイルの表示

@ -1,25 +1,20 @@
import React, { useContext, useEffect } from 'react';
import { Link, useLocation } from 'react-router-dom';
import { useCookies } from 'react-cookie';
import { HeaderContext } from '../context';
export default function AdminSide() {
const {selected_item_sidebar, SetSelectedItemOfSidebar} = useContext(HeaderContext);
const {
selected_item_sidebar,
SetSelectedItemOfSidebar,
handleLogout
} = useContext(HeaderContext);
const {pathname} = useLocation();
const [cookies, setCookie, removeCookie] = useCookies(['user']);
useEffect(()=>{
SetSelectedItemOfSidebar(pathname.split('/')[2]);
}, [])
const handleLogout = () => {
axios.get('/admin/logout')
.then(() => {
localStorage.removeItem('admin_token');
window.location.href = '/admin/login';
})
}
}, []);
return (
<div className="l-side">

ファイルの表示

@ -15,14 +15,14 @@ const KIKIAPP = () => {
if(document.getElementById('root')){
ReactDOM.render((
<HeaderContextProvider>
<CookiesProvider>
<BrowserRouter>
<HeaderContextProvider>
<ScrollToTop />
<KIKIAPP />
</HeaderContextProvider>
</BrowserRouter>
</CookiesProvider>
</HeaderContextProvider>
), document.getElementById('root'));
}

ファイルの表示

@ -1,30 +1,23 @@
import React, { useContext, useEffect } from 'react';
import { Link, useLocation } from 'react-router-dom';
import { useCookies } from 'react-cookie';
import { HeaderContext } from '../context';
export default function ChildSide() {
const {
selected_item_sidebar,
SetSelectedItemOfSidebar,
handleLogout
} = useContext(HeaderContext);
const {selected_item_sidebar, SetSelectedItemOfSidebar} = useContext(HeaderContext);
const {pathname} = useLocation();
const [cookies, setCookie, removeCookie] = useCookies(['user']);
useEffect(()=>{
SetSelectedItemOfSidebar(pathname.split('/')[2]);
}, [])
const handleLogout = () => {
axios.get('/c-account/logout')
.then(() => {
localStorage.removeItem('c-account_token');
window.location.href = '/c-account/login';
})
}
return (
<div className="l-side">
<div className="l-side-logo">

ファイルの表示

@ -1,15 +1,45 @@
import { createContext, useState } from "react";
import { useLocation, useNavigate } from "react-router-dom";
export const HeaderContext = createContext({});
export const HeaderContextProvider = ({ children }) => {
const {pathname} = useLocation();
const navigator = useNavigate();
const acc_type = pathname.split('/')[1];
const [selected_item_sidebar, SetSelectedItemOfSidebar] = useState('');
const handleLogout = () => {
axios.get(`/${acc_type}/logout`)
.then(() => {
localStorage.removeItem(`${acc_type}_token`);
navigator(`/${acc_type}/login`);
})
}
const isAuthenticate = () => {
let token = localStorage.getItem(`${acc_type}_token`);
if(!token){
navigator(`/${acc_type}/login`);
}
else{
token = JSON.parse(token);
expires = token.expires;
if(new Date().getTime() >= expires){
handleLogout();
}
}
}
return (
<HeaderContext.Provider
value={{
selected_item_sidebar, SetSelectedItemOfSidebar
selected_item_sidebar, SetSelectedItemOfSidebar,
handleLogout,
isAuthenticate
}}
>
{children}

ファイルの表示

@ -1,6 +1,5 @@
import React, { useContext, useEffect } from 'react';
import { Link, useLocation } from 'react-router-dom';
import { useCookies } from 'react-cookie';
import { HeaderContext } from '../context';
@ -8,9 +7,12 @@ export default function ParentSide() {
const father_image = document.getElementById('father_image').value;
const {selected_item_sidebar, SetSelectedItemOfSidebar} = useContext(HeaderContext);
const {
selected_item_sidebar,
SetSelectedItemOfSidebar,
handleLogout
} = useContext(HeaderContext);
const {pathname} = useLocation();
const [cookies, setCookie, removeCookie] = useCookies(['user']);
useEffect(()=>{
@ -18,14 +20,6 @@ export default function ParentSide() {
}, [])
const handleLogout = () => {
axios.get('/p-account/logout')
.then(() => {
localStorage.removeItem('p-account_token');
window.location.href = '/p-account/login';
})
}
return (
<div className="l-side">
<div className="l-side-logo">