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

1.0.0 updates #75

Merged
merged 8 commits into from
Aug 15, 2024
Merged

1.0.0 updates #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
715ca0c
use project pareto main for sample files
MichaelPesce Jul 17, 2024
c8cec0f
build with main
MichaelPesce Jul 17, 2024
e0e2b09
build with main
MichaelPesce Jul 17, 2024
daa38a2
merge main in
MichaelPesce Aug 13, 2024
e22d23f
update version number
MichaelPesce Aug 13, 2024
1bb91d3
build off 1.0.0
MichaelPesce Aug 13, 2024
d163147
fix sample file urls
MichaelPesce Aug 13, 2024
da21823
fix backend insatllation step
MichaelPesce Aug 13, 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
8 changes: 4 additions & 4 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:
- "sourced-water"
- "1.0.0"

defaults:
run:
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:

- name: Install correct branch of pareto
working-directory: ../
run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && pip install --progress-bar off .
run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && git fetch --all --tags && git checkout tags/1.0.0 -b 1.0.0 && pip install --progress-bar off .

- name: Install build requirements
working-directory: ./backend
Expand All @@ -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.08.06-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.13-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.08.06-win64.exe
electron/dist/ParetoUI-24.08.13-win64.exe
3 changes: 0 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ jobs:
run: |
echo REACT_APP_PARETO_VERSION=1.0.0 >> .env

# - name: Install pint
# run: pip install pint==0.23

- name: get idaes extensions
run: idaes get-extensions

Expand Down
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.08.06",
"version": "24.08.13",
"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.08.06-win64.exe"
"artifactName": "ParetoUI-24.08.13-win64.exe"
},
"dmg": {
"artifactName": "ParetoUI-24.08.06-arm64.dmg"
"artifactName": "ParetoUI-24.08.13-arm64.dmg"
},
"deb": {
"depends": [
Expand All @@ -86,7 +86,7 @@
"liblapack3",
"libblas3"
],
"artifactName": "ParetoUI-24.08.06-amd64.deb"
"artifactName": "ParetoUI-24.08.13-amd64.deb"
},
"directories": {
"buildResources": "assets"
Expand All @@ -106,7 +106,7 @@
"win": {
"target": "nsis",
"icon": "build/pareto-logo.ico",
"artifactName": "ParetoUI-24.08.06-win64.exe"
"artifactName": "ParetoUI-24.08.13-win64.exe"
},
"linux": {
"target": "Deb",
Expand Down
3 changes: 2 additions & 1 deletion electron/ui/src/components/FileUploadModal/FileUploadModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ export default function FileUploadModal(props) {
const [ warningMessage, setWarningMessage ] = useState("")
const [ file, setFile ] = useState(null)
const fileTypes = ["xlsx", "kmz", "kml"];
const PARETO_VERSION = "main"

const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/strategic_permian_demo.xlsx"
const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/workshop_baseline_all_data.xlsx"
const workshopFileName = "workshop_baseline_all_data_"+process.env.REACT_APP_PARETO_VERSION+".xlsx"

const { port } = useApp()


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