add new images as data files for build; update v number; run portable…

… build
project-pareto · Oct 6, 2023 · 8a2e021 · 8a2e021
1 parent 0ef8359
commit 8a2e021
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -69,15 +69,15 @@ jobs:
 
       - name: Sign Windows Distribution
         run: |
-          AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/ParetoUI-23.10.05-win64.exe
+          AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/ParetoUI-23.10.06-win64.exe
 
       - name: Upload artifact for windows build
         uses: actions/upload-artifact@v3
         if: always()
         with:
             name: windows-pareto-dist
             path: |
-              electron/dist/ParetoUI-23.10.05-win64.exe
+              electron/dist/ParetoUI-23.10.06-win64.exe
   # windows-build:
   #   name: Windows Build
 
@@ -126,4 +126,4 @@ jobs:
   #       with:
   #           name: windows-pareto-dist
   #           path: |
-  #             electron/dist/ParetoUI-23.10.05-win64.exe
+  #             electron/dist/ParetoUI-23.10.06-win64.exe
diff --git a/backend/app/extra-hooks/hook-pareto.py b/backend/app/extra-hooks/hook-pareto.py
@@ -55,4 +55,12 @@
 datas.append(('internal/assets/DisposalOverrideInput.png', 'app/internal/assets'))
 datas.append(('internal/assets/SRAInput.png', 'app/internal/assets'))
 
+# add workshop pngs
+datas.append(('internal/assets/workshop_baseline_input.png', 'app/internal/assets'))
+datas.append(('internal/assets/workshop_baseline_output.png', 'app/internal/assets'))
+datas.append(('internal/assets/workshop_SRA_input.png', 'app/internal/assets'))
+datas.append(('internal/assets/workshop_SRA_output.png', 'app/internal/assets'))
+datas.append(('internal/assets/workshop_beneficial_reuse_input.png', 'app/internal/assets'))
+datas.append(('internal/assets/workshop_beneficial_reuse_output.png', 'app/internal/assets'))
+
 print(datas)
diff --git a/electron/package.json b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pareto-ui",
-  "version": "23.10.05",
+  "version": "23.10.06",
   "author": "Michael Pesce",
   "private": true,
   "main": "build/main.js",
@@ -74,10 +74,10 @@
     "nsis": {
       "oneClick": false,
       "allowToChangeInstallationDirectory": true,
-      "artifactName": "ParetoUI-23.10.05-win64.exe"
+      "artifactName": "ParetoUI-23.10.06-win64.exe"
     },
     "dmg": {
-      "artifactName": "ParetoUI-23.10.05-arm64.dmg"
+      "artifactName": "ParetoUI-23.10.06-arm64.dmg"
     },
     "deb": {
       "depends": [
@@ -86,7 +86,7 @@
         "liblapack3",
         "libblas3"
       ],
-      "artifactName": "ParetoUI-23.10.05-amd64.deb"
+      "artifactName": "ParetoUI-23.10.06-amd64.deb"
     },
     "directories": {
       "buildResources": "assets"
@@ -104,9 +104,9 @@
       "icon": "build/pareto-logo.ico"
     },
     "win": {
-      "target": "nsis",
+      "target": "portable",
       "icon": "build/pareto-logo.ico",
-      "artifactName": "ParetoUI-23.10.05-win64.exe"
+      "artifactName": "ParetoUI-23.10.06-win64.exe"
     },
     "linux": {
       "target": "Deb",

diff --git a/electron/ui/src/views/LandingPage/LandingPage.js b/electron/ui/src/views/LandingPage/LandingPage.js
@@ -58,7 +58,7 @@ export default function LandingPage(props) {
                 <Grid item xs={3}> </Grid>
                 <Grid item xs={6}> 
                     <Box>
-                        <p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v23.10.05 (PARETO v0.9.0)</p>
+                        <p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v23.10.06 (PARETO v0.9.0)</p>
                     </Box>
                 </Grid>
                 <Grid item xs={3}> </Grid>