[kbss-cvut#293] Migrated Login route

filip-kopecky · Dec 16, 2022 · b87ca39 · b87ca39
1 parent c8dfacc
commit b87ca39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/IntlApp.tsx b/src/IntlApp.tsx
@@ -10,7 +10,7 @@ import { connect } from "react-redux";
 import TermItState from "./model/TermItState";
 import BreadcrumbRoute from "./component/breadcrumb/BreadcrumbRoute";
 import Mask from "./component/misc/Mask";
-import { CompatRouter } from "react-router-dom-v5-compat";
+import { CompatRouter, CompatRoute } from "react-router-dom-v5-compat";
 
 const PublicMainView = React.lazy(() => import("./component/public/MainView"));
 const MainView = React.lazy(() => import("./component/MainView"));
@@ -21,13 +21,14 @@ interface IntlWrapperProps {
 
 const IntlWrapper: React.FC<IntlWrapperProps> = (props) => {
   const { intl } = props;
+  console.log(Routes.publicVocabularies.link());
   return (
     <IntlProvider {...intl}>
       <Router history={Routing.history}>
         <CompatRouter>
           <React.Suspense fallback={<Mask />}>
             <Switch>
-              <Route path={Routes.login.path} component={Login} />
+              <CompatRoute path={Routes.login.path} component={Login} />
               <Route path={Routes.register.path} component={Register} />
               <BreadcrumbRoute
                 path={Routes.publicDashboard.path}

diff --git a/src/component/login/Login.tsx b/src/component/login/Login.tsx
@@ -15,7 +15,7 @@ import { login } from "../../action/AsyncUserActions";
 import EnhancedInput, { LabelDirection } from "../misc/EnhancedInput";
 import Constants, { getEnv } from "../../util/Constants";
 import "./Login.scss";
-import { Link } from "react-router-dom";
+import { Link } from "react-router-dom-v5-compat";
 import WindowTitle from "../misc/WindowTitle";
 import ConfigParam from "../../util/ConfigParam";