moved widgets into their own subdir

src/__tests__/components/dialog/edit-widget-control-creator.js

@@ -1,22 +1,22 @@
 
 import { expect } from 'chai';
 
-import createControls from '../../../components/dialog/edit-widget-control-creator';
-import EditWidgetTextControl from '../../../components/dialog/edit-widget-text-control';
-import EditWidgetColorControl from '../../../components/dialog/edit-widget-color-control';
-import EditWidgetTimeControl from '../../../components/dialog/edit-widget-time-control';
-import EditImageWidgetControl from '../../../components/dialog/edit-widget-image-control';
-import EditWidgetSimulatorControl from '../../../components/dialog/edit-widget-simulator-control';
-import EditWidgetSignalControl from '../../../components/dialog/edit-widget-signal-control';
-import EditWidgetSignalsControl from '../../../components/dialog/edit-widget-signals-control';
-import EditWidgetOrientation from '../../../components/dialog/edit-widget-orientation';
-import EditWidgetTextSizeControl from '../../../components/dialog/edit-widget-text-size-control';
-import EditWidgetAspectControl from '../../../components/dialog/edit-widget-aspect-control';
-import EditWidgetCheckboxControl from '../../../components/dialog/edit-widget-checkbox-control';
-import EditWidgetMinMaxControl from '../../../components/dialog/edit-widget-min-max-control';
-import EditWidgetColorZonesControl from '../../../components/dialog/edit-widget-color-zones-control';
-import EditWidgetHTMLContent from '../../../components/dialog/edit-widget-html-content';
-import EditWidgetNumberControl from '../../../components/dialog/edit-widget-number-control';
+import createControls from '../../../components/dialogs/edit-widget-control-creator';
+import EditWidgetTextControl from '../../../components/dialogs/edit-widget-text-control';
+import EditWidgetColorControl from '../../../components/dialogs/edit-widget-color-control';
+import EditWidgetTimeControl from '../../../components/dialogs/edit-widget-time-control';
+import EditImageWidgetControl from '../../../components/dialogs/edit-widget-image-control';
+import EditWidgetSimulatorControl from '../../../components/dialogs/edit-widget-simulator-control';
+import EditWidgetSignalControl from '../../../components/dialogs/edit-widget-signal-control';
+import EditWidgetSignalsControl from '../../../components/dialogs/edit-widget-signals-control';
+import EditWidgetOrientation from '../../../components/dialogs/edit-widget-orientation';
+import EditWidgetTextSizeControl from '../../../components/dialogs/edit-widget-text-size-control';
+import EditWidgetAspectControl from '../../../components/dialogs/edit-widget-aspect-control';
+import EditWidgetCheckboxControl from '../../../components/dialogs/edit-widget-checkbox-control';
+import EditWidgetMinMaxControl from '../../../components/dialogs/edit-widget-min-max-control';
+import EditWidgetColorZonesControl from '../../../components/dialogs/edit-widget-color-zones-control';
+import EditWidgetHTMLContent from '../../../components/dialogs/edit-widget-html-content';
+import EditWidgetNumberControl from '../../../components/dialogs/edit-widget-number-control';
 
 describe('edit widget control creator', () => {
     it('should not return null', () => {

src/components/dialogs/edit-widget-orientation.js

@@ -22,7 +22,7 @@
 import React, { Component } from 'react';
 import { FormGroup, Col, Row, Radio, ControlLabel } from 'react-bootstrap';
 
-import WidgetSlider from '../widget-slider';
+import WidgetSlider from '../widgets/slider';
 
 class EditWidgetOrientation extends Component {
   constructor(props) {
@@ -52,11 +52,11 @@ class EditWidgetOrientation extends Component {
               Orientation
             </Col>
             <Col sm={10}>
-              { 
+              {
                 Object.keys(WidgetSlider.OrientationTypes).map( (type) => {
                   let value = WidgetSlider.OrientationTypes[type].value;
                   let name = WidgetSlider.OrientationTypes[type].name;
-                  
+
                   return (
                     <Radio inline key={value} name='orientation' checked={ value === this.state.widget.orientation } onChange={(e) => this.handleOrientationChange(value)}>
                       { name }
@@ -70,4 +70,4 @@ class EditWidgetOrientation extends Component {
   }
 }
 
-export default EditWidgetOrientation;
+export default EditWidgetOrientation;

src/components/widget-factory.js

@@ -20,7 +20,7 @@
  * You should have received a copy of the GNU General Public License
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
-import WidgetSlider from './widget-slider';
+import WidgetSlider from './widgets/slider';
 
 class WidgetFactory {
 

src/components/widgets/box.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-box.js
+ * File: box.js
  * Author: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
  * Date: 25.04.2017
  * Copyright: 2018, Institute for Automation of Complex Power Systems, EONERC
@@ -22,7 +22,7 @@
 
 import React, { Component } from 'react';
 
-import EditWidgetColorControl from './dialog/edit-widget-color-control';
+import EditWidgetColorControl from '../dialogs/edit-widget-color-control';
 
 class WidgetBox extends Component {
   render() {

src/components/widgets/button.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-button.js
+ * File: button.js
  * Author: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
  * Date: 29.03.2017
  * Copyright: 2018, Institute for Automation of Complex Power Systems, EONERC
@@ -22,7 +22,7 @@
 
 import React, { Component } from 'react';
 
-import EditWidgetColorControl from './dialog/edit-widget-color-control';
+import EditWidgetColorControl from '../dialogs/edit-widget-color-control';
 
 class WidgetButton extends Component {
 

src/components/widgets/gauge.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-gauge.js
+ * File: gauge.js
  * Author: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
  * Date: 31.03.2017
  * Copyright: 2018, Institute for Automation of Complex Power Systems, EONERC

src/components/widgets/html.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-html.js
+ * File: html.js
  * Author: Markus Grigull <mgrigull@eonerc.rwth-aachen.de>
  * Date: 29.08.2017
  *

src/components/widgets/image.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-image.js
+ * File: image.js
  * Author: Markus Grigull <mgrigull@eonerc.rwth-aachen.de>
  * Date: 14.03.2017
  *
@@ -21,8 +21,8 @@
 
 import React from 'react';
 
-import AppDispatcher from '../app-dispatcher';
-import config from '../config';
+import AppDispatcher from '../../app-dispatcher';
+import config from '../../config';
 
 class WidgetImage extends React.Component {
   componentWillReceiveProps(nextProps) {

src/components/widgets/input.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-number-input.js
+ * File: input.js
  * Author: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
  * Date: 29.03.2017
  * Copyright: 2018, Institute for Automation of Complex Power Systems, EONERC

src/components/widgets/label.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-label.js
+ * File: label.js
  * Author: Markus Grigull <mgrigull@eonerc.rwth-aachen.de>
  * Date: 14.03.2017
  *
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 
-import EditWidgetColorControl from './dialog/edit-widget-color-control';
+import EditWidgetColorControl from '../dialogs/edit-widget-color-control';
 
 class WidgetLabel extends Component {
   render() {

src/components/widgets/lamp.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-lamp.js
+ * File: lamp.js
  * Author: Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
  * Date: 20.09.2017
  *
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 
-import EditWidgetColorControl from './dialog/edit-widget-color-control';
+import EditWidgetColorControl from '../dialogs/edit-widget-color-control';
 
 class WidgetLamp extends Component {
   constructor(props) {

src/components/widgets/plot-table.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-plot-table.js
+ * File: plot-table.js
  * Author: Markus Grigull <mgrigull@eonerc.rwth-aachen.de>
  * Date: 15.03.2017
  *
@@ -23,8 +23,8 @@ import React, { Component } from 'react';
 import classNames from 'classnames';
 import { FormGroup, Checkbox } from 'react-bootstrap';
 
-import Plot from './widget-plot/plot';
-import PlotLegend from './widget-plot/plot-legend';
+import Plot from '../widget-plot/plot';
+import PlotLegend from '../widget-plot/plot-legend';
 
 class WidgetPlotTable extends Component {
   constructor(props) {

src/components/widgets/plot.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-plot.js
+ * File: plot.js
  * Author: Markus Grigull <mgrigull@eonerc.rwth-aachen.de>
  * Date: 08.03.2017
  *
@@ -21,8 +21,8 @@
 
 import React from 'react';
 
-import Plot from './widget-plot/plot';
-import PlotLegend from './widget-plot/plot-legend';
+import Plot from '../widget-plot/plot';
+import PlotLegend from '../widget-plot/plot-legend';
 
 class WidgetPlot extends React.Component {
   constructor(props) {

src/components/widgets/slider.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-slider.js
+ * File: slider.js
  * Author: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
  * Date: 30.03.2017
  * Copyright: 2018, Institute for Automation of Complex Power Systems, EONERC

src/components/widgets/table.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-table.js
+ * File: table.js
  * Author: Markus Grigull <mgrigull@eonerc.rwth-aachen.de>
  * Date: 14.03.2017
  *
@@ -21,8 +21,8 @@
 
 import React, { Component } from 'react';
 
-import Table from './table';
-import TableColumn from './table-column';
+import Table from '../table';
+import TableColumn from '../table-column';
 
 class WidgetTable extends Component {
   constructor(props) {
@@ -46,7 +46,7 @@ class WidgetTable extends Component {
     if (nextProps.data == null
       || nextProps.data[simulator] == null
       || nextProps.data[simulator].output == null
-      || nextProps.data[simulator].output.values.length === 0  
+      || nextProps.data[simulator].output.values.length === 0
       || nextProps.data[simulator].output.values[0].length === 0) {
       // clear values
       this.setState({ rows: [], sequence: null });

src/components/widgets/topology.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-topology.js
+ * File: topology.js
  * Author: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
  * Date: 08.01.2018
  *
@@ -21,8 +21,8 @@
 
 import React from 'react';
 import {ReactSVGPanZoom} from 'react-svg-pan-zoom';
-import config from '../config';
-import '../styles/simple-spinner.css';
+import config from '../../config';
+import '../../styles/simple-spinner.css';
 
 
 // Do not show Pintura's grid

src/components/widgets/value.js

@@ -1,5 +1,5 @@
 /**
- * File: widget-value.js
+ * File: value.js
  * Author: Markus Grigull <mgrigull@eonerc.rwth-aachen.de>
  * Date: 04.03.2017
  *
@@ -46,7 +46,7 @@ class WidgetValue extends Component {
     }
 
     const unit = nextProps.simulationModel.outputMapping[nextProps.widget.signal].type;
-    
+
     // check if value has changed
     const signal = nextProps.data[simulator].output.values[nextProps.widget.signal];
     if (signal != null && this.state.value !== signal[signal.length - 1].y) {

src/containers/project.js

@@ -33,11 +33,11 @@ import SimulationStore from '../stores/simulation-store';
 import Icon from '../components/icon';
 import CustomTable from '../components/table';
 import TableColumn from '../components/table-column';
-import NewVisualzationDialog from '../components/dialog/new-visualization';
-import EditVisualizationDialog from '../components/dialog/edit-visualization';
-import ImportVisualizationDialog from '../components/dialog/import-visualization';
+import NewVisualzationDialog from '../components/dialogs/new-visualization';
+import EditVisualizationDialog from '../components/dialogs/edit-visualization';
+import ImportVisualizationDialog from '../components/dialogs/import-visualization';
 
-import DeleteDialog from '../components/dialog/delete-dialog';
+import DeleteDialog from '../components/dialogs/delete-dialog';
 
 class Visualizations extends Component {
   static getStores() {

src/containers/projects.js

@@ -31,10 +31,10 @@ import SimulationStore from '../stores/simulation-store';
 import Icon from '../components/icon';
 import Table from '../components/table';
 import TableColumn from '../components/table-column';
-import NewProjectDialog from '../components/dialog/new-project';
-import EditProjectDialog from '../components/dialog/edit-project';
+import NewProjectDialog from '../components/dialogs/new-project';
+import EditProjectDialog from '../components/dialogs/edit-project';
 
-import DeleteDialog from '../components/dialog/delete-dialog';
+import DeleteDialog from '../components/dialogs/delete-dialog';
 
 class Projects extends React.Component {
   static getStores() {

src/containers/simulation.js

@@ -34,10 +34,10 @@ import AppDispatcher from '../app-dispatcher';
 import Icon from '../components/icon';
 import Table from '../components/table';
 import TableColumn from '../components/table-column';
-import ImportSimulationModelDialog from '../components/dialog/import-simulation-model';
+import ImportSimulationModelDialog from '../components/dialogs/import-simulation-model';
 
 import SimulatorAction from '../components/simulator-action';
-import DeleteDialog from '../components/dialog/delete-dialog';
+import DeleteDialog from '../components/dialogs/delete-dialog';
 
 class Simulation extends React.Component {
   static getStores() {

src/containers/simulations.js

@@ -33,12 +33,12 @@ import SimulationModelStore from '../stores/simulation-model-store';
 import Icon from '../components/icon';
 import Table from '../components/table';
 import TableColumn from '../components/table-column';
-import NewSimulationDialog from '../components/dialog/new-simulation';
-import EditSimulationDialog from '../components/dialog/edit-simulation';
-import ImportSimulationDialog from '../components/dialog/import-simulation';
+import NewSimulationDialog from '../components/dialogs/new-simulation';
+import EditSimulationDialog from '../components/dialogs/edit-simulation';
+import ImportSimulationDialog from '../components/dialogs/import-simulation';
 
 import SimulatorAction from '../components/simulator-action';
-import DeleteDialog from '../components/dialog/delete-dialog';
+import DeleteDialog from '../components/dialogs/delete-dialog';
 
 class Simulations extends Component {
   static getStores() {

src/containers/simulators.js

@@ -32,12 +32,12 @@ import UserStore from '../stores/user-store';
 import Icon from '../components/icon';
 import Table from '../components/table';
 import TableColumn from '../components/table-column';
-import NewSimulatorDialog from '../components/dialog/new-simulator';
-import EditSimulatorDialog from '../components/dialog/edit-simulator';
-import ImportSimulatorDialog from '../components/dialog/import-simulator';
+import NewSimulatorDialog from '../components/dialogs/new-simulator';
+import EditSimulatorDialog from '../components/dialogs/edit-simulator';
+import ImportSimulatorDialog from '../components/dialogs/import-simulator';
 
 import SimulatorAction from '../components/simulator-action';
-import DeleteDialog from '../components/dialog/delete-dialog';
+import DeleteDialog from '../components/dialogs/delete-dialog';
 
 class Simulators extends Component {
   static getStores() {

src/containers/users.js

@@ -30,10 +30,10 @@ import UsersStore from '../stores/users-store';
 import Icon from '../components/icon';
 import Table from '../components/table';
 import TableColumn from '../components/table-column';
-import NewUserDialog from '../components/dialog/new-user';
-import EditUserDialog from '../components/dialog/edit-user';
+import NewUserDialog from '../components/dialogs/new-user';
+import EditUserDialog from '../components/dialogs/edit-user';
 
-import DeleteDialog from '../components/dialog/delete-dialog';
+import DeleteDialog from '../components/dialogs/delete-dialog';
 
 class Users extends Component {
   static getStores() {

src/containers/visualization.js

@@ -32,7 +32,7 @@ import WidgetFactory from '../components/widget-factory';
 import ToolboxItem from '../components/toolbox-item';
 import Dropzone from '../components/dropzone';
 import Widget from './widget';
-import EditWidget from '../components/dialog/edit-widget';
+import EditWidget from '../components/dialogs/edit-widget';
 import Grid from '../components/grid';
 
 import UserStore from '../stores/user-store';

src/containers/widget.js

@@ -31,20 +31,20 @@ import SimulatorDataStore from '../stores/simulator-data-store';
 import SimulationModelStore from '../stores/simulation-model-store';
 import FileStore from '../stores/file-store';
 
-import WidgetLamp from '../components/widget-lamp';
-import WidgetValue from '../components/widget-value';
-import WidgetPlot from '../components/widget-plot';
-import WidgetTable from '../components/widget-table';
-import WidgetLabel from '../components/widget-label';
-import WidgetPlotTable from '../components/widget-plot-table';
-import WidgetImage from '../components/widget-image';
-import WidgetButton from '../components/widget-button';
-import WidgetInput from '../components/widget-input';
-import WidgetSlider from '../components/widget-slider';
-import WidgetGauge from '../components/widget-gauge';
-import WidgetBox from '../components/widget-box';
-import WidgetHTML from '../components/widget-html';
-import WidgetTopology from '../components/widget-topology';
+import WidgetLamp from '../components/widgets/lamp';
+import WidgetValue from '../components/widgets/value';
+import WidgetPlot from '../components/widgets/plot';
+import WidgetTable from '../components/widgets/table';
+import WidgetLabel from '../components/widgets/label';
+import WidgetPlotTable from '../components/widgets/plot-table';
+import WidgetImage from '../components/widgets/image';
+import WidgetButton from '../components/widgets/button';
+import WidgetInput from '../components/widgets/input';
+import WidgetSlider from '../components/widgets/slider';
+import WidgetGauge from '../components/widgets/gauge';
+import WidgetBox from '../components/widgets/box';
+import WidgetHTML from '../components/widgets/html';
+import WidgetTopology from '../components/widgets/topology';
 
 import '../styles/widgets.css';