diff --git a/bin/live b/bin/live --- a/bin/live +++ b/bin/live @@ -1,3 +1,2 @@ #!/bin/zsh -pnpm exec vite -c light9/web/live/vite.config.ts & -wait +exec pnpm exec vite -c light9/live/vite.config.ts diff --git a/light9/web/live/Effect.ts b/light9/live/Effect.ts rename from light9/web/live/Effect.ts rename to light9/live/Effect.ts --- a/light9/web/live/Effect.ts +++ b/light9/live/Effect.ts @@ -1,9 +1,9 @@ import debug from "debug"; import { Literal, NamedNode, Quad_Object, Quad_Predicate, Quad_Subject, Term } from "n3"; import { some } from "underscore"; -import { Patch, patchContainsPreds, patchUpdate } from "../patch"; -import { SyncedGraph } from "../SyncedGraph"; -import { shortShow } from "../show_specific"; +import { Patch, patchContainsPreds, patchUpdate } from "../web/patch"; +import { SyncedGraph } from "../web/SyncedGraph"; +import { shortShow } from "../web/show_specific"; type Color = string; export type ControlValue = number | Color | NamedNode; diff --git a/light9/web/live/GraphToControls.ts b/light9/live/GraphToControls.ts rename from light9/web/live/GraphToControls.ts rename to light9/live/GraphToControls.ts --- a/light9/web/live/GraphToControls.ts +++ b/light9/live/GraphToControls.ts @@ -1,6 +1,6 @@ import debug from "debug"; import { NamedNode } from "n3"; -import { SyncedGraph } from "../SyncedGraph"; +import { SyncedGraph } from "../web/SyncedGraph"; import { ControlValue, Effect } from "./Effect"; const log = debug("g2c"); diff --git a/light9/web/live/Light9DeviceControl.ts b/light9/live/Light9DeviceControl.ts rename from light9/web/live/Light9DeviceControl.ts rename to light9/live/Light9DeviceControl.ts --- a/light9/web/live/Light9DeviceControl.ts +++ b/light9/live/Light9DeviceControl.ts @@ -3,13 +3,13 @@ import { css, html, LitElement } from "l import { customElement, property } from "lit/decorators.js"; import { NamedNode } from "n3"; import { unique } from "underscore"; -import { Patch, patchContainsPreds } from "../patch"; -import { getTopGraph } from "../RdfdbSyncedGraph"; -import { SyncedGraph } from "../SyncedGraph"; +import { Patch, patchContainsPreds } from "../web/patch"; +import { getTopGraph } from "../web/RdfdbSyncedGraph"; +import { SyncedGraph } from "../web/SyncedGraph"; import { GraphToControls } from "./GraphToControls"; import { Choice } from "./Light9Listbox"; import { Light9LiveControl } from "./Light9LiveControl"; -export { ResourceDisplay } from "../ResourceDisplay"; +export { ResourceDisplay } from "../web/ResourceDisplay"; export { Light9LiveControl }; const log = debug("devcontrol"); diff --git a/light9/web/live/Light9Listbox.ts b/light9/live/Light9Listbox.ts rename from light9/web/live/Light9Listbox.ts rename to light9/live/Light9Listbox.ts diff --git a/light9/web/live/Light9LiveControl.ts b/light9/live/Light9LiveControl.ts rename from light9/web/live/Light9LiveControl.ts rename to light9/live/Light9LiveControl.ts --- a/light9/web/live/Light9LiveControl.ts +++ b/light9/live/Light9LiveControl.ts @@ -3,8 +3,8 @@ const log = debug("control"); import { css, html, LitElement, PropertyPart, PropertyValues } from "lit"; import { customElement, property } from "lit/decorators.js"; import { NamedNode } from "n3"; -import { getTopGraph } from "../RdfdbSyncedGraph"; -import { SyncedGraph } from "../SyncedGraph"; +import { getTopGraph } from "../web/RdfdbSyncedGraph"; +import { SyncedGraph } from "../web/SyncedGraph"; import { ControlValue } from "./Effect"; import { GraphToControls } from "./GraphToControls"; import { DeviceAttrRow } from "./Light9DeviceControl"; diff --git a/light9/web/live/Light9LiveControls.ts b/light9/live/Light9LiveControls.ts rename from light9/web/live/Light9LiveControls.ts rename to light9/live/Light9LiveControls.ts --- a/light9/web/live/Light9LiveControls.ts +++ b/light9/live/Light9LiveControls.ts @@ -3,11 +3,11 @@ import { css, html, LitElement, Property import { customElement, property } from "lit/decorators.js"; import { NamedNode } from "n3"; import { sortBy, uniq } from "underscore"; -import { Patch, patchContainsPreds } from "../patch"; -import { getTopGraph } from "../RdfdbSyncedGraph"; -import { SyncedGraph } from "../SyncedGraph"; +import { Patch, patchContainsPreds } from "../web/patch"; +import { getTopGraph } from "../web/RdfdbSyncedGraph"; +import { SyncedGraph } from "../web/SyncedGraph"; import { GraphToControls } from "./GraphToControls"; -export { EditChoice } from "../EditChoice"; +export { EditChoice } from "../web/EditChoice"; export { Light9DeviceControl as Light9LiveDeviceControl } from "./Light9DeviceControl"; const log = debug("controls"); diff --git a/light9/web/live/README.md b/light9/live/README.md rename from light9/web/live/README.md rename to light9/live/README.md diff --git a/light9/web/live/index.html b/light9/live/index.html rename from light9/web/live/index.html rename to light9/live/index.html diff --git a/light9/web/live/vite.config.ts b/light9/live/vite.config.ts rename from light9/web/live/vite.config.ts rename to light9/live/vite.config.ts --- a/light9/web/live/vite.config.ts +++ b/light9/live/vite.config.ts @@ -3,8 +3,8 @@ import { defineConfig } from "vite"; const servicePort = 8217; export default defineConfig({ base: "/live/", - root: "./light9/web/live", - publicDir: "../web", + root: "./light9/live", + publicDir: "../..", server: { host: "0.0.0.0", strictPort: true,