refactor: refactor designer

src/designer/src/Designer.js → src/designer/components/designer.component.jsx

@@ -4,20 +4,20 @@ import ReactDOM from 'react-dom';
 import _ from 'lodash';
 import {HotKeys} from 'react-hotkeys';
 import Radium from 'radium';
-import Icon from './Icon';
 
-import InsertMenu from './panels/InsertMenu';
-import SVGRenderer from './SVGRenderer';
-import Handler from './Handler';
+import Icon from './icon.component';
+import InsertMenu from './panels/insertMenu.component';
+import SVGRenderer from './svgRenderer.component';
+import Handler from './handler.component';
 import {modes} from './constants';
-import scale from './actions/Scaler';
-import rotate from './actions/Rotator';
-import drag from './actions/Dragger';
-import Text  from './objects/Text';
-import Path  from './objects/Path';
-import Circle  from './objects/Circle';
-import Rect from './objects/Rect';
-import PanelList from './panels/PanelList';
+import scale from '../actions/scaler.action';
+import rotate from '../actions/rotator.action';
+import drag from '../actions/dragger.action';
+import Text  from './objects/text.component';
+import Path  from './objects/path.component';
+import Circle  from './objects/circle.component';
+import Rect from './objects/rect.component';
+import PanelList from './panels/panelList.component';
 
 class Designer extends Component {
   static defaultProps = {

src/designer/src/Handler.js → src/designer/components/handler.component.jsx

@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import Radium from 'radium';
-import Icon from './Icon';
+import Icon from './icon.component';
 
 function ScaleAnchor(props) {
   let {boundingBox} = props;

src/designer/src/objects/Circle.js → src/designer/components/objects/circle.component.jsx

@@ -1,10 +1,10 @@
 /* eslint-disable */
 import React, {Component} from 'react';
 import {modes} from '../constants';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 import _ from 'lodash';
 
-import Vector from './Vector';
+import Vector from './vector.component';
 
 export default class Circle extends Vector {
   static meta = {

src/designer/src/objects/Path.js → src/designer/components/objects/path.component.jsx

@@ -1,11 +1,11 @@
 /* eslint-disable */
 import React, {Component} from 'react';
 import {modes} from '../constants';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 import _ from 'lodash';
 
-import Vector from './Vector';
-import BezierEditor from '../editors/BezierEditor';
+import Vector from './vector.component';
+import BezierEditor from '../editors/bezierEditor.component';
 
 export default class Path extends Vector {
   static meta = {

src/designer/src/objects/Rect.js → src/designer/components/objects/rect.component.jsx

@@ -1,11 +1,11 @@
 /* eslint-disable */
 import React, {Component} from 'react';
 import {modes} from '../constants';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 import _ from 'lodash';
-import Text  from './Text';
 
-import Vector from './Vector';
+import Text  from './text.component';
+import Vector from './vector.component';
 
 export default class Rect extends Vector {
   static meta = {

src/designer/src/objects/Text.js → src/designer/components/objects/text.component.jsx

@@ -1,10 +1,10 @@
 /* eslint-disable */
 import React, {Component} from 'react';
 import {modes} from '../constants';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 import _ from 'lodash';
 
-import Vector from './Vector';
+import Vector from './vector.component';
 
 export default class Text extends Vector {
   static meta = {

src/designer/src/objects/Vector.js → src/designer/components/objects/vector.component.jsx

@@ -1,13 +1,13 @@
 /* eslint-disable */
 import React, {Component} from 'react';
 import {modes} from '../constants';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 import _ from 'lodash';
 
-import SizePanel from '../panels/SizePanel';
-import TextPanel from '../panels/TextPanel';
-import StylePanel from '../panels/StylePanel';
-import ArrangePanel from '../panels/ArrangePanel';
+import SizePanel from '../panels/sizePanel.component';
+import TextPanel from '../panels/textPanel.component';
+import StylePanel from '../panels/stylePanel.component';
+import ArrangePanel from '../panels/arrangePanel.component';
 
 
 

src/designer/src/panels/ArrangePanel.js → src/designer/components/panels/arrangePanel.component.jsx

@@ -4,13 +4,13 @@ import Radium from 'radium';
 import _ from 'lodash';
 
 import styles from './styles';
-import Icon from '../Icon';
-import Panel from './Panel';
-import PropertyGroup from './PropertyGroup';
-import Button from './Button';
-import SwitchState from './SwitchState';
-import Columns from './Columns';
-import Column from './Column';
+import Icon from '../icon.component';
+import Panel from './panel.component';
+import PropertyGroup from './propertyGroup.component';
+import Button from './button.component';
+import SwitchState from './switchState.component';
+import Columns from './columns.component';
+import Column from './column.component';
 
 export default class ArrangePanel extends Panel {
   render() {

src/designer/src/panels/Button.js → src/designer/components/panels/button.component.jsx

@@ -2,7 +2,7 @@
 import React, {Component} from 'react';
 import Radium from 'radium';
 import _ from 'lodash';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 
 import styles from './styles';
 

src/designer/src/panels/ColorInput.js → src/designer/components/panels/colorInput.component.jsx

@@ -3,7 +3,7 @@ import React, {Component} from 'react';
 import Radium from 'radium';
 import ChromePicker from 'react-color';
 import _ from 'lodash';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 
 import styles from './styles';
 

src/designer/src/panels/Column.js → src/designer/components/panels/column.component.jsx

@@ -2,7 +2,7 @@
 import React, {Component} from 'react';
 import Radium from 'radium';
 import _ from 'lodash';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 
 import styles from './styles';
 

src/designer/src/panels/Columns.js → src/designer/components/panels/columns.component.jsx

@@ -2,7 +2,7 @@
 import React, {Component} from 'react';
 import Radium from 'radium';
 import _ from 'lodash';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 
 import styles from './styles';
 

src/designer/src/panels/InsertMenu.js → src/designer/components/panels/insertMenu.component.jsx

@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
 import Radium from 'radium';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 
 class InsertMenu extends Component {
 

src/designer/src/panels/PanelList.js → src/designer/components/panels/panelList.component.jsx

@@ -4,15 +4,15 @@ import Radium from 'radium';
 import _ from 'lodash';
 import Portal from 'react-portal';
 
-import Icon from '../Icon';
-import Panel from './Panel';
+import Icon from '../icon.component';
+import Panel from './panel.component';
 
 import styles from './styles';
-import PropertyGroup from './PropertyGroup';
-import Button from './Button';
-import SwitchState from './SwitchState';
-import Columns from './Columns';
-import Column from './Column';
+import PropertyGroup from './propertyGroup.component';
+import Button from './button.component';
+import SwitchState from './switchState.component';
+import Columns from './columns.component';
+import Column from './column.component';
 
 class PanelList extends Component {
   render() {

src/designer/src/panels/PropertyGroup.js → src/designer/components/panels/propertyGroup.component.jsx

@@ -2,7 +2,7 @@
 import React, {Component} from 'react';
 import Radium from 'radium';
 import _ from 'lodash';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 
 import styles from './styles';
 

src/designer/src/panels/SizePanel.js → src/designer/components/panels/sizePanel.component.jsx

@@ -3,15 +3,15 @@ import React, {Component} from 'react';
 import Radium from 'radium';
 import _ from 'lodash';
 
-import Icon from '../Icon';
-import Panel from './Panel';
+import Icon from '../icon.component';
+import Panel from './panel.component';
 
 import styles from './styles';
-import PropertyGroup from './PropertyGroup';
-import Button from './Button';
-import SwitchState from './SwitchState';
-import Columns from './Columns';
-import Column from './Column';
+import PropertyGroup from './propertyGroup.component';
+import Button from './button.component';
+import SwitchState from './switchState.component';
+import Columns from './columns.component';
+import Column from './column.component';
 
 export default class SizePanel extends Panel {
   render() {

src/designer/src/panels/StylePanel.js → src/designer/components/panels/stylePanel.component.jsx

@@ -3,16 +3,16 @@ import React, {Component} from 'react';
 import Radium from 'radium';
 import _ from 'lodash';
 
-import Icon from '../Icon';
-import Panel from './Panel';
+import Icon from '../icon.component';
+import Panel from './panel.component';
 
 import styles from './styles';
-import PropertyGroup from './PropertyGroup';
-import Button from './Button';
-import SwitchState from './SwitchState';
-import Columns from './Columns';
-import Column from './Column';
-import ColorInput from './ColorInput';
+import PropertyGroup from './propertyGroup.component';
+import Button from './button.component';
+import SwitchState from './switchState.component';
+import Columns from './columns.component';
+import Column from './column.component';
+import ColorInput from './colorInput.component';
 
 export default class StylePanel extends Panel {
   modes = [

src/designer/src/panels/SwitchState.js → src/designer/components/panels/switchState.component.jsx

@@ -2,7 +2,7 @@
 import React, {Component} from 'react';
 import Radium from 'radium';
 import _ from 'lodash';
-import Icon from '../Icon';
+import Icon from '../icon.component';
 
 const SwitchState = (props) => {
   let selected = props.value !== props.defaultValue;

src/designer/src/panels/TextPanel.js → src/designer/components/panels/textPanel.component.jsx

@@ -3,15 +3,15 @@ import React, {Component} from 'react';
 import Radium from 'radium';
 import _ from 'lodash';
 
-import Icon from '../Icon';
-import Panel from './Panel';
+import Icon from '../icon.component';
+import Panel from './panel.component';
 
 import styles from './styles';
-import PropertyGroup from './PropertyGroup';
-import Button from './Button';
-import SwitchState from './SwitchState';
-import Columns from './Columns';
-import Column from './Column';
+import PropertyGroup from './propertyGroup.component';
+import Button from './button.component';
+import SwitchState from './switchState.component';
+import Columns from './columns.component';
+import Column from './column.component';
 
 export default class TextPanel extends Panel {
   fontFamilies = [

src/designer/drawingtool/App.js → src/designer/components/roomDesigner.component.jsx

@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
-import classes from './App.module.css'
-import MondrianExample from './components/Mondrian';
+import classes from '../roomDesigner.module.css'
+import Designing from '../containers/mondrian.container';
 import ColorPalette from '../../colorPalette/containers/colorPalette.container';
 import FlatButton from 'material-ui/FlatButton'
 
@@ -28,7 +28,7 @@ handleColor = () => {
           <div className={classes.preview}>
             <FlatButton label="Color Tool" onClick={this.handleColor}/>
             {this.state.color ? <ColorPalette /> : null}
-            <MondrianExample params={this.props.params} />
+            <Designing params={this.props.params} />
           </div>
         </div>
       </div>

src/designer/drawingtool/components/Mondrian.js → src/designer/containers/mondrian.container.jsx

@@ -1,9 +1,9 @@
 import React, { Component } from 'react';
-import Designer from '../../src/Designer';
+import Designer from '../components/designer.component';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { setRoomDesign, getRooms, selectRoom, updateRoomDesign } from '../../../rooms/actions/rooms.action';
-import { changeRoute } from '../../../routing/actions/routing.action';
+import { setRoomDesign, getRooms, selectRoom, updateRoomDesign } from '../../rooms/actions/rooms.action';
+import { changeRoute } from '../../routing/actions/routing.action';
 
 export default class Designing extends Component {
   currentRoom = "bathroom"

src/furniture/containers/furnitureList.container.jsx

@@ -9,7 +9,7 @@ import { browserHistory } from 'react-router';
 import FList from '../components/fList.component';
 import AddFurnitureForm from './addFurnitureForm.container';
 import ListingFurniture from '../components/listingFurniture.component'
-import Designer from '../../designer/drawingtool/App';
+import Designer from '../../designer/components/roomDesigner.component';
 import AllFurniture from '../components/allFurniture.component';
 import furnitureHelper from '../furnitureHelper';
 import ListView from '../components/listView.component';
@@ -192,4 +192,4 @@ function mapDispatchToProps(dispatch) {
   return bindActionCreators({selectRoom, getRooms,  changeRoute, getBudget}, dispatch);
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(FurnitureList);
+export default connect(mapStateToProps, mapDispatchToProps)(FurnitureList);