Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Groundwater Sourced -> Sourced Water #74

Merged
merged 4 commits into from
Aug 6, 2024
Merged

Groundwater Sourced -> Sourced Water #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81a8721
groundwater sourced -
MichaelPesce Aug 6, 2024
99f8c1d
update v numbers, run build
MichaelPesce Aug 6, 2024
f9ee774
build with sample xlsx from main
MichaelPesce Aug 6, 2024
2329de7
reverse xlsx file name change
MichaelPesce Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: App build
on:
push:
branches:
- "add-slack-option"
- "sourced-water"

defaults:
run:
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions electron/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pareto-ui",
"version": "24.07.24",
"version": "24.08.06",
"author": "Michael Pesce",
"private": true,
"main": "build/main.js",
Expand Down Expand Up @@ -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": [
Expand All @@ -86,7 +86,7 @@
"liblapack3",
"libblas3"
],
"artifactName": "ParetoUI-24.07.24-amd64.deb"
"artifactName": "ParetoUI-24.08.06-amd64.deb"
},
"directories": {
"buildResources": "assets"
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion electron/ui/cypress/e2e/ScenarioTests.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Expand Down
2 changes: 1 addition & 1 deletion electron/ui/src/views/LandingPage/LandingPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion electron/ui/src/views/ModelResults/KPIDashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}>
Expand Down