diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.css
index 4fea44459f..adbde74ba5 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.css
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.css
@@ -1,37 +1,44 @@
-.App {
- text-align: center;
+.ant-upload.ant-upload-drag {
+ height: 170px;
}
-.App-logo {
- animation: App-logo-spin infinite 20s linear;
- height: 40vmin;
- pointer-events: none;
+.release .release-icon{
+ margin-right: 15px;
}
-.App-header {
- background-color: #282c34;
- min-height: 100vh;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- font-size: calc(10px + 2vmin);
- color: white;
+.release .release-icon img{
+ width: 100%;
+ border-radius: 100%;
}
-.App-link {
- color: #61dafb;
+.release .release-title{
+ margin-left: 15px;
}
-@keyframes App-logo-spin {
- from {
- transform: rotate(0deg);
- }
- to {
- transform: rotate(360deg);
- }
+.release .release-screenshot img{
+ width: 100%;
+ border-radius: 15px;
+ padding: 5px;
}
-.ant-upload.ant-upload-drag {
- height: 170px;
+.logo {
+ width: 120px;
+ height: 31px;
+ margin: 0 0 16px 20px;
+ float: left;
+}
+
+.logo img{
+ height: 35px;
+}
+
+.main-container{
+ background: #f0f2f5;
+ min-height: 780px
+}
+
+@media only screen and (min-width: 768px) {
+ .main-container{
+ padding: 24px;
+ }
}
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
index 26db61287c..646cbd9aea 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
@@ -33,7 +33,8 @@ class ConnectedLifecycleModal extends React.Component {
componentWillReceiveProps(nextProps) {
if (nextProps !== this.props) {
this.setState({
- visible: nextProps.visible
+ visible: nextProps.visible,
+ loading: false
})
}
}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js
index 8e0953c9c3..412589062b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js
@@ -1,29 +1,43 @@
import React from "react";
-import {Avatar, Row, Col, Typography} from "antd";
+import {Avatar, Row, Col, Typography, Button} from "antd";
+import "../../../App.css";
const {Title, Text} = Typography;
class ReleaseView extends React.Component {
render() {
const release = this.props.release;
+ console.log(release);
return (
-
+
);
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.html b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.html
index 98499e9ecf..33ea810110 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.html
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.html
@@ -1 +1,8 @@
-
\ No newline at end of file
+
+
+
+
+
Entgra App Publisher
+
+
+
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
index d327475721..42bfd2c3a9 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
@@ -96,20 +96,17 @@ export const updateLifecycleState = (uuid, nextState, reason) => dispatch => {
const request = "method=post&content-type=application/json&payload=" + JSON.stringify(payload) + "&api-endpoint=/application-mgt-publisher/v1.0/applications/life-cycle/" + uuid;
- console.log(request);
return axios.post('https://' + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request
).then(res => {
- if (res.status === 200) {
- if(res.data.data.hasOwnProperty("release")) {
- let release = res.data.data;
- dispatch({type: ActionTypes.UPDATE_LIFECYCLE_STATE, payload: release});
- }else{
- alert("error");
- dispatch({
- type: ActionTypes.CLOSE_LIFECYCLE_MODAL
- });
- }
+ if (res.status === 201) {
+ let release = res.data.data;
+ dispatch({type: ActionTypes.UPDATE_LIFECYCLE_STATE, payload: release});
+ }else {
+ alert("error");
+ dispatch({
+ type: ActionTypes.CLOSE_LIFECYCLE_MODAL
+ });
}
}).catch(function (error) {
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 ea9d762d9b..1528c2d873 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
@@ -3,12 +3,11 @@ import {Layout, Menu, Icon} from 'antd';
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'
-
+import {Switch, Redirect} from 'react-router'
+import "../../App.css";
class Dashboard extends React.Component {
constructor(props) {
@@ -20,36 +19,42 @@ class Dashboard extends React.Component {
render() {
return (
-
-
-
-
-
-
-
-
-
-
- {this.state.routes.map((route) => (
-
- ))}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {this.state.routes.map((route) => (
+
+ ))}
+
+
+
+
+
+
+
);
}
}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js
index ebf96e42f1..69e268939b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js
@@ -1,4 +1,5 @@
import React from "react";
+import '../../../../App.css';
import {PageHeader, Typography, Input, Button, Row, Col, Avatar, Card} from "antd";
import {connect} from "react-redux";
import ReleaseView from "../../../../components/apps/release/ReleaseView";
@@ -62,17 +63,15 @@ class ConnectedRelease extends React.Component {
-