suwako
/
kikikan
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

fixed

このコミットが含まれているのは:
dragon1211 2022-02-02 13:43:02 -08:00
親 41bfaba31a
コミット 7ab472bcb2
4個のファイルの変更、27行の追加、126行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

104
backend/public/js/index.js vendored
ファイルの表示

@ -34971,6 +34971,18 @@ function AlertStateMessage() {
navigator(pathname);
}
var token = localStorage.getItem("".concat(acc_type, "_token"));
if (token) {
token = JSON.parse(token);
if (token.from_login) {
setSuccess('ログインに成功しました');
token.from_login = false;
localStorage.setItem("".concat(acc_type, "_token"), JSON.stringify(token));
}
}
}, [pathname]);
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.Fragment, {
children: [_400error ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_alert__WEBPACK_IMPORTED_MODULE_1__["default"], {
@ -34991,86 +35003,6 @@ function AlertStateMessage() {
/***/ }),
/***/ "./resources/js/component/check_login_status.jsx":
/*!*******************************************************!*\
!*** ./resources/js/component/check_login_status.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 */ CheckLoginStatus)
/* 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_cookie__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-cookie */ "./node_modules/react-cookie/es6/useCookies.js");
/* harmony import */ var _alert__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./alert */ "./resources/js/component/alert.jsx");
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
function CheckLoginStatus() {
var _useLocation = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_3__.useLocation)(),
pathname = _useLocation.pathname;
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState2 = _slicedToArray(_useState, 2),
_success = _useState2[0],
setSuccess = _useState2[1];
var navigator = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_3__.useNavigate)();
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 () {
var acc_type = pathname.split('/')[1];
var token = localStorage.getItem("".concat(acc_type, "_token"));
if (!token) {
navigator("/".concat(acc_type, "/login"));
} else {
token = JSON.parse(token);
if (token.from_login) {
setSuccess('ログインに成功しました');
token.from_login = false;
localStorage.setItem("".concat(acc_type, "_token"), JSON.stringify(token));
}
}
}, [pathname]);
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.Fragment, {
children: _success ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_alert__WEBPACK_IMPORTED_MODULE_1__["default"], {
type: "success",
hide: function hide() {
return setSuccess('');
},
children: _success
}) : null
});
}
/***/ }),
/***/ "./resources/js/component/modal_confirm.jsx":
/*!**************************************************!*\
!*** ./resources/js/component/modal_confirm.jsx ***!
@ -36547,11 +36479,9 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
/* harmony export */ });
/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js");
/* harmony import */ var _component_check_login_status__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../component/check_login_status */ "./resources/js/component/check_login_status.jsx");
/* harmony import */ var _component_alert_state_msg__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../component/alert_state_msg */ "./resources/js/component/alert_state_msg.jsx");
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/index.js");
/* harmony import */ var _component_alert_state_msg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../component/alert_state_msg */ "./resources/js/component/alert_state_msg.jsx");
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
@ -36559,9 +36489,9 @@ __webpack_require__.r(__webpack_exports__);
var DashboardLayout = function DashboardLayout(_ref) {
var side = _ref.side;
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("main", {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("main", {
className: "l-container meeting-consent",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_component_alert_state_msg__WEBPACK_IMPORTED_MODULE_1__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_component_check_login_status__WEBPACK_IMPORTED_MODULE_0__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_3__.Outlet, {}), side]
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_component_alert_state_msg__WEBPACK_IMPORTED_MODULE_0__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Outlet, {}), side]
});
};

10
backend/resources/js/component/alert_state_msg.jsx
ファイルの表示

@ -18,6 +18,16 @@ export default function AlertStateMessage() {
}
navigator(pathname);
}
let token = localStorage.getItem(`${acc_type}_token`);
if(token){
token = JSON.parse(token);
if(token.from_login) {
setSuccess('ログインに成功しました');
token.from_login = false;
localStorage.setItem(`${acc_type}_token`, JSON.stringify(token));
}
}
}, [pathname]);
return (

37
backend/resources/js/component/check_login_status.jsx
ファイルの表示

@ -1,37 +0,0 @@
import { useEffect, useState } from "react";
import { useLocation, useNavigate } from "react-router-dom";
import { useCookies } from 'react-cookie';
import Alert from './alert';
export default function CheckLoginStatus() {
const { pathname } = useLocation();
const [_success, setSuccess] = useState('');
const navigator = useNavigate();
const [cookies, setCookie, removeCookie] = useCookies(['user']);
useEffect(() => {
const acc_type = pathname.split('/')[1];
let token = localStorage.getItem(`${acc_type}_token`);
if(!token){
navigator(`/${acc_type}/login`);
}
else{
token = JSON.parse(token);
if(token.from_login) {
setSuccess('ログインに成功しました');
token.from_login = false;
localStorage.setItem(`${acc_type}_token`, JSON.stringify(token));
}
}
}, [pathname]);
return (
<>
{ _success ? <Alert type="success" hide={()=>setSuccess('')}>{ _success }</Alert> : null}
</>
);
}

2
backend/resources/js/layout/DashboardLayout.js vendored
ファイルの表示

@ -1,5 +1,4 @@
import { Outlet } from 'react-router-dom';
import CheckLoginStatus from '../component/check_login_status';
import AlertStateMessage from '../component/alert_state_msg';
const DashboardLayout = ({side}) => {
@ -7,7 +6,6 @@ const DashboardLayout = ({side}) => {
return (
<main className="l-container meeting-consent">
<AlertStateMessage />
<CheckLoginStatus />
<Outlet />
{side}
</main>