more shuffling of ui files

src/kiri/core/widgets.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $ } from '../../moto/webui.js';
-import { api } from './api.js';
+import { api } from '../ui/api.js';
 import { load } from '../../load/file.js';
 import { Widget, newWidget } from './widget.js';
 

src/kiri/mode/cam/anim-2d-fe.js

@@ -2,7 +2,7 @@
 
 // UI FRONT END ANIMATION CODE for 2D
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { space } from '../../../moto/space.js';
 
 const { client } = api;

src/kiri/mode/cam/anim-3d-fe.js

@@ -2,7 +2,7 @@
 
 // UI FRONT END ANIMATION CODE for 3D (indexed)
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { space } from '../../../moto/space.js';
 
 const { client } = api;

src/kiri/mode/cam/cl-flip.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { env, opAdd, opRender } from './init-ui.js';
 import { CAM } from './driver-fe.js';
 import { clearTabs, restoreTabs } from './cl-tab.js';

src/kiri/mode/cam/cl-helical.js

@@ -1,4 +1,4 @@
-import { api } from "../../core/api.js";
+import { api } from '../../ui/api.js';
 import { CAM } from "./driver-fe.js";
 import { clearPops, env } from "./init-ui.js";
 

src/kiri/mode/cam/cl-hole.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { env, clearPops } from './init-ui.js';
 import { CAM } from './driver-fe.js';
 

src/kiri/mode/cam/cl-ops.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $, h } from '../../../moto/webui.js';
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { env, opRender } from './init-ui.js';
 import { Tool } from './tool.js';
 import { opFlip } from './cl-flip.js';

src/kiri/mode/cam/cl-origin.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { env, clearPops } from './init-ui.js';
 import { CAM } from './driver-fe.js';
 import { addbox, clearboxes } from '../../core/boxes.js';

src/kiri/mode/cam/cl-stock.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { env, isDark } from './init-ui.js';
 import { space as SPACE } from '../../../moto/space.js';
 

src/kiri/mode/cam/cl-surface.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { env, clearPops } from './init-ui.js';
 import { CAM } from './driver-fe.js';
 

src/kiri/mode/cam/cl-tab.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { env, isDark } from './init-ui.js';
 import { addbox, delbox, clearboxes } from '../../core/boxes.js';
 import { traceDone } from './cl-trace.js';

src/kiri/mode/cam/cl-trace.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { env, clearPops, isDark } from './init-ui.js';
 import { CAM } from './driver-fe.js';
 import { Layers } from '../../ui/layers.js';

src/kiri/mode/cam/driver-fe.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { codec } from '../../core/codec.js';
 
 function surface_prep(index, ondone) {

src/kiri/mode/cam/init-menu.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { originReset, originSelect } from './cl-origin.js';
 import { updateTool } from './tools.js';
 

src/kiri/mode/cam/init-ui.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $ } from '../../../moto/webui.js';
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { load } from '../../../load/file.js';
 import { animate as anim_2d, animate_clear as anim_2d_clear } from './anim-2d-fe.js';
 import { animate2 as anim_3d, animate_clear2 as anim_3d_clear } from './anim-3d-fe.js';

src/kiri/mode/cam/tools.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $ } from '../../../moto/webui.js';
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { consts } from '../../core/consts.js';
 import { settings as setconf } from '../../ui/config/manager.js';
 import { Tool, calcTaperAngle, calcTaperBallExtent, calcTaperLength } from './tool.js';

src/kiri/mode/fdm/init-menu.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 
 let LANG = api.language.current;
 let { FDM } = api.const.MODES,

src/kiri/mode/fdm/init-ui.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $ } from '../../../moto/webui.js';
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 import { conf } from '../../ui/config/defaults.js';
 import { util } from '../../../geo/base.js';
 import { client } from '../../ui/client.js';

src/kiri/mode/laser/init-menu.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 
 let LANG = api.language.current;
 let { LASER, DRAG, WJET, WEDM } = api.const.MODES,

src/kiri/mode/sla/init-menu.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 
 let LANG = api.language.current;
 let { SLA } = api.const.MODES,

src/kiri/mode/sla/init-ui.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $ } from '../../../moto/webui.js';
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 
 export const SLA = {
     init,

src/kiri/mode/wedm/init-ui.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../../core/api.js';
+import { api } from '../../ui/api.js';
 
 const state = {
     api: undefined,

src/kiri/run/engine.js

@@ -3,7 +3,7 @@
 import '../../add/array.js';
 import '../../add/class.js';
 import '../../add/three.js';
-import { api } from '../core/api.js';
+import { api } from '../ui/api.js';
 import { conf } from '../ui/config/defaults.js';
 import { client } from '../ui/client.js';
 import { load } from '../../load/file.js';

src/kiri/ui/alerts.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../core/api.js';
+import { api } from './api.js';
 
 let alerts = [];
 

src/kiri/ui/api.js

@@ -1,31 +1,31 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import alerts from '../ui/alerts.js';
+import alerts from './alerts.js';
-import settings from '../ui/config/manager.js';
+import settings from './config/manager.js';
-import STACKS from '../ui/stacks.js';
+import STACKS from './stacks.js';
 
 import { broker } from '../../moto/broker.js';
-import { client as work } from '../ui/client.js';
+import { client as work } from './client.js';
-import { consts, COLOR as color, LISTS as lists } from './consts.js';
+import { consts, COLOR as color, LISTS as lists } from '../core/consts.js';
-import { device, devices } from '../ui/devices.js';
+import { device, devices } from './devices.js';
 import { catalog, dialog, event, group, help, hide, image } from './main.js';
 import { modal, mode, process, show, space, util, view } from './main.js';
 import { local as dataLocal } from '../../data/local.js';
-import { noop, ajax, o2js, js2o } from './utils.js';
+import { noop, ajax, o2js, js2o } from '../core/utils.js';
 import { functions } from './function.js';
 import { platform } from './platform.js';
-import { selection } from './selection.js';
+import { selection } from './select.js';
-import { stats } from '../ui/stats.js';
+import { stats } from './stats.js';
-import { newWidget } from './widget.js';
+import { newWidget } from '../core/widget.js';
-import { widgets } from './widgets.js';
+import { widgets } from '../core/widgets.js';
 import { updateTool } from '../mode/cam/tools.js';
 import { beta, version } from '../../moto/license.js';
 import { space as SPACE } from '../../moto/space.js';
 import { types as load } from '../../load/file.js';
 
-import { LANG } from '../ui/lang.js';
+import { LANG } from './lang.js';
 import { LOCAL, SETUP, SECURE } from './main.js';
-import { UI } from '../ui/component.js';
+import { UI } from './component.js';
 
 import web from '../../moto/webui.js';
 

src/kiri/ui/client.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../core/api.js';
+import { api } from './api.js';
 import { noop } from '../core/utils.js';
 import { codec } from '../core/codec.js';
 import { Widget } from '../core/widget.js';

src/kiri/ui/component.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $ } from '../../moto/webui.js';
-import { api } from '../core/api.js';
+import { api } from './api.js';
 
 let DOC = self.document,
     inputAction = null,

src/kiri/ui/config/manager.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $, h } from '../../../moto/webui.js';
-import { api } from '../../core/api.js';
+import { api } from '../api.js';
 import { conf } from './defaults.js';
 import { codec } from '../../core/codec.js';
 import { consts } from '../../core/consts.js';

src/kiri/ui/devices.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $, h } from '../../moto/webui.js';
-import { api } from '../core/api.js';
+import { api } from './api.js';
 import { conf } from './config/defaults.js';
 import { space } from '../../moto/space.js';
 import { devices as devlist } from '../../pack/kiri-devs.js';

src/kiri/ui/do.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../core/api.js';
+import { api } from './api.js';
 import { space } from '../../moto/space.js';
 
 const { event } = api;

src/kiri/ui/export.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $ } from '../../moto/webui.js';
-import { api } from '../core/api.js';
+import { api } from './api.js';
 import { client } from './client.js';
 import { local } from '../../data/local.js';
 import { util } from '../../geo/base.js';

src/kiri/ui/frame.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from '../core/api.js';
+import { api } from './api.js';
 import { load } from '../../load/file.js';
 import { newWidget } from '../core/widget.js';
 import { VIEWS } from '../core/consts.js';

src/kiri/ui/function.js

@@ -1,11 +1,11 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { api } from './api.js';
-import { client } from '../ui/client.js';
+import { client } from './client.js';
-import { codec } from './codec.js';
+import { codec } from '../core/codec.js';
 import { space } from '../../moto/space.js';
-import { COLOR, PMODES } from './consts.js';
+import { COLOR, PMODES } from '../core/consts.js';
-import { exportFile } from '../ui/export.js';
+import { exportFile } from './export.js';
 
 let complete = {};
 

src/kiri/ui/init.js

@@ -4,16 +4,16 @@ import { $, $c } from '../../moto/webui.js';
 import { api } from './api.js';
 import { base } from '../../geo/base.js';
 import { local as sdb } from '../../data/local.js';
-import { slider } from '../ui/slider.js';
+import { slider } from './slider.js';
-import { keyboard } from '../ui/keyboard.js';
+import { keyboard } from './keyboard.js';
-import { modal } from '../ui/modal.js';
+import { modal } from './modal.js';
-import { interact } from '../ui/interact.js';
+import { interact } from './interact.js';
 import { space } from '../../moto/space.js';
 import { LOCAL, SETUP } from './main.js';
-import { VIEWS, MODES, SEED } from './consts.js';
+import { VIEWS, MODES, SEED } from '../core/consts.js';
 import { beta, version } from '../../moto/license.js';
-import { settings as set_ctrl } from '../ui/config/manager.js';
+import { settings as set_ctrl } from './config/manager.js';
-import STACKS from '../ui/stacks.js';
+import STACKS from './stacks.js';
 import { init as initCAM } from '../mode/cam/init-ui.js';
 import { init as initDRAG } from '../mode/drag/init-ui.js';
 import { init as initFDM } from '../mode/fdm/init-ui.js';

src/kiri/ui/main.js

@@ -1,27 +1,27 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import '../ui/frame.js';
+import './frame.js';
 import '../../ext/base64.js';
 
-import STACKS from '../ui/stacks.js';
+import STACKS from './stacks.js';
-import { modal } from '../ui/modal.js';
+import { modal } from './modal.js';
 
 import { $ } from '../../moto/webui.js';
 import { api } from './api.js';
 import { broker } from '../../moto/broker.js';
-import { consts } from './consts.js';
+import { consts } from '../core/consts.js';
 import { Index } from '../../data/index.js';
 import { local as dataLocal } from '../../data/local.js';
-import { openFiles } from '../ui/files.js';
+import { openFiles } from './files.js';
 import { platform } from './platform.js';
-import { selection } from './selection.js';
+import { selection } from './select.js';
-import { settings } from '../ui/config/manager.js';
+import { settings } from './config/manager.js';
-import { showDevices } from '../ui/devices.js';
+import { showDevices } from './devices.js';
 import { space as SPACE } from '../../moto/space.js';
-import { stats } from '../ui/stats.js';
+import { stats } from './stats.js';
-import { noop, utils } from './utils.js';
+import { noop, utils } from '../core/utils.js';
 import { version } from '../../moto/license.js';
-import { Widget, newWidget } from './widget.js';
+import { Widget, newWidget } from '../core/widget.js';
 import { showTools } from '../mode/cam/tools.js';
 
 let { parseOpt, o2js, js2o, ls2o } = utils,

src/kiri/ui/platform.js

@@ -2,14 +2,14 @@
 
 import { $, h } from '../../moto/webui.js';
 import { api } from './api.js';
-import { ajax, js2o } from './utils.js';
+import { ajax, js2o } from '../core/utils.js';
 import { base } from '../../geo/base.js';
 import { load } from '../../load/file.js';
 import { space } from '../../moto/space.js';
-import { Widget, newWidget } from './widget.js';
+import { Widget, newWidget } from '../core/widget.js';
-import { Packer } from '../ui/pack.js';
+import { Packer } from './pack.js';
 
-import { COLOR, MODES } from './consts.js';
+import { COLOR, MODES } from '../core/consts.js';
 import { THREE } from '../../ext/three.js';
 
 const V0 = new THREE.Vector3(0,0,0);

src/kiri/ui/stacks.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $ } from '../../moto/webui.js';
-import { api } from '../core/api.js';
+import { api } from './api.js';
 import { Stack } from './stack.js';
 
 let freeMem = true,

src/main/kiri.js

@@ -7,7 +7,7 @@ import '../kiri/ui/lang.js';
 import '../kiri/core/lang-en.js';
 
 import { broker } from '../moto/broker.js';
-import { run } from '../kiri/core/init.js';
+import { run } from '../kiri/ui/init.js';
 
 let traceload = location.search.indexOf('traceload') > 0;
 let load = [];