update deps and UI actions

niivue · Sep 19, 2024 · f800f0f · f800f0f
1 parent f7bc255
commit f800f0f
Show file tree

Hide file tree

Showing 8 changed files with 1,255 additions and 1,479 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,49 +1,21 @@
-name: Deploy
-
+name: Build and Deploy
 on:
   push:
     branches:
       - main
-
 jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-
-      - name: Install dependencies
-        uses: bahmutov/npm-install@v1
-
-      - name: Build project
-        run: npm run build
-
-      - name: Upload production-ready build files
-        uses: actions/upload-artifact@v3
-        with:
-          name: production-files
-          path: ./dist
-
-  deploy:
-    name: Deploy
-    needs: build
+  build-and-publish-live-demo:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-
     steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: production-files
-          path: ./dist
-
-      - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install and Build
+        run: |
+          npm install
+          npm run build
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./dist
+          branch: demo # The branch the action should deploy to.
+          folder: dist # The folder the action should deploy.
diff --git a/index.html b/index.html
@@ -11,15 +11,27 @@
   <body>
 
     <header>
+      <!-- reset button -->
+      <button id="resetButton">Reset</button>
       <label for="command">Command</label>
       <input id="command" value="-dehaze 5 -dog 2 3.2"/>
       <button id="processButton" disabled>Process</button>
       <button id="saveButton">Save</button>
       <button id="aboutButton">About</button>
       <button id="helpButton">Help</button>
-      <button id="moreButton">More commands</button>
+      <!-- <button id="moreButton">More commands</button> -->
+       <!-- more commands dropdown -->
+      <label id="moreCommandsLabel" for="moreCommands" style="color:white">More commands</label>
+      <select id="moreCommands"></select>
+      <div id="loadingCircle" class="loading-circle hidden"></div>
       <label for="overlayCheck" style="color:white">Overlay</label>
       <input type="checkbox" id="overlayCheck" checked />
+      <!-- overlay opacity slider -->
+      <label id="overlayOpacityLabel" for="overlayOpacity" style="color:white">Opacity</label>
+      <input type="range" id="overlayOpacity" min="0" max="1" step="0.01" value="1" />
+      <!-- overlay color select (empty but will be populated in main.js) -->
+      <label id="overlayColorLabel" for="overlayColor" style="color:white">Color</label>
+      <select id="overlayColor"></select>
     </header>
     <main>
       <canvas id="gl"></canvas>