From 18f4f877ca996f003a0ed31c22de6b32b7e628f0 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Tue, 23 Apr 2019 15:59:57 +0530
Subject: [PATCH 1/3] completed login with redirection

---
 .../react-app/src/pages/Login.js              | 56 +++++++++++++++++--
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js
index d6b1b3fa15..3eb16f993d 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js
@@ -1,9 +1,10 @@
 import React from "react";
-import {Typography, Row, Col, Form, Icon, Input, Button, Checkbox,} from 'antd';
+import {Typography, Row, Col, Form, Icon, Input, Button, Checkbox} from 'antd';
 import styles from './Login.less';
 import axios from 'axios';
 
 const {Title} = Typography;
+const {Text} = Typography;
 
 class Login extends React.Component {
     render() {
@@ -35,17 +36,51 @@ class Login extends React.Component {
 }
 
 class NormalLoginForm extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            inValid: false,
+            loading : false
+        };
+
+    }
+
+
+
+
     handleSubmit = (e) => {
+        const thisForm = this;
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
+            thisForm.setState({
+                inValid: false
+            });
             if (!err) {
+                thisForm.setState({
+                    loading: true
+                });
                 console.log('Received values of form: ', values);
-                let data = "username="+values.username+"&password="+values.password+"&platform=publisher";
+                let data = "username=" + values.username + "&password=" + values.password + "&platform=publisher";
                 axios.post('https://localhost:9443/api/application-mgt-handler/v1.0/login', data
-                    ).then(res => {
+                ).then(res => {
+                    console.log(res);
+                    if (res.status === 200) {
                         console.log(res);
                         console.log(res.data);
-                    })
+                        console.log(res.status);
+                        window.location = res.data.url;
+                    }
+
+                }).catch(function (error) {
+                    if (error.response.status === 400) {
+                        console.log("hoo");
+                        thisForm.setState({
+                            inValid: true,
+                            loading: false
+                        });
+                    }
+                });
             }
 
         });
@@ -53,6 +88,14 @@ class NormalLoginForm extends React.Component {
 
     render() {
         const {getFieldDecorator} = this.props.form;
+        let errorMsg = "";
+        if (this.state.inValid) {
+            errorMsg = <Text type="danger">Invalid Login Details</Text>;
+        }
+        let loading = "";
+        if (this.state.loading) {
+            loading = <Text type="secondary">Loading..</Text>;
+        }
         return (
             <Form onSubmit={this.handleSubmit} className="login-form">
                 <Form.Item>
@@ -72,13 +115,16 @@ class NormalLoginForm extends React.Component {
                                placeholder="Password"/>
                     )}
                 </Form.Item>
+                {loading}
+                {errorMsg}
                 <Form.Item>
                     {getFieldDecorator('remember', {
                         valuePropName: 'checked',
                         initialValue: true,
                     })(
-                        <Checkbox>Remember me....</Checkbox>
+                        <Checkbox>Remember me</Checkbox>
                     )}
+                    <br/>
                     <a className="login-form-forgot" href="">Forgot password</a>
                     <Button block type="primary" htmlType="submit" className="login-form-button">
                         Log in

From f5c1eea6fa9bfe4e149f79f9f676f5957a6c6d16 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Tue, 23 Apr 2019 19:43:06 +0530
Subject: [PATCH 2/3] removed console logs

---
 .../react-app/src/index.js                                  | 6 +++---
 .../react-app/src/pages/Login.js                            | 6 ------
 2 files changed, 3 insertions(+), 9 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 734182829b..3fc404c07d 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
@@ -17,15 +17,15 @@ const routes = [
         component: Login
     },
     {
-        path: '/publisher/dashboard',
+        path: '/publisher/application-mgt',
         component: Dashboard,
         routes: [
             {
-                path: '/publisher/dashboard/apps',
+                path: '/publisher/application-mgt/apps',
                 component: Apps
             },
             {
-                path: '/publisher/dashboard/new-app',
+                path: '/publisher/application-mgt/new-app',
                 component: AddNewApp
             }
         ]
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js
index 3eb16f993d..f3d10d1631 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js
@@ -64,17 +64,11 @@ class NormalLoginForm extends React.Component {
                 let data = "username=" + values.username + "&password=" + values.password + "&platform=publisher";
                 axios.post('https://localhost:9443/api/application-mgt-handler/v1.0/login', data
                 ).then(res => {
-                    console.log(res);
                     if (res.status === 200) {
-                        console.log(res);
-                        console.log(res.data);
-                        console.log(res.status);
                         window.location = res.data.url;
                     }
-
                 }).catch(function (error) {
                     if (error.response.status === 400) {
-                        console.log("hoo");
                         thisForm.setState({
                             inValid: true,
                             loading: false

From 9f402d5f91cc5cf20aa5fab8b54eebd1b301465e Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Tue, 23 Apr 2019 21:47:44 +0530
Subject: [PATCH 3/3] Publisher: added default child route

---
 .../react-app/package.json                    |  3 +-
 .../react-app/src/index.js                    |  8 ++---
 .../react-app/src/pages/Login.js              |  4 ---
 .../src/pages/dashboard/Dashboard.js          | 29 +++++++++++--------
 4 files changed, 23 insertions(+), 21 deletions(-)

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 3aa97aca33..3029a00c3f 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
@@ -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",
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 3fc404c07d..df386140c4 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
@@ -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
             }
         ]
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js
index f3d10d1631..e49b031118 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js
+++ b/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();
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 7e963d7ef9..9d8569b12a 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,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="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="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="3"><Link to="new-app"><Icon type="upload"/>Add New App</Link></Menu.Item>
                     </Menu>
                 </Header>
-                <Content style={{ padding: '0 0' }}>
-                    {this.state.routes.map((route) => (
-                        <RouteWithSubRoutes key={route.path} {...route} />
-                    ))}
+                <Content style={{padding: '0 0'}}>
+                    <Switch>
+                        <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>