Merge pull request #1008 from Megala21/migrate_application

Moving css files to public foler
merge-requests/7/head
Megala Uthayakumar 7 years ago committed by GitHub
commit 485ff83fc2

@ -21,14 +21,14 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<link rel="stylesheet" type="text/css" href="/css/font-wso2.css"> <link rel="stylesheet" type="text/css" href="/publisher/css/font-wso2.css">
<link rel="stylesheet" type="text/css" href="/themes/default/default-theme.css"> <link rel="stylesheet" type="text/css" href="/publisher/themes/default/default-theme.css">
<!-- <!--
manifest.json provides metadata used when your web app is added to the manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/ homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
--> -->
<link rel="manifest" href="/manifest.json"> <link rel="manifest" href="/publisher/manifest.json">
<link rel="shortcut icon" href="/images/favicon.png"> <link rel="shortcut icon" href="/publisher/images/favicon.png">
<!-- <!--
Notice the use of %PUBLIC_URL% in the tags above. Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build. It will be replaced with the URL of the `public` folder during the build.
@ -45,7 +45,7 @@
You need to enable JavaScript to run this app. You need to enable JavaScript to run this app.
</noscript> </noscript>
<div id="root"></div> <div id="root"></div>
<script src='/dist/index.js'></script> <script src='/publisher/dist/index.js'></script>
<!-- <!--
This HTML file is a template. This HTML file is a template.
If you open it directly in the browser, you will see an empty page. If you open it directly in the browser, you will see an empty page.

@ -18,7 +18,7 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React, {Component} from 'react'; import React, {Component} from 'react';
import './appImage.css'; import Theme from '../../../theme';
/** /**
* Component for holding uploaded image. * Component for holding uploaded image.
@ -29,6 +29,18 @@ class AppImage extends Component {
constructor() { constructor() {
super(); super();
this.removeImage = this.removeImage.bind(this); this.removeImage = this.removeImage.bind(this);
this.scriptId = "appImage";
}
componentWillMount() {
/**
*Loading the theme files based on the the user-preference.
*/
Theme.insertThemingScripts(this.scriptId);
}
componentWillUnmount() {
Theme.removeThemingScripts(this.scriptId);
} }
/** /**
@ -44,7 +56,7 @@ class AppImage extends Component {
const {image, imageId} = this.props; const {image, imageId} = this.props;
return ( return (
<div className="image-container" style={this.props.imageStyles}> <div className="image-container" style={this.props.imageStyles}>
<img src={image} style={{width: '100%'}} className="image" id={imageId}/> <img src={image} className="image" id={imageId}/>
<div className="btn-content"> <div className="btn-content">
<i className="close-btn" id={imageId} onClick={this.removeImage}>X</i> <i className="close-btn" id={imageId} onClick={this.removeImage}>X</i>
</div> </div>

@ -17,9 +17,24 @@
*/ */
import React, {Component} from 'react'; import React, {Component} from 'react';
import './chip.css'; import Theme from '../../../theme';
class Chip extends Component { class Chip extends Component {
constructor() {
super();
this.scriptId = "chip";
}
componentWillMount() {
/**
*Loading the theme files based on the the user-preference.
*/
Theme.insertThemingScripts(this.scriptId);
}
componentWillUnmount() {
Theme.removeThemingScripts(this.scriptId);
}
render() { render() {
return ( return (

@ -18,8 +18,7 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React, {Component} from 'react'; import React, {Component} from 'react';
import './drawer.css'; import Theme from '../../../theme'
import {Row} from "reactstrap";
/** /**
* Custom React component for Application View. * Custom React component for Application View.
@ -29,6 +28,18 @@ class Drawer extends Component {
constructor() { constructor() {
super(); super();
this.closeDrawer = this.closeDrawer.bind(this); this.closeDrawer = this.closeDrawer.bind(this);
this.scriptId = "drawer";
}
componentWillMount() {
/**
*Loading the theme files based on the the user-preference.
*/
Theme.insertThemingScripts(this.scriptId);
}
componentWillUnmount() {
Theme.removeThemingScripts(this.scriptId);
} }
/** /**

@ -18,13 +18,29 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React, {Component} from 'react'; import React, {Component} from 'react';
import './floatingButton.css'; import Theme from '../../../theme';
/** /**
* Floating Action button. * Floating Action button.
* */ * */
class FloatingButton extends Component { class FloatingButton extends Component {
constructor() {
super();
this.scriptId = "floatingButton";
}
componentWillMount() {
/**
*Loading the theme files based on the the user-preference.
*/
Theme.insertThemingScripts(this.scriptId);
}
componentWillUnmount() {
Theme.removeThemingScripts(this.scriptId);
}
handleClick(event) { handleClick(event) {
this.props.onClick(event); this.props.onClick(event);
} }

@ -18,9 +18,9 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React, {Component} from 'react'; import React, {Component} from 'react';
import './imageUploader.css';
import Dropzone from "react-dropzone"; import Dropzone from "react-dropzone";
import {Row} from "reactstrap"; import {Row} from "reactstrap";
import Theme from '../../../theme';
class ImageUploader extends Component { class ImageUploader extends Component {
@ -29,7 +29,19 @@ class ImageUploader extends Component {
this.setImages = this.setImages.bind(this); this.setImages = this.setImages.bind(this);
this.state = { this.state = {
images: [] images: []
} };
this.scriptId = "imageUploader";
}
componentWillMount() {
/**
*Loading the theme files based on the the user-preference.
*/
Theme.insertThemingScripts(this.scriptId);
}
componentWillUnmount() {
Theme.removeThemingScripts(this.scriptId);
} }
setImages(images) { setImages(images) {

@ -18,11 +18,23 @@
import React, {Component} from 'react'; import React, {Component} from 'react';
import {Col, Row} from "reactstrap"; import {Col, Row} from "reactstrap";
import './notification.css'; import Theme from '../../../theme'
class NotificationItem extends Component { class NotificationItem extends Component {
constructor() { constructor() {
super(); super();
this.scriptId = "notification";
}
componentWillMount() {
/**
*Loading the theme files based on the the user-preference.
*/
Theme.insertThemingScripts(this.scriptId);
}
componentWillUnmount() {
Theme.removeThemingScripts(this.scriptId);
} }
render() { render() {

@ -19,10 +19,23 @@
import React, {Component} from 'react'; import React, {Component} from 'react';
import {Col, Row} from "reactstrap"; import {Col, Row} from "reactstrap";
import './notification.css'; import './notification.css';
import Theme from '../../../theme'
class NotificationView extends Component { class NotificationView extends Component {
constructor() { constructor() {
super(); super();
this.scriptId = "notification";
}
componentWillMount() {
/**
*Loading the theme files based on the the user-preference.
*/
Theme.insertThemingScripts(this.scriptId);
}
componentWillUnmount() {
Theme.removeThemingScripts(this.scriptId);
} }
render() { render() {

@ -17,10 +17,26 @@
*/ */
import React, {Component} from 'react'; import React, {Component} from 'react';
import './switch.css'; import Theme from '../../../theme';
class Switch extends Component { class Switch extends Component {
constructor() {
super();
this.scriptId = "switch";
}
componentWillMount() {
/**
*Loading the theme files based on the the user-preference.
*/
Theme.insertThemingScripts(this.scriptId);
}
componentWillUnmount() {
Theme.removeThemingScripts(this.scriptId);
}
render() { render() {
const {height, width} = this.props; const {height, width} = this.props;
return ( return (

@ -16,7 +16,6 @@
* under the License. * under the License.
*/ */
var path = require('path'); var path = require('path');
import '!!style-loader!css-loader!src/css/font-wso2.css';
const config = { const config = {
entry: { entry: {

@ -49,6 +49,11 @@
<artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId> <artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.application.mgt.auth.handler.feature</artifactId>
<type>zip</type>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -100,6 +105,7 @@
</adviceFile> </adviceFile>
<includedFeatures> <includedFeatures>
<includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}</includedFeatureDef> <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}</includedFeatureDef>
<includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.auth.handler.feature:${carbon.device.mgt.version}</includedFeatureDef>
</includedFeatures> </includedFeatures>
<bundles> <bundles>
<bundleDef> <bundleDef>

@ -329,6 +329,12 @@
<type>zip</type> <type>zip</type>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.application.mgt.auth.handler.feature</artifactId>
<type>zip</type>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.application.mgt.publisher.ui.feature</artifactId> <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui.feature</artifactId>

Loading…
Cancel
Save