From 248cf449abf4a689710c650479d19d96eba1d9c7 Mon Sep 17 00:00:00 2001 From: Anna Shi Date: Sat, 7 Dec 2024 17:48:26 -0500 Subject: [PATCH 1/3] fixed env variables --- .env | 6 ++---- .env.development | 13 ++----------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.env b/.env index 6367254..ba0c9ea 100644 --- a/.env +++ b/.env @@ -1,9 +1,7 @@ -# REACT_APP_API_URL=https://api.harmonydata.ac.uk REACT_APP_API_URL=http://localhost:8000 REACT_APP_API_EXAMPLES=$REACT_APP_API_URL/text/examples REACT_APP_API_PARSE=$REACT_APP_API_URL/text/parse REACT_APP_API_MATCH=$REACT_APP_API_URL/text/match -# REACT_APP_API_VERSION=$REACT_APP_API_URL/info/version -# REACT_APP_API_MODELS=$REACT_APP_API_URL/info/list-models -# REACT_APP_ABSOLUTE_URL_PREFIX=https://harmonydata.github.io +REACT_APP_API_VERSION=$REACT_APP_API_URL/info/version +REACT_APP_API_MODELS=$REACT_APP_API_URL/info/list-models REACT_APP_ABSOLUTE_URL_PREFIX=http://localhost:8000 diff --git a/.env.development b/.env.development index c9c21ac..ba0c9ea 100644 --- a/.env.development +++ b/.env.development @@ -1,16 +1,7 @@ -# REACT_APP_API_URL=https://harmonystagingtmp.azurewebsites.net/ -# REACT_APP_API_EXAMPLES=$REACT_APP_API_URL/text/examples -# REACT_APP_API_PARSE=$REACT_APP_API_URL/text/parse -# REACT_APP_API_MATCH=$REACT_APP_API_URL/text/match -# REACT_APP_API_VERSION=$REACT_APP_API_URL/info/version -# REACT_APP_API_MODELS=$REACT_APP_API_URL/info/list-models -# REACT_APP_ABSOLUTE_URL_PREFIX=https://harmonydata.github.io -# REACT_APP_API_URL=https://api.harmonydata.ac.uk REACT_APP_API_URL=http://localhost:8000 REACT_APP_API_EXAMPLES=$REACT_APP_API_URL/text/examples REACT_APP_API_PARSE=$REACT_APP_API_URL/text/parse REACT_APP_API_MATCH=$REACT_APP_API_URL/text/match -# REACT_APP_API_VERSION=$REACT_APP_API_URL/info/version -# REACT_APP_API_MODELS=$REACT_APP_API_URL/info/list-models -# REACT_APP_ABSOLUTE_URL_PREFIX=https://harmonydata.github.io +REACT_APP_API_VERSION=$REACT_APP_API_URL/info/version +REACT_APP_API_MODELS=$REACT_APP_API_URL/info/list-models REACT_APP_ABSOLUTE_URL_PREFIX=http://localhost:8000 From 6e2b4ed1433c05996a1d43af9ab9b5cf596c967b Mon Sep 17 00:00:00 2001 From: Anna Shi Date: Sat, 7 Dec 2024 18:00:54 -0500 Subject: [PATCH 2/3] added duplicate export button for pdf --- src/components/ResultsOptions.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/components/ResultsOptions.js b/src/components/ResultsOptions.js index 69ab43f..46e59a7 100644 --- a/src/components/ResultsOptions.js +++ b/src/components/ResultsOptions.js @@ -174,8 +174,25 @@ export default function ResultsOptions({ }} > - Export + Excel Export + + {/* second button check */} + + From 54a75918828537e87754a5081641269c47c94d43 Mon Sep 17 00:00:00 2001 From: Anna Shi Date: Sat, 7 Dec 2024 18:12:05 -0500 Subject: [PATCH 3/3] added pdf icon to export button --- src/components/ResultsOptions.js | 8 +++----- src/img/pdf.svg | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 src/img/pdf.svg diff --git a/src/components/ResultsOptions.js b/src/components/ResultsOptions.js index 46e59a7..404819d 100644 --- a/src/components/ResultsOptions.js +++ b/src/components/ResultsOptions.js @@ -11,6 +11,7 @@ import { InputAdornment, } from "@mui/material"; import { ReactComponent as xlsxSVG } from "../img/file-excel-solid.svg"; +import { ReactComponent as pdfSVG } from "../img/pdf.svg"; import DropdownShareButton from "./DropdownShareButton"; import SvgIcon from "@mui/material/SvgIcon"; import { useAuth } from "../contexts/AuthContext"; @@ -176,8 +177,6 @@ export default function ResultsOptions({ Excel Export - - {/* second button check */} - diff --git a/src/img/pdf.svg b/src/img/pdf.svg new file mode 100644 index 0000000..e2a24ba --- /dev/null +++ b/src/img/pdf.svg @@ -0,0 +1 @@ + \ No newline at end of file