|
|
@ -1,4 +1,4 @@
|
|
|
|
import { Outlet, Link, useHref, useNavigate, NavLink } from "react-router-dom";
|
|
|
|
import { Outlet, Link, useHref, useNavigate, useLocation, NavLink } from "react-router-dom";
|
|
|
|
import { useEffect, useState } from 'react';
|
|
|
|
import { useEffect, useState } from 'react';
|
|
|
|
import { observer } from "mobx-react";
|
|
|
|
import { observer } from "mobx-react";
|
|
|
|
import { toJS } from "mobx";
|
|
|
|
import { toJS } from "mobx";
|
|
|
@ -39,13 +39,18 @@ function App() {
|
|
|
|
const href = useHref();
|
|
|
|
const href = useHref();
|
|
|
|
const loginToken = login.token;
|
|
|
|
const loginToken = login.token;
|
|
|
|
const navigate = useNavigate();
|
|
|
|
const navigate = useNavigate();
|
|
|
|
|
|
|
|
const location = useLocation();
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
|
|
useEffect(() => {
|
|
|
|
// console.info("href: " + href + '; login.token: ' + loginToken + '; timeout: ' + login.timeout);
|
|
|
|
|
|
|
|
if (href !== '/login' && isEmpty(loginToken)) {
|
|
|
|
if (href !== '/login' && isEmpty(loginToken)) {
|
|
|
|
navigate('/login');
|
|
|
|
navigate('/login');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}, [href]);
|
|
|
|
}, [href]);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
|
|
|
|
|
|
window.gtag('event', 'page_view', { page_location: window.location.href });
|
|
|
|
|
|
|
|
}, [location]);
|
|
|
|
|
|
|
|
|
|
|
|
const onSubmit = () => {
|
|
|
|
const onSubmit = () => {
|
|
|
|
authStore.valdateUserPassword(login.username, password)
|
|
|
|
authStore.valdateUserPassword(login.username, password)
|
|
|
|
.then(() => {
|
|
|
|
.then(() => {
|
|
|
|