Commit f468b445 authored by Sonja Happ's avatar Sonja Happ
Browse files

Refactoring of js code base:

- Grouping js files based on the elements of the data model instead of parent js class
- All js files providing functionality for one element of the data model are now in one folder; this makes is easier to implement changes for one element in all affected files/ classes
- js files which are common to multiple elements are in the common folder
- The new structure is more in alignment with the new Go backend code base structure
- This commit does not contain any changes in functionality of the frontend
parent 982e5661
import { expect } from 'chai'; import { expect } from 'chai';
import createControls from '../../../components/dialogs/edit-widget-control-creator'; import createControls from '../widget/edit-widget-control-creator';
import EditWidgetTextControl from '../../../components/dialogs/edit-widget-text-control'; import EditWidgetTextControl from '../widget/edit-widget-text-control';
import EditWidgetColorControl from '../../../components/dialogs/edit-widget-color-control'; import EditWidgetColorControl from '../widget/edit-widget-color-control';
import EditWidgetTimeControl from '../../../components/dialogs/edit-widget-time-control'; import EditWidgetTimeControl from '../widget/edit-widget-time-control';
import EditImageWidgetControl from '../../../components/dialogs/edit-widget-image-control'; import EditImageWidgetControl from '../widget/edit-widget-image-control';
import EditWidgetSimulationControl from '../../../components/dialogs/edit-widget-simulation-control'; import EditWidgetSimulationControl from '../widget/edit-widget-simulation-control';
import EditWidgetSignalControl from '../../../components/dialogs/edit-widget-signal-control'; import EditWidgetSignalControl from '../widget/edit-widget-signal-control';
import EditWidgetSignalsControl from '../../../components/dialogs/edit-widget-signals-control'; import EditWidgetSignalsControl from '../widget/edit-widget-signals-control';
import EditWidgetOrientation from '../../../components/dialogs/edit-widget-orientation'; import EditWidgetOrientation from '../widget/edit-widget-orientation';
import EditWidgetTextSizeControl from '../../../components/dialogs/edit-widget-text-size-control'; import EditWidgetTextSizeControl from '../widget/edit-widget-text-size-control';
import EditWidgetAspectControl from '../../../components/dialogs/edit-widget-aspect-control'; import EditWidgetAspectControl from '../widget/edit-widget-aspect-control';
import EditWidgetCheckboxControl from '../../../components/dialogs/edit-widget-checkbox-control'; import EditWidgetCheckboxControl from '../widget/edit-widget-checkbox-control';
import EditWidgetMinMaxControl from '../../../components/dialogs/edit-widget-min-max-control'; import EditWidgetMinMaxControl from '../widget/edit-widget-min-max-control';
import EditWidgetColorZonesControl from '../../../components/dialogs/edit-widget-color-zones-control'; import EditWidgetColorZonesControl from '../widget/edit-widget-color-zones-control';
import EditWidgetHTMLContent from '../../../components/dialogs/edit-widget-html-content'; import EditWidgetHTMLContent from '../widget/edit-widget-html-content';
import EditWidgetNumberControl from '../../../components/dialogs/edit-widget-number-control'; import EditWidgetNumberControl from '../widget/edit-widget-number-control';
describe('edit widget control creator', () => { describe('edit widget control creator', () => {
it('should not return null', () => { it('should not return null', () => {
......
...@@ -28,28 +28,28 @@ import { Redirect, Route } from 'react-router-dom'; ...@@ -28,28 +28,28 @@ import { Redirect, Route } from 'react-router-dom';
import { Col } from 'react-bootstrap'; import { Col } from 'react-bootstrap';
import { Hidden } from 'react-grid-system' import { Hidden } from 'react-grid-system'
import AppDispatcher from '../app-dispatcher'; import AppDispatcher from './common/app-dispatcher';
import SimulationStore from '../stores/simulation-store'; import SimulationStore from './simulation/simulation-store';
import SimulatorStore from '../stores/simulator-store'; import SimulatorStore from './simulator/simulator-store';
import UserStore from '../stores/user-store'; import UserStore from './user/user-store';
import NotificationsDataManager from '../data-managers/notifications-data-manager'; import NotificationsDataManager from './common/data-managers/notifications-data-manager';
import Home from '../components/home'; import Home from './common/home';
import Header from '../components/header'; import Header from './common/header';
import Footer from '../components/footer'; import Footer from './common/footer';
import SidebarMenu from '../components/menu-sidebar'; import SidebarMenu from './common/menu-sidebar';
import HeaderMenu from '../components/header-menu'; import HeaderMenu from './common/header-menu';
import Projects from './projects'; import Projects from './project/projects';
import Project from './project'; import Project from './project/project';
import Simulators from './simulators'; import Simulators from './simulator/simulators';
import Visualization from './visualization'; import Visualization from './visualization/visualization';
import Simulations from './simulations'; import Simulations from './simulation/simulations';
import Simulation from './simulation'; import Simulation from './simulation/simulation';
import SimulationModel from './simulation-model'; import SimulationModel from './simulationmodel/simulation-model';
import Users from './users'; import Users from './user/users';
import '../styles/app.css'; import './styles/app.css';
class App extends React.Component { class App extends React.Component {
...@@ -161,6 +161,6 @@ class App extends React.Component { ...@@ -161,6 +161,6 @@ class App extends React.Component {
} }
} }
let fluxContainerConverter = require('./FluxContainerConverter'); let fluxContainerConverter = require('./common/FluxContainerConverter');
export default Container.create(fluxContainerConverter.convert(App)); export default Container.create(fluxContainerConverter.convert(App));
//DragDropContext(HTML5Backend)(Container.create(App)); //DragDropContext(HTML5Backend)(Container.create(App));
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
import { ReduceStore } from 'flux/utils'; import { ReduceStore } from 'flux/utils';
import AppDispatcher from '../app-dispatcher'; import AppDispatcher from './app-dispatcher';
class ArrayStore extends ReduceStore { class ArrayStore extends ReduceStore {
constructor(type, dataManager) { constructor(type, dataManager) {
......
...@@ -26,7 +26,7 @@ import React from 'react'; ...@@ -26,7 +26,7 @@ import React from 'react';
//import RestAPI from '../api/rest-api'; //import RestAPI from '../api/rest-api';
import config from '../config'; import config from '../config';
import UserStore from "../stores/user-store"; import UserStore from "../user/user-store";
class Home extends React.Component { class Home extends React.Component {
constructor(props) { 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