Merge pull request #74 from MichaelPesce/sourced-water

Groundwater Sourced -> Sourced Water
project-pareto · Aug 6, 2024 · a46d962 · a46d962
2 parents 191d209 + 2329de7
commit a46d962
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: App build
 on:
   push:
     branches:
-      - "add-slack-option"
+      - "sourced-water"
 
 defaults:
   run:
@@ -66,12 +66,12 @@ 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-24.07.24-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-24.08.06-win64.exe
 
       - name: Upload artifact for windows build
         uses: actions/upload-artifact@v4
         if: always()
         with:
             name: windows-pareto-dist
             path: |
-              electron/dist/ParetoUI-24.07.24-win64.exe
+              electron/dist/ParetoUI-24.08.06-win64.exe
diff --git a/electron/package-lock.json b/electron/package-lock.json
diff --git a/electron/package.json b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pareto-ui",
-  "version": "24.07.24",
+  "version": "24.08.06",
   "author": "Michael Pesce",
   "private": true,
   "main": "build/main.js",
@@ -74,10 +74,10 @@
     "nsis": {
       "oneClick": false,
       "allowToChangeInstallationDirectory": true,
-      "artifactName": "ParetoUI-24.07.24-win64.exe"
+      "artifactName": "ParetoUI-24.08.06-win64.exe"
     },
     "dmg": {
-      "artifactName": "ParetoUI-24.07.24-arm64.dmg"
+      "artifactName": "ParetoUI-24.08.06-arm64.dmg"
     },
     "deb": {
       "depends": [
@@ -86,7 +86,7 @@
         "liblapack3",
         "libblas3"
       ],
-      "artifactName": "ParetoUI-24.07.24-amd64.deb"
+      "artifactName": "ParetoUI-24.08.06-amd64.deb"
     },
     "directories": {
       "buildResources": "assets"
@@ -106,7 +106,7 @@
     "win": {
       "target": "nsis",
       "icon": "build/pareto-logo.ico",
-      "artifactName": "ParetoUI-24.07.24-win64.exe"
+      "artifactName": "ParetoUI-24.08.06-win64.exe"
     },
     "linux": {
       "target": "Deb",

diff --git a/electron/ui/cypress/e2e/ScenarioTests.cy.js b/electron/ui/cypress/e2e/ScenarioTests.cy.js
@@ -174,7 +174,7 @@ describe('scenario testing', () => {
         //validate results
         cy.contains(/recycling rate/i).should('be.visible')
         cy.contains(/total disposal/i).should('be.visible')
-        cy.contains(/groundwater source/i).should('be.visible')
+        cy.contains(/sourced water/i).should('be.visible')
         cy.contains(/capex/i).should('be.visible')
         cy.contains(/opex/i).should('be.visible')
     })

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"}}>v24.07.24 (PARETO v{process.env.REACT_APP_PARETO_VERSION})</p>
+                        <p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v24.08.06 (PARETO v{process.env.REACT_APP_PARETO_VERSION})</p>
                     </Box>
                 </Grid>
                 <Grid item xs={3}> </Grid>

diff --git a/electron/ui/src/views/ModelResults/KPIDashboard.js b/electron/ui/src/views/ModelResults/KPIDashboard.js
@@ -198,7 +198,7 @@ export default function KPIDashboard(props) {
             <Grid item xs={12}>
                 <Box sx={{display: 'flex', justifyContent: 'center'}}>
                 <IconButton disabled><WaterIcon sx={{ color:"#59b8d6" }}/></IconButton>
-                <p style={styles.kpiTitle}>Groundwater Sourced</p>
+                <p style={styles.kpiTitle}>Sourced Water</p>
                 </Box>
             </Grid>
             <Grid item xs={12}>