kitchen-simulator 5.0.0-test.1 → 5.0.0-test.12

package/README.md

@@ -10,7 +10,7 @@ yarn
 yarn start
 ```
 
-You need to check **demo/webpack.config.js** to change the API server.
+You need to check **webpack.config.js** to change the API server.
 
 ```
   if (isProduction) {

package/package.json

@@ -1,83 +1,79 @@
 {
   "name": "kitchen-simulator",
-  "version": "5.0.0-test.1",
-  "main": "lib/renderer.js",
-  "module": "es/renderer.js",
+  "version": "5.0.0-test.12",
+  "description": "It is a kitchen simulator.",
+  "main": "src/index.js",
+  "module": "src/index.js",
   "exports": {
     ".": {
-      "import": "./es/renderer.js",
-      "require": "./lib/renderer.js"
-    },
-    "./renderer": {
-      "import": "./es/renderer.js",
-      "require": "./lib/renderer.js"
+      "import": "./src/index.js"
     },
-    "./index": {
-      "import": "./es/index.js",
-      "require": "./lib/index.js"
+    "./KitchenConfiguratorApp": {
+      "import": "./src/KitchenConfiguratorApp.jsx"
     }
   },
+
   "files": [
-    "es",
-    "lib",
-    "src",
+    "src/*.js",
+    "src/*.jsx",
+    "src/catalog",
+    "src/utils",
+    "src/actions",
+    "src/reducers",
+    "src/class",
+    "src/plugins",
+    "src/shared-style",
+    "src/translator",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+
+    "src/components/_export.js",
+    "src/components/atoms",
+    "src/components/button",
+    "src/components/molecules",
+    "src/components/style",
+    "src/components/tutorial-view",
+    "src/components/viewer2d",
+    "src/components/viewer3d",
+    "src/components/content.jsx",
+    "src/components/catalog-view.jsx",
+    "src/components/project-configurator.jsx"
   ],
-  "description": "It is a kitchen simulator.",
+
   "sideEffects": [
     "*.css",
     "*.scss",
     "*.sass"
   ],
-  "scripts": {
-    "build-commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib --source-maps true",
-    "build-es": "cross-env BABEL_ENV=es babel src --copy-files --out-dir es --source-maps true",
-    "prepack": "npm run clean && npm run build-commonjs && npm run build-es",
 
-    "start": "webpack-dev-server --config demo/webpack.config.js --port 9000 --mode development",
-    "start9010": "webpack-dev-server --config demo/webpack.config.js --port 9010 --mode development",
-    "start9020": "webpack-dev-server --config demo/webpack.config.js --port 9020 --mode development",
-    "build-demo": "webpack --config demo/webpack.config.js --mode production",
-    "build": "npm run clean && npm run build-demo && npm run build-commonjs && npm run build-es && mkdir -p demo/dist && cp -R demo/src/catalog demo/dist/ && cp -R demo/src/assets demo/dist/",
-    "add-build-to-vcs": "git add -A src/version.js && git add -A es && git add -A lib && git add -A demo/dist",
-    "clean": "rimraf lib es demo/dist",
+  "scripts": {
+    "start": "webpack-dev-server --config ./webpack.config.js --port 9000 --mode development",
+    "start9010": "webpack-dev-server --config ./webpack.config.js --port 9010 --mode development",
+    "start9020": "webpack-dev-server --config ./webpack.config.js --port 9020 --mode development",
+    "build": "npm run build-. && mkdir -p ./dist && cp -R ./src/catalog ./dist/ && cp -R ./src/assets ./dist/",
+    "clean": "rimraf ./dist",
     "update-version-file": "const-version ./package.json ./src/version.js",
-    "version": "npm run update-version-file && npm run build && npm run add-build-to-vcs",
+    "version": "npm run update-version-file && npm run build && git add -A src/version.js && git add -A ./dist",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "server": "node server.js"
+    "server": "node server.js",
+    "prepack": "npm run clean"
   },
+
   "repository": {
     "type": "git",
     "url": "git+https://github.com/orgs/4DPixel/teams/kitchen-simulator.git"
   },
-  "keywords": [
-    "floorplanner",
-    "plan",
-    "svg",
-    "3d",
-    "home design",
-    "interior design",
-    "react",
-    "react-component",
-    "react.js",
-    "ui",
-    "interface",
-    "component"
-  ],
+  "keywords": ["floorplanner","plan","svg","3d","home design","interior design","react","react-component","react.js","ui","interface","component"],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/orgs/4DPixel/teams/kitchen-simulator/issues"
   },
   "maintainers": [
-    {
-      "url": "https://github.com/softdev1029",
-      "name": "softdev1029"
-    }
+    { "url": "https://github.com/softdev1029", "name": "softdev1029" }
   ],
   "homepage": "/dist",
+
   "dependencies": {
-    "@babel/cli": "^7.24.8",
     "@mapbox/react-range": "0.0.7",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.2",
@@ -89,9 +85,6 @@
     "assert": "^2.1.0",
     "aws-sdk": "^2.984.0",
     "axios": "^0.20.0",
-    "babel-loader": "^9.1.3",
-    "babel-plugin-import-glob": "^2.0.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "camera-controls": "^2.8.5",
@@ -129,10 +122,8 @@
     "styled-components": "^5.2.0",
     "velocity-react": "1.4.3"
   },
+
   "devDependencies": {
-    "@babel/core": "^7.24.7",
-    "@babel/preset-env": "^7.24.7",
-    "@babel/preset-react": "^7.24.7",
     "const-version": "2.0.0",
     "cross-env": "5.2.0",
     "css-loader": "^5.0.1",
@@ -152,6 +143,7 @@
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.0.4"
   },
+
   "peerDependencies": {
     "react": ">=16.8 || ^17 || ^18",
     "react-dom": ">=16.8 || ^17 || ^18",

package/src/CrossSignOn.jsx

@@ -0,0 +1,94 @@
+import React, { useEffect, useState } from 'react';
+import ls from 'localstorage-slim';
+import {
+  LOCAL_STORAGE_CUSTOMER_INFO,
+  LOCAL_STORAGE_ORIGINAL_TOKEN,
+  LOCAL_STORAGE_TOKEN_NAME,
+  LOCAL_STORAGE_TOKEN_VALUE
+} from './constants.js';
+import { base64Decode } from './utils/helper.js';
+
+export const LOG_PREFIX = `[Cross Sign On]`;
+export const QUERY_PARAM_TOKEN = 'token';
+export const ENCODED_QUERY_PARAM_TOKEN = 'details';
+
+try {
+  console.log(`${LOG_PREFIX} Clearing local storage`);
+  ls.clear();
+} catch (e) {
+  console.log(`${LOG_PREFIX} Error clearing local storage`, e);
+}
+
+function extractAccessTokenFromUrl() {
+  try {
+    const url = new URL(window.location.href);
+    const token = url.searchParams.get(QUERY_PARAM_TOKEN);
+    const encodedToken = url.searchParams.get(ENCODED_QUERY_PARAM_TOKEN);
+
+    if (!token && !encodedToken) {
+      console.log(`${LOG_PREFIX} No access token found in URL`);
+      return undefined;
+    }
+
+    if (token) {
+      ls.set(LOCAL_STORAGE_ORIGINAL_TOKEN, token);
+      ls.set(LOCAL_STORAGE_TOKEN_VALUE, token);
+      ls.set(LOCAL_STORAGE_TOKEN_NAME, 'token=');
+      return token;
+    }
+
+    try {
+      const decoded = base64Decode(encodedToken);
+      const parsed = JSON.parse(decoded);
+      ls.set(LOCAL_STORAGE_ORIGINAL_TOKEN, encodedToken);
+      if (parsed.token) {
+        ls.set(LOCAL_STORAGE_TOKEN_VALUE, parsed.token);
+      }
+      ls.set(LOCAL_STORAGE_TOKEN_NAME, 'details=');
+
+      const customerInfo = {
+        email: parsed.email,
+        firstName: parsed.first_name,
+        lastName: parsed.last_name
+      };
+      ls.set(LOCAL_STORAGE_CUSTOMER_INFO, customerInfo);
+
+      return parsed;
+    } catch (e) {
+      return undefined;
+    }
+  } catch (e) {
+    console.error(`${LOG_PREFIX} Error extracting access token from URL`, e);
+    return undefined;
+  }
+}
+
+function extractAccessTokenFromLocalStorage() {
+  const token = ls.get(LOCAL_STORAGE_ORIGINAL_TOKEN);
+  if (!token || typeof token !== 'string') return undefined;
+  return token;
+}
+
+const CrossSignOn = ({ App }) => {
+  const [accessToken, setAccessToken] = useState(() => {
+    return extractAccessTokenFromUrl() || extractAccessTokenFromLocalStorage();
+  });
+
+  useEffect(() => {
+    const handleTokenChange = () => {
+      const newToken =
+        extractAccessTokenFromUrl() || extractAccessTokenFromLocalStorage();
+      setAccessToken(newToken);
+    };
+
+    window.addEventListener('token-changed', handleTokenChange);
+
+    return () => {
+      window.removeEventListener('token-changed', handleTokenChange);
+    };
+  }, []);
+
+  return <App accessToken={accessToken} />;
+};
+
+export default CrossSignOn;

package/src/KitchenConfigurator.jsx

@@ -1,7 +1,7 @@
 import Dialog from '@material-ui/core/Dialog';
 import axios from 'axios';
 import convert from 'convert-units';
-import { Plugins as PlannerPlugins } from 'KitchenConfigurator';
+import { Plugins as PlannerPlugins } from './index';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import ReactGA from 'react-ga4';

package/src/_renderer.jsx

@@ -0,0 +1,42 @@
+import React from 'react';
+import KitchenConfiguratorApp from './KitchenConfiguratorApp.jsx'; // webpack alias points to ../src
+import mockProps from './mockProps.json';
+import mockCategoryData from './categoryData.json';
+import mockDataBundle from './dataBundle.json';
+import ReactDOM from 'react-dom';
+
+// --- renderer props ---
+const options = { unit: 'in', enable3D: true };
+
+const onSave = ({ payload }) => {
+  console.log('SAVE triggered:', payload.scene);
+};
+
+const onEvent = evt => {
+  console.log('EVENT:', evt.type, evt.payload);
+};
+
+const onError = err => {
+  console.error('ERROR:', err);
+};
+
+document.getElementById('app').style.display = 'block';
+
+ReactDOM.render(
+  <KitchenConfiguratorApp
+    width={1264}
+    height={1164}
+    projectElement={mockProps.projectElement}
+    categoryData={mockCategoryData}
+    dataBundle={mockDataBundle}
+    configData={mockProps.configData}
+    options={options}
+    logoImg="/assets/logo.png"
+    companyUrl="https://example.com"
+    toolbarButtons={[]}
+    onSave={onSave}
+    onEvent={onEvent}
+    onError={onError}
+  />,
+  document.getElementById('app')
+);

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/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/components/_export.js

@@ -0,0 +1,29 @@
+import Content from './content';
+import Viewer2DComponents from './viewer2d/export';
+import StyleComponents from './style/export';
+
+export {
+  // ToolbarComponents,
+  Content,
+  // SidebarComponents,
+  // FooterBarComponents,
+  Viewer2DComponents,
+  StyleComponents
+  // HeaderComponents,
+  // WizardStepComponents,
+  // SignComponents,
+  // MyProjectsComonents
+};
+
+export default {
+  // ToolbarComponents,
+  Content,
+  // SidebarComponents,
+  // FooterBarComponents,
+  // WizardStepComponents,
+  Viewer2DComponents,
+  StyleComponents
+  // HeaderComponents,
+  // SignComponents,
+  // MyProjectsComonents
+};

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 = [];

package/src/components/viewer3d/viewer3d.js

@@ -5,32 +5,31 @@ import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import * as Three from 'three';
 import {
+  checkCabinetOverlap,
+  createBacksplash,
+  deleteSpecifiedMeshObjects,
+  fVLine,
+  getDistances,
   parseData,
   updateScene,
-  visibleTransformBox,
-  getDistances,
-  fVLine,
-  deleteSpecifiedMeshObjects,
-  createBacksplash,
-  checkCabinetOverlap
+  visibleTransformBox
 } from './scene-creator';
-import { disposeScene } from './three-memory-cleaner';
-import { disposeObject } from './three-memory-cleaner';
+import { disposeObject, disposeScene } from './three-memory-cleaner';
 import diff from 'immutablediff';
 import * as SharedStyle from '../../shared-style';
 import {
-  MODE_DRAWING_ITEM_3D,
-  MODE_IDLE_3D,
+  BASE_CABINET_LAYOUTPOS,
   MODE_3D_VIEW,
-  UNIT_CENTIMETER,
+  MODE_DRAGGING_ITEM_3D,
   MODE_DRAWING_HOLE_3D,
-  SECONDARY_PURPLE_COLOR,
+  MODE_DRAWING_ITEM_3D,
   MODE_ELEVATION_VIEW,
-  MODE_DRAGGING_ITEM_3D,
+  MODE_IDLE_3D,
   MODE_ROTATING_ITEM_3D,
-  WALL_CABINET_LAYOUTPOS,
-  BASE_CABINET_LAYOUTPOS,
-  TALL_CABINET_LAYOUTPOS
+  SECONDARY_PURPLE_COLOR,
+  TALL_CABINET_LAYOUTPOS,
+  UNIT_CENTIMETER,
+  WALL_CABINET_LAYOUTPOS
 } from '../../constants';
 
 import { isUndefined } from 'util';
@@ -40,13 +39,14 @@ import { GeometryUtils } from '../../utils/export';
 import { handleCamRect, isElevationView, isEmpty } from '../../utils/helper';
 import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
 import CameraControls from 'camera-controls';
-CameraControls.install({ THREE: Three });
 import { returnReplaceableDeepSearchType } from '../viewer2d/utils';
 import {
   getAllMeshes,
   vectorIntersectWithMesh
 } from '../../utils/objects-utils';
 
+CameraControls.install({ THREE: Three });
+
 export default class Scene3DViewer extends React.Component {
   constructor(props) {
     super(props);
@@ -2978,7 +2978,7 @@ export default class Scene3DViewer extends React.Component {
           line = line.children[0].children[0];
           // index(faces) of the line
           const indexAttribute = line.geometry.getIndex();
-          const firstFaceIndices = undefined;
+          let firstFaceIndices = undefined;
           if (indexAttribute && indexAttribute.length > 0) {
             firstFaceIndices = [
               indexAttribute.getX(0),

package/src/index.js

@@ -12,9 +12,6 @@ import KitchenConfiguratorReducers from './reducers/export';
 import KitchenConfiguratorClasses from './class/export';
 import ElementsFactories from './catalog/factories/export';
 import KitchenConfiguratorUtils from './utils/export';
-
-export { default } from './KitchenConfiguratorApp';
-
 export {
   Catalog,
   Translator,
@@ -32,4 +29,4 @@ export {
   KitchenConfiguratorUtils
 };
 
-export { default as Renderer } from './KitchenConfiguratorApp';
+export { default } from './KitchenConfiguratorApp';