IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web.Client: Confirm: changed routing

Browse Source
This commit is contained in:
Daniil Senkiv 2019-09-23 11:48:33 +03:00
parent dafe2d478a
commit 49ee05a926
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/ASC.Web.Client/src/App.js
View File

@ -4,7 +4,7 @@ import { Loader } from "asc-web-components";
import StudioLayout from "./components/Layout/index";
import Login from "./components/pages/Login";
import { PrivateRoute } from "./helpers/privateRoute";
import { PublicRoute } from "./helpers/publicRoute";
import PublicRoute from "./helpers/publicRoute";
import { Error404 } from "./components/pages/Error";
const Home = lazy(() => import("./components/pages/Home"));
@ -20,7 +20,7 @@ const App = () => {
>
<Switch>
<PublicRoute exact path={["/login","/login/:error"]} component={Login} />
<PublicRoute path="/confirm" component={Confirm} />
<Route path="/confirm" component={Confirm} />
<PrivateRoute exact path="/" component={Home} />
<PrivateRoute exact path="/about" component={About} />
<PrivateRoute component={Error404} />

10
web/ASC.Web.Client/src/components/pages/Confirm/index.js
View File

@ -1,7 +1,7 @@
import React, { Suspense, lazy } from "react";
import { Switch, Redirect } from "react-router-dom";
import { Switch, Redirect, Route } from "react-router-dom";
import { Loader } from "asc-web-components";
import { PublicRoute } from "../../../helpers/publicRoute";
import PublicRoute from "../../../helpers/publicRoute";
import i18n from "./i18n";
import { I18nextProvider } from "react-i18next";
@ -23,17 +23,17 @@ const Confirm = ({ match }) => {
path={`${match.path}/type=LinkInvite`}
component={CreateUserForm}
/>
<PublicRoute
<Route
exact
path={`${match.path}/type=EmailActivation`}
component={ActivateEmailForm}
/>
<PublicRoute
<Route
exact
path={`${match.path}/type=PasswordChange`}
component={ChangePasswordForm}
/>
<PublicRoute
<Route
exact
path={`${match.path}/type=PhoneActivation`}
component={ChangePhoneForm}

3
web/ASC.Web.Client/src/helpers/publicRoute.js
View File

@ -21,4 +21,5 @@ export const PublicRoute = ({ component: Component, ...rest }) => {
}
/>
)
};
};
export default PublicRoute;