WIP 3

brianmay · Sep 17, 2023 · 80379fe · 80379fe
1 parent b98ae13
commit 80379fe
Show file tree

Hide file tree

Showing 7,325 changed files with 1,116,021 additions and 431 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,5 @@
 local/
 target/
 .envrc/
-brian-frontend/node_modules/
-robotica-frontenv/dist/
+robotica-frontend/node_modules/
+robotica-frontend/dist/
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -17,16 +17,12 @@ updates:
     directory: "/robotica-frontend"
     schedule:
       interval: "daily"
-  - package-ecosystem: "cargo"
-    directory: "/robotica-slint"
+  - package-ecosystem: "npm"
+    directory: "/robotica-frontend"
     schedule:
       interval: "daily"
   - package-ecosystem: "cargo"
-    directory: "/brian-frontend"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "npm"
-    directory: "/brian-frontend"
+    directory: "/robotica-slint"
     schedule:
       interval: "daily"
   - package-ecosystem: "cargo"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,8 +30,6 @@ jobs:
         run: cargo test -p robotica-frontend
       - name: Test backend lib (Brian)
         run: cargo test -p brian-backend
-      - name: Test frontend lib (Brian)
-        run: cargo test -p brian-frontend
 
   push:
     name: Push

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,6 +17,5 @@ members = [
     "robotica-frontend",
     "robotica-common",
     "robotica-slint",
-    "brian-frontend",
     "brian-backend",
 ]
diff --git a/Dockerfile b/Dockerfile
@@ -20,9 +20,9 @@ ENV VCS_REF=${VCS_REF}
 
 RUN cargo build --release -p brian-backend
 RUN ls -l /brian-backend/target/release/brian-backend
-RUN npm -C brian-frontend install
-RUN npm -C brian-frontend run build
-RUN ls -l /brian-backend/brian-frontend/dist
+RUN npm -C robotica-frontend install
+RUN npm -C robotica-frontend run build
+RUN ls -l /brian-backend/robotica-frontend/dist
 
 FROM debian:bullseye-slim
 ARG APP=/usr/src/app
@@ -46,8 +46,8 @@ RUN groupadd $APP_USER \
     && mkdir -p ${APP}
 
 COPY --from=builder /brian-backend/target/release/brian-backend ${APP}/brian-backend
-COPY --from=builder /brian-backend/brian-frontend/dist ${APP}/brian-frontend/dist
-RUN ls -l ${APP}/brian-frontend/dist
+COPY --from=builder /brian-backend/robotica-frontend/dist ${APP}/robotica-frontend/dist
+RUN ls -l ${APP}/robotica-frontend/dist
 
 USER $APP_USER
 WORKDIR ${APP}

diff --git a/brian-frontend/.gitignore b/brian-frontend/.gitignore
diff --git a/brian-frontend/Cargo.toml b/brian-frontend/Cargo.toml
diff --git a/brian-frontend/src/components/mod.rs b/brian-frontend/src/components/mod.rs