From aa1f8959ab822eb206e9d9d43aa9d418d6a35815 Mon Sep 17 00:00:00 2001 From: Vladislav Makhov Date: Fri, 24 Jul 2020 14:17:37 +0300 Subject: [PATCH 01/20] web: components: bump version --- web/ASC.Web.Components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json index 22c1b4d72c..925881f8ac 100644 --- a/web/ASC.Web.Components/package.json +++ b/web/ASC.Web.Components/package.json @@ -1,6 +1,6 @@ { "name": "asc-web-components", - "version": "1.0.370", + "version": "1.0.371", "description": "Ascensio System SIA component library", "license": "AGPL-3.0", "main": "dist/asc-web-components.js", From 20b67c8261f9675f49df2321cef448ff70a6bf1f Mon Sep 17 00:00:00 2001 From: Vladislav Makhov Date: Fri, 24 Jul 2020 14:18:03 +0300 Subject: [PATCH 02/20] Fix Box export --- web/ASC.Web.Components/src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/ASC.Web.Components/src/index.js b/web/ASC.Web.Components/src/index.js index 0374776a7f..8723b393aa 100644 --- a/web/ASC.Web.Components/src/index.js +++ b/web/ASC.Web.Components/src/index.js @@ -3,6 +3,7 @@ export { default as AvatarEditor } from './components/avatar-editor' export { default as Aside } from './components/aside' export { default as Backdrop } from './components/backdrop' export { default as Badge } from './components/badge' +export { default as Box } from './components/box' export { default as Button } from './components/button' export { default as Calendar } from './components/calendar' export { default as Checkbox } from './components/checkbox' From e751296adbcee16ffe5c2ed43ec9fd49b8e7f0fb Mon Sep 17 00:00:00 2001 From: Vladislav Makhov Date: Fri, 24 Jul 2020 14:21:13 +0300 Subject: [PATCH 03/20] Unauth header init --- .../src/components/Layout/index.js | 13 ++- .../Layout/sub-components/header-unauth.js | 80 +++++++++++++++++++ 2 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 web/ASC.Web.Common/src/components/Layout/sub-components/header-unauth.js diff --git a/web/ASC.Web.Common/src/components/Layout/index.js b/web/ASC.Web.Common/src/components/Layout/index.js index d619293ca3..e7ad30b478 100644 --- a/web/ASC.Web.Common/src/components/Layout/index.js +++ b/web/ASC.Web.Common/src/components/Layout/index.js @@ -7,6 +7,7 @@ import Main from "./sub-components/main"; import HeaderNav from "./sub-components/header-nav"; import NavLogoItem from "./sub-components/nav-logo-item"; import NavItem from "./sub-components/nav-item"; +import HeaderUnauth from "./sub-components/header-unauth"; class Layout extends React.Component { constructor(props) { @@ -45,7 +46,7 @@ class Layout extends React.Component { } } if (props.availableModules && this.state.availableModules) { - hash += utils.array.isArrayEqual(this.state.availableModules, props.availableModules); + hash += utils.array.isArrayEqual(this.state.availableModules, props.availableModules); } return hash; }; @@ -74,7 +75,7 @@ class Layout extends React.Component { const newState = { isBackdropAvailable: mainModules.length > 0 || !!props.asideContent, isHeaderNavAvailable: isolateModules.length > 0 || !!props.currentUser, - isHeaderAvailable: mainModules.length > 0, + //isHeaderAvailable: mainModules.length > 0, isNavAvailable: mainModules.length > 0, isAsideAvailable: !!props.asideContent, @@ -156,9 +157,12 @@ class Layout extends React.Component { isNavHoverEnabled: false }); }; + + isAuthKey = localStorage.getItem("asc_auth_key") ? true : false; render() { //console.log("Layout render"); + //const isAuthKey = localStorage.getItem("asc_auth_key") ? true : false; return ( <> @@ -175,14 +179,15 @@ class Layout extends React.Component { userActions={this.state.currentUserActions} /> )} - {this.state.isHeaderAvailable && ( + { this.isAuthKey ? - )} + : {this.props.children} + } {this.state.isNavAvailable && (