From b4dd67532590a9ffe86910e4a7f695397f659ee2 Mon Sep 17 00:00:00 2001 From: at670475 Date: Wed, 9 Oct 2019 19:52:20 +0200 Subject: [PATCH] Fix problems Signed-off-by: at670475 --- .gitignore | 2 +- frontend/.env | 9 +++++---- frontend/.env.development | 4 +++- frontend/.env.production | 2 ++ frontend/.env.test | 5 +++-- frontend/public/index.html | 2 +- frontend/src/assets/images/github.jpeg | Bin 0 -> 9474 bytes frontend/src/components/Header/Header.css | 17 +++++++++++++---- frontend/src/components/Header/Header.jsx | 3 +-- .../src/components/Header/HeaderContainer.jsx | 1 - frontend/src/epics/fetch-tiles.jsx | 8 +++++--- .../src/reducers/zowe-versions-reducer.jsx | 3 --- 12 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 frontend/src/assets/images/github.jpeg diff --git a/.gitignore b/.gitignore index 4d29575..87748ea 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ # misc .DS_Store .env.local -.env.development.local +frontend/.env.development.local .env.test.local .env.production.local diff --git a/frontend/.env b/frontend/.env index 831ba82..f03009f 100644 --- a/frontend/.env +++ b/frontend/.env @@ -1,9 +1,10 @@ -REACT_APP_CATALOG_HOMEPAGE=/ui/v1/apicatalog -REACT_APP_CATALOG_HOME=/api/v1/apicatalog -REACT_APP_CATALOG_UPDATE=/containers +REACT_APP_CATALOG_HOMEPAGE= +REACT_APP_CATALOG_HOME=/api/v1/catalogs +REACT_APP_CATALOG_UPDATE=/version REACT_APP_STATUS_UPDATE_PERIOD=30000 REACT_APP_STATUS_UPDATE_MAX_RETRIES=10 REACT_APP_STATUS_UPDATE_DEBOUNCE=300 REACT_APP_CA_ENV=false REACT_APP_STATUS_UPDATE_SCALING_DURATION=1000 -REACT_APP_GATEWAY_URL= +REACT_APP_GATEWAY_URL=https://localhost:80 +REACT_APP_CATALOG_VERSION=/latest \ No newline at end of file diff --git a/frontend/.env.development b/frontend/.env.development index d9e1a27..0e903f6 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -3,4 +3,6 @@ REACT_APP_STATUS_UPDATE_PERIOD=10000 REACT_APP_STATUS_UPDATE_MAX_RETRIES=3 REACT_APP_STATUS_UPDATE_DEBOUNCE=300 REACT_APP_STATUS_UPDATE_SCALING_DURATION=1000 -REACT_APP_GATEWAY_URL= +REACT_APP_GATEWAY_URL=https://localhost:80 +REACT_APP_CATALOG_VERSION=/latest +REACT_APP_CATALOG_HOME=/api/v1/catalogs \ No newline at end of file diff --git a/frontend/.env.production b/frontend/.env.production index 9c0c96a..df7811a 100644 --- a/frontend/.env.production +++ b/frontend/.env.production @@ -4,3 +4,5 @@ REACT_APP_STATUS_UPDATE_DEBOUNCE=300 REACT_APP_STATUS_UPDATE_SCALING_DURATION=1000 REACT_APP_GATEWAY_URL= REACT_APP_CA_ENV=false +REACT_APP_CATALOG_VERSION=/latest +REACT_APP_CATALOG_HOME=/api/v1/catalogs \ No newline at end of file diff --git a/frontend/.env.test b/frontend/.env.test index e9d0483..e55321c 100644 --- a/frontend/.env.test +++ b/frontend/.env.test @@ -1,9 +1,10 @@ -REACT_APP_GATEWAY_URL=https://localhost:10010 +REACT_APP_GATEWAY_URL=https://localhost:80 REACT_APP_STATUS_UPDATE_PERIOD=4000 REACT_APP_STATUS_UPDATE_MAX_RETRIES=2 REACT_APP_STATUS_UPDATE_DEBOUNCE=300 REACT_APP_STATUS_UPDATE_SCALING_DURATION=1000 -REACT_APP_CATALOG_URL_TEST=https://localhost:10010/ui/v1/apicatalog +REACT_APP_CATALOG_URL_TEST=https://localhost:80/api/v1/catalogs REACT_APP_CATALOG_USERNAME=user REACT_APP_CATALOG_PASSWORD=user REACT_APP_CA_ENV=false +REACT_APP_CATALOG_VERSION=/latest \ No newline at end of file diff --git a/frontend/public/index.html b/frontend/public/index.html index a54979f..f42a76e 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -20,7 +20,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - API Catalog + Zowe Components Catalog