From f3f73540337470e2e98df2ee42c8317dc4060898 Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Tue, 30 Jan 2018 17:14:58 -0800 Subject: [PATCH] update relative imports to modules --- web/app/cad/craft/cadRegistryPlugin.js | 2 +- web/app/cad/craft/craftPlugin.js | 2 +- web/app/cad/craft/cutExtrude/previewer.js | 4 ++-- web/app/cad/craft/primitives/boxOperation.js | 2 +- web/app/cad/craft/primitives/planeOperation.js | 4 ++-- web/app/cad/dom/actionInfo/ActionInfo.jsx | 4 ++-- web/app/cad/dom/components/AppTabs.jsx | 2 +- web/app/cad/dom/components/PlugableControlBar.jsx | 2 +- web/app/cad/dom/components/PlugableToolbar.jsx | 8 ++++---- .../dom/components/wizard/FaceSelectionControl.jsx | 2 +- web/app/cad/dom/components/wizard/Wizard.jsx | 2 +- web/app/cad/dom/menu/MenuHolder.jsx | 13 ++++++------- web/app/cad/keyboard/keyboardPlugin.js | 2 +- .../scene/selectionMarker/sketchSelectionMarker.js | 2 +- web/app/cad/scene/wrappers/sceneObject.js | 2 +- web/app/cad/sketch/sketcherPlugin.js | 2 +- 16 files changed, 27 insertions(+), 28 deletions(-) diff --git a/web/app/cad/craft/cadRegistryPlugin.js b/web/app/cad/craft/cadRegistryPlugin.js index 04813fa7..075e9e2d 100644 --- a/web/app/cad/craft/cadRegistryPlugin.js +++ b/web/app/cad/craft/cadRegistryPlugin.js @@ -1,4 +1,4 @@ -import {createToken} from "../../../../modules/bus/index"; +import {createToken} from "bus"; import * as SceneGraph from 'scene/sceneGraph'; export function activate({bus, services}) { diff --git a/web/app/cad/craft/craftPlugin.js b/web/app/cad/craft/craftPlugin.js index 30bdd091..acf227cd 100644 --- a/web/app/cad/craft/craftPlugin.js +++ b/web/app/cad/craft/craftPlugin.js @@ -1,4 +1,4 @@ -import {createToken} from "../../../../modules/bus/index"; +import {createToken} from "bus"; export function activate({bus, services}) { diff --git a/web/app/cad/craft/cutExtrude/previewer.js b/web/app/cad/craft/cutExtrude/previewer.js index 7150f02e..6ae206cf 100644 --- a/web/app/cad/craft/cutExtrude/previewer.js +++ b/web/app/cad/craft/cutExtrude/previewer.js @@ -1,9 +1,9 @@ import {getEncloseDetails} from "./cutExtrude"; import {curveTessParams} from "../../../brep/geom/impl/curve/curve-tess"; -import Vector from "../../../../../modules/math/vector"; +import Vector from "math/vector"; import {TriangulatePolygons} from "../../tess/triangulation"; -import {createMeshGeometry} from "../../../../../modules/scene/geoms"; +import {createMeshGeometry} from "scene/geoms"; export function createPreviewGeomProvider(inversed) { diff --git a/web/app/cad/craft/primitives/boxOperation.js b/web/app/cad/craft/primitives/boxOperation.js index 95839626..27e5598b 100644 --- a/web/app/cad/craft/primitives/boxOperation.js +++ b/web/app/cad/craft/primitives/boxOperation.js @@ -1,7 +1,7 @@ import {box} from '../../../brep/brep-primitives' import {BREPSceneSolid} from '../../scene/wrappers/brepSceneObject'; import {createPreviewer} from "../../preview/scenePreviewer"; -import {createBoxGeometry} from "../../../../../modules/scene/geoms"; +import {createBoxGeometry} from "scene/geoms"; const METADATA = [ ['width' , 'number', 500, {min: 0}], diff --git a/web/app/cad/craft/primitives/planeOperation.js b/web/app/cad/craft/primitives/planeOperation.js index ed8fff73..cbd90477 100644 --- a/web/app/cad/craft/primitives/planeOperation.js +++ b/web/app/cad/craft/primitives/planeOperation.js @@ -1,12 +1,12 @@ import {box} from '../../../brep/brep-primitives' import {BREPSceneSolid} from '../../scene/wrappers/brepSceneObject'; import {createPreviewer} from "../../preview/scenePreviewer"; -import {createBoxGeometry, createMeshGeometry} from "../../../../../modules/scene/geoms"; +import {createBoxGeometry, createMeshGeometry} from "scene/geoms"; import {CURRENT_SELECTION as S} from "../wizard/wizardPlugin"; import {STANDARD_BASES} from "../../../math/l3space"; import {Plane} from "../../../brep/geom/impl/plane"; import {PlaneSceneObject} from "../../scene/wrappers/planeSceneObject"; -import Vector from "../../../../../modules/math/vector"; +import Vector from "math/vector"; const METADATA = [ ['orientation', 'choice', 'XY', {options: ['XY', 'XZ', 'ZY']}], diff --git a/web/app/cad/dom/actionInfo/ActionInfo.jsx b/web/app/cad/dom/actionInfo/ActionInfo.jsx index 29502be6..09a16281 100644 --- a/web/app/cad/dom/actionInfo/ActionInfo.jsx +++ b/web/app/cad/dom/actionInfo/ActionInfo.jsx @@ -1,8 +1,8 @@ import React, {Fragment} from 'react'; import ls from './ActionInfo.less'; -import AuxWidget from '../../../../../modules/ui/components/AuxWidget'; -import connect from '../../../../../modules/ui/connect'; +import AuxWidget from 'ui/components/AuxWidget'; +import connect from 'ui/connect'; import {TOKENS as ACTION_TOKENS} from '../../actions/actionSystemPlugin'; import {TOKENS as KeyboardTokens} from '../../keyboard/keyboardPlugin'; diff --git a/web/app/cad/dom/components/AppTabs.jsx b/web/app/cad/dom/components/AppTabs.jsx index 6c34f28a..c463c7a1 100644 --- a/web/app/cad/dom/components/AppTabs.jsx +++ b/web/app/cad/dom/components/AppTabs.jsx @@ -8,7 +8,7 @@ import TabSwitcher, {Tab} from 'ui/components/TabSwticher'; import connect from 'ui/connect'; import {TOKENS as APP_TABS_TOKENS} from "../appTabsPlugin"; -import Card from "../../../../../modules/ui/components/Card"; +import Card from "ui/components/Card"; function AppTabs({activeTab, tabs, switchTo, close, detach}) { return
diff --git a/web/app/cad/dom/components/PlugableControlBar.jsx b/web/app/cad/dom/components/PlugableControlBar.jsx index a6b6367f..6424a6e2 100644 --- a/web/app/cad/dom/components/PlugableControlBar.jsx +++ b/web/app/cad/dom/components/PlugableControlBar.jsx @@ -6,7 +6,7 @@ import {TOKENS as UI_TOKENS} from '../uiEntryPointsPlugin'; import {TOKENS as ACTION_TOKENS} from '../../actions/actionSystemPlugin'; import {toIdAndOverrides} from "../../actions/actionRef"; import {mapActionBehavior} from "../../actions/actionButtonBehavior"; -import {DEFAULT_MAPPER} from "../../../../../modules/ui/connect"; +import {DEFAULT_MAPPER} from "ui/connect"; import {isMenuAction} from "../menu/menuPlugin"; diff --git a/web/app/cad/dom/components/PlugableToolbar.jsx b/web/app/cad/dom/components/PlugableToolbar.jsx index 72282a25..ce9e4bf8 100644 --- a/web/app/cad/dom/components/PlugableToolbar.jsx +++ b/web/app/cad/dom/components/PlugableToolbar.jsx @@ -3,12 +3,12 @@ import connect from 'ui/connect'; import Fa from 'ui/components/Fa'; import {TOKENS as UI_TOKENS} from '../uiEntryPointsPlugin'; import {TOKENS as ACTION_TOKENS} from '../../actions/actionSystemPlugin'; -import Toolbar, {ToolbarButton} from '../../../../../modules/ui/components/Toolbar'; -import ImgIcon from '../../../../../modules/ui/components/ImgIcon'; +import Toolbar, {ToolbarButton} from 'ui/components/Toolbar'; +import ImgIcon from 'ui/components/ImgIcon'; import {toIdAndOverrides} from '../../actions/actionRef'; import {mapActionBehavior} from '../../actions/actionButtonBehavior'; -import {DEFAULT_MAPPER} from '../../../../../modules/ui/connect'; -import capitalize from '../../../../../modules/gems/capitalize'; +import {DEFAULT_MAPPER} from 'ui/connect'; +import capitalize from 'gems/capitalize'; function ConfigurableToolbar({actions, small, ...props}) { diff --git a/web/app/cad/dom/components/wizard/FaceSelectionControl.jsx b/web/app/cad/dom/components/wizard/FaceSelectionControl.jsx index 669c30ae..b55ca535 100644 --- a/web/app/cad/dom/components/wizard/FaceSelectionControl.jsx +++ b/web/app/cad/dom/components/wizard/FaceSelectionControl.jsx @@ -1,6 +1,6 @@ import React from 'react'; -import TextControl from "../../../../../../modules/ui/components/controls/TextControl"; +import TextControl from "ui/components/controls/TextControl"; export default function FaceSelectionControl(props) { return diff --git a/web/app/cad/dom/components/wizard/Wizard.jsx b/web/app/cad/dom/components/wizard/Wizard.jsx index eb34c8f9..924c941d 100644 --- a/web/app/cad/dom/components/wizard/Wizard.jsx +++ b/web/app/cad/dom/components/wizard/Wizard.jsx @@ -14,7 +14,7 @@ import {CURRENT_SELECTION} from "../../../craft/wizard/wizardPlugin"; import {isTCADError} from "../../../../utils/errors"; import ls from './Wizard.less'; -import RadioButtons, {RadioButton} from "../../../../../../modules/ui/components/controls/RadioButtons"; +import RadioButtons, {RadioButton} from "ui/components/controls/RadioButtons"; export default class Wizard extends React.Component { diff --git a/web/app/cad/dom/menu/MenuHolder.jsx b/web/app/cad/dom/menu/MenuHolder.jsx index 801c155e..cd306c30 100644 --- a/web/app/cad/dom/menu/MenuHolder.jsx +++ b/web/app/cad/dom/menu/MenuHolder.jsx @@ -1,13 +1,12 @@ -import React, {Fragment} from 'react'; +import React from 'react'; import connect from 'ui/connect'; import {TOKENS as MENU_TOKENS} from './menuPlugin'; import {TOKENS as ACTION_TOKENS} from '../../actions/actionSystemPlugin'; -import Menu, {MenuItem, MenuSeparator} from "../../../../../modules/ui/components/Menu"; -import Fa from "../../../../../modules/ui/components/Fa"; -import Filler from "../../../../../modules/ui/components/Filler"; -import {TOKENS as KeyboardTokens} from "../../keyboard/keyboardPlugin"; -import {DEFAULT_MAPPER} from "../../../../../modules/ui/connect"; -import {mapActionBehavior} from "../../actions/actionButtonBehavior"; +import Menu, {MenuItem, MenuSeparator} from 'ui/components/Menu'; +import Filler from 'ui/components/Filler'; +import Fa from 'ui/components/Fa'; +import {TOKENS as KeyboardTokens} from '../../keyboard/keyboardPlugin'; +import {mapActionBehavior} from '../../actions/actionButtonBehavior'; function MenuHolder({menus}) { return menus.map(({id, actions}) => ); diff --git a/web/app/cad/keyboard/keyboardPlugin.js b/web/app/cad/keyboard/keyboardPlugin.js index 6a450a08..582c0239 100644 --- a/web/app/cad/keyboard/keyboardPlugin.js +++ b/web/app/cad/keyboard/keyboardPlugin.js @@ -1,7 +1,7 @@ import Mousetrap from 'mousetrap'; import DefaultKeymap from './keymaps/default'; -import {createToken} from "../../../../modules/bus/index"; +import {createToken} from "bus"; import {TOKENS as ACTION_TOKENS} from "../actions/actionSystemPlugin"; import {isMenuAction, TOKENS as MENU_TOKENS} from "../dom/menu/menuPlugin"; diff --git a/web/app/cad/scene/selectionMarker/sketchSelectionMarker.js b/web/app/cad/scene/selectionMarker/sketchSelectionMarker.js index ece17641..bb3c2808 100644 --- a/web/app/cad/scene/selectionMarker/sketchSelectionMarker.js +++ b/web/app/cad/scene/selectionMarker/sketchSelectionMarker.js @@ -1,6 +1,6 @@ import {AbstractSelectionMarker} from "./abstractSelectionMarker"; import {setAttribute} from 'scene/objectData'; -import {getAttribute} from "../../../../../modules/scene/objectData"; +import {getAttribute} from "scene/objectData"; import {LineMarker} from "./lineMarker"; export class SketchSelectionMarker extends LineMarker { diff --git a/web/app/cad/scene/wrappers/sceneObject.js b/web/app/cad/scene/wrappers/sceneObject.js index 73608296..af9beb21 100644 --- a/web/app/cad/scene/wrappers/sceneObject.js +++ b/web/app/cad/scene/wrappers/sceneObject.js @@ -1,7 +1,7 @@ import Vector from 'math/vector'; import {BasisForPlane} from '../../../math/l3space' import DPR from 'dpr' -import {setAttribute} from "../../../../../modules/scene/objectData"; +import {setAttribute} from "scene/objectData"; import {genSolidId} from "../../craft/cadRegistryPlugin"; //todo: rename to shell diff --git a/web/app/cad/sketch/sketcherPlugin.js b/web/app/cad/sketch/sketcherPlugin.js index f859d595..f4b9c781 100644 --- a/web/app/cad/sketch/sketcherPlugin.js +++ b/web/app/cad/sketch/sketcherPlugin.js @@ -1,5 +1,5 @@ -import {createToken} from '../../../../modules/bus/index'; +import {createToken} from 'bus'; import {ReadSketch} from './sketchReader'; import {getSketchBoundaries} from './sketchBoundaries'; import {TOKENS as CRAFT_TOKENS} from '../craft/craftPlugin';