Commit 67b7b876 authored by Sonja Happ's avatar Sonja Happ
Browse files

Merge branch 'new-api-restructuring' into new-api-add-scenario

# Conflicts:
#	src/app.js
parents 78a604af d1b5e416
import { expect } from 'chai';
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 EditWidgetSimulationControl from '../../../components/dialogs/edit-widget-simulation-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';
import createControls from '../../widget/edit-widget-control-creator';
import EditWidgetTextControl from '../../widget/edit-widget-text-control';
import EditWidgetColorControl from '../../widget/edit-widget-color-control';
import EditWidgetTimeControl from '../../widget/edit-widget-time-control';
import EditImageWidgetControl from '../../widget/edit-widget-image-control';
import EditWidgetSimulationControl from '../../widget/edit-widget-simulation-control';
import EditWidgetSignalControl from '../../widget/edit-widget-signal-control';
import EditWidgetSignalsControl from '../../widget/edit-widget-signals-control';
import EditWidgetOrientation from '../../widget/edit-widget-orientation';
import EditWidgetTextSizeControl from '../../widget/edit-widget-text-size-control';
import EditWidgetAspectControl from '../../widget/edit-widget-aspect-control';
import EditWidgetCheckboxControl from '../../widget/edit-widget-checkbox-control';
import EditWidgetMinMaxControl from '../../widget/edit-widget-min-max-control';
import EditWidgetColorZonesControl from '../../widget/edit-widget-color-zones-control';
import EditWidgetHTMLContent from '../../widget/edit-widget-html-content';
import EditWidgetNumberControl from '../../widget/edit-widget-number-control';
describe('edit widget control creator', () => {
it('should not return null', () => {
......
......@@ -28,30 +28,30 @@ import { Redirect, Route } from 'react-router-dom';
import { Col } from 'react-bootstrap';
import { Hidden } from 'react-grid-system'
import AppDispatcher from '../app-dispatcher';
import ScenarioStore from '../stores/scenario-store';
import SimulatorStore from '../stores/simulator-store';
import UserStore from '../stores/user-store';
import NotificationsDataManager from '../data-managers/notifications-data-manager';
import Home from '../components/home';
import Header from '../components/header';
import Footer from '../components/footer';
import SidebarMenu from '../components/menu-sidebar';
import HeaderMenu from '../components/header-menu';
//import Projects from './projects';
//import Project from './project';
import Simulators from './simulators';
import Visualization from './visualization';
//import Simulations from './simulations';
//import Simulation from './simulation';
import Scenarios from './scenarios'
import Scenario from './scenario'
import SimulationModel from './simulation-model';
import Users from './users';
import '../styles/app.css';
import AppDispatcher from './common/app-dispatcher';
import ScenarioStore from './scenario/scenario-store';
import SimulatorStore from './simulator/simulator-store';
import UserStore from './user/user-store';
import NotificationsDataManager from './common/data-managers/notifications-data-manager';
import Home from './common/home';
import Header from './common/header';
import Footer from './common/footer';
import SidebarMenu from './common/menu-sidebar';
import HeaderMenu from './common/header-menu';
//import Projects from './project/projects';
//import Project from './project/project';
import Simulators from './simulator/simulators';
import Visualization from './visualization/visualization';
//import Simulations from './simulation/simulations';
//import Simulation from './simulation/simulation';
import Scenarios from './scenario/scenarios';
import Scenario from './scenario/scenario';
import SimulationModel from './simulationmodel/simulation-model';
import Users from './user/users';
import './styles/app.css';
class App extends React.Component {
......@@ -167,6 +167,6 @@ class App extends React.Component {
//<Route exact path="/simulations" component={Simulations} />
//<Route path="/simulations/:simulation" component={Simulation} />
let fluxContainerConverter = require('./FluxContainerConverter');
let fluxContainerConverter = require('./common/FluxContainerConverter');
export default Container.create(fluxContainerConverter.convert(App));
//DragDropContext(HTML5Backend)(Container.create(App));
......@@ -21,7 +21,7 @@
import { ReduceStore } from 'flux/utils';
import AppDispatcher from '../app-dispatcher';
import AppDispatcher from './app-dispatcher';
class ArrayStore extends ReduceStore {
constructor(type, dataManager) {
......
......@@ -26,7 +26,7 @@ import React from 'react';
//import RestAPI from '../api/rest-api';
import config from '../config';
import UserStore from "../stores/user-store";
import UserStore from "../user/user-store";
class Home extends React.Component {
constructor(props) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment