Merge branch 'development' into logging_for_ddf

.github/workflows/ci.yml

@@ -0,0 +1,53 @@
+name: CI Pipeline
+
+on:
+  push:
+    branches:
+      - main
+      - development
+  pull_request:
+    branches:
+      - main
+      - development
+
+jobs:
+  build:
+    name: Build and Test
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install CLI dependencies
+        run: |
+          npm install rollup --save-dev
+          npm ci
+        working-directory: client
+
+      - name: Build client
+        run: |
+          npm run build
+        working-directory: client
+
+      - name: Setup server
+        run: |
+          cd ./
+          pip install -r requirements.txt 
+          cd server/
+          flask db init 
+          flask db migrate 
+          flask db upgrade
+
+      - name: Start server
+        run: |
+          nohup flask run &
+        working-directory: server
+
+      - name: Wait for server to start
+        run: |
+          sleep 5
+
+      - name: Verify server is running
+        run: |
+          curl -f http://localhost:8000

Dockerfile

@@ -0,0 +1,35 @@
+FROM python:3.9-slim
+
+ARG IP
+ARG PORT
+
+# download and install dependencies
+RUN apt-get update && apt-get install -y \
+    curl \
+    npm \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /
+
+COPY . .
+
+RUN sed -i -e 's/\r$//' install.sh
+
+RUN chmod +x ./install.sh
+
+RUN ./install.sh
+
+RUN sed -i -e 's/\r$//' run_prod.sh
+
+RUN chmod +x ./run_prod.sh
+
+WORKDIR /server
+
+RUN echo echo "Port: $PORT"
+
+EXPOSE $PORT
+
+WORKDIR /
+
+CMD ["sh", "./run_prod.sh"]

README.md

@@ -16,6 +16,7 @@ The project is maintained by computer science students at SUNY New Paltz, under
 - [**Ari Yeger**](https://github.com/L10nhunter)
 - [**CJ Jenks**](https://github.com/iron768)
 
+
 ## Features
 
 - **Concurrent Communication**: Manage multiple 3D printers simultaneously.
@@ -25,7 +26,7 @@ The project is maintained by computer science students at SUNY New Paltz, under
   - Storage management for purging old files while retaining essential data.
   - Job prioritization and favoring.
   - Comprehensive job filtering and history tracking.
-  - initiate printer pauses and filament color changes.
+  - Initiate printer pauses and filament color changes.
 - **Error Logging**: Assign comments and track issues for past jobs to analyze job success and error rates.
 - **Advanced Viewing**:
   - Real-time 3D model previews before and during printing.
@@ -49,7 +50,7 @@ The software is currently designed to run on Ubuntu 20.04 LTS and later. MacOS a
 Clone the repository:
 
 ```bash
-git clone https://github.com/sunyhyralab/QView3D.git
+git clone https://github.com/sunyhydralab/QView3D.git
 ```
 
 ### Run Locally:

client/package.json

@@ -17,7 +17,7 @@
         "type-check": "vue-tsc --build --force",
         "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
         "format": "prettier --write src/",
-        "start-flask": "cd ../server && flask run",
+        "start-flask": "npm run build && cd ../server && flask run",
         "start-vue": "npm run dev",
         "start": "npm-run-all --parallel start-flask start-vue",
         "start-electron": "electron-forge start",
@@ -37,7 +37,6 @@
         "bootstrap-daterangepicker": "^3.1.0",
         "cors": "^2.8.5",
         "electron-squirrel-startup": "^1.0.1",
-        "electron-store": "^10.0.0",
         "file-saver": "^2.0.5",
         "gcode-preview": "^2.13.0",
         "node": "^21.6.2",
@@ -62,6 +61,7 @@
         "@electron/fuses": "^1.8.0",
         "@rushstack/eslint-patch": "^1.3.3",
         "@tsconfig/node18": "^18.2.2",
+        "@types/bootstrap": "^5.2.10",
         "@types/file-saver": "^2.0.7",
         "@types/jsdom": "^21.1.6",
         "@types/node": "^18.19.3",
@@ -72,7 +72,6 @@
         "@vue/test-utils": "^2.4.3",
         "@vue/tsconfig": "^0.5.0",
         "electron": "^32.1.1",
-        "electron-wix-msi": "^5.1.3",
         "eslint": "^8.49.0",
         "eslint-plugin-vue": "^9.17.0",
         "jsdom": "^23.0.1",