From ca1f147c77f85af35b2b3a6aee2bc1414186a590 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Mon, 29 Apr 2019 13:51:03 +0530
Subject: [PATCH] fixed wrong redirection

---
 .../react-app/src/App.js                      |  2 +-
 .../react-app/src/index.js                    |  4 +-
 .../src/pages/dashboard/apps/Apps.js          | 64 +++++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js

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 7ba8524e2e5..9c532989fac 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
@@ -20,7 +20,7 @@ class App extends React.Component {
             <Router>
                 <div>
                     <Switch>
-                        <Redirect exact from="/publisher" to="/publisher/dashboard/apps"/>
+                        <Redirect exact from="/publisher" to="/publisher/apps"/>
                         {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/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js
index fc646cba4d5..882fe0c8b6a 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
@@ -4,7 +4,7 @@ import * as serviceWorker from './serviceWorker';
 import App from "./App";
 import Login from "./pages/Login";
 import Dashboard from "./pages/dashboard/Dashboard";
-import OldApps from "./pages/dashboard/apps/OldApps";
+import Apps from "./pages/dashboard/apps/Apps";
 import AddNewApp from "./pages/dashboard/add-new-app/AddNewApp";
 import './index.css';
 import store from "./js/store/index";
@@ -25,7 +25,7 @@ const routes = [
         routes: [
             {
                 path: '/publisher/apps',
-                component: OldApps,
+                component: Apps,
                 exact: true
             },
             {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js
new file mode 100644
index 00000000000..e90fcf84b9f
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js
@@ -0,0 +1,64 @@
+import React from "react";
+import "antd/dist/antd.css";
+import {Table, Divider, Tag, Card, PageHeader, Typography, Avatar,Input, Button, Icon, Row, Col} from "antd";
+import Highlighter from 'react-highlight-words';
+import axios from "axios";
+
+const Paragraph = Typography;
+const Search = Input.Search;
+
+const routes = [
+    {
+        path: 'index',
+        breadcrumbName: 'Publisher',
+    },
+    {
+        path: 'first',
+        breadcrumbName: 'Dashboard',
+    },
+    {
+        path: 'second',
+        breadcrumbName: 'Apps',
+    },
+];
+
+
+class Apps extends React.Component {
+    routes;
+    constructor(props) {
+        super(props);
+        this.routes = props.routes;
+
+    }
+
+
+
+    render() {
+        return (
+            <div>
+                <PageHeader
+                    breadcrumb={{routes}}
+                />
+                <div style={{background: '#f0f2f5', padding: 24, minHeight: 780}}>
+
+                    <Card>
+                        <Row style={{padding:10}}>
+                            <Col span={6} offset={18}>
+                                <Search
+                                    placeholder="search"
+                                    onSearch={value => console.log(value)}
+                                    style={{ width: 200}}
+                                />
+                                <Button style={{margin:5}}>Advanced Search</Button>
+                            </Col>
+                        </Row>
+                    </Card>
+                </div>
+
+            </div>
+
+        );
+    }
+}
+
+export default Apps;