Merge branch 'master' into develop
# Conflicts: # products/ASC.Files/Client/yarn.lock # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/.env # web/ASC.Web.Client/src/App.js # web/ASC.Web.Client/src/helpers/i18n.js # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/package.json # web/ASC.Web.Common/src/api/modules/index.js # web/ASC.Web.Common/src/store/auth/reducer.js # web/ASC.Web.Common/yarn.lock # web/ASC.Web.Components/yarn.lock
This commit is contained in:
commit
4d5ca86a74
@ -1,12 +1,13 @@
|
||||
{
|
||||
"name": "asc-files-client",
|
||||
"version": "0.0.10",
|
||||
"version": "0.0.11",
|
||||
"private": true,
|
||||
"homepage": "/products/files",
|
||||
"dependencies": {
|
||||
"@welldone-software/why-did-you-render": "^4.2.5",
|
||||
"asc-web-common": "file:../../../packages/asc-web-common",
|
||||
"asc-web-components": "file:../../../packages/asc-web-components",
|
||||
"axios": "^0.21.1",
|
||||
"connected-react-router": "6.6.1",
|
||||
"copy-to-clipboard": "^3.3.1",
|
||||
"fast-deep-equal": "^3.1.3",
|
||||
@ -28,6 +29,7 @@
|
||||
"react-i18next": "11.3.0",
|
||||
"react-router": "5.1.2",
|
||||
"react-router-dom": "5.1.2",
|
||||
"react-svg": "^11.2.1",
|
||||
"react-virtualized-auto-sizer": "^1.0.3",
|
||||
"react-window": "^1.8.6",
|
||||
"styled-components": "^5.2.1"
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "asc-people-client",
|
||||
"version": "0.0.10",
|
||||
"version": "0.0.11",
|
||||
"private": true,
|
||||
"homepage": "/products/people",
|
||||
"dependencies": {
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,3 @@
|
||||
PUBLIC_URL=/
|
||||
WDS_SOCKET_PATH=/
|
||||
WDS_SOCKET_PATH=/sockjs-node
|
||||
PORT=5001
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "asc-web-client",
|
||||
"version": "0.0.10",
|
||||
"version": "0.0.11",
|
||||
"private": true,
|
||||
"homepage": "",
|
||||
"dependencies": {
|
||||
@ -25,6 +25,7 @@
|
||||
"react-i18next": "11.3.0",
|
||||
"react-router": "5.1.2",
|
||||
"react-router-dom": "5.1.2",
|
||||
"react-svg": "^11.2.1",
|
||||
"react-string-format": "^0.1.0",
|
||||
"styled-components": "^5.2.1"
|
||||
},
|
||||
|
@ -34,7 +34,7 @@ const App = (props) => {
|
||||
//this.isThirdPartyResponse = pathname.indexOf("thirdparty") !== -1;
|
||||
//}
|
||||
|
||||
const { isLoaded, loadBaseInfo, isThirdPartyResponse } = props;
|
||||
const { isLoaded, loadBaseInfo, isThirdPartyResponse, homepage } = props;
|
||||
|
||||
useEffect(() => {
|
||||
try {
|
||||
@ -82,6 +82,7 @@ const App = (props) => {
|
||||
// setIsLoaded();
|
||||
// });
|
||||
|
||||
console.log("Client App render", props);
|
||||
return navigator.onLine ? (
|
||||
<Layout>
|
||||
<Router history={history}>
|
||||
@ -89,41 +90,42 @@ const App = (props) => {
|
||||
<Main>
|
||||
<Suspense fallback={null}>
|
||||
<Switch>
|
||||
<Route exact path="/wizard" component={Wizard} />
|
||||
<Route exact path={`${homepage}/wizard`} component={Wizard} />
|
||||
<PublicRoute
|
||||
exact
|
||||
path={[
|
||||
"/login",
|
||||
"/login/error=:error",
|
||||
"/login/confirmed-email=:confirmedEmail",
|
||||
`${homepage}/login`,
|
||||
`${homepage}/login/error=:error`,
|
||||
`${homepage}/login/confirmed-email=:confirmedEmail`,
|
||||
]}
|
||||
component={Login}
|
||||
/>
|
||||
<Route path="/confirm" component={Confirm} />
|
||||
<Route path={`${homepage}/confirm`} component={Confirm} />
|
||||
<PrivateRoute
|
||||
path={`/thirdparty/:provider`}
|
||||
path={`${homepage}/thirdparty/:provider`}
|
||||
component={ThirdPartyResponse}
|
||||
/>
|
||||
<PrivateRoute
|
||||
exact
|
||||
path={["/", "/error=:error"]}
|
||||
path={[`${homepage}/`, `${homepage}/error=:error`]}
|
||||
component={Home}
|
||||
/>
|
||||
<PrivateRoute exact path="/about" component={About} />
|
||||
<PrivateRoute restricted path="/settings" component={Settings} />
|
||||
<PrivateRoute
|
||||
exact
|
||||
path={[
|
||||
"/coming-soon",
|
||||
"/products/mail",
|
||||
"/products/projects",
|
||||
"/products/crm",
|
||||
"/products/calendar",
|
||||
"/products/talk/",
|
||||
`${homepage}/coming-soon`,
|
||||
`${homepage}/products/mail`,
|
||||
`${homepage}/products/projects`,
|
||||
`${homepage}/products/crm`,
|
||||
`${homepage}/products/calendar`,
|
||||
`${homepage}/products/talk/`,
|
||||
]}
|
||||
component={ComingSoon}
|
||||
/>
|
||||
<PrivateRoute path="/payments" component={Payments} />
|
||||
<PrivateRoute
|
||||
path={`${homepage}/payments`}
|
||||
component={Payments}
|
||||
/>
|
||||
<PrivateRoute component={Error404} />
|
||||
</Switch>
|
||||
</Suspense>
|
||||
@ -148,5 +150,6 @@ export default inject(({ auth }) => {
|
||||
},
|
||||
isThirdPartyResponse,
|
||||
isLoaded,
|
||||
homepage: auth.settingsStore.homepage || config.homepage,
|
||||
};
|
||||
})(observer(App));
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user