diff --git a/src/__tests__/components/dialog/edit-widget-control-creator.js b/src/__tests__/components/dialog/edit-widget-control-creator.js index be81bc8..5141075 100644 --- a/src/__tests__/components/dialog/edit-widget-control-creator.js +++ b/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', () => { diff --git a/src/components/dialog/delete-dialog.js b/src/components/dialogs/delete-dialog.js similarity index 100% rename from src/components/dialog/delete-dialog.js rename to src/components/dialogs/delete-dialog.js diff --git a/src/components/dialog/dialog.js b/src/components/dialogs/dialog.js similarity index 100% rename from src/components/dialog/dialog.js rename to src/components/dialogs/dialog.js diff --git a/src/components/dialog/edit-node.js b/src/components/dialogs/edit-node.js similarity index 100% rename from src/components/dialog/edit-node.js rename to src/components/dialogs/edit-node.js diff --git a/src/components/dialog/edit-project.js b/src/components/dialogs/edit-project.js similarity index 100% rename from src/components/dialog/edit-project.js rename to src/components/dialogs/edit-project.js diff --git a/src/components/dialog/edit-simulation.js b/src/components/dialogs/edit-simulation.js similarity index 100% rename from src/components/dialog/edit-simulation.js rename to src/components/dialogs/edit-simulation.js diff --git a/src/components/dialog/edit-simulator.js b/src/components/dialogs/edit-simulator.js similarity index 100% rename from src/components/dialog/edit-simulator.js rename to src/components/dialogs/edit-simulator.js diff --git a/src/components/dialog/edit-user.js b/src/components/dialogs/edit-user.js similarity index 100% rename from src/components/dialog/edit-user.js rename to src/components/dialogs/edit-user.js diff --git a/src/components/dialog/edit-visualization.js b/src/components/dialogs/edit-visualization.js similarity index 100% rename from src/components/dialog/edit-visualization.js rename to src/components/dialogs/edit-visualization.js diff --git a/src/components/dialog/edit-widget-aspect-control.js b/src/components/dialogs/edit-widget-aspect-control.js similarity index 100% rename from src/components/dialog/edit-widget-aspect-control.js rename to src/components/dialogs/edit-widget-aspect-control.js diff --git a/src/components/dialog/edit-widget-checkbox-control.js b/src/components/dialogs/edit-widget-checkbox-control.js similarity index 100% rename from src/components/dialog/edit-widget-checkbox-control.js rename to src/components/dialogs/edit-widget-checkbox-control.js diff --git a/src/components/dialog/edit-widget-color-control.js b/src/components/dialogs/edit-widget-color-control.js similarity index 100% rename from src/components/dialog/edit-widget-color-control.js rename to src/components/dialogs/edit-widget-color-control.js diff --git a/src/components/dialog/edit-widget-color-zones-control.js b/src/components/dialogs/edit-widget-color-zones-control.js similarity index 100% rename from src/components/dialog/edit-widget-color-zones-control.js rename to src/components/dialogs/edit-widget-color-zones-control.js diff --git a/src/components/dialog/edit-widget-control-creator.js b/src/components/dialogs/edit-widget-control-creator.js similarity index 100% rename from src/components/dialog/edit-widget-control-creator.js rename to src/components/dialogs/edit-widget-control-creator.js diff --git a/src/components/dialog/edit-widget-html-content.js b/src/components/dialogs/edit-widget-html-content.js similarity index 100% rename from src/components/dialog/edit-widget-html-content.js rename to src/components/dialogs/edit-widget-html-content.js diff --git a/src/components/dialog/edit-widget-image-control.js b/src/components/dialogs/edit-widget-image-control.js similarity index 100% rename from src/components/dialog/edit-widget-image-control.js rename to src/components/dialogs/edit-widget-image-control.js diff --git a/src/components/dialog/edit-widget-min-max-control.js b/src/components/dialogs/edit-widget-min-max-control.js similarity index 100% rename from src/components/dialog/edit-widget-min-max-control.js rename to src/components/dialogs/edit-widget-min-max-control.js diff --git a/src/components/dialog/edit-widget-number-control.js b/src/components/dialogs/edit-widget-number-control.js similarity index 100% rename from src/components/dialog/edit-widget-number-control.js rename to src/components/dialogs/edit-widget-number-control.js diff --git a/src/components/dialog/edit-widget-orientation.js b/src/components/dialogs/edit-widget-orientation.js similarity index 95% rename from src/components/dialog/edit-widget-orientation.js rename to src/components/dialogs/edit-widget-orientation.js index 9f3e67f..737aaef 100644 --- a/src/components/dialog/edit-widget-orientation.js +++ b/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 - { + { Object.keys(WidgetSlider.OrientationTypes).map( (type) => { let value = WidgetSlider.OrientationTypes[type].value; let name = WidgetSlider.OrientationTypes[type].name; - + return ( this.handleOrientationChange(value)}> { name } @@ -70,4 +70,4 @@ class EditWidgetOrientation extends Component { } } -export default EditWidgetOrientation; \ No newline at end of file +export default EditWidgetOrientation; diff --git a/src/components/dialog/edit-widget-signal-control.js b/src/components/dialogs/edit-widget-signal-control.js similarity index 100% rename from src/components/dialog/edit-widget-signal-control.js rename to src/components/dialogs/edit-widget-signal-control.js diff --git a/src/components/dialog/edit-widget-signals-control.js b/src/components/dialogs/edit-widget-signals-control.js similarity index 100% rename from src/components/dialog/edit-widget-signals-control.js rename to src/components/dialogs/edit-widget-signals-control.js diff --git a/src/components/dialog/edit-widget-simulator-control.js b/src/components/dialogs/edit-widget-simulator-control.js similarity index 100% rename from src/components/dialog/edit-widget-simulator-control.js rename to src/components/dialogs/edit-widget-simulator-control.js diff --git a/src/components/dialog/edit-widget-text-control.js b/src/components/dialogs/edit-widget-text-control.js similarity index 100% rename from src/components/dialog/edit-widget-text-control.js rename to src/components/dialogs/edit-widget-text-control.js diff --git a/src/components/dialog/edit-widget-text-size-control.js b/src/components/dialogs/edit-widget-text-size-control.js similarity index 100% rename from src/components/dialog/edit-widget-text-size-control.js rename to src/components/dialogs/edit-widget-text-size-control.js diff --git a/src/components/dialog/edit-widget-time-control.js b/src/components/dialogs/edit-widget-time-control.js similarity index 100% rename from src/components/dialog/edit-widget-time-control.js rename to src/components/dialogs/edit-widget-time-control.js diff --git a/src/components/dialog/edit-widget.js b/src/components/dialogs/edit-widget.js similarity index 100% rename from src/components/dialog/edit-widget.js rename to src/components/dialogs/edit-widget.js diff --git a/src/components/dialog/import-node.js b/src/components/dialogs/import-node.js similarity index 100% rename from src/components/dialog/import-node.js rename to src/components/dialogs/import-node.js diff --git a/src/components/dialog/import-simulation-model.js b/src/components/dialogs/import-simulation-model.js similarity index 100% rename from src/components/dialog/import-simulation-model.js rename to src/components/dialogs/import-simulation-model.js diff --git a/src/components/dialog/import-simulation.js b/src/components/dialogs/import-simulation.js similarity index 100% rename from src/components/dialog/import-simulation.js rename to src/components/dialogs/import-simulation.js diff --git a/src/components/dialog/import-simulator.js b/src/components/dialogs/import-simulator.js similarity index 100% rename from src/components/dialog/import-simulator.js rename to src/components/dialogs/import-simulator.js diff --git a/src/components/dialog/import-visualization.js b/src/components/dialogs/import-visualization.js similarity index 100% rename from src/components/dialog/import-visualization.js rename to src/components/dialogs/import-visualization.js diff --git a/src/components/dialog/new-node.js b/src/components/dialogs/new-node.js similarity index 100% rename from src/components/dialog/new-node.js rename to src/components/dialogs/new-node.js diff --git a/src/components/dialog/new-project.js b/src/components/dialogs/new-project.js similarity index 100% rename from src/components/dialog/new-project.js rename to src/components/dialogs/new-project.js diff --git a/src/components/dialog/new-simulation.js b/src/components/dialogs/new-simulation.js similarity index 100% rename from src/components/dialog/new-simulation.js rename to src/components/dialogs/new-simulation.js diff --git a/src/components/dialog/new-simulator.js b/src/components/dialogs/new-simulator.js similarity index 100% rename from src/components/dialog/new-simulator.js rename to src/components/dialogs/new-simulator.js diff --git a/src/components/dialog/new-user.js b/src/components/dialogs/new-user.js similarity index 100% rename from src/components/dialog/new-user.js rename to src/components/dialogs/new-user.js diff --git a/src/components/dialog/new-visualization.js b/src/components/dialogs/new-visualization.js similarity index 100% rename from src/components/dialog/new-visualization.js rename to src/components/dialogs/new-visualization.js diff --git a/src/components/widget-factory.js b/src/components/widget-factory.js index f644423..434d3aa 100644 --- a/src/components/widget-factory.js +++ b/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 . ******************************************************************************/ -import WidgetSlider from './widget-slider'; +import WidgetSlider from './widgets/slider'; class WidgetFactory { diff --git a/src/components/widget-box.js b/src/components/widgets/box.js similarity index 93% rename from src/components/widget-box.js rename to src/components/widgets/box.js index db4621d..c32517f 100644 --- a/src/components/widget-box.js +++ b/src/components/widgets/box.js @@ -1,5 +1,5 @@ /** - * File: widget-box.js + * File: box.js * Author: Ricardo Hernandez-Montoya * 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() { diff --git a/src/components/widget-button.js b/src/components/widgets/button.js similarity index 94% rename from src/components/widget-button.js rename to src/components/widgets/button.js index 9a6c33b..11eef51 100644 --- a/src/components/widget-button.js +++ b/src/components/widgets/button.js @@ -1,5 +1,5 @@ /** - * File: widget-button.js + * File: button.js * Author: Ricardo Hernandez-Montoya * 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 { diff --git a/src/components/widget-gauge.js b/src/components/widgets/gauge.js similarity index 99% rename from src/components/widget-gauge.js rename to src/components/widgets/gauge.js index 9f86902..d1baa50 100644 --- a/src/components/widget-gauge.js +++ b/src/components/widgets/gauge.js @@ -1,5 +1,5 @@ /** - * File: widget-gauge.js + * File: gauge.js * Author: Ricardo Hernandez-Montoya * Date: 31.03.2017 * Copyright: 2018, Institute for Automation of Complex Power Systems, EONERC diff --git a/src/components/widget-html.js b/src/components/widgets/html.js similarity index 97% rename from src/components/widget-html.js rename to src/components/widgets/html.js index b358fea..78dd3c6 100644 --- a/src/components/widget-html.js +++ b/src/components/widgets/html.js @@ -1,5 +1,5 @@ /** - * File: widget-html.js + * File: html.js * Author: Markus Grigull * Date: 29.08.2017 * diff --git a/src/components/widget-image.js b/src/components/widgets/image.js similarity index 94% rename from src/components/widget-image.js rename to src/components/widgets/image.js index cde16e0..3438a51 100644 --- a/src/components/widget-image.js +++ b/src/components/widgets/image.js @@ -1,5 +1,5 @@ /** - * File: widget-image.js + * File: image.js * Author: Markus Grigull * 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) { diff --git a/src/components/widget-input.js b/src/components/widgets/input.js similarity index 98% rename from src/components/widget-input.js rename to src/components/widgets/input.js index d5ad7b6..eaa2b0b 100644 --- a/src/components/widget-input.js +++ b/src/components/widgets/input.js @@ -1,5 +1,5 @@ /** - * File: widget-number-input.js + * File: input.js * Author: Ricardo Hernandez-Montoya * Date: 29.03.2017 * Copyright: 2018, Institute for Automation of Complex Power Systems, EONERC diff --git a/src/components/widget-label.js b/src/components/widgets/label.js similarity index 92% rename from src/components/widget-label.js rename to src/components/widgets/label.js index 58d2233..4ce680e 100644 --- a/src/components/widget-label.js +++ b/src/components/widgets/label.js @@ -1,5 +1,5 @@ /** - * File: widget-label.js + * File: label.js * Author: Markus Grigull * 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() { diff --git a/src/components/widget-lamp.js b/src/components/widgets/lamp.js similarity index 95% rename from src/components/widget-lamp.js rename to src/components/widgets/lamp.js index 2ed2f0e..5b90f56 100644 --- a/src/components/widget-lamp.js +++ b/src/components/widgets/lamp.js @@ -1,5 +1,5 @@ /** - * File: widget-lamp.js + * File: lamp.js * Author: Steffen Vogel * 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) { diff --git a/src/components/widget-plot-table.js b/src/components/widgets/plot-table.js similarity index 98% rename from src/components/widget-plot-table.js rename to src/components/widgets/plot-table.js index 08a400e..368f7c5 100644 --- a/src/components/widget-plot-table.js +++ b/src/components/widgets/plot-table.js @@ -1,5 +1,5 @@ /** - * File: widget-plot-table.js + * File: plot-table.js * Author: Markus Grigull * 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) { diff --git a/src/components/widget-plot.js b/src/components/widgets/plot.js similarity index 96% rename from src/components/widget-plot.js rename to src/components/widgets/plot.js index 5dd00b6..e61ca10 100644 --- a/src/components/widget-plot.js +++ b/src/components/widgets/plot.js @@ -1,5 +1,5 @@ /** - * File: widget-plot.js + * File: plot.js * Author: Markus Grigull * 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) { diff --git a/src/components/widget-slider.js b/src/components/widgets/slider.js similarity index 99% rename from src/components/widget-slider.js rename to src/components/widgets/slider.js index 2f37fd9..49f1994 100644 --- a/src/components/widget-slider.js +++ b/src/components/widgets/slider.js @@ -1,5 +1,5 @@ /** - * File: widget-slider.js + * File: slider.js * Author: Ricardo Hernandez-Montoya * Date: 30.03.2017 * Copyright: 2018, Institute for Automation of Complex Power Systems, EONERC diff --git a/src/components/widget-table.js b/src/components/widgets/table.js similarity index 93% rename from src/components/widget-table.js rename to src/components/widgets/table.js index b266a23..0be4178 100644 --- a/src/components/widget-table.js +++ b/src/components/widgets/table.js @@ -1,5 +1,5 @@ /** - * File: widget-table.js + * File: table.js * Author: Markus Grigull * 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 }); diff --git a/src/components/widget-topology.js b/src/components/widgets/topology.js similarity index 98% rename from src/components/widget-topology.js rename to src/components/widgets/topology.js index c31bf97..a11940a 100644 --- a/src/components/widget-topology.js +++ b/src/components/widgets/topology.js @@ -1,5 +1,5 @@ /** - * File: widget-topology.js + * File: topology.js * Author: Ricardo Hernandez-Montoya * 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 diff --git a/src/components/widget-value.js b/src/components/widgets/value.js similarity index 98% rename from src/components/widget-value.js rename to src/components/widgets/value.js index aa056da..556db40 100644 --- a/src/components/widget-value.js +++ b/src/components/widgets/value.js @@ -1,5 +1,5 @@ /** - * File: widget-value.js + * File: value.js * Author: Markus Grigull * 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) { diff --git a/src/containers/project.js b/src/containers/project.js index 985dfbc..ce5e3b4 100644 --- a/src/containers/project.js +++ b/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() { diff --git a/src/containers/projects.js b/src/containers/projects.js index 8173006..b94c846 100644 --- a/src/containers/projects.js +++ b/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() { diff --git a/src/containers/simulation.js b/src/containers/simulation.js index 6fb8c0b..090a8de 100644 --- a/src/containers/simulation.js +++ b/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() { diff --git a/src/containers/simulations.js b/src/containers/simulations.js index 25ee82a..2bd8a1d 100644 --- a/src/containers/simulations.js +++ b/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() { diff --git a/src/containers/simulators.js b/src/containers/simulators.js index 4bd7ff6..8868c15 100644 --- a/src/containers/simulators.js +++ b/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() { diff --git a/src/containers/users.js b/src/containers/users.js index 9d34c3b..1e1779e 100644 --- a/src/containers/users.js +++ b/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() { diff --git a/src/containers/visualization.js b/src/containers/visualization.js index e08f8e1..34040e2 100644 --- a/src/containers/visualization.js +++ b/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'; diff --git a/src/containers/widget.js b/src/containers/widget.js index bdb7761..beec69c 100644 --- a/src/containers/widget.js +++ b/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';