Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

repair many ref error: path issue. #353

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/src/components/LongPressable/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() } )

Expand Down
4 changes: 2 additions & 2 deletions client/src/components/MathBox/MathBox.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
10 changes: 5 additions & 5 deletions client/src/components/MathBox/MathBoxComponents.js
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/MathBox/helpers.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @flow
import math from "utils/mathjs";
import math from "../../utils/mathjs";

// TODO test this? Maybe Flow is good enough

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ScrollWithOverflow/index.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/SubtleButton/index.js
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
2 changes: 1 addition & 1 deletion client/src/constants/parsing.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import {
Parser,
ScopeEvaluator
} from 'utils/mathParsing'
} from '../utils/mathParsing'

export const parser = new Parser()
export const scopeEvaluator = new ScopeEvaluator(parser)
Expand Down
2 changes: 1 addition & 1 deletion client/src/containers/ControlledTabs/reducer.js
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions client/src/containers/ControllerHeader/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/src/containers/ControllerHeader/selectors.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getParent } from 'containers/MathObjects/selectors'
import { getParent } from '../../containers/MathObjects/selectors'

const FORBIDDEN_INSERT_FOLDERS = new Set( [
'axes',
Expand Down
2 changes: 1 addition & 1 deletion client/src/containers/Drawer/ScreenSizeDrawerManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions client/src/containers/MathBoxScene/components/MathBoxScene.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion client/src/containers/MathBoxScene/index.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion client/src/containers/MathObjects/Folder/actions.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
toggleProperty,
setProperty
} from 'containers/MathObjects/actions'
} from '../../../containers/MathObjects/actions'
import { FOLDER } from './metadata'

export const setContentCollapsed = (id, value) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions client/src/containers/MathObjects/Folder/components/Folder.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion client/src/containers/MathObjects/Folder/selectors.js
Original file line number Diff line number Diff line change
@@ -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] ) {
Expand Down
6 changes: 3 additions & 3 deletions client/src/containers/MathObjects/MathGraphics/Axis/index.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions client/src/containers/MathObjects/MathGraphics/Camera/index.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions client/src/containers/MathObjects/MathGraphics/Grid/index.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
6 changes: 3 additions & 3 deletions client/src/containers/MathObjects/MathGraphics/Line/index.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
Loading