kitchen-simulator 5.0.0-test.7 → 5.0.0-test.71

package/src/components/viewer3d/ruler-utils/scene3D.jsx

@@ -1,87 +1,85 @@
-import React from 'react';
-import { GeometryUtils } from '../../../utils/export';
-import { isElevationView } from '../../..//utils/helper';
-import { verticesDistance } from '../../../utils/geometry';
-import convert from 'convert-units';
-import Layer3D from './layer3D';
-
-export function compareVertices(v0, v1) {
-  return v0.x === v1.x ? v0.y - v1.y : v0.x - v1.x;
-}
-
-export default function Scene3D({
-  scene,
-  catalog,
-  width,
-  height,
-  mode,
-  downloadFlag
-}) {
-  let { layers } = scene;
-  let selectedLayer = layers.get(scene.selectedLayer);
-  let ceilHeight = selectedLayer.ceilHeight;
-  let selectedLine = selectedLayer.lines.get(
-    selectedLayer.selected.lines.toJS()[0]
-  );
-  let vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
-  let vertex1 = selectedLayer.vertices.get(selectedLine.vertices.get(1));
-
-  let lineLength = convert(verticesDistance(vertex0, vertex1))
-    .from(scene.unit)
-    .to(selectedLayer.unit);
-  let multi = downloadFlag ? 0.85 : 0.6;
-  let scale = Math.min(
-    (width * multi) / lineLength,
-    (height * multi) / ceilHeight
-  );
-  let frontRect = {
-    width: lineLength * scale,
-    height: ceilHeight * scale
-  };
-
-  let i = 0,
-    grids = [];
-  let viewScale = Math.min(
-    width / window.innerWidth,
-    height / window.innerHeight
-  );
-
-  for (let x = -width / 2; x <= width / 2; x = x + 30 * viewScale) {
-    for (let y = -height / 2; y <= height / 2; y = y + 30 * viewScale) {
-      if (
-        Math.abs(x) > frontRect.width / 2 ||
-        Math.abs(y) > frontRect.height / 2
-      ) {
-        grids.push(
-          <circle
-            key={`grid_${i}`}
-            cx={x}
-            cy={y}
-            r={2 * viewScale}
-            fill="#bbb"
-          />
-        );
-        i++;
-      }
-    }
-  }
-  return (
-    <g>
-      {grids}
-      <Layer3D
-        key={selectedLayer.id}
-        layer={selectedLayer}
-        frontRect={frontRect}
-        lineLength={lineLength}
-        ceilHeight={ceilHeight.toFixed(0)}
-        catalog={catalog}
-        scene={scene}
-        scale={scale}
-        mode={mode}
-        line={selectedLine}
-        viewScale={viewScale}
-        downloadFlag={downloadFlag}
-      />
-    </g>
-  );
-}
+import React from 'react';
+import { verticesDistance } from '../../../utils/geometry';
+import * as convert from 'convert-units';
+import Layer3D from './layer3D';
+
+export function compareVertices(v0, v1) {
+  return v0.x === v1.x ? v0.y - v1.y : v0.x - v1.x;
+}
+
+export default function Scene3D({
+  scene,
+  catalog,
+  width,
+  height,
+  mode,
+  downloadFlag
+}) {
+  let { layers } = scene;
+  let selectedLayer = layers.get(scene.selectedLayer);
+  let ceilHeight = selectedLayer.ceilHeight;
+  let selectedLine = selectedLayer.lines.get(
+    selectedLayer.selected.lines.toJS()[0]
+  );
+  let vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
+  let vertex1 = selectedLayer.vertices.get(selectedLine.vertices.get(1));
+
+  let lineLength = convert(verticesDistance(vertex0, vertex1))
+    .from(scene.unit)
+    .to(selectedLayer.unit);
+  let multi = downloadFlag ? 0.85 : 0.6;
+  let scale = Math.min(
+    (width * multi) / lineLength,
+    (height * multi) / ceilHeight
+  );
+  let frontRect = {
+    width: lineLength * scale,
+    height: ceilHeight * scale
+  };
+
+  let i = 0,
+    grids = [];
+  let viewScale = Math.min(
+    width / window.innerWidth,
+    height / window.innerHeight
+  );
+
+  for (let x = -width / 2; x <= width / 2; x = x + 30 * viewScale) {
+    for (let y = -height / 2; y <= height / 2; y = y + 30 * viewScale) {
+      if (
+        Math.abs(x) > frontRect.width / 2 ||
+        Math.abs(y) > frontRect.height / 2
+      ) {
+        grids.push(
+          <circle
+            key={`grid_${i}`}
+            cx={x}
+            cy={y}
+            r={2 * viewScale}
+            fill="#bbb"
+          />
+        );
+        i++;
+      }
+    }
+  }
+  return (
+    <g>
+      {grids}
+      <Layer3D
+        key={selectedLayer.id}
+        layer={selectedLayer}
+        frontRect={frontRect}
+        lineLength={lineLength}
+        ceilHeight={ceilHeight.toFixed(0)}
+        catalog={catalog}
+        scene={scene}
+        scale={scale}
+        mode={mode}
+        line={selectedLine}
+        viewScale={viewScale}
+        downloadFlag={downloadFlag}
+      />
+    </g>
+  );
+}

package/src/components/viewer3d/scene-creator.js

@@ -28,7 +28,7 @@ import {
   WALL_CABINET_LAYOUTPOS
 } from '../../constants';
 import { GeometryUtils, IDBroker, MoldingUtils } from '../../utils/export';
-import convert from 'convert-units';
+import * as convert from 'convert-units';
 import { verticesDistance } from '../../utils/geometry';
 import { returnReplaceableDeepSearchType } from '../viewer2d/utils';
 import {

package/src/components/viewer3d/viewer3d-first-person.js

@@ -1,12 +1,12 @@
 'use strict';
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import * as PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import * as Three from 'three';
 import { parseData, updateScene } from './scene-creator';
 import { disposeScene } from './three-memory-cleaner';
-import diff from 'immutablediff';
+import * as diff from 'immutablediff';
 import { initPointerLock } from './pointer-lock-navigation';
 import {
   firstPersonOnKeyDown,

package/src/components/viewer3d/{viewer3d.js → viewer3d.jsx}

@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import * as PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import * as Three from 'three';
 import {
@@ -15,7 +15,7 @@ import {
   visibleTransformBox
 } from './scene-creator';
 import { disposeObject, disposeScene } from './three-memory-cleaner';
-import diff from 'immutablediff';
+import * as diff from 'immutablediff';
 import * as SharedStyle from '../../shared-style';
 import {
   BASE_CABINET_LAYOUTPOS,
@@ -34,7 +34,7 @@ import {
 
 import { isUndefined } from 'util';
 import { verticesDistance } from '../../utils/geometry';
-import convert from 'convert-units';
+import * as convert from 'convert-units';
 import { GeometryUtils } from '../../utils/export';
 import { handleCamRect, isElevationView, isEmpty } from '../../utils/helper';
 import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';

package/src/constants.js

@@ -729,3 +729,6 @@ export const ITEM_TYPE = {
   LIGHTING: 'lighting',
   FURNISHING: 'furnishing'
 };
+
+export const QUERY_PARAM_TOKEN = 'token';
+export const ENCODED_QUERY_PARAM_TOKEN = 'details';

package/src/index.js

@@ -2,7 +2,6 @@ import Catalog from './catalog/catalog';
 import Translator from './translator/translator';
 import * as Models from './models';
 import reducer from './reducers/reducer';
-import KitchenConfigurator from './KitchenConfigurator';
 import Plugins from './plugins/export';
 import * as KitchenConfiguratorConstants from './constants';
 import * as KitchenConfiguratorSharedStyle from './shared-style';
@@ -17,7 +16,6 @@ export {
   Translator,
   Models,
   reducer,
-  KitchenConfigurator,
   Plugins,
   KitchenConfiguratorConstants,
   KitchenConfiguratorSharedStyle,

package/src/models.js

@@ -2,7 +2,7 @@ import { Record, List, Map, fromJS } from 'immutable';
 import { MODE_IDLE, UNIT_INCH } from './constants';
 import { SNAP_MASK } from './utils/snap';
 import { isEmpty } from './utils/helper';
-import convert from 'convert-units';
+import * as convert from 'convert-units';
 let safeLoadMapList = (mapList, Model, defaultMap) => {
   return mapList
     ? new Map(mapList).map(m => new Model(m)).toMap()

package/src/reducers/viewer2d-reducer.js

@@ -13,7 +13,7 @@ import {
   UPDATE_CEIL_HEIGHT,
   UPDATE_CEIL_HEIGHT_UNIT
 } from '../constants';
-import convert from 'convert-units';
+import * as convert from 'convert-units';
 
 export default function (state, action) {
   let { scene } = state;

package/src/reducers/viewer3d-reducer.js

@@ -8,7 +8,7 @@ import {
 } from '../constants';
 import { Project } from '../class/export';
 import { history } from '../utils/export';
-import convert from 'convert-units';
+import * as convert from 'convert-units';
 
 export default function (state, action) {
   state = state.merge({

package/src/styles/export.js

@@ -0,0 +1,7 @@
+import * as TabsStyle from './tabs.css';
+
+export { TabsStyle };
+
+export default {
+  TabsStyle
+};

package/src/styles/tabs.css

@@ -0,0 +1,40 @@
+.react-tabs__tab-list {
+  border-bottom: 1px solid #aaa;
+  margin: 0 0 10px;
+  padding: 0;
+}
+
+.react-tabs__tab {
+  display: inline-block;
+  border: 1px solid transparent;
+  border-bottom: none;
+  bottom: -1px;
+  position: relative;
+  list-style: none;
+  padding: 6px 12px;
+  cursor: pointer;
+}
+
+.react-tabs__tab--selected,
+.react-tabs__tab:focus {
+  border-color: #aaa;
+  color: #1ca6fc;
+  outline: none;
+}
+
+.react-tabs__tab-panel {
+  display: none;
+}
+
+.react-tabs__tab-panel--selected {
+  display: block;
+}
+
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}

package/src/utils/geometry.js

@@ -20,7 +20,7 @@ import {
   UNIT_ANGLE,
   MIN_ANGLE_DISALLOW_DRAW_WALL
 } from '../constants';
-import convert from 'convert-units';
+import * as convert from 'convert-units';
 import * as Three from 'three';
 import { returnReplaceableDeepSearchType } from '../components/viewer2d/utils.js';
 import { isEmpty } from './helper.js';
@@ -2346,7 +2346,7 @@ export function isRightWall(v0, v1) {
  * OVERLAP_LINK: two lines are linked at the common point, so they can be merged to one line
  * OVERLAP_INCLUDED: destLine includes srcLine
  * OVERLAP_SOME: two lines are overlapped with some common range, then returns the trimmed segments of srcLine
- * 
+ *
  *  //////// test - start /////////////
     const p1 = { x1: 1413.1313131313132, y1: 1044.949494949495 };
     const p2 = { x1: 1476.2626262626263, y1: 1108.0808080808079 };

package/src/utils/graph-inner-cycles.js

@@ -1,6 +1,6 @@
-import Graph from './graph';
-import getEdgesOfSubgraphs from './get-edges-of-subgraphs';
-import graphCycles from './graph-cycles';
+import * as Graph from './graph';
+import * as getEdgesOfSubgraphs from './get-edges-of-subgraphs';
+import * as graphCycles from './graph-cycles';
 import { List } from 'immutable';
 
 export function calculateInnerCycles(verticesArray, edgesArray) {

package/src/utils/helper.js

@@ -8,7 +8,7 @@ import {
 } from '../../src/constants';
 import * as Three from 'three';
 import { returnReplaceableDeepSearchType } from './../components/viewer2d/utils';
-import convert from 'convert-units';
+import * as convert from 'convert-units';
 import { formatNumber } from './math';
 
 const AWS = require('aws-sdk');

package/src/utils/history.js

@@ -1,5 +1,5 @@
 import { Map } from 'immutable';
-import diff from 'immutablediff';
+import * as diff from 'immutablediff';
 import patch from 'immutablepatch';
 
 export const historyPush = (historyStructure, item) => {