Publisher: added default child route

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json

@@ -18,7 +18,8 @@
     "react-highlight-words": "^0.16.0",
     "react-router-config": "^5.0.0",
     "react-router-dom": "latest",
-    "react-scripts": "2.1.8"
+    "react-scripts": "2.1.8",
+    "react-router": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js

@@ -13,19 +13,19 @@ import {Provider} from "react-redux";
 
 const routes = [
     {
-        path: '/publisher/Login',
+        path: '/publisher/login',
         component: Login
     },
     {
-        path: '/publisher/application-mgt',
+        path: '/publisher',
         component: Dashboard,
         routes: [
             {
-                path: '/publisher/application-mgt/apps',
+                path: '/publisher/apps',
                 component: Apps
             },
             {
-                path: '/publisher/application-mgt/new-app',
+                path: '/publisher/new-app',
                 component: AddNewApp
             }
         ]

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js

@@ -43,12 +43,8 @@ class NormalLoginForm extends React.Component {
             inValid: false,
             loading : false
         };
-
     }
 
-
-
-
     handleSubmit = (e) => {
         const thisForm = this;
         e.preventDefault();

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

@@ -1,19 +1,20 @@
 import React from "react";
-import { Layout, Menu, Icon } from 'antd';
+import {Layout, Menu, Icon} from 'antd';
 
-const { Header, Content, Footer } = Layout;
+const {Header, Content, Footer} = Layout;
 
 import styles from './Dashboard.less';
 import Logo from "../../../public/images/logo.svg";
 import {Link, NavLink} from "react-router-dom";
 import RouteWithSubRoutes from "../../components/RouteWithSubRoutes"
+import { Switch, Redirect } from 'react-router'
 
 
 class Dashboard extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
-            routes : props.routes
+            routes: props.routes
         }
     }
 
@@ -28,20 +29,24 @@ class Dashboard extends React.Component {
                         theme="light"
                         mode="horizontal"
                         defaultSelectedKeys={['2']}
-                        style={{ lineHeight: '64px' }}
+                        style={{lineHeight: '64px'}}
                     >
-                        <Menu.Item key="1"><Link to="apps"><Icon type="appstore" />Apps</Link></Menu.Item>
+                        <Menu.Item key="1"><Link to="apps"><Icon type="appstore"/>Apps</Link></Menu.Item>
-                        <Menu.Item key="2"><Link to="apps"><Icon type="line-chart" />Apps</Link></Menu.Item>
+                        <Menu.Item key="2"><Link to="apps"><Icon type="line-chart"/>Apps</Link></Menu.Item>
-                        <Menu.Item key="3"><Link to="new-app"><Icon type="upload" />Add New App</Link></Menu.Item>
+                        <Menu.Item key="3"><Link to="new-app"><Icon type="upload"/>Add New App</Link></Menu.Item>
                     </Menu>
                 </Header>
-                <Content style={{ padding: '0 0' }}>
+                <Content style={{padding: '0 0'}}>
-                    {this.state.routes.map((route) => (
+                    <Switch>
-                        <RouteWithSubRoutes key={route.path} {...route} />
+                        <Redirect exact from="/publisher" to="/publisher/apps"/>
-                    ))}
+                        {this.state.routes.map((route) => (
+                            <RouteWithSubRoutes key={route.path} {...route} />
+                        ))}
+
+                    </Switch>
 
                 </Content>
-                <Footer style={{ textAlign: 'center' }}>
+                <Footer style={{textAlign: 'center'}}>
                     ©2019 entgra.io
                 </Footer>
             </Layout>