From e5e7dc5bcc508f6a3a4729dad736319545b29a16 Mon Sep 17 00:00:00 2001 From: Jayasanka Date: Thu, 11 Jul 2019 17:49:28 +0530 Subject: [PATCH] Add theming feature to store --- .../react-app/public/conf/config.json | 4 +- .../src/components/new-app/AddNewAppForm.js | 1 - .../react-app/src/pages/Login.css | 44 ++++++++++++++++ .../react-app/src/pages/Login.js | 21 ++++---- .../react-app/src/pages/Login.less | 33 ------------ .../src/pages/dashboard/Dashboard.js | 1 - .../dashboard/add-new-app/AddNewPublicApp.js | 1 - .../dashboard/add-new-app/AddNewWebClip.js | 1 - .../add-new-release/AddNewRelease.js | 1 - .../src/pages/dashboard/apps/Apps.js | 1 - .../src/pages/dashboard/manage/Manage.js | 1 - .../react-app/webpack.config.js | 7 +-- .../react-app/package.json | 50 +++++++++---------- .../react-app/public/conf/config.json | 4 +- .../react-app/src/App.css | 19 ++++--- .../react-app/src/App.js | 3 +- .../react-app/src/pages/Login.css | 44 ++++++++++++++++ .../react-app/src/pages/Login.js | 36 ++++++++----- .../react-app/src/pages/Login.less | 34 ------------- .../src/pages/dashboard/Dashboard.js | 19 ++++--- .../pages/dashboard/add-new-app/AddNewApp.js | 1 - .../src/pages/dashboard/apps/Apps.js | 1 - .../react-app/webpack.config.js | 17 ++++--- 23 files changed, 181 insertions(+), 163 deletions(-) create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.css delete mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.less create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.css delete mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.less diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json index fcea32d729..4a5890600e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json @@ -2,8 +2,8 @@ "theme": { "type": "default", "value": "lightBaseTheme", - "logo" : "https://www.brandchannel.com/wp-content/uploads/2016/05/instagram-new-logo-may-2016.jpg", - "primaryColor": "#F62459" + "logo" : "https://entgra.io/assets/images/svg/logo.svg", + "primaryColor": "rgb(24, 144, 255)" }, "serverConfig": { "protocol": "https", diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js index 10f8482934..74856e99b8 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js @@ -1,5 +1,4 @@ import React from "react"; -//import "antd/dist/antd.css"; import { Card, Button, diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.css new file mode 100644 index 0000000000..66accd6913 --- /dev/null +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.css @@ -0,0 +1,44 @@ +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg) scale(1.0); + } + 100% { + -moz-transform: rotate(360deg) scale(0.1); + } +} + +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg) scale(1.0); + } + 100% { + -webkit-transform: rotate(360deg) scale(0.1); + } +} + +@keyframes spin { + 0% { + -webkit-transform: rotate(0deg) scale(1.0); + } + 100% { + -webkit-transform: rotate(360deg) scale(0.1); + transform: rotate(360deg) scale(0.1); + } +} + +.background { + position: absolute; + height: 100%; + width: 100%; + z-index: 0; + background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg'); + background-repeat: no-repeat; + background-position: center 110px; + background-size: 100%; + animation: spin 200s infinite linear; +} + +.content { + position: relative; + z-index: 1; +} \ No newline at end of file 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 32104673fb..c13c1d9827 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,8 +1,9 @@ import React from "react"; import {Typography, Row, Col, Form, Icon, Input, Button, Checkbox} from 'antd'; -import styles from './Login.less'; +import './Login.css'; import axios from 'axios'; import config from "../../public/conf/config.json"; +import "./Login.css"; const {Title} = Typography; const {Text} = Typography; @@ -10,14 +11,12 @@ const {Text} = Typography; class Login extends React.Component { render() { return ( -
-
+
+
+
+
@@ -31,7 +30,7 @@ class Login extends React.Component { height: 60 } } - className={styles.logo} src={config.theme.logo}/> + src={config.theme.logo}/> Login @@ -122,7 +121,7 @@ class NormalLoginForm extends React.Component { {getFieldDecorator('password', { rules: [{required: true, message: 'Please input your Password!'}], })( - } type="password" placeholder="Password"/> )} diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.less b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.less deleted file mode 100644 index 4d0606375a..0000000000 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.less +++ /dev/null @@ -1,33 +0,0 @@ -@nice-blue: #5B83AD; -@light-blue: @nice-blue + #111; - -.header { - color: @nice-blue; -} - -.main{ - background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg'); - background-repeat: no-repeat; - background-position: center 110px; - background-size: 100%; - - .header { - color: @nice-blue; - } - - -} -.content{ - padding-top: 128px; -} - -.logo{ - margin-top: 36px; - height: 44px; - width: 100%; - -} - -input{ - min-height: 0; -} \ No newline at end of file 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 4f82e49fbe..ec1ae9affd 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,6 +1,5 @@ import React from "react"; import {Layout, Menu, Icon} from 'antd'; -// import Logo from "../../../public/images/logo.svg"; import {Switch, Link} from "react-router-dom"; import RouteWithSubRoutes from "../../components/RouteWithSubRoutes" import {Redirect} from 'react-router' diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewPublicApp.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewPublicApp.js index e6aa284574..37083f4921 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewPublicApp.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewPublicApp.js @@ -1,5 +1,4 @@ import React from "react"; -//import "antd/dist/antd.css"; import { PageHeader, Typography diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewWebClip.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewWebClip.js index a280309159..f1aaf13f55 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewWebClip.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewWebClip.js @@ -1,5 +1,4 @@ import React from "react"; -//import "antd/dist/antd.css"; import { PageHeader, Typography diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js index af92c42f42..3578dca633 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js @@ -1,5 +1,4 @@ import React from "react"; -//import "antd/dist/antd.css"; import { PageHeader, Typography 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 index edf28b49bb..9c6848d5f8 100644 --- 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 @@ -1,5 +1,4 @@ import React from "react"; -//import "antd/dist/antd.css"; import {PageHeader, Typography,Input, Button, Row, Col} from "antd"; import ListApps from "../../../components/apps/list-apps/ListApps"; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/Manage.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/Manage.js index d550bf206f..236d06c2f2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/Manage.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/Manage.js @@ -1,5 +1,4 @@ import React from "react"; -//import "antd/dist/antd.css"; import {PageHeader, Typography, Input, Button, Row, Col} from "antd"; import ManageCategories from "../../../components/manage/categories/ManageCategories"; import ManageTags from "../../../components/manage/categories/ManageTags"; 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 f32cbd8a01..9e08e09924 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 @@ -23,7 +23,7 @@ const configurations = require("./public/conf/config.json"); const config = { devtool: "source-map", output: { - publicPath: '/publisher/' // <---- this + publicPath: '/publisher/' }, watch: false, resolve: { @@ -78,11 +78,6 @@ const config = { }, { loader: "css-loader", - // options: { - // sourceMap: true, - // modules: true, - // localIdentName: "[local]___[hash:base64:5]" - // } }, { loader: "less-loader", diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/package.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/package.json index 24acd03ce4..77dc59124d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/package.json +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/package.json @@ -10,24 +10,22 @@ }, "license": "Apache License 2.0", "dependencies": { - "acorn": "^6.1.1", - "antd": "^3.15.0", - "axios": "^0.18.0", - "d3": "^5.9.2", + "acorn": "^6.2.0", + "antd": "^3.20.1", + "axios": "^0.18.1", + "d3": "^5.9.7", "dagre": "^0.8.4", "javascript-time-ago": "^2.0.1", "keymirror": "^0.1.1", "lodash.debounce": "^4.0.8", "rc-viewer": "0.0.9", - "react": "^16.8.4", - "react-d3-graph": "^2.0.2", - "react-dom": "^16.8.4", + "react-d3-graph": "^2.1.0", "react-highlight-words": "^0.16.0", "react-image-viewer-zoom": "^1.0.36", "react-infinite-scroller": "^1.2.4", - "react-router": "latest", - "react-router-config": "^5.0.0", - "react-router-dom": "latest", + "react-router": "^5.0.1", + "react-router-config": "^5.0.1", + "react-router-dom": "^5.0.1", "react-scripts": "2.1.8", "react-star-ratings": "^2.3.0", "react-twemoji": "^0.2.3", @@ -36,16 +34,16 @@ "storm-react-diagrams": "^5.2.1" }, "devDependencies": { - "@babel/core": "^7.0.0", - "@babel/plugin-proposal-class-properties": "^7.0.0", - "@babel/preset-env": "^7.0.0", + "@babel/core": "^7.5.4", + "@babel/plugin-proposal-class-properties": "^7.5.0", + "@babel/preset-env": "^7.5.4", "@babel/preset-react": "^7.0.0", - "@babel/register": "^7.0.0", - "babel-loader": "^8.0.0", - "body-parser": "^1.18.3", + "@babel/register": "^7.4.4", + "babel-loader": "^8.0.6", + "body-parser": "^1.19.0", "chai": "^4.1.2", "css-loader": "^0.28.11", - "express": "^4.16.4", + "express": "^4.17.1", "express-pino-logger": "^4.0.0", "file-loader": "^2.0.0", "html-loader": "^0.5.5", @@ -58,20 +56,20 @@ "mocha": "^5.2.0", "mock-local-storage": "^1.0.5", "node-env-run": "^3.0.2", - "node-sass": "^4.11.0", - "nodemon": "^1.18.9", + "node-sass": "^4.12.0", + "nodemon": "^1.19.1", "npm-run-all": "^4.1.5", - "pino-colada": "^1.4.4", + "pino-colada": "^1.4.5", "postcss-loader": "^3.0.0", - "react": "^15.6.2", - "react-dom": "^15.6.2", - "react-intl": "^2.4.0", + "react": "^16.8.6", + "react-dom": "^16.8.6", + "react-intl": "^2.9.0", "sass-loader": "^6.0.7", "style-loader": "^0.18.2", "url-loader": "^1.1.2", - "webpack": "^4.27.1", - "webpack-cli": "^3.1.2", - "webpack-dev-server": "^3.1.10" + "webpack": "^4.35.3", + "webpack-cli": "^3.3.5", + "webpack-dev-server": "^3.7.2" }, "scripts": { "start": "webpack-dev-server --mode development --open", diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/public/conf/config.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/public/conf/config.json index b9c5fe6266..ac90b4874d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/public/conf/config.json +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/public/conf/config.json @@ -1,7 +1,9 @@ { "theme": { "type": "default", - "value": "lightBaseTheme" + "value": "lightBaseTheme", + "logo" : "https://entgra.io/assets/images/svg/logo.svg", + "primaryColor": "rgb(24, 144, 255)" }, "serverConfig": { "protocol": "https", diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.css index 1e8064d0d9..f4f68f0f70 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.css +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.css @@ -2,16 +2,15 @@ height: 170px; } -.release-icon img{ - width: 100%; - border-radius: 28%; -} .release .release-icon{ margin-right: 15px; } -.appCard .release-icon{ - margin-bottom: 10px; + +.release .release-icon img{ + width: 100%; + border-radius: 28%; } + .release .release-title{ margin-left: 15px; } @@ -22,14 +21,14 @@ padding: 5px; } -.logo { - width: 120px; +.logo-image { + /*width: 120px;*/ height: 31px; - margin: 0 0 16px 20px; + margin: 0 5px 16px 24px; float: left; } -.logo img{ +.logo-image img{ height: 35px; } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js index 898b67496f..2b6921e095 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js @@ -1,5 +1,5 @@ import React from "react"; -import "antd/dist/antd.css"; +import "antd/dist/antd.less"; import RouteWithSubRoutes from "./components/RouteWithSubRoutes"; import { BrowserRouter as Router, @@ -15,7 +15,6 @@ class App extends React.Component { } render() { - // console.log(this.routes); return (
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.css new file mode 100644 index 0000000000..c5520cd792 --- /dev/null +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.css @@ -0,0 +1,44 @@ +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg) scale(1.0); + } + 100% { + -moz-transform: rotate(360deg) scale(0.1); + } +} + +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg) scale(1.0); + } + 100% { + -webkit-transform: rotate(360deg) scale(0.1); + } +} + +@keyframes spin { + 0% { + -webkit-transform: rotate(0deg) scale(1.0); + } + 100% { + -webkit-transform: rotate(360deg) scale(0.1); + transform: rotate(360deg) scale(0.1); + } +} + +.background { + position: absolute; + height: 100%; + width: 100%; + z-index: 0; + background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg'); + background-repeat: no-repeat; + background-position: center 110px; + background-size: 100%; + animation: spin 200s infinite linear; +} + +.content { + position: relative; + z-index: 1; +} \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.js index fbdb202364..b480b5e584 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.js @@ -1,6 +1,6 @@ import React from "react"; import {Typography, Row, Col, Form, Icon, Input, Button, Checkbox} from 'antd'; -import styles from './Login.less'; +import './Login.css'; import axios from 'axios'; import config from "../../public/conf/config.json"; @@ -10,16 +10,27 @@ const {Text} = Typography; class Login extends React.Component { render() { return ( -
-
+
+
+
+
- + + + + - - + + - Login + Login @@ -42,7 +53,7 @@ class NormalLoginForm extends React.Component { super(props); this.state = { inValid: false, - loading : false + loading: false }; } @@ -65,10 +76,10 @@ class NormalLoginForm extends React.Component { const request = Object.keys(parameters).map(key => key + '=' + parameters[key]).join('&'); - axios.post(config.serverConfig.protocol + "://"+config.serverConfig.hostname+':'+config.serverConfig.httpsPort+config.serverConfig.loginUri, request + axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.loginUri, request ).then(res => { if (res.status === 200) { - window.location = config.serverConfig.protocol + "://"+config.serverConfig.hostname+':'+config.serverConfig.httpsPort+"/store"; + window.location = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + "/store"; } }).catch(function (error) { if (error.response.status === 400) { @@ -99,7 +110,8 @@ class NormalLoginForm extends React.Component { {getFieldDecorator('username', { rules: [{required: true, message: 'Please input your username!'}], })( - } + } placeholder="Username"/> )} @@ -107,7 +119,7 @@ class NormalLoginForm extends React.Component { {getFieldDecorator('password', { rules: [{required: true, message: 'Please input your Password!'}], })( - } type="password" placeholder="Password"/> )} diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.less b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.less deleted file mode 100644 index f04eeb84c8..0000000000 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.less +++ /dev/null @@ -1,34 +0,0 @@ -@nice-blue: #5B83AD; -@light-blue: @nice-blue + #111; - -.header { - color: @nice-blue; -} - -.main{ - background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg'); - background-repeat: no-repeat; - background-position: center 110px; - background-size: 100%; - - .header { - color: @nice-blue; - } - - -} - -.content{ - padding-top: 128px; -} - -.logo{ - height: 44px; - margin: auto; - width: 100%; - -} - -input{ - min-height: 0; -} \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js index 55c9924858..9c2682904b 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js @@ -1,13 +1,11 @@ import React from "react"; import {Layout, Menu, Icon} from 'antd'; - const {Header, Content, Footer} = Layout; - -import Logo from "../../../public/images/logo.svg"; -import {Link, NavLink} from "react-router-dom"; +import {Link} from "react-router-dom"; import RouteWithSubRoutes from "../../components/RouteWithSubRoutes" -import {Switch, Redirect} from 'react-router' +import {Switch} from 'react-router' import "../../App.css"; +import config from "../../../public/conf/config.json"; class Dashboard extends React.Component { constructor(props) { @@ -15,7 +13,8 @@ class Dashboard extends React.Component { this.state = { routes: props.routes, selectedKeys : [] - } + }; + this.Logo = config.theme.logo; } changeSelectedMenuItem = (key) =>{ @@ -29,14 +28,14 @@ class Dashboard extends React.Component { return (
-
-
- +
+
+ logo
Android diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js index f65353d118..46c4efcd82 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js @@ -1,5 +1,4 @@ import React from "react"; -import "antd/dist/antd.css"; import { PageHeader, Typography, diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/Apps.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/Apps.js index cb9ab7720a..11cf5d4315 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/Apps.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/Apps.js @@ -1,5 +1,4 @@ import React from "react"; -import "antd/dist/antd.css"; import AppList from "../../../components/apps/AppList"; class Apps extends React.Component { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/webpack.config.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/webpack.config.js index 19c52f4fbe..2f3874ea21 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/webpack.config.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/webpack.config.js @@ -18,11 +18,12 @@ var path = require('path'); const HtmlWebPackPlugin = require("html-webpack-plugin"); const MiniCssExtractPlugin = require("mini-css-extract-plugin"); +const configurations = require("./public/conf/config.json"); const config = { devtool: "source-map", output: { - publicPath: '/store/' // <---- this + publicPath: '/store/' }, watch: false, resolve: { @@ -77,14 +78,16 @@ const config = { }, { loader: "css-loader", - options: { - sourceMap: true, - modules: true, - localIdentName: "[local]___[hash:base64:5]" - } }, { - loader: "less-loader" + loader: "less-loader", + options: { + modifyVars: { + 'primary-color': configurations.theme.primaryColor, + 'link-color': configurations.theme.primaryColor, + }, + javascriptEnabled: true, + }, } ] },