diff --git a/.env b/.env index 8579a8f..10d2a9b 100644 --- a/.env +++ b/.env @@ -1,4 +1,6 @@ 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 +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 8579a8f..10d2a9b 100644 --- a/environments/dev/dev.env +++ b/environments/dev/dev.env @@ -1,4 +1,6 @@ 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 +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 e7d2349..53e9db7 100644 --- a/environments/prod/prod.env +++ b/environments/prod/prod.env @@ -1,4 +1,6 @@ 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 +REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico +REACT_APP_HUB_ID=1 \ No newline at end of file diff --git a/public/index.html b/public/index.html index 0e46bc7..de399e5 100644 --- a/public/index.html +++ b/public/index.html @@ -2,11 +2,11 @@ - + - - - + + + %REACT_APP_TAB_TITLE% 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 diff --git a/public/loaded-files/gepafin-logo.svg b/public/loaded-files/gepafin-logo.svg new file mode 100644 index 0000000..5ae5063 --- /dev/null +++ b/public/loaded-files/gepafin-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/loaded-files/logo.svg b/public/loaded-files/logo.svg deleted file mode 100644 index 64c7443..0000000 --- a/public/loaded-files/logo.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/loaded-files/sviluppumbria-logo.svg b/public/loaded-files/sviluppumbria-logo.svg new file mode 100644 index 0000000..1119155 --- /dev/null +++ b/public/loaded-files/sviluppumbria-logo.svg @@ -0,0 +1,353 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/scss/components/layout.scss b/src/assets/scss/components/layout.scss index d859314..b140c91 100644 --- a/src/assets/scss/components/layout.scss +++ b/src/assets/scss/components/layout.scss @@ -34,6 +34,10 @@ img { max-width: 100%; } +.appLogo { + height: 50px; +} + .inner { display: flex; height: 100%; diff --git a/src/icons/LogoIcon/index.js b/src/icons/LogoIcon/index.js index 9888a04..a5e6f75 100644 --- a/src/icons/LogoIcon/index.js +++ b/src/icons/LogoIcon/index.js @@ -1,38 +1,11 @@ import React from 'react'; +const logofileName = process.env.REACT_APP_LOGO_FILENAME; +const appTitle = process.env.REACT_APP_TAB_TITLE; + const LogoIcon = () => { - return - - - - - - - - - - - - - - + const { origin } = window.location; + return {appTitle} } export default LogoIcon; \ 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`); + } } }