From a5ccbdcb79901d324408ad68bf5c01faab712c83 Mon Sep 17 00:00:00 2001
From: Karel Hala <khala@redhat.com>
Date: Tue, 3 Oct 2023 11:13:01 +0200
Subject: [PATCH] Enable energy data Rest API
---
src/react-auth0-spa.js | 40 +++++++++-------------------------------
src/utils/helpers.js | 32 ++------------------------------
2 files changed, 11 insertions(+), 61 deletions(-)
diff --git a/src/react-auth0-spa.js b/src/react-auth0-spa.js
index 1a68263..bb04c44 100644
--- a/src/react-auth0-spa.js
+++ b/src/react-auth0-spa.js
@@ -15,36 +15,21 @@ export const Auth0Provider = ({ children, onRedirectCallback = DEFAULT_REDIRECT_
const [auth0Client, setAuth0] = useState();
const [loading, setLoading] = useState(true);
const [popupOpen, setPopupOpen] = useState(false);
- const [{ apiSun, apiTemp, apiAir, apiGermany, apiAustria, apiCroatia, apiCzechia, apiSlovakia, apiPoland, apiFrance, apiSweden }, setAllApis] =
- useState({
- apiSun: {},
- apiTemp: {},
- apiAir: {},
- apiGermany: {},
- apiAustria: {},
- apiCroatia: {},
- apiCzechia: {},
- apiSlovakia: {},
- apiPoland: {},
- apiFrance: {},
- apiSweden: {},
- });
+ const [{ apiSun, apiTemp, apiAir, apiEnergy }, setAllApis] = useState({
+ apiSun: {},
+ apiTemp: {},
+ apiAir: {},
+ apiEnergy: {},
+ });
useEffect(() => {
if (user) {
- const { sun, air, temp, germany, austria, croatia, czechia, slovakia, poland, france, sweden } = user;
+ const { sun, air, temp, energy } = user;
setAllApis({
apiSun: createInstance(sun),
apiTemp: createInstance(temp),
apiAir: createInstance(air),
- apiGermany: createInstance(germany),
- apiAustria: createInstance(austria),
- apiCroatia: createInstance(croatia),
- apiCzechia: createInstance(czechia),
- apiSlovakia: createInstance(slovakia),
- apiPoland: createInstance(poland),
- apiFrance: createInstance(france),
- apiSweden: createInstance(sweden),
+ apiEnergy: createInstance(energy),
});
}
}, [user]);
@@ -133,14 +118,7 @@ export const Auth0Provider = ({ children, onRedirectCallback = DEFAULT_REDIRECT_
apiSun,
apiAir,
apiTemp,
- apiGermany,
- apiAustria,
- apiCroatia,
- apiCzechia,
- apiSlovakia,
- apiPoland,
- apiFrance,
- apiSweden,
+ apiEnergy,
loading,
popupOpen,
loginWithPopup,
diff --git a/src/utils/helpers.js b/src/utils/helpers.js
index 7e8ba7c..bbf799a 100644
--- a/src/utils/helpers.js
+++ b/src/utils/helpers.js
@@ -11,7 +11,7 @@ export const useType = () => {
};
export const useRest = (type) => {
- const { apiSun, apiTemp, apiAir, apiGermany, apiAustria, apiCroatia, apiCzechia, apiSlovakia, apiPoland, apiFrance, apiSweden } = useAuth0();
+ const { apiSun, apiTemp, apiAir, apiEnergy } = useAuth0();
const [{ resource, rest }, setRestApi] = useState({});
const typeMapper = useCallback((resourceType) => {
const apiTypes = {
@@ -28,37 +28,9 @@ export const useRest = (type) => {
rest: 'temp-avg',
},
germany: {
- resource: apiGermany,
+ resource: apiEnergy,
rest: 'germany',
},
- austria: {
- resource: apiAustria,
- rest: 'austria',
- },
- france: {
- resource: apiFrance,
- rest: 'france',
- },
- poland: {
- resource: apiPoland,
- rest: 'poland',
- },
- sweden: {
- resource: apiSweden,
- rest: 'sweden',
- },
- croatia: {
- resource: apiCroatia,
- rest: 'croatia',
- },
- czechia: {
- resource: apiCzechia,
- rest: 'czechia',
- },
- slovakia: {
- resource: apiSlovakia,
- rest: 'slovakia',
- },
};
return apiTypes[resourceType] || apiTypes.sunshine;
}, []);
--
GitLab