Merge branch 'master' into 'master'

Add footer text of app manager UI to config

See merge request entgra/carbon-device-mgt!399
feature/appm-store/pbac
Dharmakeerthi Lasantha 5 years ago
commit 43d6a21a3b

@ -1,7 +1,8 @@
{ {
"theme": { "theme": {
"logo": "https://entgra.io/assets/images/svg/logo.svg", "logo": "https://entgra.io/assets/images/svg/logo.svg",
"primaryColor": "rgb(24, 144, 255)" "primaryColor": "rgb(24, 144, 255)",
"footerText": "©2019 entgra.io"
}, },
"serverConfig": { "serverConfig": {
"invoker": { "invoker": {

@ -38,6 +38,7 @@ class Dashboard extends React.Component {
}; };
this.config = this.props.context; this.config = this.props.context;
this.Logo = this.config.theme.logo; this.Logo = this.config.theme.logo;
this.footerText = this.config.theme.footerText;
} }
showMobileNavigationBar = () => { showMobileNavigationBar = () => {
@ -217,7 +218,7 @@ class Dashboard extends React.Component {
</Switch> </Switch>
</Content> </Content>
<Footer style={{textAlign: 'center'}}> <Footer style={{textAlign: 'center'}}>
©2019 entgra.io {this.footerText}
</Footer> </Footer>
</Layout> </Layout>
</div> </div>

@ -3,7 +3,8 @@
"type": "default", "type": "default",
"value": "lightBaseTheme", "value": "lightBaseTheme",
"logo" : "https://entgra.io/assets/images/svg/logo.svg", "logo" : "https://entgra.io/assets/images/svg/logo.svg",
"primaryColor": "rgb(24, 144, 255)" "primaryColor": "rgb(24, 144, 255)",
"footerText": "©2019 entgra.io"
}, },
"serverConfig": { "serverConfig": {
"invokerUri": "/ui-request-handler/invoke/application-mgt-store/v1.0", "invokerUri": "/ui-request-handler/invoke/application-mgt-store/v1.0",

@ -45,6 +45,7 @@ class Dashboard extends React.Component {
} }
}; };
this.logo = this.props.context.theme.logo; this.logo = this.props.context.theme.logo;
this.footerText = this.props.context.theme.footerText;
this.config = this.props.context; this.config = this.props.context;
} }
@ -228,7 +229,7 @@ class Dashboard extends React.Component {
</Content> </Content>
<Footer style={{textAlign: 'center'}}> <Footer style={{textAlign: 'center'}}>
©2019 entgra.io {this.footerText}
</Footer> </Footer>
</Layout> </Layout>
</div> </div>

Loading…
Cancel
Save