diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json
index 7512d9fcd7..781fc652ef 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json
@@ -13,6 +13,7 @@
"antd": "^3.15.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
+ "react-highlight-words": "^0.16.0",
"react-router-config": "^5.0.0",
"react-router-dom": "latest",
"react-scripts": "2.1.8"
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.css
index 8b45ed5931..36d26ff0fb 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.css
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.css
@@ -1,3 +1,23 @@
.App {
padding: 20px;
+}
+
+.ant-layout-header{
+ padding: 0;
+ height: auto;
+ box-shadow: 0 2px 8px #f0f1f2;
+}
+
+.steps-content {
+ margin-top: 16px;
+ border: 1px dashed #e9e9e9;
+ border-radius: 6px;
+ background-color: #fafafa;
+ min-height: 200px;
+ text-align: center;
+ padding-top: 80px;
+}
+
+.steps-action {
+ margin-top: 24px;
}
\ No newline at end of file
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 7ccba02f0c..166528a210 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,10 +1,12 @@
import React from 'react';
import ReactDOM from 'react-dom';
-import './index.css';
import * as serviceWorker from './serviceWorker';
-import App from "./App"
-import Login from "./pages/Login"
-import Dashboard from "./pages/dashboard/Dashboard"
+import App from "./App";
+import Login from "./pages/Login";
+import Dashboard from "./pages/dashboard/Dashboard";
+import Apps from "./pages/dashboard/apps/Apps";
+import AddNewApp from "./pages/dashboard/add-new-app/AddNewApp";
+import './index.css';
@@ -15,7 +17,17 @@ const routes = [
},
{
path: '/publisher/dashboard',
- component: Dashboard
+ component: Dashboard,
+ routes: [
+ {
+ path: '/publisher/dashboard/apps',
+ component: Apps
+ },
+ {
+ path: '/publisher/dashboard/new-app',
+ component: AddNewApp
+ }
+ ]
}
]
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 cca9ef97b5..02815546af 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, PageHeader } from 'antd';
+import { Layout, Menu, Icon } from 'antd';
const { Header, Content, Footer } = Layout;
@@ -7,7 +7,7 @@ import styles from './Dashboard.less';
import Logo from "../../../public/images/logo.svg";
import Login from "../Login";
import {renderRoutes} from "react-router-config";
-import {NavLink} from "react-router-dom";
+import {Link, NavLink} from "react-router-dom";
import RouteWithSubRoutes from "../../components/RouteWithSubRoutes"
@@ -30,25 +30,16 @@ class Dashboard extends React.Component {
defaultSelectedKeys={['2']}
style={{ lineHeight: '64px' }}
>
-
nav 1
- nav 2
- nav 3
+ Apps
+ Apps
+ Add New App
-
- Home
- List
- App
-
-
-
- {this.state.routes.map((route) => (
-
- ))}
-
+ {this.state.routes.map((route) => (
+
+ ))}
+