From c7964286e0c357f55a88d05cdf123fde42fa1b66 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Wed, 10 Jul 2024 07:09:58 -0400 Subject: [PATCH] build using main (temp hardcode main for download files) --- .github/workflows/build.yml | 4 ++-- .github/workflows/main.yml | 2 +- .../ui/src/components/FileUploadModal/FileUploadModal.js | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a0c904c..ff246272 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: App build on: push: branches: - - "1.0rc0" + - "1.0.0" defaults: run: @@ -33,7 +33,7 @@ jobs: - name: Add project pareto version to .env file working-directory: ./electron/ui run: | - echo REACT_APP_PARETO_VERSION=1.0.0rc1 >> .env + echo REACT_APP_PARETO_VERSION=1.0.0 >> .env - name: Install Electron JS dependencies run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd7d1e00..7358a184 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,7 @@ jobs: - name: Add project pareto version to .env file working-directory: ./electron/ui run: | - echo REACT_APP_PARETO_VERSION=1.0.0rc1 >> .env + echo REACT_APP_PARETO_VERSION=1.0.0 >> .env # - name: Install pint # run: pip install pint==0.23 diff --git a/electron/ui/src/components/FileUploadModal/FileUploadModal.js b/electron/ui/src/components/FileUploadModal/FileUploadModal.js index cd232498..b26043f1 100644 --- a/electron/ui/src/components/FileUploadModal/FileUploadModal.js +++ b/electron/ui/src/components/FileUploadModal/FileUploadModal.js @@ -20,9 +20,11 @@ export default function FileUploadModal(props) { const [ file, setFile ] = useState(null) const fileTypes = ["xlsx", "kmz", "kml"]; - 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" + let tempVersion = "main" + + const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+tempVersion+"/pareto/case_studies/strategic_permian_demo.xlsx" + const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+tempVersion+"/pareto/case_studies/workshop_baseline_all_data.xlsx" + const workshopFileName = "workshop_baseline_all_data_"+tempVersion+".xlsx" const { port } = useApp()