From c7181f3c1bf72addc2268e4c3292e74275718b16 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Thu, 17 Oct 2024 15:01:52 +0200 Subject: [PATCH 1/5] - updated env vars; --- .env | 2 +- environments/dev/dev.env | 2 +- environments/prod/prod.env | 2 +- public/index.html | 8 +- .../{logo.svg => gepafin-logo.svg} | 0 public/loaded-files/sviluppumbria-logo.svg | 354 ++++++++++++++++++ 6 files changed, 361 insertions(+), 7 deletions(-) rename public/loaded-files/{logo.svg => gepafin-logo.svg} (100%) create mode 100644 public/loaded-files/sviluppumbria-logo.svg diff --git a/.env b/.env index 8579a8f..9fc1609 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ REACT_APP_TAB_TITLE=Gepafin REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1 REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit -REACT_APP_LOGO_FILENAME=logo.svg \ No newline at end of file +REACT_APP_LOGO_FILENAME=gepafin-logo.svg \ No newline at end of file diff --git a/environments/dev/dev.env b/environments/dev/dev.env index 8579a8f..9fc1609 100644 --- a/environments/dev/dev.env +++ b/environments/dev/dev.env @@ -1,4 +1,4 @@ REACT_APP_TAB_TITLE=Gepafin REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1 REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit -REACT_APP_LOGO_FILENAME=logo.svg \ No newline at end of file +REACT_APP_LOGO_FILENAME=gepafin-logo.svg \ No newline at end of file diff --git a/environments/prod/prod.env b/environments/prod/prod.env index e7d2349..307b3b1 100644 --- a/environments/prod/prod.env +++ b/environments/prod/prod.env @@ -1,4 +1,4 @@ REACT_APP_TAB_TITLE=Gepafin REACT_APP_API_EXECUTION_ADDRESS=https://bandi-api.gepafin.it/v1 REACT_APP_API_ADDRESS=https://bandi-api.gepafin.it -REACT_APP_LOGO_FILENAME=logo.svg \ No newline at end of file +REACT_APP_LOGO_FILENAME=gepafin-logo.svg \ No newline at end of file diff --git a/public/index.html b/public/index.html index 0e46bc7..91a00df 100644 --- a/public/index.html +++ b/public/index.html @@ -2,11 +2,11 @@ - + - - - + + + %REACT_APP_TAB_TITLE% diff --git a/public/loaded-files/logo.svg b/public/loaded-files/gepafin-logo.svg similarity index 100% rename from public/loaded-files/logo.svg rename to public/loaded-files/gepafin-logo.svg diff --git a/public/loaded-files/sviluppumbria-logo.svg b/public/loaded-files/sviluppumbria-logo.svg new file mode 100644 index 0000000..392600b --- /dev/null +++ b/public/loaded-files/sviluppumbria-logo.svg @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f85dc56f690e0c49837c83346504659989d7cf51 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Fri, 18 Oct 2024 11:04:23 +0200 Subject: [PATCH 2/5] - updated code to work with hub id var; --- .env | 3 ++- environments/dev/dev.env | 3 ++- environments/prod/prod.env | 3 ++- src/pages/Login/index.js | 7 ++++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 9fc1609..62cb328 100644 --- a/.env +++ b/.env @@ -1,4 +1,5 @@ REACT_APP_TAB_TITLE=Gepafin REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1 REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit -REACT_APP_LOGO_FILENAME=gepafin-logo.svg \ No newline at end of file +REACT_APP_LOGO_FILENAME=gepafin-logo.svg +REACT_APP_HUB_ID=1 \ No newline at end of file diff --git a/environments/dev/dev.env b/environments/dev/dev.env index 9fc1609..62cb328 100644 --- a/environments/dev/dev.env +++ b/environments/dev/dev.env @@ -1,4 +1,5 @@ REACT_APP_TAB_TITLE=Gepafin REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1 REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit -REACT_APP_LOGO_FILENAME=gepafin-logo.svg \ No newline at end of file +REACT_APP_LOGO_FILENAME=gepafin-logo.svg +REACT_APP_HUB_ID=1 \ No newline at end of file diff --git a/environments/prod/prod.env b/environments/prod/prod.env index 307b3b1..8fd9699 100644 --- a/environments/prod/prod.env +++ b/environments/prod/prod.env @@ -1,4 +1,5 @@ REACT_APP_TAB_TITLE=Gepafin REACT_APP_API_EXECUTION_ADDRESS=https://bandi-api.gepafin.it/v1 REACT_APP_API_ADDRESS=https://bandi-api.gepafin.it -REACT_APP_LOGO_FILENAME=gepafin-logo.svg \ No newline at end of file +REACT_APP_LOGO_FILENAME=gepafin-logo.svg +REACT_APP_HUB_ID=1 \ No newline at end of file diff --git a/src/pages/Login/index.js b/src/pages/Login/index.js index a9b8221..d03c3c0 100644 --- a/src/pages/Login/index.js +++ b/src/pages/Login/index.js @@ -18,6 +18,7 @@ import { Accordion } from 'primereact/accordion'; import { AccordionTab } from 'primereact/accordion'; const API_BASE_URL = process.env.REACT_APP_API_ADDRESS; +const APP_HUB_ID = process.env.REACT_APP_HUB_ID; const Login = () => { const token = useStore().main.token(); @@ -29,7 +30,11 @@ const Login = () => { const loginWithSpid = () => { if (!loading) { - window.location.replace(`${API_BASE_URL}/saml2/authenticate/loginumbria`); + if (APP_HUB_ID) { + window.location.replace(`${API_BASE_URL}/saml2/authenticate/loginumbria?hubId=${APP_HUB_ID}`); + }else { + window.location.replace(`${API_BASE_URL}/saml2/authenticate/loginumbria`); + } } } From 70e775b98d64cf599c92e591fba3194edf248041 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Fri, 18 Oct 2024 11:16:20 +0200 Subject: [PATCH 3/5] - added env var for favicon; --- .env | 1 + environments/dev/dev.env | 1 + environments/prod/prod.env | 1 + .../{favicon.ico => gepafin-favicon.ico} | Bin 4 files changed, 3 insertions(+) rename public/loaded-files/{favicon.ico => gepafin-favicon.ico} (100%) diff --git a/.env b/.env index 62cb328..10d2a9b 100644 --- a/.env +++ b/.env @@ -2,4 +2,5 @@ REACT_APP_TAB_TITLE=Gepafin REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1 REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit REACT_APP_LOGO_FILENAME=gepafin-logo.svg +REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico REACT_APP_HUB_ID=1 \ No newline at end of file diff --git a/environments/dev/dev.env b/environments/dev/dev.env index 62cb328..10d2a9b 100644 --- a/environments/dev/dev.env +++ b/environments/dev/dev.env @@ -2,4 +2,5 @@ REACT_APP_TAB_TITLE=Gepafin REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1 REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit REACT_APP_LOGO_FILENAME=gepafin-logo.svg +REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico REACT_APP_HUB_ID=1 \ No newline at end of file diff --git a/environments/prod/prod.env b/environments/prod/prod.env index 8fd9699..53e9db7 100644 --- a/environments/prod/prod.env +++ b/environments/prod/prod.env @@ -2,4 +2,5 @@ REACT_APP_TAB_TITLE=Gepafin REACT_APP_API_EXECUTION_ADDRESS=https://bandi-api.gepafin.it/v1 REACT_APP_API_ADDRESS=https://bandi-api.gepafin.it REACT_APP_LOGO_FILENAME=gepafin-logo.svg +REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico REACT_APP_HUB_ID=1 \ No newline at end of file diff --git a/public/loaded-files/favicon.ico b/public/loaded-files/gepafin-favicon.ico similarity index 100% rename from public/loaded-files/favicon.ico rename to public/loaded-files/gepafin-favicon.ico From d4cf597cd90a41dc84121b19e0d2103e4defe779 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Fri, 18 Oct 2024 11:17:04 +0200 Subject: [PATCH 4/5] - updated index.html file; --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 91a00df..de399e5 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,7 @@ - + From 430ae955acbc676f3430a116c3a33a1228724db9 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Fri, 18 Oct 2024 11:48:19 +0200 Subject: [PATCH 5/5] - added correct logo gepafin; - fixed layout; --- public/loaded-files/gepafin-logo.svg | 33 +------------------ public/loaded-files/sviluppumbria-logo.svg | 1 - src/assets/scss/components/layout.scss | 4 +++ src/icons/LogoIcon/index.js | 37 +++------------------- 4 files changed, 10 insertions(+), 65 deletions(-) diff --git a/public/loaded-files/gepafin-logo.svg b/public/loaded-files/gepafin-logo.svg index 64c7443..5ae5063 100644 --- a/public/loaded-files/gepafin-logo.svg +++ b/public/loaded-files/gepafin-logo.svg @@ -1,32 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/loaded-files/sviluppumbria-logo.svg b/public/loaded-files/sviluppumbria-logo.svg index 392600b..1119155 100644 --- a/public/loaded-files/sviluppumbria-logo.svg +++ b/public/loaded-files/sviluppumbria-logo.svg @@ -1,5 +1,4 @@ - {appTitle} } export default LogoIcon; \ No newline at end of file