community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the navigation bar issue in APPM UI

Browse Source
This commit is contained in:
Nipun Nadeen De Silva 2019-10-08 07:56:13 +00:00 committed by Dharmakeerthi Lasantha
parent 617ba8782f
commit 0757783b81
4 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/ListApps.js vendored
View File

@ -57,10 +57,10 @@ class ListApps extends React.Component {
return ( return (
<Card> <Card>
<Row gutter={28}> <Row gutter={28}>
<Col md={6}> <Col md={7}>
<Filters setFilters={this.setFilters}/> <Filters setFilters={this.setFilters}/>
</Col> </Col>
<Col md={18}> <Col md={17}>
<Row> <Row>
<Col span={6}> <Col span={6}>
<Title level={4}>Apps</Title> <Title level={4}>Apps</Title>

27
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js vendored
View File

@ -77,8 +77,7 @@ class Dashboard extends React.Component {
<Icon type="plus"/> <Icon type="plus"/>
Add New App Add New App
</span> </span>
} }>
>
<Menu.Item key="add-new-public-app"> <Menu.Item key="add-new-public-app">
<Link to="/publisher/add-new-app/public"> <Link to="/publisher/add-new-app/public">
Public App Public App
@ -105,8 +104,7 @@ class Dashboard extends React.Component {
title={ title={
<span className="submenu-title-wrapper"> <span className="submenu-title-wrapper">
<Icon type="control"/>Manage <Icon type="control"/>Manage
</span> </span>}>
}>
<Menu.Item key="manage"> <Menu.Item key="manage">
<Link to="/publisher/manage"> <Link to="/publisher/manage">
<Icon type="setting"/> General <Icon type="setting"/> General
@ -125,8 +123,7 @@ class Dashboard extends React.Component {
title={ title={
<span className="submenu-title-wrapper"> <span className="submenu-title-wrapper">
<Icon type="user"/>Profile <Icon type="user"/>Profile
</span> </span>}>
}>
<Logout/> <Logout/>
</SubMenu> </SubMenu>
</Menu> </Menu>
@ -137,9 +134,12 @@ class Dashboard extends React.Component {
<Layout className="mobile-layout"> <Layout className="mobile-layout">
<div className="mobile-menu-button"> <div className="mobile-menu-button">
<Button type="link" onClick={this.showMobileNavigationBar}> <Button type="link" onClick={this.showMobileNavigationBar}>
<Icon type={this.state.collapsed ? 'menu-fold' : 'menu-unfold'} className="bar-icon"/> <Icon
type={this.state.collapsed ? 'menu-fold' : 'menu-unfold'}
className="bar-icon"/>
</Button> </Button>
</div> </div>
</Layout>
<Drawer <Drawer
title={ title={
<Link to="/publisher/apps"> <Link to="/publisher/apps">
@ -160,8 +160,11 @@ class Dashboard extends React.Component {
mode="inline" mode="inline"
defaultSelectedKeys={['1']} defaultSelectedKeys={['1']}
style={{lineHeight: '64px', width: 231}}> style={{lineHeight: '64px', width: 231}}>
<Menu.Item key="1"><Link to="/publisher/apps"><Icon <Menu.Item key="1">
type="appstore"/>Apps</Link></Menu.Item> <Link to="/publisher/apps">
<Icon type="appstore"/>Apps
</Link>
</Menu.Item>
<SubMenu <SubMenu
title={ title={
<span className="submenu-title-wrapper"> <span className="submenu-title-wrapper">
@ -188,6 +191,7 @@ class Dashboard extends React.Component {
</Menu.Item> </Menu.Item>
</Menu> </Menu>
</Drawer> </Drawer>
<Layout className="mobile-layout">
<Menu <Menu
mode="horizontal" mode="horizontal"
defaultSelectedKeys={['1']} defaultSelectedKeys={['1']}
@ -196,8 +200,7 @@ class Dashboard extends React.Component {
title={ title={
<span className="submenu-title-wrapper"> <span className="submenu-title-wrapper">
<Icon type="user"/> <Icon type="user"/>
</span> </span>}>
}>
<Logout/> <Logout/>
</SubMenu> </SubMenu>
</Menu> </Menu>
@ -219,6 +222,6 @@ class Dashboard extends React.Component {
</div> </div>
); );
} }
}; }
export default withConfigContext(Dashboard); export default withConfigContext(Dashboard);

2
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.js vendored
View File

@ -159,7 +159,7 @@ class NormalLoginForm extends React.Component {
)} )}
<br/> <br/>
<a className="login-form-forgot" href="">Forgot password</a> <a className="login-form-forgot" href="">Forgot password</a>
<Button block type="primary" htmlType="submit" className="login-form-button"> <Button loading={this.state.loading} block type="primary" htmlType="submit" className="login-form-button">
Log in Log in
</Button> </Button>
</Form.Item> </Form.Item>

40
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js vendored
View File

@ -123,22 +123,23 @@ class Dashboard extends React.Component {
theme="light" theme="light"
mode="horizontal" mode="horizontal"
defaultSelectedKeys={selectedKeys} defaultSelectedKeys={selectedKeys}
style={{lineHeight: '64px'}} style={{lineHeight: '64px'}}>
>
{DeviceTypesData} {DeviceTypesData}
<Menu.Item key="web-clip"><Link to="/store/web-clip"><Icon type="upload"/>Web <Menu.Item key="web-clip">
Clips</Link></Menu.Item> <Link to="/store/web-clip">
<Icon type="upload"/>
Web Clips
</Link>
</Menu.Item>
<SubMenu className="profile" <SubMenu className="profile"
title={ title={
<span className="submenu-title-wrapper"> <span className="submenu-title-wrapper">
<Icon type="user"/> <Icon type="user"/>
Profile Profile
</span> </span> }>
}
>
<Logout/> <Logout/>
</SubMenu> </SubMenu>
</Menu> </Menu>
@ -153,6 +154,7 @@ class Dashboard extends React.Component {
<Icon type={this.state.collapsed ? 'menu-fold' : 'menu-unfold'} className="bar-icon"/> <Icon type={this.state.collapsed ? 'menu-fold' : 'menu-unfold'} className="bar-icon"/>
</Button> </Button>
</div> </div>
</Layout>
<Drawer <Drawer
title={<Link to="/store/android"> title={<Link to="/store/android">
<img alt="logo" src={this.logo} style={{marginLeft: 30}} width={"60%"}/> <img alt="logo" src={this.logo} style={{marginLeft: 30}} width={"60%"}/>
@ -162,34 +164,32 @@ class Dashboard extends React.Component {
onClose={this.onCloseMobileNavigationBar} onClose={this.onCloseMobileNavigationBar}
visible={this.state.visible} visible={this.state.visible}
getContainer={false} getContainer={false}
style={{position: 'absolute'}} style={{position: 'absolute'}}>
>
<Menu <Menu
theme="light" theme="light"
mode="inline" mode="inline"
defaultSelectedKeys={selectedKeys} defaultSelectedKeys={selectedKeys}
style={{lineHeight: '64px', width: 231}} style={{lineHeight: '64px', width: 231}}>
>
{DeviceTypesData} {DeviceTypesData}
<Menu.Item key="web-clip"><Link to="/store/web-clip"><Icon type="upload"/>Web <Menu.Item key="web-clip">
Clips</Link></Menu.Item> <Link to="/store/web-clip">
<Icon type="upload"/>Web Clips
</Link>
</Menu.Item>
</Menu> </Menu>
</Drawer> </Drawer>
<Layout className="mobile-layout">
<Menu <Menu
mode="horizontal" mode="horizontal"
defaultSelectedKeys={selectedKeys} defaultSelectedKeys={selectedKeys}
style={{lineHeight: '63px', position: 'fixed', marginLeft: '80%'}} style={{lineHeight: '63px', position: 'fixed', marginLeft: '80%'}}>
>
<SubMenu <SubMenu
title={ title={
<span className="submenu-title-wrapper"> <span className="submenu-title-wrapper">
<Icon type="user"/> <Icon type="user"/>
</span> </span>}>
}
>
<Logout/> <Logout/>
</SubMenu> </SubMenu>
</Menu> </Menu>
@ -202,9 +202,7 @@ class Dashboard extends React.Component {
<RouteWithSubRoutes changeSelectedMenuItem={this.changeSelectedMenuItem} <RouteWithSubRoutes changeSelectedMenuItem={this.changeSelectedMenuItem}
key={route.path} {...route} /> key={route.path} {...route} />
))} ))}
</Switch> </Switch>
</Content> </Content>
<Footer style={{textAlign: 'center'}}> <Footer style={{textAlign: 'center'}}>