AD-SDL · tginsbu1 · Jun 7, 2024 · Jun 4, 2024 · Jun 6, 2024 · Jun 7, 2024
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+**/node_modules
diff --git a/.gitignore b/.gitignore
@@ -301,3 +301,6 @@ test_experiment/
 
 # Output data
 .wei/
+
+#node modules
+**/node_modules
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-yaml
       - id: check-json
@@ -17,7 +17,7 @@ repos:
       - id: nbstripout
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.3.2
+    rev: v0.4.8
     hooks:
       # Run the linter.
       - id: ruff

diff --git a/Dockerfile b/Dockerfile
@@ -7,6 +7,7 @@ LABEL org.opencontainers.image.licenses=MIT
 RUN set -eux; \
 	apt-get update; \
 	apt-get install -y gosu; \
+	apt-get install -y npm; \
 	rm -rf /var/lib/apt/lists/*
 
 # User configuration
@@ -30,17 +31,29 @@ RUN --mount=type=cache,target=/root/.cache \
     pip install -r wei/requirements/requirements.txt
 
 # Copy wei files
-COPY wei wei/wei
+COPY src wei/src
 COPY tests wei/tests
 COPY pyproject.toml wei/pyproject.toml
 COPY README.md wei/README.md
 COPY scripts wei/scripts
 
-
 # Install dependencies and wei
 RUN --mount=type=cache,target=/root/.cache \
     pip install -e wei
 
 COPY wei-entrypoint.sh /wei-entrypoint.sh
 RUN chmod +x /wei-entrypoint.sh
 ENTRYPOINT [ "/wei-entrypoint.sh" ]
+
+COPY ./src/ui/package*.json ./
+
+# install project dependencies
+RUN npm install
+#--mount=type=cache,target=./node_modules \
+#	npm install
+
+# copy project files and folders to the current working directory (i.e. 'app' folder)
+
+# build app for production with minification
+
+RUN npm run build --prefix wei/src/ui
diff --git a/compose.yaml b/compose.yaml
@@ -45,7 +45,7 @@ services:
       - diaspora_config:/home/app/.diaspora
       - ./tests/workcells:/workcell_defs
       - ~/.wei:/home/app/.wei
-      - ./:/home/app/wei # for development only
+
     environment:
       - PYTHONUNBUFFERED=1 # Fix weird bug with empty logging
       - USER_ID=${USER_ID:-1000}

diff --git a/package-lock.json b/package-lock.json
diff --git a/pyproject.toml b/pyproject.toml
@@ -69,10 +69,8 @@ requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 
 
-[tool.setuptools.packages.find]
-where = ["."]
-include = ["wei*"]
-exclude = ["*tests*"]
+[tool.setuptools]
+package-dir = {"wei" = "src/wei"}
 
 #####################
 # Development Tools #

diff --git a/src/ui/bun.lockb b/src/ui/bun.lockb
diff --git a/src/ui/components.d.ts b/src/ui/components.d.ts
@@ -0,0 +1,21 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+export {}
+
+declare module 'vue' {
+  export interface GlobalComponents {
+    Dashboard: typeof import('./src/components/Dashboard.vue')['default']
+    Event: typeof import('./src/components/Event.vue')['default']
+    Experiments: typeof import('./src/components/Experiments.vue')['default']
+    LocationsColumn: typeof import('./src/components/LocationsColumn.vue')['default']
+    ModuleColumn: typeof import('./src/components/ModuleColumn.vue')['default']
+    ModuleModal: typeof import('./src/components/ModuleModal.vue')['default']
+    Workflow: typeof import('./src/components/Workflow.vue')['default']
+    WorkflowModal: typeof import('./src/components/WorkflowModal.vue')['default']
+    WorkflowsColumn: typeof import('./src/components/WorkflowsColumn.vue')['default']
+    WorkflowTable: typeof import('./src/components/WorkflowTable.vue')['default']
+  }
+}
diff --git a/src/ui/index.html b/src/ui/index.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Squid Dashboard</title>
+</head>
+
+<body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+</body>
+
+</html>