diff --git a/client/src/components/LongPressable/index.test.js b/client/src/components/LongPressable/index.test.js index a824f448..acf7dc0d 100644 --- a/client/src/components/LongPressable/index.test.js +++ b/client/src/components/LongPressable/index.test.js @@ -2,7 +2,7 @@ import React from 'react' import LongPressable from './index' import Enzyme, { shallow } from 'enzyme' import Adapter from 'enzyme-adapter-react-16' -import { timeout } from 'utils/functions' +import { timeout } from '../../utils/functions' Enzyme.configure( { adapter: new Adapter() } ) diff --git a/client/src/components/MathBox/MathBox.js b/client/src/components/MathBox/MathBox.js index 7f2a0385..a80db62d 100644 --- a/client/src/components/MathBox/MathBox.js +++ b/client/src/components/MathBox/MathBox.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react' -import { timeout } from 'utils/functions' -import LoopManager from 'services/LoopManager' +import { timeout } from '../../utils/functions' +import LoopManager from '../../services/LoopManager' type Props = { mathbox: any, diff --git a/client/src/components/MathBox/MathBoxComponents.js b/client/src/components/MathBox/MathBoxComponents.js index 6cf0c147..7644c553 100644 --- a/client/src/components/MathBox/MathBoxComponents.js +++ b/client/src/components/MathBox/MathBoxComponents.js @@ -1,7 +1,7 @@ // @flow import * as React from "react"; import { Color } from "three/src/math/Color.js"; -import math from "utils/mathjs"; +import math from "../../utils/mathjs"; import { isBoolean, isEqualNumerically, @@ -12,10 +12,10 @@ import { validateFunctionSignature, hasFunctionSignature, } from "./helpers"; -import diffWithSets from "utils/shallowDiffWithSets"; -import { lighten } from "utils/colors"; -import marchingCubes from "utils/marchingCubes"; -import { colorMaps } from "constants/colors"; +import diffWithSets from "../../utils/shallowDiffWithSets"; +import { lighten } from "../../utils/colors"; +import marchingCubes from "../../utils/marchingCubes"; +import { colorMaps } from "../../constants/colors"; type MathBoxNode = any; diff --git a/client/src/components/MathBox/helpers.js b/client/src/components/MathBox/helpers.js index 213fe7bd..3e83dd74 100644 --- a/client/src/components/MathBox/helpers.js +++ b/client/src/components/MathBox/helpers.js @@ -1,5 +1,5 @@ // @flow -import math from "utils/mathjs"; +import math from "../../utils/mathjs"; // TODO test this? Maybe Flow is good enough diff --git a/client/src/components/ScrollWithOverflow/index.js b/client/src/components/ScrollWithOverflow/index.js index d42f22cd..b9ba3cab 100644 --- a/client/src/components/ScrollWithOverflow/index.js +++ b/client/src/components/ScrollWithOverflow/index.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react' import styled from 'styled-components' -import { mathbox } from "containers/MathBoxScene/components/MathBoxScene.js"; +import { mathbox } from "../../containers/MathBoxScene/components/MathBoxScene.js"; /** * ScrollWithOverflow is a component intended to allow scrolling in the diff --git a/client/src/components/SubtleButton/index.js b/client/src/components/SubtleButton/index.js index 9cc37413..1ee91361 100644 --- a/client/src/components/SubtleButton/index.js +++ b/client/src/components/SubtleButton/index.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react' import styled, { css } from 'styled-components' -import { lighten } from 'utils/colors' +import { lighten } from '../../utils/colors' import PropTypes from 'prop-types' const buttonEffects = css` diff --git a/client/src/constants/parsing.js b/client/src/constants/parsing.js index 9fea8512..6ab0241a 100644 --- a/client/src/constants/parsing.js +++ b/client/src/constants/parsing.js @@ -2,7 +2,7 @@ import { Parser, ScopeEvaluator -} from 'utils/mathParsing' +} from '../utils/mathParsing' export const parser = new Parser() export const scopeEvaluator = new ScopeEvaluator(parser) diff --git a/client/src/containers/ControlledTabs/reducer.js b/client/src/containers/ControlledTabs/reducer.js index a6f62430..1bdbd6d3 100644 --- a/client/src/containers/ControlledTabs/reducer.js +++ b/client/src/containers/ControlledTabs/reducer.js @@ -1,5 +1,5 @@ import { SET_ACTIVE_TAB } from './actions' -import { CREATE_MATH_OBJECT } from 'containers/MathObjects/actions' +import { CREATE_MATH_OBJECT } from '../../containers/MathObjects/actions' const initialState = { controls: { activeTab: '1' diff --git a/client/src/containers/ControllerHeader/components/ControllerHeader.js b/client/src/containers/ControllerHeader/components/ControllerHeader.js index 66a4d977..eff6b3cd 100644 --- a/client/src/containers/ControllerHeader/components/ControllerHeader.js +++ b/client/src/containers/ControllerHeader/components/ControllerHeader.js @@ -2,12 +2,12 @@ import * as React from 'react' import styled from 'styled-components' import { Menu, Dropdown, Button, Icon } from 'antd' -import idGenerator from 'constants/idGenerator' +import idGenerator from '../../../constants/idGenerator' import typeof { createMathObject as CreateMathObject -} from 'containers/MathObjects/actions' -import { FOLDER } from 'containers/MathObjects/Folder/metadata' -import type { Support } from 'containers/MathObjects/MathObject' +} from '../../../containers/MathObjects/actions' +import { FOLDER } from '../../../containers/MathObjects/Folder/metadata' +import type { Support } from '../../../containers/MathObjects/MathObject' const NewObjectButton = styled(Button)` font-weight: bold; diff --git a/client/src/containers/ControllerHeader/index.js b/client/src/containers/ControllerHeader/index.js index ddfd8752..c22f34b4 100644 --- a/client/src/containers/ControllerHeader/index.js +++ b/client/src/containers/ControllerHeader/index.js @@ -3,9 +3,9 @@ import ControllerHeader from './components/ControllerHeader' import type { Props, OwnProps } from './components/ControllerHeader' import { connect } from 'react-redux' import { getActiveFolder } from './selectors' -import { createMathObject } from 'containers/MathObjects/actions' -import { setActiveObject } from 'containers/MathObjects/services/activeObject/actions' -import { setContentCollapsed } from 'containers/MathObjects/Folder/actions' +import { createMathObject } from '../../containers/MathObjects/actions' +import { setActiveObject } from '../../containers/MathObjects/services/activeObject/actions' +import { setContentCollapsed } from '../../containers/MathObjects/Folder/actions' const mapStateToProps = ( { activeObject, sortableTree } ) => { const treeRoot = sortableTree.root diff --git a/client/src/containers/ControllerHeader/selectors.js b/client/src/containers/ControllerHeader/selectors.js index 93e7b68f..7c9d47ce 100644 --- a/client/src/containers/ControllerHeader/selectors.js +++ b/client/src/containers/ControllerHeader/selectors.js @@ -1,4 +1,4 @@ -import { getParent } from 'containers/MathObjects/selectors' +import { getParent } from '../../containers/MathObjects/selectors' const FORBIDDEN_INSERT_FOLDERS = new Set( [ 'axes', diff --git a/client/src/containers/Drawer/ScreenSizeDrawerManager.js b/client/src/containers/Drawer/ScreenSizeDrawerManager.js index 60e28420..78bc765c 100644 --- a/client/src/containers/Drawer/ScreenSizeDrawerManager.js +++ b/client/src/containers/Drawer/ScreenSizeDrawerManager.js @@ -4,7 +4,7 @@ import { connect } from 'react-redux' import withSizes from 'react-sizes' import { closeDrawer, openDrawer, setWidth } from './actions' import { DEFAULT_WIDTH } from './reducer' -import { MOBILE_BREAKPOINT } from 'constants/theme' +import { MOBILE_BREAKPOINT } from '../../constants/theme' type DispatchProps = {| openDrawer: string => void, diff --git a/client/src/containers/Drawer/components/DrawerToggleButton.js b/client/src/containers/Drawer/components/DrawerToggleButton.js index d64d1151..fe3a334a 100644 --- a/client/src/containers/Drawer/components/DrawerToggleButton.js +++ b/client/src/containers/Drawer/components/DrawerToggleButton.js @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react' import PropTypes from 'prop-types' import styled, { css } from 'styled-components' import { Icon } from 'antd' -import SubtleButton from 'components/SubtleButton' +import SubtleButton from '../../../components/SubtleButton' const StyledButton = styled(SubtleButton)` z-index:200; diff --git a/client/src/containers/MathBoxScene/components/MathBoxScene.js b/client/src/containers/MathBoxScene/components/MathBoxScene.js index 4e9b8174..381ea3e8 100644 --- a/client/src/containers/MathBoxScene/components/MathBoxScene.js +++ b/client/src/containers/MathBoxScene/components/MathBoxScene.js @@ -10,17 +10,17 @@ import { Color } from "three/src/math/Color.js"; import { Vector3 } from "three/src/math/Vector3.js"; import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js"; import React, { PureComponent } from 'react' -import { MathBox, Cartesian } from 'components/MathBox' -import { MathScopeConsumer } from 'containers/MathScopeContext' -import { MathGraphics } from 'containers/MathObjects' +import { MathBox, Cartesian } from '../../../components/MathBox' +import { MathScopeConsumer } from '../../../containers/MathScopeContext' +import { MathGraphics } from '../../../containers/MathObjects' import PropTypes from 'prop-types' -import { parser } from 'constants/parsing' -import { RenderErrorData, setError } from 'services/errors' +import { parser } from '../../../constants/parsing' +import { RenderErrorData, setError } from '../../../services/errors' import { evalData, handleEvalErrors, filterObject -} from 'services/evalData' +} from '../../../services/evalData' type SetError = typeof setError type ErrorState = { diff --git a/client/src/containers/MathBoxScene/index.js b/client/src/containers/MathBoxScene/index.js index dbb604fa..7078ea15 100644 --- a/client/src/containers/MathBoxScene/index.js +++ b/client/src/containers/MathBoxScene/index.js @@ -1,6 +1,6 @@ import MathBoxScene from './components/MathBoxScene' import { connect } from 'react-redux' -import { setError } from 'services/errors' +import { setError } from '../../services/errors' const mapStateToProps = ( { mathGraphics, evalErrors, renderErrors } ) => ( { mathGraphics, diff --git a/client/src/containers/MathObjects/Folder/actions.js b/client/src/containers/MathObjects/Folder/actions.js index 971cd8ea..892f4c6e 100644 --- a/client/src/containers/MathObjects/Folder/actions.js +++ b/client/src/containers/MathObjects/Folder/actions.js @@ -1,7 +1,7 @@ import { toggleProperty, setProperty -} from 'containers/MathObjects/actions' +} from '../../../containers/MathObjects/actions' import { FOLDER } from './metadata' export const setContentCollapsed = (id, value) => { diff --git a/client/src/containers/MathObjects/Folder/components/CollapsedIndicator.js b/client/src/containers/MathObjects/Folder/components/CollapsedIndicator.js index dd9182e1..b2611744 100644 --- a/client/src/containers/MathObjects/Folder/components/CollapsedIndicator.js +++ b/client/src/containers/MathObjects/Folder/components/CollapsedIndicator.js @@ -2,8 +2,8 @@ import React from 'react' import { Icon } from 'antd' import styled from 'styled-components' import PropTypes from 'prop-types' -import SubtleButton from 'components/SubtleButton' -import { theme } from 'constants/theme' +import SubtleButton from '../../../../components/SubtleButton' +import { theme } from '../../../../constants/theme' const CollapseIndicatorButton = styled(SubtleButton)` padding-left: 2px; diff --git a/client/src/containers/MathObjects/Folder/components/Folder.js b/client/src/containers/MathObjects/Folder/components/Folder.js index 254f91e9..9add72a5 100644 --- a/client/src/containers/MathObjects/Folder/components/Folder.js +++ b/client/src/containers/MathObjects/Folder/components/Folder.js @@ -1,12 +1,12 @@ import React, { PureComponent } from 'react' -import SortableList from 'components/SortableList' -import MathGraphics from 'containers/MathObjects/MathGraphics' -import MathSymbols from 'containers/MathObjects/MathSymbols' +import SortableList from '../../../../components/SortableList' +import MathGraphics from '../../../../containers/MathObjects/MathGraphics' +import MathSymbols from '../../../../containers/MathObjects/MathSymbols' import CollapsedIndicator from './CollapsedIndicator' import Collapsible from 'react-collapsible' import PropTypes from 'prop-types' -import MathObjectUI from 'containers/MathObjects/MathObjectUI' -import theme from 'constants/theme' +import MathObjectUI from '../../../../containers/MathObjects/MathObjectUI' +import theme from '../../../../constants/theme' import { FOLDER } from '../metadata' export default class Folder extends PureComponent { diff --git a/client/src/containers/MathObjects/Folder/selectors.js b/client/src/containers/MathObjects/Folder/selectors.js index 0f255d3f..3a5042d7 100644 --- a/client/src/containers/MathObjects/Folder/selectors.js +++ b/client/src/containers/MathObjects/Folder/selectors.js @@ -1,7 +1,7 @@ import { AXIS, GRID -} from 'containers/MathObjects/MathGraphics' +} from '../../../containers/MathObjects/MathGraphics' import createCachedSelector from 're-reselect' function getType(mathGraphics, mathSymbols, id) { if (mathGraphics[id] ) { diff --git a/client/src/containers/MathObjects/MathGraphics/Axis/index.js b/client/src/containers/MathObjects/MathGraphics/Axis/index.js index 14626102..6ef6b37a 100644 --- a/client/src/containers/MathObjects/MathGraphics/Axis/index.js +++ b/client/src/containers/MathObjects/MathGraphics/Axis/index.js @@ -1,14 +1,14 @@ // @flow import React, { PureComponent } from 'react' -import { Axis as AxisGraphic } from 'components/MathBox' +import { Axis as AxisGraphic } from '../../../../components/MathBox' import MathGraphic from '../MathGraphic' import MathGraphicUI from '../containers/MathGraphicUI' import { axisMeta } from '../metadata' import { MathInputRHS, ConnectedStaticMath -} from 'containers/MathObjects/containers/MathInput' -import { MainRow, Cell, Label } from 'containers/MathObjects/components' +} from '../../../../containers/MathObjects/containers/MathInput' +import { MainRow, Cell, Label } from '../../../../containers/MathObjects/components' export const AXIS = 'AXIS' diff --git a/client/src/containers/MathObjects/MathGraphics/Camera/UseComputedToggle.js b/client/src/containers/MathObjects/MathGraphics/Camera/UseComputedToggle.js index 2b7bdde1..ee3563c2 100644 --- a/client/src/containers/MathObjects/MathGraphics/Camera/UseComputedToggle.js +++ b/client/src/containers/MathObjects/MathGraphics/Camera/UseComputedToggle.js @@ -2,7 +2,7 @@ import * as React from 'react' import { Switch } from 'antd' import { connect } from 'react-redux' -import { setProperty } from 'containers/MathObjects/actions' +import { setProperty } from '../../../../containers/MathObjects/actions' type OwnProps = {| parentId: string, diff --git a/client/src/containers/MathObjects/MathGraphics/Camera/index.js b/client/src/containers/MathObjects/MathGraphics/Camera/index.js index db911408..4c0ec3b6 100644 --- a/client/src/containers/MathObjects/MathGraphics/Camera/index.js +++ b/client/src/containers/MathObjects/MathGraphics/Camera/index.js @@ -1,15 +1,15 @@ // @flow import React, { PureComponent } from 'react' -import { Camera as CameraGraphic } from 'components/MathBox' +import { Camera as CameraGraphic } from '../../../../components/MathBox' import MathGraphic from '../MathGraphic' -import MathObjectUI from 'containers/MathObjects/MathObjectUI' +import MathObjectUI from '../../../../containers/MathObjects/MathObjectUI' import { cameraMeta } from '../metadata' -import { MathInputRHS } from 'containers/MathObjects/containers/MathInput' -import ToggleSwitch from 'containers/MathObjects/containers/ToggleSwitch' -import { MainRow, Cell, Label } from 'containers/MathObjects/components' +import { MathInputRHS } from '../../../../containers/MathObjects/containers/MathInput' +import ToggleSwitch from '../../../../containers/MathObjects/containers/ToggleSwitch' +import { MainRow, Cell, Label } from '../../../../containers/MathObjects/components' import UseComputedToggle from './UseComputedToggle' import styled from 'styled-components' -import typeof { setProperty } from 'containers/MathObjects/actions' +import typeof { setProperty } from '../../../../containers/MathObjects/actions' const IndentedRow = styled(MainRow)` padding-left:20px; diff --git a/client/src/containers/MathObjects/MathGraphics/Grid/index.js b/client/src/containers/MathObjects/MathGraphics/Grid/index.js index fe4c4ec4..017bf3ce 100644 --- a/client/src/containers/MathObjects/MathGraphics/Grid/index.js +++ b/client/src/containers/MathObjects/MathGraphics/Grid/index.js @@ -1,14 +1,14 @@ // @flow import React, { PureComponent } from 'react' -import { Grid as GridGraphic } from 'components/MathBox' +import { Grid as GridGraphic } from '../../../../components/MathBox' import MathGraphic from '../MathGraphic' import MathGraphicUI from '../containers/MathGraphicUI' import { gridMeta } from '../metadata' import { ConnectedStaticMath -} from 'containers/MathObjects/containers/MathInput' +} from '../../../../containers/MathObjects/containers/MathInput' import styled from 'styled-components' -import { MainRow } from 'containers/MathObjects/components' +import { MainRow } from '../../../../containers/MathObjects/components' export const GRID = 'GRID' diff --git a/client/src/containers/MathObjects/MathGraphics/ImplicitSurface/index.js b/client/src/containers/MathObjects/MathGraphics/ImplicitSurface/index.js index bd701cbf..41da7af1 100644 --- a/client/src/containers/MathObjects/MathGraphics/ImplicitSurface/index.js +++ b/client/src/containers/MathObjects/MathGraphics/ImplicitSurface/index.js @@ -1,14 +1,14 @@ // @flow import React, { PureComponent } from 'react' -import { ImplicitSurface as ImplicitSurfaceGraphic } from 'components/MathBox' +import { ImplicitSurface as ImplicitSurfaceGraphic } from '../../../../components/MathBox' import MathGraphic from '../MathGraphic' import MathGraphicUI from '../containers/MathGraphicUI' import { implicitSurfaceMeta } from '../metadata' -import { MainRow } from 'containers/MathObjects/components' +import { MainRow } from '../../../../containers/MathObjects/components' import { MathInputRHS, StaticMathStyled -} from 'containers/MathObjects/containers/MathInput' +} from '../../../../containers/MathObjects/containers/MathInput' export const IMPLICIT_SURFACE = 'IMPLICIT_SURFACE' diff --git a/client/src/containers/MathObjects/MathGraphics/Line/index.js b/client/src/containers/MathObjects/MathGraphics/Line/index.js index 8b369694..f634504e 100644 --- a/client/src/containers/MathObjects/MathGraphics/Line/index.js +++ b/client/src/containers/MathObjects/MathGraphics/Line/index.js @@ -1,11 +1,11 @@ // @flow import React, { PureComponent } from 'react' -import { Line as LineGraphic } from 'components/MathBox' +import { Line as LineGraphic } from '../../../../components/MathBox' import MathGraphic from '../MathGraphic' import MathGraphicUI from '../containers/MathGraphicUI' import { lineMeta } from '../metadata' -import { MainRow } from 'containers/MathObjects/components' -import { MathInputRHS } from 'containers/MathObjects/containers/MathInput' +import { MainRow } from '../../../../containers/MathObjects/components' +import { MathInputRHS } from '../../../../containers/MathObjects/containers/MathInput' export const LINE = 'LINE' diff --git a/client/src/containers/MathObjects/MathGraphics/MathGraphic.js b/client/src/containers/MathObjects/MathGraphics/MathGraphic.js index ec1125a3..7f75bcfb 100644 --- a/client/src/containers/MathObjects/MathGraphics/MathGraphic.js +++ b/client/src/containers/MathObjects/MathGraphics/MathGraphic.js @@ -1,6 +1,6 @@ // @flow import type { MetaData } from './types' -import { capitalize } from 'utils/helpers' +import { capitalize } from '../../../utils/helpers' import type { MathObjectWrapper, Settings, Support } from '../MathObject' /** diff --git a/client/src/containers/MathObjects/MathGraphics/ParametricCurve/index.js b/client/src/containers/MathObjects/MathGraphics/ParametricCurve/index.js index 584e07df..2d873dfe 100644 --- a/client/src/containers/MathObjects/MathGraphics/ParametricCurve/index.js +++ b/client/src/containers/MathObjects/MathGraphics/ParametricCurve/index.js @@ -1,14 +1,14 @@ // @flow import React, { PureComponent } from 'react' -import { ParametricCurve as ParametricCurveGraphic } from 'components/MathBox' +import { ParametricCurve as ParametricCurveGraphic } from '../../../../components/MathBox' import MathGraphic from '../MathGraphic' import MathGraphicUI from '../containers/MathGraphicUI' import { parametricCurveMeta } from '../metadata' -import { MainRow } from 'containers/MathObjects/components' +import { MainRow } from '../../../../containers/MathObjects/components' import { MathInputRHS, StaticMathStyled -} from 'containers/MathObjects/containers/MathInput' +} from '../../../../containers/MathObjects/containers/MathInput' export const PARAMETRIC_CURVE = 'PARAMETRIC_CURVE' diff --git a/client/src/containers/MathObjects/MathGraphics/ParametricSurface/containers/ParametricSurfaceStatus.js b/client/src/containers/MathObjects/MathGraphics/ParametricSurface/containers/ParametricSurfaceStatus.js index b50b53c7..6355ae5d 100644 --- a/client/src/containers/MathObjects/MathGraphics/ParametricSurface/containers/ParametricSurfaceStatus.js +++ b/client/src/containers/MathObjects/MathGraphics/ParametricSurface/containers/ParametricSurfaceStatus.js @@ -1,13 +1,13 @@ // @flow import React from 'react' import { connect } from 'react-redux' -import EvaluatedStatusSymbol from 'containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol' -import { colors, colorMaps } from 'constants/colors' +import EvaluatedStatusSymbol from '../../../../../containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol' +import { colors, colorMaps } from '../../../../../constants/colors' import { Tabs } from 'antd' import { StaticMathStyled, MathInputRHS -} from 'containers/MathObjects/containers/MathInput' +} from '../../../../../containers/MathObjects/containers/MathInput' import { ColorScale } from './components/ColorScale' const TabPane = Tabs.TabPane diff --git a/client/src/containers/MathObjects/MathGraphics/ParametricSurface/containers/components/ColorScale.js b/client/src/containers/MathObjects/MathGraphics/ParametricSurface/containers/components/ColorScale.js index d1310a09..234ef47a 100644 --- a/client/src/containers/MathObjects/MathGraphics/ParametricSurface/containers/components/ColorScale.js +++ b/client/src/containers/MathObjects/MathGraphics/ParametricSurface/containers/components/ColorScale.js @@ -1,8 +1,8 @@ // @flow import React from 'react' -import { StaticMathStyled } from 'containers/MathObjects/containers/MathInput' +import { StaticMathStyled } from '../../../../../../containers/MathObjects/containers/MathInput' import styled from 'styled-components' -import { colorMaps } from 'constants/colors' +import { colorMaps } from '../../../../../../constants/colors' const ScaleContainer = styled.div` display:flex; diff --git a/client/src/containers/MathObjects/MathGraphics/ParametricSurface/index.js b/client/src/containers/MathObjects/MathGraphics/ParametricSurface/index.js index c7dd37b5..5557716a 100644 --- a/client/src/containers/MathObjects/MathGraphics/ParametricSurface/index.js +++ b/client/src/containers/MathObjects/MathGraphics/ParametricSurface/index.js @@ -4,7 +4,7 @@ import { ParametricSurface as ParametricSurfaceGraphic, ExplicitSurface as ExplicitSurfaceGraphic, ExplicitSurfacePolar as ExplicitSurfacePolarGraphic -} from 'components/MathBox' +} from '../../../../components/MathBox' import MathGraphic from '../MathGraphic' import MathGraphicUI from '../containers/MathGraphicUI' import ParametricSurfaceStatus from './containers/ParametricSurfaceStatus' @@ -14,12 +14,12 @@ import { explicitSurfacePolarMeta } from '../metadata' import type { MetaData } from '../types' -import { MainRow } from 'containers/MathObjects/components' +import { MainRow } from '../../../../containers/MathObjects/components' import { MathInputRHS, StaticMathStyled -} from 'containers/MathObjects/containers/MathInput' -import { parser } from 'constants/parsing' +} from '../../../../containers/MathObjects/containers/MathInput' +import { parser } from '../../../../constants/parsing' type Props = { id: string diff --git a/client/src/containers/MathObjects/MathGraphics/Point/index.js b/client/src/containers/MathObjects/MathGraphics/Point/index.js index 16443683..df0cac28 100644 --- a/client/src/containers/MathObjects/MathGraphics/Point/index.js +++ b/client/src/containers/MathObjects/MathGraphics/Point/index.js @@ -1,11 +1,11 @@ // @flow import React, { PureComponent } from 'react' -import { Point as PointGraphic } from 'components/MathBox' +import { Point as PointGraphic } from '../../../../components/MathBox' import MathGraphic from '../MathGraphic' import MathGraphicUI from '../containers/MathGraphicUI' import { pointMeta } from '../metadata' -import { MainRow } from 'containers/MathObjects/components' -import { MathInputRHS } from 'containers/MathObjects/containers/MathInput' +import { MainRow } from '../../../../containers/MathObjects/components' +import { MathInputRHS } from '../../../../containers/MathObjects/containers/MathInput' export const POINT = 'POINT' diff --git a/client/src/containers/MathObjects/MathGraphics/Vector/index.js b/client/src/containers/MathObjects/MathGraphics/Vector/index.js index 02323b4c..cd481967 100644 --- a/client/src/containers/MathObjects/MathGraphics/Vector/index.js +++ b/client/src/containers/MathObjects/MathGraphics/Vector/index.js @@ -1,11 +1,11 @@ // @flow import React, { PureComponent } from 'react' -import { Vector as VectorGraphic } from 'components/MathBox' +import { Vector as VectorGraphic } from '../../../../components/MathBox' import MathGraphic from '../MathGraphic' import MathGraphicUI from '../containers/MathGraphicUI' import { vectorMeta } from '../metadata' -import { MainRow } from 'containers/MathObjects/components' -import { MathInputRHS } from 'containers/MathObjects/containers/MathInput' +import { MainRow } from '../../../../containers/MathObjects/components' +import { MathInputRHS } from '../../../../containers/MathObjects/containers/MathInput' export const VECTOR = 'VECTOR' diff --git a/client/src/containers/MathObjects/MathGraphics/VectorField/index.js b/client/src/containers/MathObjects/MathGraphics/VectorField/index.js index b170c532..cfce3587 100644 --- a/client/src/containers/MathObjects/MathGraphics/VectorField/index.js +++ b/client/src/containers/MathObjects/MathGraphics/VectorField/index.js @@ -1,14 +1,14 @@ // @flow import React, { PureComponent } from 'react' -import { VectorField as VectorFieldGraphic } from 'components/MathBox' +import { VectorField as VectorFieldGraphic } from '../../../../components/MathBox' import MathGraphic from '../MathGraphic' import MathGraphicUI from '../containers/MathGraphicUI' import { vectorFieldMeta } from '../metadata' -import { MainRow } from 'containers/MathObjects/components' +import { MainRow } from '../../../../containers/MathObjects/components' import { MathInputRHS, StaticMathStyled -} from 'containers/MathObjects/containers/MathInput' +} from '../../../../containers/MathObjects/containers/MathInput' export const VECTOR_FIELD = 'VECTOR_FIELD' diff --git a/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/EvaluatedStatusSymbol.js b/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/EvaluatedStatusSymbol.js index 67b08558..1b1ec0df 100644 --- a/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/EvaluatedStatusSymbol.js +++ b/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/EvaluatedStatusSymbol.js @@ -1,13 +1,13 @@ // @flow import * as React from 'react' import StatusSymbol from './StatusSymbol' -import type { Scope, Parser } from 'utils/mathParsing' -import { MathScopeConsumer } from 'containers/MathScopeContext' +import type { Scope, Parser } from '../../../../../../utils/mathParsing' +import { MathScopeConsumer } from '../../../../../../containers/MathScopeContext' import typeof { toggleProperty, setProperty -} from 'containers/MathObjects/actions' -import { parser } from 'constants/parsing' +} from '../../../../../../containers/MathObjects/actions' +import { parser } from '../../../../../../constants/parsing' export type DefaultProps = {| parser: Parser diff --git a/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/components/ColorPicker.js b/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/components/ColorPicker.js index 7f537b61..48dc9a19 100644 --- a/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/components/ColorPicker.js +++ b/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/components/ColorPicker.js @@ -2,7 +2,7 @@ import React from 'react' import styled from 'styled-components' import ColorSquare from './ColorSquare' -import { colors } from 'constants/colors' +import { colors } from '../../../../../../../../constants/colors' const Container = styled.div` display: grid; diff --git a/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/components/ColorSquare.js b/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/components/ColorSquare.js index d6adc667..26315408 100644 --- a/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/components/ColorSquare.js +++ b/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/components/ColorSquare.js @@ -1,7 +1,7 @@ // @flow import React from 'react' import styled from 'styled-components' -import { colorMaps } from 'constants/colors' +import { colorMaps } from '../../../../../../../../constants/colors' const Color = styled.div` ${props => colorMaps[props.color] diff --git a/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/index.js b/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/index.js index 3f4fd72e..cc27f0a8 100644 --- a/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/index.js +++ b/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/components/StatusSymbol/index.js @@ -1,9 +1,9 @@ // @flow import * as React from 'react' import styled from 'styled-components' -import LongPressable from 'components/LongPressable' +import LongPressable from '../../../../../../../components/LongPressable' import ColorPickerPopover from './components/ColorPickerPopover' -import { colorMaps } from 'constants/colors' +import { colorMaps } from '../../../../../../../constants/colors' const Circle = styled.div` width: 30px; diff --git a/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/index.js b/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/index.js index 6601226a..d106d7cb 100644 --- a/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/index.js +++ b/client/src/containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol/index.js @@ -1,11 +1,11 @@ // @flow -import type { OptionalizeSome } from 'utils/flow' +import type { OptionalizeSome } from '../../../../../utils/flow' import EvaluatedStatusSymbol from './components/EvaluatedStatusSymbol' import type { Props, OwnProps, DefaultProps } from './components/EvaluatedStatusSymbol' import { toggleProperty, setProperty -} from 'containers/MathObjects/actions' +} from '../../../../../containers/MathObjects/actions' // For connecting import { connect } from 'react-redux' diff --git a/client/src/containers/MathObjects/MathGraphics/containers/MathGraphicUI/components/MathGraphicUI.js b/client/src/containers/MathObjects/MathGraphics/containers/MathGraphicUI/components/MathGraphicUI.js index e1a6e475..60ee1195 100644 --- a/client/src/containers/MathObjects/MathGraphics/containers/MathGraphicUI/components/MathGraphicUI.js +++ b/client/src/containers/MathObjects/MathGraphics/containers/MathGraphicUI/components/MathGraphicUI.js @@ -1,11 +1,11 @@ // @flow import * as React from 'react' -import MathObjectUI from 'containers/MathObjects/MathObjectUI' -import { MainRow } from 'containers/MathObjects/components' -import EvaluatedStatusSymbol from 'containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol' -import Settings from 'containers/MathObjects/containers/Settings' -import { capitalize } from 'utils/helpers' -import type { MetaData } from 'containers/MathObjects/MathGraphics/types' +import MathObjectUI from '../../../../../../containers/MathObjects/MathObjectUI' +import { MainRow } from '../../../../../../containers/MathObjects/components' +import EvaluatedStatusSymbol from '../../../../../../containers/MathObjects/MathGraphics/containers/EvaluatedStatusSymbol' +import Settings from '../../../../../../containers/MathObjects/containers/Settings' +import { capitalize } from '../../../../../../utils/helpers' +import type { MetaData } from '../../../../../../containers/MathObjects/MathGraphics/types' import styled from 'styled-components' type Props = { diff --git a/client/src/containers/MathObjects/MathGraphics/containers/MathGraphicUI/index.js b/client/src/containers/MathObjects/MathGraphics/containers/MathGraphicUI/index.js index 43359cef..fa4752e6 100644 --- a/client/src/containers/MathObjects/MathGraphics/containers/MathGraphicUI/index.js +++ b/client/src/containers/MathObjects/MathGraphics/containers/MathGraphicUI/index.js @@ -3,7 +3,7 @@ import { connect } from 'react-redux' import { toggleProperty, setProperty -} from 'containers/MathObjects/actions' +} from '../../../../../containers/MathObjects/actions' const mapStateToProps = ( { activeObject, mathGraphics, parseErrors, evalErrors }, ownProps) => { const { id } = ownProps diff --git a/client/src/containers/MathObjects/MathSymbols/BooleanVariable/components/BooleanVariable.js b/client/src/containers/MathObjects/MathSymbols/BooleanVariable/components/BooleanVariable.js index 16cef9a4..662f58a4 100644 --- a/client/src/containers/MathObjects/MathSymbols/BooleanVariable/components/BooleanVariable.js +++ b/client/src/containers/MathObjects/MathSymbols/BooleanVariable/components/BooleanVariable.js @@ -1,13 +1,13 @@ // @flow import React, { PureComponent } from 'react' import { Switch } from 'antd' -import MathObjectUI from 'containers/MathObjects/MathObjectUI' -import { MainRow, Cell, Label } from 'containers/MathObjects/components' +import MathObjectUI from '../../../../../containers/MathObjects/MathObjectUI' +import { MainRow, Cell, Label } from '../../../../../containers/MathObjects/components' import { MathInputLHS -} from 'containers/MathObjects/containers/MathInput' +} from '../../../../../containers/MathObjects/containers/MathInput' import { BOOLEAN_VARIABLE } from '../metadata' -import typeof { setProperty } from 'containers/MathObjects/actions' +import typeof { setProperty } from '../../../../../containers/MathObjects/actions' type Props = { id: string, diff --git a/client/src/containers/MathObjects/MathSymbols/BooleanVariable/index.js b/client/src/containers/MathObjects/MathSymbols/BooleanVariable/index.js index a76fd6a0..9eb72d1e 100644 --- a/client/src/containers/MathObjects/MathSymbols/BooleanVariable/index.js +++ b/client/src/containers/MathObjects/MathSymbols/BooleanVariable/index.js @@ -1,7 +1,7 @@ import { BOOLEAN_VARIABLE, defaultSettings } from './metadata' import { connect } from 'react-redux' -import { MathSymbol } from 'containers/MathObjects/MathObject' -import { setProperty } from 'containers/MathObjects/actions' +import { MathSymbol } from '../../../../containers/MathObjects/MathObject' +import { setProperty } from '../../../../containers/MathObjects/actions' import BooleanVariable from './components/BooleanVariable' const mapStateToProps = ( { mathSymbols }, ownProps) => ( { diff --git a/client/src/containers/MathObjects/MathSymbols/Variable/components/Variable.js b/client/src/containers/MathObjects/MathSymbols/Variable/components/Variable.js index 436e16d2..c63e7a9a 100644 --- a/client/src/containers/MathObjects/MathSymbols/Variable/components/Variable.js +++ b/client/src/containers/MathObjects/MathSymbols/Variable/components/Variable.js @@ -1,13 +1,13 @@ import React, { PureComponent } from 'react' import PropTypes from 'prop-types' -import MathObjectUI from 'containers/MathObjects/MathObjectUI' -import { MainRow } from 'containers/MathObjects/components' +import MathObjectUI from '../../../../../containers/MathObjects/MathObjectUI' +import { MainRow } from '../../../../../containers/MathObjects/components' import { MathInputLHS, MathInputRHS, MathTextOutput, StaticMathStyled -} from 'containers/MathObjects/containers/MathInput' +} from '../../../../../containers/MathObjects/containers/MathInput' import { VARIABLE } from '../metadata' const justifyRight = { diff --git a/client/src/containers/MathObjects/MathSymbols/Variable/index.js b/client/src/containers/MathObjects/MathSymbols/Variable/index.js index 501565e0..8e40cee3 100644 --- a/client/src/containers/MathObjects/MathSymbols/Variable/index.js +++ b/client/src/containers/MathObjects/MathSymbols/Variable/index.js @@ -1,5 +1,5 @@ // @flow -import { MathSymbol } from 'containers/MathObjects/MathObject' +import { MathSymbol } from '../../../../containers/MathObjects/MathObject' import Variable from './components/Variable' import { VARIABLE, defaultSettings } from './metadata' diff --git a/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/EvaluatedSlider.js b/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/EvaluatedSlider.js index 28773a6c..58080e89 100644 --- a/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/EvaluatedSlider.js +++ b/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/EvaluatedSlider.js @@ -1,12 +1,12 @@ // @flow import React, { PureComponent } from 'react' import { Slider } from 'antd' -import type { Scope, Parser } from 'utils/mathParsing' +import type { Scope, Parser } from '../../../../../utils/mathParsing' import { evalData, handleEvalErrors -} from 'services/evalData' -import typeof { setError as SetError } from 'services/errors' +} from '../../../../../services/evalData' +import typeof { setError as SetError } from '../../../../../services/errors' type Props = { parentId: string, diff --git a/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/SliderValueDisplay.js b/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/SliderValueDisplay.js index 7db1e13a..eba1c049 100644 --- a/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/SliderValueDisplay.js +++ b/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/SliderValueDisplay.js @@ -4,7 +4,7 @@ import { MathInputLHS, MathInputRHS, StaticMathStyled -} from 'containers/MathObjects/containers/MathInput' +} from '../../../../../containers/MathObjects/containers/MathInput' SliderValueDisplay.propTypes = { parentId: PropTypes.string.isRequired, diff --git a/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/VariableSlider.js b/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/VariableSlider.js index 473d7f2c..934d2ad2 100644 --- a/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/VariableSlider.js +++ b/client/src/containers/MathObjects/MathSymbols/VariableSlider/components/VariableSlider.js @@ -1,21 +1,21 @@ // @flow -import type { Scope } from 'utils/mathParsing/MathExpression' -import typeof { setError as SetError } from 'services/errors' +import type { Scope } from '../../../../../utils/mathParsing/MathExpression' +import typeof { setError as SetError } from '../../../../../services/errors' import React, { PureComponent } from 'react' -import MathObjectUI from 'containers/MathObjects/MathObjectUI' +import MathObjectUI from '../../../../../containers/MathObjects/MathObjectUI' import { MainRow -} from 'containers/MathObjects/components' +} from '../../../../../containers/MathObjects/components' import { VARIABLE_SLIDER } from '../metadata' import SliderValueDisplay from './SliderValueDisplay' import EvaluatedSlider from './EvaluatedSlider' import AnimationControls from './AnimationControls' -import { MathInputRHS } from 'containers/MathObjects/containers/MathInput' -import { MathScopeConsumer } from 'containers/MathScopeContext' -import { parser } from 'constants/parsing' +import { MathInputRHS } from '../../../../../containers/MathObjects/containers/MathInput' +import { MathScopeConsumer } from '../../../../../containers/MathScopeContext' +import { parser } from '../../../../../constants/parsing' import typeof { setProperty as SetProperty -} from 'containers/MathObjects/actions' +} from '../../../../../containers/MathObjects/actions' const limitStyle = { flex: 0 } diff --git a/client/src/containers/MathObjects/MathSymbols/VariableSlider/index.js b/client/src/containers/MathObjects/MathSymbols/VariableSlider/index.js index ff46d1c5..4bb20823 100644 --- a/client/src/containers/MathObjects/MathSymbols/VariableSlider/index.js +++ b/client/src/containers/MathObjects/MathSymbols/VariableSlider/index.js @@ -1,11 +1,11 @@ // @flow import type { Dispatch } from 'redux' -import { MathSymbol } from 'containers/MathObjects/MathObject' +import { MathSymbol } from '../../../../containers/MathObjects/MathObject' import VariableSlider from './components/VariableSlider' import { connect } from 'react-redux' -import { setPropertyAndError, setProperty } from 'containers/MathObjects/actions' +import { setPropertyAndError, setProperty } from '../../../../containers/MathObjects/actions' import { setSliderValue } from './actions' -import { ParseErrorData, setError } from 'services/errors' +import { ParseErrorData, setError } from '../../../../services/errors' import { defaultSettings, VARIABLE_SLIDER } from './metadata' const mapStateToProps = ( { mathSymbols, sliderValues, evalErrors }, ownProps) => { diff --git a/client/src/containers/MathObjects/MathSymbols/VariableSlider/reducer.js b/client/src/containers/MathObjects/MathSymbols/VariableSlider/reducer.js index 45267bd2..9538774d 100644 --- a/client/src/containers/MathObjects/MathSymbols/VariableSlider/reducer.js +++ b/client/src/containers/MathObjects/MathSymbols/VariableSlider/reducer.js @@ -1,5 +1,5 @@ import { VARIABLE_SLIDER, defaultValue } from './metadata' -import { CREATE_MATH_OBJECT } from 'containers/MathObjects/actions' +import { CREATE_MATH_OBJECT } from '../../../../containers/MathObjects/actions' import { SET_SLIDER_VALUE } from './actions' const initialState = {} diff --git a/client/src/containers/MathObjects/actions.js b/client/src/containers/MathObjects/actions.js index 080b34f3..55a8dfaf 100644 --- a/client/src/containers/MathObjects/actions.js +++ b/client/src/containers/MathObjects/actions.js @@ -1,7 +1,7 @@ // @flow import { batchActions } from 'redux-batched-actions' -import { setError } from 'services/errors' -import type { ErrorData } from 'services/errors/ErrorData' +import { setError } from '../../services/errors' +import type { ErrorData } from '../../services/errors/ErrorData' export const TOGGLE_PROPERTY = 'TOGGLE_PROPERTY' export const SET_PROPERTY = 'SET_PROPERTY' diff --git a/client/src/containers/MathObjects/components/DeleteButton.js b/client/src/containers/MathObjects/components/DeleteButton.js index 2a8c3471..db82859f 100644 --- a/client/src/containers/MathObjects/components/DeleteButton.js +++ b/client/src/containers/MathObjects/components/DeleteButton.js @@ -1,6 +1,6 @@ import React from 'react' import styled from 'styled-components' -import SubtleButton from 'components/SubtleButton' +import SubtleButton from '../../../components/SubtleButton' import { Icon } from 'antd' const StyledDeleteButton = styled(SubtleButton)` diff --git a/client/src/containers/MathObjects/components/MathObjectUI.js b/client/src/containers/MathObjects/components/MathObjectUI.js index dc0e6424..d378359d 100644 --- a/client/src/containers/MathObjects/components/MathObjectUI.js +++ b/client/src/containers/MathObjects/components/MathObjectUI.js @@ -1,9 +1,9 @@ import React, { Fragment, PureComponent, createRef } from 'react' import PropTypes from 'prop-types' import styled, { css } from 'styled-components' -import EditableDescription from 'components/EditableDescription' +import EditableDescription from '../../../components/EditableDescription' import DeleteButton from './DeleteButton' -import { theme } from 'constants/theme' +import { theme } from '../../../constants/theme' const OuterContainer = styled.span` display: inline-flex; diff --git a/client/src/containers/MathObjects/containers/MathInput/MathInputLHS.js b/client/src/containers/MathObjects/containers/MathInput/MathInputLHS.js index ba8e4304..b3ff8048 100644 --- a/client/src/containers/MathObjects/containers/MathInput/MathInputLHS.js +++ b/client/src/containers/MathObjects/containers/MathInput/MathInputLHS.js @@ -2,20 +2,20 @@ import React, { PureComponent } from 'react' import MathInput from './components/MathInput' import { connect } from 'react-redux' -import { setPropertyAndError } from 'containers/MathObjects/actions' -import { parser } from 'constants/parsing' +import { setPropertyAndError } from '../../../../containers/MathObjects/actions' +import { parser } from '../../../../constants/parsing' import { isAssignmentLHS, isAssignment, isValidName } from './components/validators' -import { setError } from 'services/errors' -import { getErrorMsg } from 'services/errors/selectors' +import { setError } from '../../../../services/errors' +import { getErrorMsg } from '../../../../services/errors/selectors' import { getValidateNameAgainst, getMathObjectProp } from './selectors' -import type { ErrorData } from 'services/errors' +import type { ErrorData } from '../../../../services/errors' import type { OtherProps } from './components/MathInput' -import type { Optionalize, OptionalizeSome } from 'utils/flow' +import type { Optionalize, OptionalizeSome } from '../../../../utils/flow' /** * @module MathInputLHS defines a connected version of MathInput for left-hand- diff --git a/client/src/containers/MathObjects/containers/MathInput/MathInputRHS.js b/client/src/containers/MathObjects/containers/MathInput/MathInputRHS.js index db275f00..5029851b 100644 --- a/client/src/containers/MathObjects/containers/MathInput/MathInputRHS.js +++ b/client/src/containers/MathObjects/containers/MathInput/MathInputRHS.js @@ -2,12 +2,12 @@ import * as React from 'react' import MathInput from './components/MathInput' import type { OtherProps } from './components/MathInput' -import type { Optionalize, OptionalizeSome } from 'utils/flow' +import type { Optionalize, OptionalizeSome } from '../../../../utils/flow' import { connect } from 'react-redux' -import { setPropertyAndError } from 'containers/MathObjects/actions' -import { setError } from 'services/errors' -import type { ErrorData } from 'services/errors' -import { getErrorMsg } from 'services/errors/selectors' +import { setPropertyAndError } from '../../../../containers/MathObjects/actions' +import { setError } from '../../../../services/errors' +import type { ErrorData } from '../../../../services/errors' +import { getErrorMsg } from '../../../../services/errors/selectors' import { getMathObjectProp } from './selectors' /** diff --git a/client/src/containers/MathObjects/containers/MathInput/MathTextOutput.js b/client/src/containers/MathObjects/containers/MathInput/MathTextOutput.js index a3f9145b..93ff179a 100644 --- a/client/src/containers/MathObjects/containers/MathInput/MathTextOutput.js +++ b/client/src/containers/MathObjects/containers/MathInput/MathTextOutput.js @@ -2,10 +2,10 @@ import * as React from 'react' import { connect } from 'react-redux' import { getMathObjectProp } from './selectors' import { StaticMathStyled } from './' -import { MathScopeConsumer } from 'containers/MathScopeContext' -import { parser } from 'constants/parsing' -import { evalData } from 'services/evalData' -import math from 'utils/mathjs' +import { MathScopeConsumer } from '../../../../containers/MathScopeContext' +import { parser } from '../../../../constants/parsing' +import { evalData } from '../../../../services/evalData' +import math from '../../../../utils/mathjs' /** * @module MathTextOutput defines a connected version of StaticMath for dynamic diff --git a/client/src/containers/MathObjects/containers/MathInput/components/MathInput.js b/client/src/containers/MathObjects/containers/MathInput/components/MathInput.js index b205af61..605c749e 100644 --- a/client/src/containers/MathObjects/containers/MathInput/components/MathInput.js +++ b/client/src/containers/MathObjects/containers/MathInput/components/MathInput.js @@ -1,14 +1,14 @@ // @flow import * as React from 'react' -import { parser } from 'constants/parsing' -import type { Parser } from 'utils/mathParsing' -import type { MQMathField } from 'components/MathQuill' +import { parser } from '../../../../../constants/parsing' +import type { Parser } from '../../../../../utils/mathParsing' +import type { MQMathField } from '../../../../../components/MathQuill' import { MathQuillStyled } from './MathQuillStyled' import { isAssignmentRHS } from './validators' import styled from 'styled-components' -import { timeout } from 'utils/functions' +import { timeout } from '../../../../../utils/functions' import { Tooltip } from 'antd' -import { ParseErrorData } from 'services/errors' +import { ParseErrorData } from '../../../../../services/errors' const MathInputContainer = styled.div` flex:1; diff --git a/client/src/containers/MathObjects/containers/MathInput/components/MathInput.test.js b/client/src/containers/MathObjects/containers/MathInput/components/MathInput.test.js index d1f41318..9932b6f4 100644 --- a/client/src/containers/MathObjects/containers/MathInput/components/MathInput.test.js +++ b/client/src/containers/MathObjects/containers/MathInput/components/MathInput.test.js @@ -3,8 +3,8 @@ import MathInput from './MathInput' import Enzyme, { shallow } from 'enzyme' import Adapter from 'enzyme-adapter-react-16' import { Tooltip } from 'antd' -import { timeout } from 'utils/functions' -import { ParseErrorData } from 'services/errors' +import { timeout } from '../../../../../utils/functions' +import { ParseErrorData } from '../../../../../services/errors' Enzyme.configure( { adapter: new Adapter() } ) diff --git a/client/src/containers/MathObjects/containers/MathInput/components/MathQuillStyled.js b/client/src/containers/MathObjects/containers/MathInput/components/MathQuillStyled.js index 51e8a697..135a7ba7 100644 --- a/client/src/containers/MathObjects/containers/MathInput/components/MathQuillStyled.js +++ b/client/src/containers/MathObjects/containers/MathInput/components/MathQuillStyled.js @@ -1,5 +1,5 @@ // @flow -import MathQuill, { StaticMath } from 'components/MathQuill' +import MathQuill, { StaticMath } from '../../../../../components/MathQuill' import styled, { css } from 'styled-components' const borderStyling = css` diff --git a/client/src/containers/MathObjects/containers/MathInput/components/validators.js b/client/src/containers/MathObjects/containers/MathInput/components/validators.js index 7bc5e066..2dfed876 100644 --- a/client/src/containers/MathObjects/containers/MathInput/components/validators.js +++ b/client/src/containers/MathObjects/containers/MathInput/components/validators.js @@ -1,4 +1,4 @@ -import { ParseErrorData } from 'services/errors' +import { ParseErrorData } from '../../../../../services/errors' const charRegexp = /\s\(char.*\)/g export function isAssignmentRHS(parser, latex) { diff --git a/client/src/containers/MathObjects/containers/MathInput/components/validators.test.js b/client/src/containers/MathObjects/containers/MathInput/components/validators.test.js index 4fe9a0ce..031ee50c 100644 --- a/client/src/containers/MathObjects/containers/MathInput/components/validators.test.js +++ b/client/src/containers/MathObjects/containers/MathInput/components/validators.test.js @@ -4,8 +4,8 @@ import { isValidName, isReal } from './validators' -import { Parser } from 'utils/mathParsing' -import { ParseErrorData } from 'services/errors' +import { Parser } from '../../../../../utils/mathParsing' +import { ParseErrorData } from '../../../../../services/errors' describe('isAssignmentRHS', () => { it('accepts valid right-hand-side of assignments', () => { diff --git a/client/src/containers/MathObjects/containers/MathInput/selectors.test.js b/client/src/containers/MathObjects/containers/MathInput/selectors.test.js index 4655ee70..86a7b575 100644 --- a/client/src/containers/MathObjects/containers/MathInput/selectors.test.js +++ b/client/src/containers/MathObjects/containers/MathInput/selectors.test.js @@ -2,7 +2,7 @@ import { calculateUsedNames, getUsedNames } from './selectors' -import { Parser } from 'utils/mathParsing' +import { Parser } from '../../../../utils/mathParsing' describe('calculateUsedNames', () => { diff --git a/client/src/containers/MathObjects/containers/Settings/components/Settings.js b/client/src/containers/MathObjects/containers/Settings/components/Settings.js index 9eea9943..8e7b2886 100644 --- a/client/src/containers/MathObjects/containers/Settings/components/Settings.js +++ b/client/src/containers/MathObjects/containers/Settings/components/Settings.js @@ -5,7 +5,7 @@ import SettingsContent from './SettingsContent' import type { FormRow } from './SettingsContent' import typeof { setProperty -} from 'containers/MathObjects/actions' +} from '../../../../../containers/MathObjects/actions' // MathObjectData is heavily inexact; missing many props that vary by type type MathObjectData = { diff --git a/client/src/containers/MathObjects/containers/Settings/components/SettingsButton.js b/client/src/containers/MathObjects/containers/Settings/components/SettingsButton.js index b24a30cc..c00a22fd 100644 --- a/client/src/containers/MathObjects/containers/Settings/components/SettingsButton.js +++ b/client/src/containers/MathObjects/containers/Settings/components/SettingsButton.js @@ -1,6 +1,6 @@ import React from 'react' import styled from 'styled-components' -import SubtleButton from 'components/SubtleButton' +import SubtleButton from '../../../../../components/SubtleButton' import { Icon } from 'antd' const StyledSettingsButton = styled(SubtleButton)` diff --git a/client/src/containers/MathObjects/containers/Settings/components/SettingsContainer.js b/client/src/containers/MathObjects/containers/Settings/components/SettingsContainer.js index f6a74918..8906e7bd 100644 --- a/client/src/containers/MathObjects/containers/Settings/components/SettingsContainer.js +++ b/client/src/containers/MathObjects/containers/Settings/components/SettingsContainer.js @@ -3,7 +3,7 @@ import SettingsButton from './SettingsButton' import { Popover, Icon } from 'antd' import PropTypes from 'prop-types' import styled from 'styled-components' -import SubtleButton from 'components/SubtleButton' +import SubtleButton from '../../../../../components/SubtleButton' const TitleBar = styled.div` display: flex; justify-content: space-between; diff --git a/client/src/containers/MathObjects/containers/Settings/components/SettingsContent.js b/client/src/containers/MathObjects/containers/Settings/components/SettingsContent.js index 3f019d0f..3ec8a8e5 100644 --- a/client/src/containers/MathObjects/containers/Settings/components/SettingsContent.js +++ b/client/src/containers/MathObjects/containers/Settings/components/SettingsContent.js @@ -1,9 +1,9 @@ // @flow import * as React from 'react' import styled from 'styled-components' -import { MathInputRHS } from 'containers/MathObjects/containers/MathInput' +import { MathInputRHS } from '../../../../../containers/MathObjects/containers/MathInput' import { Input, Switch } from 'antd' -import type { InputType } from 'containers/MathObjects/MathGraphics/types' +import type { InputType } from '../../../../../containers/MathObjects/MathGraphics/types' export type FormRow = { inputType: InputType, diff --git a/client/src/containers/MathObjects/containers/Settings/index.js b/client/src/containers/MathObjects/containers/Settings/index.js index 5510d97b..7ff99fda 100644 --- a/client/src/containers/MathObjects/containers/Settings/index.js +++ b/client/src/containers/MathObjects/containers/Settings/index.js @@ -4,7 +4,7 @@ import Settings from './components/Settings' import type { OwnProps, Props } from './components/Settings' import { setProperty -} from 'containers/MathObjects/actions' +} from '../../../../containers/MathObjects/actions' const mapStateToProps = ( { mathGraphics, mathSymbols }, ownProps) => { const { parentId: id } = ownProps diff --git a/client/src/containers/MathObjects/containers/ToggleSwitch/index.js b/client/src/containers/MathObjects/containers/ToggleSwitch/index.js index 6b375b74..cd53ce2a 100644 --- a/client/src/containers/MathObjects/containers/ToggleSwitch/index.js +++ b/client/src/containers/MathObjects/containers/ToggleSwitch/index.js @@ -2,8 +2,8 @@ import * as React from 'react' import { Switch } from 'antd' import { connect } from 'react-redux' -import { setProperty } from 'containers/MathObjects/actions' -import type { ExtractReturn } from 'utils/flow' +import { setProperty } from '../../../../containers/MathObjects/actions' +import type { ExtractReturn } from '../../../../utils/flow' type SetProperty = typeof setProperty // SwitchProps is missing some props diff --git a/client/src/containers/MathScopeContext/components/MathScopeContext.js b/client/src/containers/MathScopeContext/components/MathScopeContext.js index d862b10f..2b84e80f 100644 --- a/client/src/containers/MathScopeContext/components/MathScopeContext.js +++ b/client/src/containers/MathScopeContext/components/MathScopeContext.js @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react' import PropTypes from 'prop-types' -import { ScopeEvaluator, Parser } from 'utils/mathParsing' -import { EvalErrorData } from 'services/errors' +import { ScopeEvaluator, Parser } from '../../../utils/mathParsing' +import { EvalErrorData } from '../../../services/errors' const MathScopeContext = React.createContext() diff --git a/client/src/containers/MathScopeContext/index.js b/client/src/containers/MathScopeContext/index.js index dbcf6aa6..fbab5aa7 100644 --- a/client/src/containers/MathScopeContext/index.js +++ b/client/src/containers/MathScopeContext/index.js @@ -1,7 +1,7 @@ import { MathScopeProvider } from './components/MathScopeContext' import { connect } from 'react-redux' import { getParseableSymbols } from './selectors' -import { setError } from 'services/errors' +import { setError } from '../../services/errors' export { MathScopeConsumer } from './components/MathScopeContext' // TODO: This updates when it does not need to because of parseErrors diff --git a/client/src/containers/MathScopeContext/selectors.js b/client/src/containers/MathScopeContext/selectors.js index c1e9717e..2c468c95 100644 --- a/client/src/containers/MathScopeContext/selectors.js +++ b/client/src/containers/MathScopeContext/selectors.js @@ -1,4 +1,4 @@ -import VariableSlider from 'containers/MathObjects/MathSymbols/VariableSlider' +import VariableSlider from '../../containers/MathObjects/MathSymbols/VariableSlider' import memoizeOne from 'memoize-one' function _getParseableSymbols(parser, mathSymbols, sliderValues) { diff --git a/client/src/containers/SortableTree/components/MathTree.js b/client/src/containers/SortableTree/components/MathTree.js index 0200dddc..2773ae01 100644 --- a/client/src/containers/SortableTree/components/MathTree.js +++ b/client/src/containers/SortableTree/components/MathTree.js @@ -1,7 +1,7 @@ import React from 'react' import { DragDropContext } from 'react-beautiful-dnd' -import SortableList from 'components/SortableList' -import Folder from 'containers/MathObjects/Folder' +import SortableList from '../../../components/SortableList' +import Folder from '../../../containers/MathObjects/Folder' import styled from 'styled-components' import PropTypes from 'prop-types' diff --git a/client/src/containers/SortableTree/reducer.js b/client/src/containers/SortableTree/reducer.js index a2a2da3b..0bb3edda 100644 --- a/client/src/containers/SortableTree/reducer.js +++ b/client/src/containers/SortableTree/reducer.js @@ -4,7 +4,7 @@ import { } from './actions' import { CREATE_MATH_OBJECT, DELETE_MATH_OBJECT } from '../MathObjects/actions' -import { Folder } from 'containers/MathObjects' +import { Folder } from '../../containers/MathObjects' import update from 'immutability-helper' export function reOrder(list, sourceIndex, destinationIndex) { diff --git a/client/src/services/LoopManager.js b/client/src/services/LoopManager.js index 6d56bd65..2d705fd1 100644 --- a/client/src/services/LoopManager.js +++ b/client/src/services/LoopManager.js @@ -1,5 +1,5 @@ // @flow -import { timeout } from 'utils/functions' +import { timeout } from '../utils/functions' type LoopAPI = { running: boolean, diff --git a/client/src/services/errors/reducer.js b/client/src/services/errors/reducer.js index 37c235bf..af104e11 100644 --- a/client/src/services/errors/reducer.js +++ b/client/src/services/errors/reducer.js @@ -1,5 +1,5 @@ import update from 'immutability-helper' -import { FOLDER } from 'containers/MathObjects' +import { FOLDER } from '../../containers/MathObjects' import { PARSE_ERROR, EVAL_ERROR, @@ -9,7 +9,7 @@ import { SET_ERROR, UNSET_ERROR } from './actions' import { CREATE_MATH_OBJECT, DELETE_MATH_OBJECT -} from 'containers/MathObjects/actions' +} from '../../containers/MathObjects/actions' const initialState = {} diff --git a/client/src/services/evalData.js b/client/src/services/evalData.js index 70cf70db..7056fa81 100644 --- a/client/src/services/evalData.js +++ b/client/src/services/evalData.js @@ -1,6 +1,6 @@ // @flow -import { EvalErrorData, setError } from 'services/errors' -import type { Scope, Parser, Symbols } from 'utils/mathParsing' +import { EvalErrorData, setError } from '../services/errors' +import type { Scope, Parser, Symbols } from '../utils/mathParsing' type SetError = typeof setError // TODO test this diff --git a/client/src/services/getCameraData.js b/client/src/services/getCameraData.js index 822f229b..5437ea17 100644 --- a/client/src/services/getCameraData.js +++ b/client/src/services/getCameraData.js @@ -1,6 +1,6 @@ // @flow -import { mathbox } from "containers/MathBoxScene/components/MathBoxScene.js"; +import { mathbox } from "../containers/MathBoxScene/components/MathBoxScene.js"; export default function () { const position: Array = mathbox.three.camera.position.toArray(); diff --git a/client/src/services/metadata/reducer.js b/client/src/services/metadata/reducer.js index 398120da..b9834552 100644 --- a/client/src/services/metadata/reducer.js +++ b/client/src/services/metadata/reducer.js @@ -3,7 +3,7 @@ import { SET_CREATION_DATE, typeof setCreationDate, SET_TITLE, typeof setTitle } from './actions' -import type { ExtractReturn } from 'utils/flow' +import type { ExtractReturn } from '../../utils/flow' type State = { title: string, diff --git a/client/src/store/hydration.js b/client/src/store/hydration.js index d6a37813..c1ff6351 100644 --- a/client/src/store/hydration.js +++ b/client/src/store/hydration.js @@ -1,7 +1,7 @@ -import MathObjects, { FOLDER } from 'containers/MathObjects' -import idGenerator from 'constants/idGenerator' +import MathObjects, { FOLDER } from '../containers/MathObjects' +import idGenerator from '../constants/idGenerator' import initialState, { sortableTreeFixedPortion } from './initialState' -import { initialState as metadataInitial } from 'services/metadata/reducer' +import { initialState as metadataInitial } from '../services/metadata/reducer' function isEmpty(obj) { return Object.keys(obj).length === 0 && obj.constructor === Object diff --git a/client/src/store/mockState.js b/client/src/store/mockState.js index 3bcbe994..c321f996 100644 --- a/client/src/store/mockState.js +++ b/client/src/store/mockState.js @@ -1,8 +1,8 @@ // @flow // NOTE: This is just for tinkering and testing ... -import idGenerator from 'constants/idGenerator' +import idGenerator from '../constants/idGenerator' import store from './index' -import { createMathObject } from 'containers/MathObjects/actions' +import { createMathObject } from '../containers/MathObjects/actions' import { FOLDER, VARIABLE, @@ -14,7 +14,7 @@ import { VECTOR, PARAMETRIC_CURVE, IMPLICIT_SURFACE -} from 'containers/MathObjects' +} from '../containers/MathObjects' // folders 'axes' and 'mainFolder' already exist from initialState store.dispatch( diff --git a/client/src/store/reducer.js b/client/src/store/reducer.js index cf968fa3..cec55a04 100644 --- a/client/src/store/reducer.js +++ b/client/src/store/reducer.js @@ -1,24 +1,24 @@ import cloneDeep from 'clone-deep' import { combineReducers } from 'redux' -import drawers from 'containers/Drawer/reducer' -import tabs from 'containers/ControlledTabs/reducer' -import sortableTree from 'containers/SortableTree/reducer' -import sliderValues from 'containers/MathObjects/MathSymbols/VariableSlider/reducer' -import activeObject from 'containers/MathObjects/services/activeObject/reducer' -import metadata from 'services/metadata/reducer' +import drawers from '../containers/Drawer/reducer' +import tabs from '../containers/ControlledTabs/reducer' +import sortableTree from '../containers/SortableTree/reducer' +import sliderValues from '../containers/MathObjects/MathSymbols/VariableSlider/reducer' +import activeObject from '../containers/MathObjects/services/activeObject/reducer' +import metadata from '../services/metadata/reducer' import { folders, mathGraphics, mathSymbols -} from 'containers/MathObjects/reducer' +} from '../containers/MathObjects/reducer' import { LOAD_STATE } from './actions' -import lastSavedState from 'services/lastSavedState/reducer' +import lastSavedState from '../services/lastSavedState/reducer' import { parseErrors, evalErrors, renderErrors -} from 'services/errors/reducer' +} from '../services/errors/reducer' const combinedReducer = combineReducers( { metadata, diff --git a/client/src/utils/mathParsing/MathExpression.js b/client/src/utils/mathParsing/MathExpression.js index 32b8873f..97bf21cf 100644 --- a/client/src/utils/mathParsing/MathExpression.js +++ b/client/src/utils/mathParsing/MathExpression.js @@ -1,6 +1,6 @@ // @flow -import math from 'utils/mathjs' -import type { Node } from 'utils/mathjs/types' +import math from '../../utils/mathjs' +import type { Node } from '../../utils/mathjs/types' import memoizeOne from 'memoize-one' export type PostProcessor = (Node) => void diff --git a/client/src/utils/mathParsing/Parser.js b/client/src/utils/mathParsing/Parser.js index 838c1c1d..4f6a5dff 100644 --- a/client/src/utils/mathParsing/Parser.js +++ b/client/src/utils/mathParsing/Parser.js @@ -2,7 +2,7 @@ import MathExpression from './MathExpression' import { preprocessHOFs, preprocessMathQuill } from './preprocessors' import { reassignOperators } from './postprocessors' -import { setMergeInto } from 'utils/sets' +import { setMergeInto } from '../../utils/sets' import type { PreProcessor, PostProcessor diff --git a/client/src/utils/mathParsing/mathscope.js b/client/src/utils/mathParsing/mathscope.js index 28593a0f..748598f3 100644 --- a/client/src/utils/mathParsing/mathscope.js +++ b/client/src/utils/mathParsing/mathscope.js @@ -48,8 +48,8 @@ import Graph from 'tarjan-graph' import diff from 'shallow-diff' import { setMergeInto -} from 'utils/sets' -import math from 'utils/mathjs' +} from '../../utils/sets' +import math from '../../utils/mathjs' import type Parser from './Parser' import type { Scope } from './MathExpression' diff --git a/client/src/utils/mathParsing/mathscope.test.js b/client/src/utils/mathParsing/mathscope.test.js index 0b2b1931..c8e40afc 100644 --- a/client/src/utils/mathParsing/mathscope.test.js +++ b/client/src/utils/mathParsing/mathscope.test.js @@ -8,7 +8,7 @@ import { ScopeEvaluator } from './mathscope' -import { toNearlyEqual } from 'utils/testing/matchers' +import { toNearlyEqual } from '../utils/testing/matchers' import Parser from './Parser' import diff from 'shallow-diff' diff --git a/client/src/utils/mathParsing/postprocessors/reassignOperators.js b/client/src/utils/mathParsing/postprocessors/reassignOperators.js index 8787010e..f182adf0 100644 --- a/client/src/utils/mathParsing/postprocessors/reassignOperators.js +++ b/client/src/utils/mathParsing/postprocessors/reassignOperators.js @@ -1,6 +1,6 @@ // @flow -import math from 'utils/mathjs' -import type { Node } from 'utils/mathjs/types' +import math from '../../../utils/mathjs' +import type { Node } from '../../../utils/mathjs/types' /** * Returns a node hander to be used as a mathjs's ExpressionTree.traverse callback diff --git a/client/src/utils/mathjs/derivatives.test.js b/client/src/utils/mathjs/derivatives.test.js index f98cf1d1..6630b46e 100644 --- a/client/src/utils/mathjs/derivatives.test.js +++ b/client/src/utils/mathjs/derivatives.test.js @@ -1,6 +1,6 @@ import { diff, unitT, unitN, unitB, curl, div, pdiff } from './derivatives' import math from './custom' -import { toNearlyEqual } from 'utils/testing/matchers' +import { toNearlyEqual } from '../utils/testing/matchers' // For comparing approximate equality of arrays, functions, objects. // For numbers, this uses a default tolerance of 1e-4 diff --git a/client/src/views/MainView/Examples/ExamplesList.js b/client/src/views/MainView/Examples/ExamplesList.js index fee6bb01..81f05d57 100644 --- a/client/src/views/MainView/Examples/ExamplesList.js +++ b/client/src/views/MainView/Examples/ExamplesList.js @@ -15,7 +15,7 @@ export default function ExamplesList(props: Props) { data.map((example: ExampleItem, index: number) => { return (
  • - + {example.title} {example.description} diff --git a/client/src/views/MainView/Examples/index.js b/client/src/views/MainView/Examples/index.js index f5f4293a..9363176f 100644 --- a/client/src/views/MainView/Examples/index.js +++ b/client/src/views/MainView/Examples/index.js @@ -1,6 +1,6 @@ import React from 'react' -import Drawer from 'containers/Drawer' -import ControlledTabs, { TabPane } from 'containers/ControlledTabs' +import Drawer from '../../../containers/Drawer' +import ControlledTabs, { TabPane } from '../../../containers/ControlledTabs' import ExamplesList from './ExamplesList' import { neatExamples, featureDemos } from './data' diff --git a/client/src/views/MainView/Header/components/HelpButton.js b/client/src/views/MainView/Header/components/HelpButton.js index eb78aeb5..b489686b 100644 --- a/client/src/views/MainView/Header/components/HelpButton.js +++ b/client/src/views/MainView/Header/components/HelpButton.js @@ -1,7 +1,7 @@ // @flow import React from 'react' import { Icon } from 'antd' -import PopModal from 'components/PopModal' +import PopModal from '../../../../components/PopModal' import styled from 'styled-components' const ContactList = styled.ul` diff --git a/client/src/views/MainView/Header/containers/ExamplesButton/index.js b/client/src/views/MainView/Header/containers/ExamplesButton/index.js index 07e1b9d6..9e1a3a25 100644 --- a/client/src/views/MainView/Header/containers/ExamplesButton/index.js +++ b/client/src/views/MainView/Header/containers/ExamplesButton/index.js @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react' import { Icon } from 'antd' import { connect } from 'react-redux' -import { openDrawer, closeDrawer } from 'containers/Drawer/actions' +import { openDrawer, closeDrawer } from '../../../../../containers/Drawer/actions' type OwnProps = {||} type StateProps = {| diff --git a/client/src/views/MainView/Header/containers/HeaderMenu/index.js b/client/src/views/MainView/Header/containers/HeaderMenu/index.js index 8e76a25e..41d771c9 100644 --- a/client/src/views/MainView/Header/containers/HeaderMenu/index.js +++ b/client/src/views/MainView/Header/containers/HeaderMenu/index.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react' import { Dropdown, Button, Menu, Icon } from 'antd' -import theme from 'constants/theme' +import theme from '../../../../../constants/theme' import styled from 'styled-components' import withSizes from 'react-sizes' diff --git a/client/src/views/MainView/Header/containers/ShareButton/components/ShareButton.js b/client/src/views/MainView/Header/containers/ShareButton/components/ShareButton.js index a2ce899a..9dc4e20a 100644 --- a/client/src/views/MainView/Header/containers/ShareButton/components/ShareButton.js +++ b/client/src/views/MainView/Header/containers/ShareButton/components/ShareButton.js @@ -1,15 +1,15 @@ // @flow import React, { PureComponent } from "react"; import { Button, Icon, Input } from "antd"; -import PopModal from "components/PopModal"; -import { saveGraph } from "services/api"; -import { dehydrate } from "store/hydration"; +import PopModal from "../../../../../../components/PopModal"; +import { saveGraph } from "../../../../../../services/api"; +import { dehydrate } from "../../../../../../store/hydration"; import randomstring from "randomstring"; import { CopyToClipboard } from "react-copy-to-clipboard"; -import typeof { setProperty as SetProperty } from "containers/MathObjects/actions"; -import typeof { setCreationDate as SetCreationDate } from "services/metadata/actions"; -import getCameraData from "services/getCameraData"; -import { CAMERA } from "containers/MathObjects"; +import typeof { setProperty as SetProperty } from "../../../../../../containers/MathObjects/actions"; +import typeof { setCreationDate as SetCreationDate } from "../../../../../../services/metadata/actions"; +import getCameraData from "../../../../../../services/getCameraData"; +import { CAMERA } from "../../../../../../containers/MathObjects"; import styled, { keyframes } from "styled-components"; const URL_CHAR_ST = [ diff --git a/client/src/views/MainView/Header/containers/ShareButton/index.js b/client/src/views/MainView/Header/containers/ShareButton/index.js index 2312fec5..b3488bad 100644 --- a/client/src/views/MainView/Header/containers/ShareButton/index.js +++ b/client/src/views/MainView/Header/containers/ShareButton/index.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux' import ShareButton from './components/ShareButton' -import { setProperty } from 'containers/MathObjects/actions' -import { setCreationDate } from 'services/metadata/actions' +import { setProperty } from '../../../../../containers/MathObjects/actions' +import { setCreationDate } from '../../../../../services/metadata/actions' const mapStateToProps = null const mapDispatchToState = { setProperty, setCreationDate } diff --git a/client/src/views/MainView/Header/containers/TitleInput/index.js b/client/src/views/MainView/Header/containers/TitleInput/index.js index a29f0968..109f8e2b 100644 --- a/client/src/views/MainView/Header/containers/TitleInput/index.js +++ b/client/src/views/MainView/Header/containers/TitleInput/index.js @@ -1,7 +1,7 @@ // @flow import React from 'react' -import EditableDescription from 'components/EditableDescription' -import { setTitle } from 'services/metadata/actions' +import EditableDescription from '../../../../../components/EditableDescription' +import { setTitle } from '../../../../../services/metadata/actions' import { connect } from 'react-redux' import styled from 'styled-components' diff --git a/client/src/views/MainView/Header/index.js b/client/src/views/MainView/Header/index.js index 76a5d61e..4119daab 100644 --- a/client/src/views/MainView/Header/index.js +++ b/client/src/views/MainView/Header/index.js @@ -7,7 +7,7 @@ import HeaderButton from './components/HeaderButton' import TitleInput from './containers/TitleInput' import HelpButton from './components/HelpButton' import ExamplesButton from './containers/ExamplesButton' -import store from 'store/index' +import store from '../../../store/index' import HeaderMenu from './containers/HeaderMenu' import { Menu } from 'antd' const Item = Menu.Item diff --git a/client/src/views/MainView/Scene.js b/client/src/views/MainView/Scene.js index 4111effe..28037dff 100644 --- a/client/src/views/MainView/Scene.js +++ b/client/src/views/MainView/Scene.js @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react' -import MathBoxContainer from 'containers/MathBoxContainer' -import MathBoxScene from 'containers/MathBoxScene' -import { mathboxElement } from "containers/MathBoxScene/components/MathBoxScene"; +import MathBoxContainer from '../../containers/MathBoxContainer' +import MathBoxScene from '../../containers/MathBoxScene' +import { mathboxElement } from "../../containers/MathBoxScene/components/MathBoxScene"; import styled from 'styled-components' const SceneBoundary = styled.div` diff --git a/client/src/views/MainView/UserControls/components/ControlsDrawer.js b/client/src/views/MainView/UserControls/components/ControlsDrawer.js index 3619fdba..504f51aa 100644 --- a/client/src/views/MainView/UserControls/components/ControlsDrawer.js +++ b/client/src/views/MainView/UserControls/components/ControlsDrawer.js @@ -1,16 +1,16 @@ import React from 'react' -import Drawer from 'containers/Drawer' -import SortableTree from 'containers/SortableTree' -import ControllerHeader from 'containers/ControllerHeader' -import ScrollWithOverflow from 'components/ScrollWithOverflow' +import Drawer from '../../../../containers/Drawer' +import SortableTree from '../../../../containers/SortableTree' +import ControllerHeader from '../../../../containers/ControllerHeader' +import ScrollWithOverflow from '../../../../components/ScrollWithOverflow' import { HEADER_HEIGHT_PX } from '../../../../constants' import MathObjects, { Folder, MathSymbols, MathGraphics, AXIS, GRID, CAMERA -} from 'containers/MathObjects' -import ControlledTabs, { TabPane } from 'containers/ControlledTabs' +} from '../../../../containers/MathObjects' +import ControlledTabs, { TabPane } from '../../../../containers/ControlledTabs' import styled from 'styled-components' // First sort the MathObject keys in the order we want, then extract the diff --git a/client/src/views/MainView/UserControls/index.js b/client/src/views/MainView/UserControls/index.js index 5494db32..35622a7b 100644 --- a/client/src/views/MainView/UserControls/index.js +++ b/client/src/views/MainView/UserControls/index.js @@ -1,6 +1,6 @@ import React, { Fragment } from 'react' import ControlsDrawer from './components/ControlsDrawer' -import ScreenSizeDrawerManager from 'containers/Drawer/ScreenSizeDrawerManager' +import ScreenSizeDrawerManager from '../../../containers/Drawer/ScreenSizeDrawerManager' export default function UserControls() { return ( diff --git a/client/src/views/MainView/actions.js b/client/src/views/MainView/actions.js index 43d76d10..f000470f 100644 --- a/client/src/views/MainView/actions.js +++ b/client/src/views/MainView/actions.js @@ -1,5 +1,5 @@ -import { getGraph } from 'services/api' -import { loadDehydratedState } from 'store/actions' +import { getGraph } from '../../services/api' +import { loadDehydratedState } from '../../store/actions' export function loadGraphFromDb(id) { diff --git a/client/src/views/MainView/index.js b/client/src/views/MainView/index.js index 818d5190..b8ae6d39 100644 --- a/client/src/views/MainView/index.js +++ b/client/src/views/MainView/index.js @@ -1,15 +1,15 @@ // @flow import React, { PureComponent } from 'react' -import FlexContainer from 'components/FlexContainer' +import FlexContainer from '../../components/FlexContainer' import UserControls from './UserControls' import Scene from './Scene' import Examples from './Examples' import Header from './Header' import { loadGraphFromDb } from './actions' -import { loadDehydratedState } from 'store/actions' -import initialState from 'store/initialState' +import { loadDehydratedState } from '../../store/actions' +import initialState from '../../store/initialState' import { connect } from 'react-redux' -import { setLastSavedState } from 'services/lastSavedState/actions' +import { setLastSavedState } from '../../services/lastSavedState/actions' type OwnProps = {| graphId?: string