From 40e9fbebb89ebfa506c0136d72586d2a25384a40 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 21 Mar 2019 14:36:51 +0530
Subject: [PATCH 1/6] Created Component for Sub Routes

---
 .../src/components/RouteWithSubRoutes.js      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js
new file mode 100644
index 0000000000..d4c5505599
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import {Route} from 'react-router-dom';
+class RouteWithSubRoutes extends React.Component{
+    props;
+    constructor(props){
+        super(props);
+        console.log(props);
+        this.props = props;
+    }
+    render() {
+        return(
+            <Route path={this.props.path} render={(props) => (
+                <this.props.component {...props} routes={this.props.routes}/>
+            )}/>
+        );
+    }
+
+}
+
+export default RouteWithSubRoutes;
\ No newline at end of file

From 7ee7384969ca0f5cf4918785251986cd3145ef4b Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 21 Mar 2019 19:59:40 +0530
Subject: [PATCH 2/6] Changed webpack to absolute path

---
 .../react-app/webpack.config.js                                | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/webpack.config.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/webpack.config.js
index dcb16b0f5e..c1724e9a8c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/webpack.config.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/webpack.config.js
@@ -21,6 +21,9 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 
 const config = {
     devtool: "source-map",
+    output: {
+        publicPath: '/publisher/' // <---- this
+    },
     watch: false,
     resolve: {
         alias: {

From 15f38ba101f4eea135bc8cf9df3fc0884f561fd8 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 21 Mar 2019 20:00:41 +0530
Subject: [PATCH 3/6] Added login to router

---
 .../react-app/src/App.js                      |  26 +++-
 .../react-app/src/index.js                    | 130 ++++++++++++++----
 2 files changed, 125 insertions(+), 31 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js
index 5cf9be115e..f09d174c33 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js
@@ -1,19 +1,31 @@
 import React from "react";
 import "antd/dist/antd.css";
-import { renderRoutes } from "react-router-config";
+import RouteWithSubRoutes from "./components/RouteWithSubRoutes";
+import {
+    BrowserRouter as Router,
+    Link,
+} from 'react-router-dom';
 
 class App extends React.Component {
+    routes;
     constructor(props) {
         super(props);
-       this.state = {
-           route : props.route
-        }
+        this.routes = props.routes;
     }
   render() {
     return (
-        <div>
-            {renderRoutes(this.state.route.routes)}
-        </div>
+        <Router>
+            <div>
+                <ul>
+                    <li><Link to="/publisher/tacos">Tacos</Link></li>
+                    <li><Link to="/publisher/sandwiches">Sandwiches</Link></li>
+                </ul>
+
+                {this.routes.map((route) => (
+                    <RouteWithSubRoutes key={route.path} {...route} />
+                ))}
+            </div>
+        </Router>
 
     );
   }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js
index 96931fc788..2478ce8287 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js
@@ -1,41 +1,123 @@
-import React from 'react';
+// import React from 'react';
 import ReactDOM from 'react-dom';
-import './index.css';
-import App from './App';
+// import './index.css';
 import * as serviceWorker from './serviceWorker';
-import { renderRoutes } from "react-router-config";
-import Dashboard from "./pages/dashboard/Dashboard"
-import Login from "./pages/Login";
-import {BrowserRouter} from "react-router-dom";
+// import { renderRoutes } from "react-router-config";
+// import Dashboard from "./pages/dashboard/Dashboard"
+// import Login from "./pages/Login";
+// import {BrowserRouter} from "react-router-dom";
+//
+//
+// const routes = [
+//     {
+//         component: App,
+//         routes: [
+//             {
+//                 path: "/publisher",
+//                 exact: true,
+//                 component: Dashboard,
+//                 routes: [
+//                     {
+//                         path: "/publisher/a",
+//                         component: Login
+//                     }
+//                 ]
+//             },
+//             {
+//                 path: "/publisher/login",
+//                 component: Login
+//             }
+//         ]
+//     }
+// ];
+//
+// ReactDOM.render( <BrowserRouter>
+//     {/* kick it all off with the root route */}
+//     {renderRoutes(routes)}
+// </BrowserRouter>, document.getElementById('root'));
+//
+// // If you want your app to work offline and load faster, you can change
+// // unregister() to register() below. Note this comes with some pitfalls.
+// // Learn more about service workers: https://bit.ly/CRA-PWA
+// serviceWorker.unregister();
+
+
+import React from 'react';
+import {
+    BrowserRouter as Router,
+    Route,
+    Link,
+} from 'react-router-dom';
+import RouteWithSubRoutes from "./components/RouteWithSubRoutes"
+import App from "./App"
+import Login from "./pages/Login"
+
+const Sandwiches = () => <h2>Sandwiches</h2>
+
+const Tacos = ({ routes }) => (
+    <div>
+        <h2>Tacos</h2>
+        <ul>
+            <li><Link to="/publisher/tacos/bus">Bus</Link></li>
+            <li><Link to="/publisher/tacos/cart">Cart</Link></li>
+        </ul>
 
+        {routes.map((route) => (
+            <RouteWithSubRoutes key={route.path} {...route} />
+        ))}
+    </div>
+)
+
+const Bus = () => <h3>Bus</h3>
+const Cart = () => <h3>Cart</h3>
 
 const routes = [
     {
-        component: App,
+        path: '/publisher/Login',
+        component: Login
+    },
+    {
+        path: '/publisher/tacos',
+        component: Tacos,
         routes: [
             {
-                path: "/publisher",
-                exact: true,
-                component: Dashboard,
-                routes: [
-                    {
-                        path: "/publisher/a",
-                        component: Login
-                    }
-                ]
+                path: '/publisher/tacos/bus',
+                component: Login
             },
             {
-                path: "/publisher/login",
-                component: Login
+                path: '/publisher/tacos/cart',
+                component: Cart
             }
         ]
     }
-];
+]
+
+// const RouteWithSubRoutes = (route) => (
+//     <Route path={route.path} render={(props) => (
+//         <route.component {...props} routes={route.routes}/>
+//     )}/>
+// )
+
+// class App extends React.Component {
+//     render() {
+//         return (
+//             <Router>
+//                 <div>
+//                     <ul>
+//                         <li><Link to="/publisher/tacos">Tacos</Link></li>
+//                         <li><Link to="/publisher/sandwiches">Sandwiches</Link></li>
+//                     </ul>
+//
+//                     {routes.map((route) => (
+//                         <RouteWithSubRoutes key={route.path} {...route} />
+//                     ))}
+//                 </div>
+//             </Router>
+//         )
+//     }
+// }
 
-ReactDOM.render( <BrowserRouter>
-    {/* kick it all off with the root route */}
-    {renderRoutes(routes)}
-</BrowserRouter>, document.getElementById('root'));
+ReactDOM.render( <App routes={routes}/>, document.getElementById('root'));
 
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.

From 536a2ca81b5ccd45cec7cd9d23ce8608af0b65ab Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Tue, 26 Mar 2019 22:40:07 +0530
Subject: [PATCH 4/6] Created new routes with router config

---
 .../react-app/src/App.js                      |   5 -
 .../src/components/RouteWithSubRoutes.js      |   1 -
 .../react-app/src/index.js                    | 100 ++----------------
 3 files changed, 7 insertions(+), 99 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js
index f09d174c33..be1c130124 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js
@@ -16,11 +16,6 @@ class App extends React.Component {
     return (
         <Router>
             <div>
-                <ul>
-                    <li><Link to="/publisher/tacos">Tacos</Link></li>
-                    <li><Link to="/publisher/sandwiches">Sandwiches</Link></li>
-                </ul>
-
                 {this.routes.map((route) => (
                     <RouteWithSubRoutes key={route.path} {...route} />
                 ))}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js
index d4c5505599..c172b28edd 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js
@@ -4,7 +4,6 @@ class RouteWithSubRoutes extends React.Component{
     props;
     constructor(props){
         super(props);
-        console.log(props);
         this.props = props;
     }
     render() {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js
index 2478ce8287..2a393bdfbc 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js
@@ -1,75 +1,12 @@
-// import React from 'react';
+import React from 'react';
 import ReactDOM from 'react-dom';
-// import './index.css';
+import './index.css';
 import * as serviceWorker from './serviceWorker';
-// import { renderRoutes } from "react-router-config";
-// import Dashboard from "./pages/dashboard/Dashboard"
-// import Login from "./pages/Login";
-// import {BrowserRouter} from "react-router-dom";
-//
-//
-// const routes = [
-//     {
-//         component: App,
-//         routes: [
-//             {
-//                 path: "/publisher",
-//                 exact: true,
-//                 component: Dashboard,
-//                 routes: [
-//                     {
-//                         path: "/publisher/a",
-//                         component: Login
-//                     }
-//                 ]
-//             },
-//             {
-//                 path: "/publisher/login",
-//                 component: Login
-//             }
-//         ]
-//     }
-// ];
-//
-// ReactDOM.render( <BrowserRouter>
-//     {/* kick it all off with the root route */}
-//     {renderRoutes(routes)}
-// </BrowserRouter>, document.getElementById('root'));
-//
-// // If you want your app to work offline and load faster, you can change
-// // unregister() to register() below. Note this comes with some pitfalls.
-// // Learn more about service workers: https://bit.ly/CRA-PWA
-// serviceWorker.unregister();
-
-
-import React from 'react';
-import {
-    BrowserRouter as Router,
-    Route,
-    Link,
-} from 'react-router-dom';
-import RouteWithSubRoutes from "./components/RouteWithSubRoutes"
 import App from "./App"
 import Login from "./pages/Login"
+import Dashboard from "./pages/dashboard/Dashboard"
 
-const Sandwiches = () => <h2>Sandwiches</h2>
-
-const Tacos = ({ routes }) => (
-    <div>
-        <h2>Tacos</h2>
-        <ul>
-            <li><Link to="/publisher/tacos/bus">Bus</Link></li>
-            <li><Link to="/publisher/tacos/cart">Cart</Link></li>
-        </ul>
-
-        {routes.map((route) => (
-            <RouteWithSubRoutes key={route.path} {...route} />
-        ))}
-    </div>
-)
 
-const Bus = () => <h3>Bus</h3>
-const Cart = () => <h3>Cart</h3>
 
 const routes = [
     {
@@ -77,12 +14,12 @@ const routes = [
         component: Login
     },
     {
-        path: '/publisher/tacos',
-        component: Tacos,
+        path: '/publisher/dashboard',
+        component: Dashboard,
         routes: [
             {
-                path: '/publisher/tacos/bus',
-                component: Login
+                path: '/publisher/dashboard/bus',
+                component: Bus
             },
             {
                 path: '/publisher/tacos/cart',
@@ -92,30 +29,7 @@ const routes = [
     }
 ]
 
-// const RouteWithSubRoutes = (route) => (
-//     <Route path={route.path} render={(props) => (
-//         <route.component {...props} routes={route.routes}/>
-//     )}/>
-// )
 
-// class App extends React.Component {
-//     render() {
-//         return (
-//             <Router>
-//                 <div>
-//                     <ul>
-//                         <li><Link to="/publisher/tacos">Tacos</Link></li>
-//                         <li><Link to="/publisher/sandwiches">Sandwiches</Link></li>
-//                     </ul>
-//
-//                     {routes.map((route) => (
-//                         <RouteWithSubRoutes key={route.path} {...route} />
-//                     ))}
-//                 </div>
-//             </Router>
-//         )
-//     }
-// }
 
 ReactDOM.render( <App routes={routes}/>, document.getElementById('root'));
 

From ab4b5d17649930c0dddd6f0b4b237d722c105b4e Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Tue, 26 Mar 2019 22:40:28 +0530
Subject: [PATCH 5/6] Created Layout for dashboard

---
 .../src/pages/dashboard/Dashboard.js          | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js
index 6088af4b6f..cca9ef97b5 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js
@@ -1,5 +1,5 @@
 import React from "react";
-import { Layout, Menu, Breadcrumb } from 'antd';
+import { Layout, Menu, Breadcrumb, PageHeader } from 'antd';
 
 const { Header, Content, Footer } = Layout;
 
@@ -8,15 +8,15 @@ import Logo from "../../../public/images/logo.svg";
 import Login from "../Login";
 import {renderRoutes} from "react-router-config";
 import {NavLink} from "react-router-dom";
+import RouteWithSubRoutes from "../../components/RouteWithSubRoutes"
 
 
 class Dashboard extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
-            route : props.route
+            routes : props.routes
         }
-        console.log(props);
     }
 
     render() {
@@ -35,19 +35,20 @@ class Dashboard extends React.Component {
                         <Menu.Item key="3">nav 3</Menu.Item>
                     </Menu>
                 </Header>
-                <Content style={{ padding: '0 50px' }}>
-                    <Breadcrumb style={{ margin: '16px 0' }}>
+                <Content style={{ padding: '0 0' }}>
+                    <Breadcrumb style={{ margin: '16px 50px' }}>
                         <Breadcrumb.Item>Home</Breadcrumb.Item>
                         <Breadcrumb.Item>List</Breadcrumb.Item>
                         <Breadcrumb.Item>App</Breadcrumb.Item>
                     </Breadcrumb>
-                    <NavLink exact to="/publisher/a" className="nav-link" >
-                        Items
-                    </NavLink>
-
-                    {/* child routes won't render without this */}
-                    {renderRoutes(this.state.route.routes, { someProp: "these extra props are optional" })}
-                    <div style={{ background: '#fff', padding: 24, minHeight: 280 }}>Content</div>
+                    <PageHeader
+                        title="Title"
+                    />
+                    <div style={{ background: '#fff', padding: 24, minHeight: 280 }}>
+                        {this.state.routes.map((route) => (
+                            <RouteWithSubRoutes key={route.path} {...route} />
+                        ))}
+                    </div>
                 </Content>
                 <Footer style={{ textAlign: 'center' }}>
                     ©2019 entgra.io

From 3c50af2a1447f8d9dd2fdab31d2a8cafb998fb70 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Tue, 26 Mar 2019 23:04:07 +0530
Subject: [PATCH 6/6] Removed unused routs

---
 .../react-app/src/index.js                           | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js
index 2a393bdfbc..7ccba02f0c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js
@@ -15,17 +15,7 @@ const routes = [
     },
     {
         path: '/publisher/dashboard',
-        component: Dashboard,
-        routes: [
-            {
-                path: '/publisher/dashboard/bus',
-                component: Bus
-            },
-            {
-                path: '/publisher/tacos/cart',
-                component: Cart
-            }
-        ]
+        component: Dashboard
     }
 ]