From 8f3d11fa0eb1553ad84739c1c4aecf2fcb47e269 Mon Sep 17 00:00:00 2001 From: megala21 Date: Tue, 12 Sep 2017 22:37:45 +0530 Subject: [PATCH] refactoring theming support --- .../src/main/resources/publisher/src/App.jsx | 6 ++--- .../Application/ApplicationCreate.jsx | 22 ++++++++--------- .../Application/ApplicationListing.jsx | 22 ++++++++--------- .../Application/CreateSteps/Step1.jsx | 24 +++++++++---------- .../Application/CreateSteps/Step2.jsx | 22 ++++++++--------- .../Application/CreateSteps/Step3.jsx | 22 ++++++++--------- .../src/components/Base/BaseLayout.jsx | 22 ++++++++--------- .../components/Platform/PlatformCreate.jsx | 22 ++++++++--------- .../components/Platform/PlatformListing.jsx | 22 ++++++++--------- .../src/components/UIComponents/DataTable.jsx | 23 +++++++++--------- .../UIComponents/DataTableHeader.jsx | 22 ++++++++--------- .../components/UIComponents/DataTableRow.jsx | 23 +++++++++--------- .../publisher/src/{themes => }/theme.js | 12 ++++++---- 13 files changed, 133 insertions(+), 131 deletions(-) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/{themes => }/theme.js (75%) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/App.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/App.jsx index 8859f1897f1..cf10a667544 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/App.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/App.jsx @@ -31,7 +31,7 @@ import { PlatformCreate, PlatformListing } from './components'; -import Theme from './themes/theme'; +import Theme from './theme'; const history = createHistory({basename: '/publisher'}); @@ -40,8 +40,8 @@ const history = createHistory({basename: '/publisher'}); *Loading the theme files based on the the user-preference. */ let muiTheme = null; -let selected = Theme.selectedTheme; -if (Theme.currentTheme === "default") { +let selected = Theme.currentTheme; +if (Theme.currentThemeType === "default") { let defaultTheme = require("material-ui/styles/baseThemes/" + selected); muiTheme = getMuiTheme(defaultTheme.default); } else { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationCreate.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationCreate.jsx index afb03ffbaa0..d4c6accb234 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationCreate.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationCreate.jsx @@ -24,7 +24,6 @@ import {Step1, Step2, Step3} from './CreateSteps'; import RaisedButton from 'material-ui/RaisedButton'; import {Card, CardActions, CardTitle} from 'material-ui/Card'; import {Step, StepLabel, Stepper,} from 'material-ui/Stepper'; -import Theme from '../../themes/theme'; /** * The App Create Component. @@ -52,16 +51,17 @@ class ApplicationCreate extends Component { } componentWillMount() { - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../themes/default/application-create.css"); - } else { - try { - require("../../themes/" + selected + "/application-create.css"); - } catch (ex){ - // If the particular customized file does not exist, use the default one. - require("../../themes/default/application-create.css"); - } + //Using the particular style specific to user selected theme. + const theme = require("../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const applicationCreateCss = "application-create.css"; + + try { + require("../../" + theme.themeFolder + "/" + selected + "/" + applicationCreateCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + applicationCreateCss); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx index 2b33e409f28..bd80a3231ec 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx @@ -21,7 +21,6 @@ import {withRouter} from 'react-router-dom'; import TextField from 'material-ui/TextField'; import DataTable from '../UIComponents/DataTable'; import {Card, CardActions, CardTitle} from 'material-ui/Card'; -import Theme from '../../themes/theme'; /** * The App Create Component. @@ -114,16 +113,17 @@ class ApplicationListing extends Component { //Fetch all the applications from backend and create application objects. this.setState({data: this.data}); - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../themes/default/application-listing.css"); - } else { - try { - require("../../themes/" + selected + "/application-listing.css"); - } catch (ex) { - // If the particular customized file does not exist, use the default one. - require("../../themes/default/application-listing.css"); - } + //Using the particular style specific to user selected theme. + const theme = require("../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const applicationListingCss = "application-listing.css"; + + try { + require("../../" + theme.themeFolder + "/" + selected + "/" + applicationListingCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + applicationListingCss); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step1.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step1.jsx index 63ee4eb6b1f..44ca7752e79 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step1.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step1.jsx @@ -22,9 +22,6 @@ import MenuItem from 'material-ui/MenuItem'; import TextField from 'material-ui/TextField'; import SelectField from 'material-ui/SelectField'; import RaisedButton from 'material-ui/RaisedButton'; -import Theme from '../../../themes/theme'; - - /** * The first step of the application creation wizard. @@ -54,16 +51,17 @@ class Step1 extends Component { } componentWillMount() { - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../../themes/default/application-create-step1.css"); - } else { - try { - require("../../../themes/" + selected + "/application-create-step1.css"); - } catch (ex){ - // If the particular customized file does not exist, use the default one. - require("../../../themes/default/application-create-step1.css"); - } + //Using the particular style specific to user selected theme. + const theme = require("../../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const applicationCreationStepCss = "application-create-step1.css"; + + try { + require("../../../" + theme.themeFolder + "/" + selected + "/" + applicationCreationStepCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + applicationCreationStepCss); } //Get the list of available platforms and set to the state. } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step2.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step2.jsx index 9686cb89677..386251a3bea 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step2.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step2.jsx @@ -28,7 +28,6 @@ import SelectField from 'material-ui/SelectField'; import RaisedButton from 'material-ui/RaisedButton'; import Clear from 'material-ui/svg-icons/content/clear'; import {GridList, GridTile} from 'material-ui/GridList'; -import Theme from '../../../themes/theme'; /** * The Second step of application create wizard. @@ -70,16 +69,17 @@ class Step2 extends Component { } componentWillMount() { - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../../themes/default/application-create-step2.css"); - } else { - try { - require("../../../themes/" + selected + "/application-create-step2.css"); - } catch (ex){ - // If the particular customized file does not exist, use the default one. - require("../../../themes/default/application-create-step2.css"); - } + //Using the particular style specific to user selected theme. + const theme = require("../../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const applicationCreationStepCss = "application-create-step2.css"; + + try { + require("../../../" + theme.themeFolder + "/" + selected + "/" + applicationCreationStepCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + applicationCreationStepCss); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step3.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step3.jsx index 88a279e7256..c042e762d76 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step3.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/CreateSteps/Step3.jsx @@ -24,7 +24,6 @@ import TextField from 'material-ui/TextField'; import FlatButton from 'material-ui/FlatButton'; import SelectField from 'material-ui/SelectField'; import RaisedButton from 'material-ui/RaisedButton'; -import Theme from '../../../themes/theme'; /** * The Third step of application create wizard. {Application Release Step} @@ -59,16 +58,17 @@ class Step3 extends Component { } componentWillMount() { - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../../themes/default/application-create-step3.css"); - } else { - try { - require("../../../themes/" + selected + "/application-create-step3.css"); - } catch (ex){ - // If the particular customized file does not exist, use the default one. - require("../../../themes/default/application-create-step3.css"); - } + //Using the particular style specific to user selected theme. + const theme = require("../../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const applicationCreationStepCss = "application-create-step1.css"; + + try { + require("../../../" + theme.themeFolder + "/" + selected + "/" + applicationCreationStepCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + applicationCreationStepCss); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Base/BaseLayout.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Base/BaseLayout.jsx index 4a18f37c73e..f14a6c99e92 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Base/BaseLayout.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Base/BaseLayout.jsx @@ -31,7 +31,6 @@ import Dashboard from 'material-ui/svg-icons/action/dashboard'; import DevicesOther from 'material-ui/svg-icons/hardware/devices-other'; import NotificationsIcon from 'material-ui/svg-icons/social/notifications'; import ActionAccountCircle from 'material-ui/svg-icons/action/account-circle'; -import Theme from '../../themes/theme'; /** @@ -51,16 +50,17 @@ class BaseLayout extends Component { } componentWillMount() { - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../themes/default/basic-layout.css"); - } else { - try { - require("../../themes/" + selected + "/basic-layout.css"); - } catch (ex){ - // If the particular customized file does not exist, use the default one. - require("../../themes/default/basic-layout.css"); - } + //Using the particular style specific to user selected theme. + const theme = require("../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const basicLayoutCss = "basic-layout.css"; + + try { + require("../../" + theme.themeFolder + "/" + selected + "/" + basicLayoutCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + basicLayoutCss); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx index fc6663f7f4a..b00731772f2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx @@ -31,7 +31,6 @@ import {GridList, GridTile} from 'material-ui/GridList'; import Close from 'material-ui/svg-icons/navigation/close'; import {Card, CardActions, CardTitle} from 'material-ui/Card'; import AddCircleOutline from 'material-ui/svg-icons/content/add-circle-outline'; -import Theme from '../../themes/theme'; /** * Platform Create component. @@ -66,16 +65,17 @@ class PlatformCreate extends Component { } componentWillMount() { - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../themes/default/platform-create.css"); - } else { - try { - require("../../themes/" + selected + "/platform-create.css"); - } catch (ex) { - // If the particular customized file does not exist, use the default one. - require("../../themes/default/platform-create.css"); - } + //Using the particular style specific to user selected theme. + const theme = require("../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const platformCreateCss = "platform-create.css"; + + try { + require("../../" + theme.themeFolder + "/" + selected + "/" + platformCreateCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + platformCreateCss); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx index 6904d2fc86b..6853740a17a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx @@ -21,7 +21,6 @@ import {withRouter} from 'react-router-dom'; import TextField from 'material-ui/TextField'; import DataTable from '../UIComponents/DataTable'; import {Card, CardActions, CardTitle} from 'material-ui/Card'; -import Theme from '../../themes/theme'; /** * The App Create Component. @@ -41,16 +40,17 @@ class PlatformListing extends Component { } componentWillMount() { - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../themes/default/platform-listing.css"); - } else { - try { - require("../../themes/" + selected + "/platform-listing.css"); - } catch (ex) { - // If the particular customized file does not exist, use the default one. - require("../../themes/default/platform-listing.css"); - } + //Using the particular style specific to user selected theme. + const theme = require("../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const platformListingCss = "platform-listing.css"; + + try { + require("../../" + theme.themeFolder + "/" + selected + "/" + platformListingCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + platformListingCss); } //Fetch all the applications from backend and create application objects. } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable.jsx index badc608bcb7..fd40970ab21 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable.jsx @@ -22,7 +22,6 @@ import DataTableRow from './DataTableRow'; import DataTableHeader from './DataTableHeader'; import RaisedButton from 'material-ui/RaisedButton'; import {Table, TableBody, TableHeader, TableRow} from 'material-ui/Table'; -import Theme from '../../themes/theme'; /** * The Custom Table Component. @@ -62,16 +61,18 @@ class DataTable extends Component { componentWillMount() { this.setState({data: this.props.data, headers: this.props.headers}); - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../themes/default/data-table.css"); - } else { - try { - require("../../themes/" + selected + "/data-table.css"); - } catch (ex) { - // If the particular customized file does not exist, use the default one. - require("../../themes/default/data-table.css"); - } + + //Using the particular style specific to user selected theme. + const theme = require("../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const dataTableCss = "data-table.css"; + + try { + require("../../" + theme.themeFolder + "/" + selected + "/" + dataTableCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + dataTableCss); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableHeader.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableHeader.jsx index fda698d9119..7de68fabc95 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableHeader.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableHeader.jsx @@ -20,7 +20,6 @@ import PropTypes from 'prop-types'; import React, {Component} from 'react'; import FlatButton from 'material-ui/FlatButton'; import {TableHeaderColumn} from 'material-ui/Table'; -import Theme from '../../themes/theme'; /** * Data Table header component. @@ -33,16 +32,17 @@ class DataTableHeader extends Component { } componentWillMount() { - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../themes/default/data-table.css"); - } else { - try { - require("../../themes/" + selected + "/data-table.css"); - } catch (ex) { - // If the particular customized file does not exist, use the default one. - require("../../themes/default/data-table.css"); - } + //Using the particular style specific to user selected theme. + const theme = require("../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const dataTableCss = "data-table.css"; + + try { + require("../../" + theme.themeFolder + "/" + selected + "/" + dataTableCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + dataTableCss); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableRow.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableRow.jsx index 8162b900a95..0b02fefde48 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableRow.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableRow.jsx @@ -19,7 +19,6 @@ import PropTypes from 'prop-types'; import React, {Component} from 'react'; import {TableRow, TableRowColumn} from 'material-ui/Table'; -import Theme from '../../themes/theme'; /** * Data table row component. @@ -36,16 +35,18 @@ class DataTableRow extends Component { componentWillMount() { this.setState({dataItem: this.props.dataItem}); - let selected = Theme.selectedTheme; - if (Theme.currentTheme === "default") { - require("../../themes/default/data-table.css"); - } else { - try { - require("../../themes/" + selected + "/data-table.css"); - } catch (ex) { - // If the particular customized file does not exist, use the default one. - require("../../themes/default/data-table.css"); - } + + //Using the particular style specific to user selected theme. + const theme = require("../../theme").default; + const selected = + (theme.currentThemeType === theme.defaultThemeType) ? theme.defaultThemeType : theme.currentTheme; + const dataTableCss = "data-table.css"; + + try { + require("../../" + theme.themeFolder + "/" + selected + "/" + dataTableCss); + } catch (ex){ + // If the particular customized file does not exist, use the default one. + require("../../" + theme.themeFolder + "/" + theme.defaultThemeType + "/" + dataTableCss); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/themes/theme.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/theme.js similarity index 75% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/themes/theme.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/theme.js index 5c8ed89cb6a..97f715bcd72 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/themes/theme.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/theme.js @@ -22,12 +22,14 @@ */ class Theme { constructor() { - const theme = require("../config.json").theme; - this.currentTheme = theme.type; - if (this.currentTheme === "default") { - this.selectedTheme = theme.value; + const theme = require("./config.json").theme; + this.currentThemeType = theme.type; + this.defaultThemeType = "default"; + this.themeFolder = "themes"; + if (this.currentThemeType === this.defaultThemeType) { + this.currentTheme = theme.value; } else { - this.selectedTheme = theme.value; + this.currentTheme = theme.value; } } }