kitchen-simulator 5.0.0-test.6 → 5.0.0-test.61

package/src/catalog/areas/area/planner-element.jsx

@@ -1,4 +1,4 @@
-import { ElementsFactories } from 'KitchenConfigurator';
+import { ElementsFactories } from '../../../index';
 
 let info = {
   title: 'area',

package/src/catalog/factories/wall-factory-3d.js

@@ -1,27 +1,20 @@
+import * as Three from 'three';
 import {
-  TextureLoader,
-  Mesh,
-  RepeatWrapping,
-  Vector2,
   BoxGeometry,
+  Group,
+  Mesh,
   MeshBasicMaterial,
   MeshStandardMaterial,
-  Group,
-  CubeTextureLoader,
-  sRGBEncoding,
-  DoubleSide
+  RepeatWrapping,
+  TextureLoader,
+  Vector2
 } from 'three';
 
 import { verticesDistance } from '../../utils/geometry';
-import * as Three from 'three';
-import { textureCube, isElevationView } from '../../../src/utils/helper';
+import { isElevationView } from '../../../src/utils/helper';
 
 import * as SharedStyle from '../../shared-style';
-import {
-  MODE_ELEVATION_VIEW,
-  LINE_THICKNESS,
-  UNIT_CENTIMETER
-} from '../../constants';
+import { LINE_THICKNESS, UNIT_CENTIMETER } from '../../constants';
 import convert from 'convert-units';
 import ThreeBSP from '../../utils/threeCSG.es6';
 
@@ -46,8 +39,8 @@ const applyTexture = (material, texture, length, height) => {
 
   if (texture) {
     material.map = loader.load(texture.uri.default);
-    (material.map.colorSpace = Three.SRGBColorSpace),
-      (material.needsUpdate = true);
+    ((material.map.colorSpace = Three.SRGBColorSpace),
+      (material.needsUpdate = true));
     material.map.wrapS = RepeatWrapping;
     material.map.wrapT = RepeatWrapping;
     material.map.repeat.set(

package/src/catalog/holes/index.js

@@ -0,0 +1,13 @@
+export { default as doorCloset } from './door-closet/planner-element.jsx';
+export { default as doorDouble } from './door-double/planner-element.jsx';
+export { default as doorExterior } from './door-exterior/planner-element.jsx';
+export { default as doorInterior } from './door-interior/planner-element.jsx';
+export { default as doorPanic } from './door-panic/planner-element.jsx';
+export { default as doorPanicDouble } from './door-panic-double/planner-element.jsx';
+export { default as doorSliding } from './door-sliding/planner-element.jsx';
+export { default as doorwayFramed } from './doorway-framed/planner-element.jsx';
+export { default as doorwayFrameless } from './doorway-frameless/planner-element.jsx';
+export { default as windowClear } from './window-clear/planner-element.jsx';
+export { default as windowCross } from './window-cross/planner-element.jsx';
+export { default as windowDoubleHung } from './window-double-hung/planner-element.jsx';
+export { default as windowVertical } from './window-vertical/planner-element.jsx';

package/src/catalog/lines/wall/planner-element.jsx

@@ -1,4 +1,4 @@
-import { ElementsFactories } from 'KitchenConfigurator';
+import { ElementsFactories } from '../../../index';
 
 const info = {
   title: 'wall',

package/src/catalog/mycatalog.js

@@ -0,0 +1,26 @@
+import { Catalog } from '../index';
+import * as Areas from './areas/**/planner-element.jsx';
+import * as Lines from './lines/**/planner-element.jsx';
+import * as Holes from './holes/**/planner-element.jsx';
+
+let catalog = new Catalog();
+// import * as Items from './Items/**/*.jsx';
+for (let x in Areas) catalog.registerElement(Areas[x]);
+for (let x in Lines) catalog.registerElement(Lines[x]);
+for (let x in Holes) catalog.registerElement(Holes[x]);
+// for (let x in Items) catalog.registerElement(Items[x]);
+catalog.registerCategory('Windows', 'Windows', [
+  Holes.windowClear,
+  Holes.windowCross,
+  Holes.windowDoubleHung,
+  Holes.windowVertical
+]);
+catalog.registerCategory('Doors', 'Doors', [
+  Holes.doorInterior,
+  Holes.doorExterior,
+  Holes.doorCloset,
+  Holes.doorSliding,
+  Holes.doorwayFramed,
+  Holes.doorwayFrameless
+]);
+export default catalog;

package/src/catalog/properties/property-checkbox.jsx

@@ -1,7 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormLabel } from '../../components/style/export';
-import PropertyStyle from './shared-property-style';
 import styled from 'styled-components';
 import {
   DEFAULT_FONT_FAMILY,

package/src/catalog/properties/property-enum.jsx

@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Seq } from 'immutable';
 import { FormLabel, FormSelect } from '../../components/style/export';
-import PropertyStyle from './shared-property-style';
 import styled from 'styled-components';
 import { TEXT_COLOR_NEUTRAL_0, DEFAULT_FONT_FAMILY } from '../../constants';
 

package/src/components/content.jsx

@@ -3,8 +3,6 @@ import PropTypes from 'prop-types';
 import Viewer2D from './viewer2d/viewer2d';
 import Viewer3D from './viewer3d/viewer3d';
 import Viewer3DFirstPerson from './viewer3d/viewer3d-first-person';
-import CatalogList from './catalog-view/catalog-list';
-import ProjectConfigurator from './configurator/project-configurator';
 import * as constants from '../constants';
 import Front3D from './viewer3d/front3D';
 
@@ -58,17 +56,6 @@ export default function Content(
         <Viewer3DFirstPerson state={state} width={width} height={height} />
       );
 
-    case constants.MODE_VIEWING_CATALOG:
-      return (
-        <CatalogList
-          state={state}
-          param={match}
-          width={width}
-          height={height}
-          categoryData={this.props.categoryData}
-        />
-      );
-
     case constants.MODE_IDLE:
     case constants.MODE_2D_ZOOM_IN:
     case constants.MODE_2D_ZOOM_OUT:
@@ -110,11 +97,6 @@ export default function Content(
         />
       );
 
-    case constants.MODE_CONFIGURING_PROJECT:
-      return (
-        <ProjectConfigurator width={width} height={height} state={state} />
-      );
-
     default:
       if (customContents.hasOwnProperty(mode)) {
         let CustomContent = customContents[mode];

package/src/components/export.js

@@ -1,36 +1,9 @@
-import ToolbarComponents from './toolbar/export';
 import Content from './content';
-import SidebarComponents from './sidebar/export';
-import FooterBarComponents from './footerbar/export';
 import Viewer2DComponents from './viewer2d/export';
-import StyleComponents from './style/export';
-import HeaderComponents from './header/export';
-import WizardStepComponents from './wizardstep/export';
-import SignComponents from './sign/export';
-import MyProjectsComonents from './myprojects/export';
 
-export {
-  ToolbarComponents,
-  Content,
-  SidebarComponents,
-  FooterBarComponents,
-  Viewer2DComponents,
-  StyleComponents,
-  HeaderComponents,
-  WizardStepComponents,
-  SignComponents,
-  MyProjectsComonents
-};
+export { Content, Viewer2DComponents };
 
 export default {
-  ToolbarComponents,
   Content,
-  SidebarComponents,
-  FooterBarComponents,
-  WizardStepComponents,
-  Viewer2DComponents,
-  StyleComponents,
-  HeaderComponents,
-  SignComponents,
-  MyProjectsComonents
+  Viewer2DComponents
 };

package/src/components/style/export.js

@@ -0,0 +1,24 @@
+import Button from './button';
+import FormColorInput from './form-color-input';
+import FormSelect from './form-select';
+import FormTextInput from './form-text-input';
+import FormNumberInput from './form-number-input';
+import FormLabel from './form-label';
+
+export {
+  Button,
+  FormColorInput,
+  FormSelect,
+  FormTextInput,
+  FormNumberInput,
+  FormLabel
+};
+
+export default {
+  Button,
+  FormColorInput,
+  FormSelect,
+  FormTextInput,
+  FormNumberInput,
+  FormLabel
+};

package/src/components/style/form-select.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import * as SharedStyle from '../../shared-style';
 import styled from 'styled-components';
 import {
   TEXT_COLOR_NEUTRAL_3,

package/src/components/style/form-text-input.jsx

@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import * as SharedStyle from '../../shared-style';
 import {
   PROJECT_NAME_LENGTH_LIMIT,
   TEXT_COLOR_NEUTRAL_3,

package/src/components/viewer2d/item.jsx

@@ -1,18 +1,10 @@
 import React from 'react';
 import { useState } from 'react';
 import PropTypes from 'prop-types';
-import If from '../../utils/react-if';
 import RulerDist from './rulerDist';
 import convert from 'convert-units';
 import { GeometryUtils } from '../../utils/export';
-import {
-  MODE_ROTATING_ITEM,
-  SECONDARY_PURPLE_COLOR,
-  STATUS_NEGATIVE_COLOR,
-  BG_COLOR_1,
-  STATUS_WARNING_COLOR,
-  WALL_CABINET_LAYOUTPOS
-} from '../../constants';
+import { MODE_ROTATING_ITEM, WALL_CABINET_LAYOUTPOS } from '../../constants';
 import { returnReplaceableDeepSearchType } from './utils';
 const STYLE_LINE = {
   fill: '#0096fd',

package/src/components/viewer2d/line.jsx

@@ -9,7 +9,6 @@ import {
 } from '../../../src/constants';
 import * as Three from 'three';
 import { isEmpty } from './utils';
-import Tooltip from '@material-ui/core/Tooltip';
 
 const STYLE = {
   stroke: 'rgb(77, 77, 77)',
@@ -1263,37 +1262,35 @@ export default function Line({
         </g>
       </g>
       {line.selected && (
-        <Tooltip title="Elevation View">
-          <g
-            id={'elevation-button'}
-            key={1}
-            transform={`translate(${x1 + 35}, ${y1 - 15})`}
-            style={{ cursor: 'pointer' }}
-          >
-            <defs>
-              <filter id="shadow">
-                <feDropShadow dx="0" dy="0" stdDeviation="0.6"></feDropShadow>
-              </filter>
-            </defs>
-            <rect
-              rx="4"
-              ry="4"
-              y="20"
-              height="22"
-              width="22"
-              fill="white"
-              filter="url(#shadow)"
-            />
-            <image
-              href="/assets/img/svg/bottombar/elevation.svg"
-              x="5"
-              y="-36"
-              height="12"
-              width="12"
-              style={{ transform: 'rotateX(180deg)' }}
-            />
-          </g>
-        </Tooltip>
+        <g
+          id={'elevation-button'}
+          key={1}
+          transform={`translate(${x1 + 35}, ${y1 - 15})`}
+          style={{ cursor: 'pointer' }}
+        >
+          <defs>
+            <filter id="shadow">
+              <feDropShadow dx="0" dy="0" stdDeviation="0.6"></feDropShadow>
+            </filter>
+          </defs>
+          <rect
+            rx="4"
+            ry="4"
+            y="20"
+            height="22"
+            width="22"
+            fill="white"
+            filter="url(#shadow)"
+          />
+          <image
+            href="/assets/img/svg/bottombar/elevation.svg"
+            x="5"
+            y="-36"
+            height="12"
+            width="12"
+            style={{ transform: 'rotateX(180deg)' }}
+          />
+        </g>
       )}
       {line.selected && (
         <g

package/src/components/viewer2d/ruler.jsx

@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import convert from 'convert-units';
 import IDBroker from '../../utils/id-broker';
-import { FormNumberInput2 } from '../style/export';
 import {
   LINE_THICKNESS,
   SHADE_LIGHT_BLUE_COLOR,

package/src/components/viewer2d/viewer2d.jsx

@@ -22,7 +22,7 @@ import State from './state';
 import * as SharedStyle from '../../shared-style';
 import { RulerX, RulerY } from './export';
 import { GeometryUtils } from '../../utils/export';
-import FormNumberInput from '../style/form-number-input';
+import FormNumberInput from '../../components/style/form-number-input';
 import convert from 'convert-units';
 import { Map } from 'immutable';
 import { formatNumber } from '../../../src/utils/math';

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 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

@@ -1,49 +1,46 @@
 import * as Three from 'three';
+import { Color, Group } from 'three';
 import createGrid from './grid-creator';
 import { disposeObject } from './three-memory-cleaner';
-import { Color, Group } from 'three';
-import { isUndefined } from 'util';
 import {
-  MODE_DRAWING_ITEM_3D,
-  EPSILON,
-  DISTANCE_EPSILON,
-  OBJTYPE_MESH,
-  ARROW_TEXT_FORECOLOR,
-  ARROW_TEXT_BACKCOLOR,
-  ARROW_TEXT_FONTFACE,
-  UNIT_CENTIMETER,
-  SHADE_DARK_PURPLE_COLOR,
-  MODE_DRAGGING_ITEM_3D,
-  MODE_ROTATING_ITEM_3D,
   ANIMATE_STEP_MAX,
   ANIMATE_STEP_MIN,
-  ANIMATE_OBJECT_OPEN_DOOR_ROTATION_UNIT,
-  TOP_MOLDING_LOCATION,
-  MIDDLE_MOLDING_LOCATION,
-  BOTTOM_MOLDING_LOCATION,
+  ARRAY_3D_MODES,
+  ARROW_TEXT_BACKCOLOR,
+  ARROW_TEXT_FONTFACE,
+  ARROW_TEXT_FORECOLOR,
   BASE_CABINET_LAYOUTPOS,
-  TALL_CABINET_LAYOUTPOS,
-  WALL_CABINET_LAYOUTPOS,
+  BOTTOM_MOLDING_LOCATION,
   DECIMAL_PLACES_2,
   DIFFERENT_VALUES_PATH_LENGTH,
+  DISTANCE_EPSILON,
+  EPSILON,
+  MIDDLE_MOLDING_LOCATION,
+  MODE_DRAGGING_ITEM_3D,
+  MODE_DRAWING_ITEM_3D,
+  MODE_IDLE,
   MODE_IDLE_3D,
-  ARRAY_3D_MODES,
-  MODE_IDLE
+  MODE_ROTATING_ITEM_3D,
+  OBJTYPE_MESH,
+  SHADE_DARK_PURPLE_COLOR,
+  TOP_MOLDING_LOCATION,
+  UNIT_CENTIMETER,
+  WALL_CABINET_LAYOUTPOS
 } from '../../constants';
-import { IDBroker, GeometryUtils, MoldingUtils } from '../../utils/export';
+import { GeometryUtils, IDBroker, MoldingUtils } from '../../utils/export';
 import convert from 'convert-units';
 import { verticesDistance } from '../../utils/geometry';
-import * as GeomUtils from '../../../demo/src/catalog/utils/geom-utils';
-import { loadTexture } from '../../../demo/src/catalog/utils/item-loader';
 import { returnReplaceableDeepSearchType } from '../viewer2d/utils';
 import {
-  replaceMeshesWithLineSegments,
+  animateDoor,
   isElevationView,
   isEmpty,
-  animateDoor,
+  replaceMeshesWithLineSegments,
   translateDrawer
 } from '../../../src/utils/helper';
 import { formatNumber } from '../../utils/math';
+import * as GeomUtils from '../../../src/catalog/utils/geom-utils.js';
+import { loadTexture } from '../../../src/catalog/utils/item-loader.jsx';
 
 let transformBox;
 export var fVLine = [];