start ui code re-organization

src/kiri/core/api.js

@@ -1,8 +1,8 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import alerts from './alerts.js';
+import alerts from '../ui/alerts.js';
 import settings from './settings.js'
-import STACKS from './stacks.js';
+import STACKS from '../ui/stacks.js';
 
 import { broker } from '../../moto/broker.js';
 import { client as work } from './client.js';
@@ -15,7 +15,7 @@ import { noop, ajax, o2js, js2o } from './utils.js';
 import { functions } from './function.js';
 import { platform } from './platform.js';
 import { selection } from './selection.js';
-import { stats } from './stats.js';
+import { stats } from '../ui/stats.js';
 import { newWidget } from './widget.js';
 import { widgets } from './widgets.js';
 import { updateTool } from '../mode/cam/tools.js';
@@ -23,9 +23,9 @@ 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 './lang.js';
+import { LANG } from '../ui/lang.js';
 import { LOCAL, SETUP, SECURE } from './main.js';
-import { UI } from './ui.js';
+import { UI } from '../ui/component.js';
 
 import web from '../../moto/webui.js';
 

src/kiri/core/codec.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { Layers } from './layers.js';
+import { Layers } from '../ui/layers.js';
 import { newPoint } from '../../geo/point.js';
 import { Polygon, newPolygon } from '../../geo/polygon.js';
 import { Slice, newSlice, Top, newTop } from './slice.js';

src/kiri/core/init.js

@@ -4,15 +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 './slider.js';
-import { keyboard } from './keyboard.js';
-import { modal } from './modal.js';
-import { interact } from './interact.js';
+import { slider } from '../ui/slider.js';
+import { keyboard } from '../ui/keyboard.js';
+import { modal } from '../ui/modal.js';
+import { interact } from '../ui/interact.js';
 import { space } from '../../moto/space.js';
 import { LOCAL, SETUP } from './main.js';
 import { VIEWS, MODES, SEED } from './consts.js';
 import { beta, version } from '../../moto/license.js';
 import { settings as set_ctrl } from './settings.js';
+import STACKS from '../ui/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';
@@ -24,8 +25,6 @@ import { menu as menuCAM } from '../mode/cam/init-menu.js';
 import { menu as menuFDM } from '../mode/fdm/init-menu.js';
 import { menu as menuLaser } from '../mode/laser/init-menu.js';
 import { menu as menuSLA } from '../mode/sla/init-menu.js';
-import STACKS from './stacks.js';
-import './tools.js';
 
 let { CAM, SLA, FDM, LASER, DRAG, WJET, WEDM } = MODES,
     { client, catalog, platform, selection, stats } = api,

src/kiri/core/main.js

@@ -1,10 +1,10 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import './frame.js';
+import '../ui/frame.js';
 import '../../ext/base64.js';
 
-import STACKS from './stacks.js';
-import { modal } from './modal.js';
+import STACKS from '../ui/stacks.js';
+import { modal } from '../ui/modal.js';
 
 import { $ } from '../../moto/webui.js';
 import { api } from './api.js';
@@ -12,13 +12,13 @@ import { broker } from '../../moto/broker.js';
 import { consts } from './consts.js';
 import { Index } from '../../data/index.js';
 import { local as dataLocal } from '../../data/local.js';
-import { openFiles } from './files.js';
+import { openFiles } from '../ui/files.js';
 import { platform } from './platform.js';
 import { selection } from './selection.js';
 import { settings } from './settings.js';
 import { showDevices } from './devices.js';
 import { space as SPACE } from '../../moto/space.js';
-import { stats } from './stats.js';
+import { stats } from '../ui/stats.js';
 import { noop, utils } from './utils.js';
 import { version } from '../../moto/license.js';
 import { Widget, newWidget } from './widget.js';

src/kiri/core/platform.js

@@ -7,7 +7,7 @@ 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 { Packer } from './pack.js';
+import { Packer } from '../ui/pack.js';
 
 import { COLOR, MODES } from './consts.js';
 import { THREE } from '../../ext/three.js';

src/kiri/core/render.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { Layers } from './layers.js';
+import { Layers } from '../ui/layers.js';
 import { newPoint } from '../../geo/point.js';
 import { newPolygon } from '../../geo/polygon.js';
 import { newSlopeFromAngle } from '../../geo/slope.js';

src/kiri/core/slice.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { Layers } from './layers.js';
+import { Layers } from '../ui/layers.js';
 import { newPoint } from '../../geo/point.js';
 import { polygons as POLY } from '../../geo/polygons.js';
 

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

@@ -3,8 +3,8 @@
 import { api } from '../../core/api.js';
 import { env, clearPops, isDark } from './init-ui.js';
 import { CAM } from './driver-fe.js';
-import { Layers } from '../../core/layers.js';
-import { Stack } from '../../core/stack.js';
+import { Layers } from '../../ui/layers.js';
+import { Stack } from '../../ui/stack.js';
 
 export let traceOn = false;
 export let lastTrace;

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

@@ -6,8 +6,8 @@ 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';
 import { space as SPACE } from '../../../moto/space.js';
-import { Layers } from '../../core/layers.js';
-import { Stack } from '../../core/stack.js';
+import { Layers } from '../../ui/layers.js';
+import { Stack } from '../../ui/stack.js';
 import { updateStock } from './cl-stock.js';
 import { createPopOps } from './cl-ops.js';
 import { tabAdd, tabDone, tabClear, restoreTabs, rotateTabs, updateTabs, clearTabs, mirrorTabs } from './cl-tab.js';

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

@@ -6,8 +6,8 @@ import { conf } from '../../core/conf.js';
 import { util } from '../../../geo/base.js';
 import { client } from '../../core/client.js';
 import { addbox, delbox, getlastbox } from '../../core/boxes.js';
-import { Layers } from '../../core/layers.js';
-import { Stack } from '../../core/stack.js';
+import { Layers } from '../../ui/layers.js';
+import { Stack } from '../../ui/stack.js';
 import { Widget, newWidget } from '../../core/widget.js';
 import { space } from '../../../moto/space.js';
 

src/kiri/mode/laser/driver.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { base } from '../../../geo/base.js';
-import { Packer } from '../../core/pack.js';
+import { Packer } from '../../ui/pack.js';
 import { newBounds } from '../../../geo/bounds.js';
 import { newPoint } from '../../../geo/point.js';
 import { newPrint } from '../../core/print.js';

src/kiri/ui/alerts.js

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

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 './api.js';
+import { api } from '../core/api.js';
 
 let DOC = self.document,
     inputAction = null,

src/kiri/ui/do.js

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

src/kiri/ui/frame.js

@@ -1,10 +1,10 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from './api.js';
+import { api } from '../core/api.js';
 import { load } from '../../load/file.js';
-import { newWidget } from './widget.js';
-import { VIEWS } from './consts.js';
-import { widgets } from './widgets.js';
+import { newWidget } from '../core/widget.js';
+import { VIEWS } from '../core/consts.js';
+import { widgets } from '../core/widgets.js';
 
 // add frame message api listener
 window.addEventListener('message', msg => {

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 './api.js';
+import { api } from '../core/api.js';
 import { Stack } from './stack.js';
 
 let freeMem = true,

src/kiri/ui/stats.js

@@ -2,7 +2,7 @@
 
 import { local } from '../../data/local.js';
 import { broker } from '../../moto/broker.js';
-import { js2o, o2js } from './utils.js';
+import { js2o, o2js } from '../core/utils.js';
 
 class Stats {
     constructor(db) {

src/main/kiri.js

@@ -3,7 +3,7 @@
 import '../add/array.js';
 import '../add/class.js';
 import '../add/three.js';
-import '../kiri/core/lang.js';
+import '../kiri/ui/lang.js';
 import '../kiri/core/lang-en.js';
 
 import { broker } from '../moto/broker.js';