diff --git a/src/fetchData.js b/src/fetchData.js index 17db168..395b1c2 100644 --- a/src/fetchData.js +++ b/src/fetchData.js @@ -6,7 +6,7 @@ export default async function fetchData(currentRegionSelection, currentTimeSelec const resp = await fetch(urlBuilder(currentRegionSelection, currentTimeSelection, currentAggregateSelection)); const respData = await resp.json(); for (let i = 0, l = respData.length; i < l; i++) { - let datum = new Datum(Date.parse(respData[i]['time']), respData[i]['value']); + let datum = new Datum(Date.parse(respData[i][0]), respData[i][1]); data.push(datum); } return data; diff --git a/src/index.html b/src/index.html index 7daac20..ffd26d0 100644 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@ - +
@@ -59,7 +59,7 @@
diff --git a/src/urlBuilder.js b/src/urlBuilder.js index 1e617d0..7ef0f4d 100644 --- a/src/urlBuilder.js +++ b/src/urlBuilder.js @@ -1,8 +1,12 @@ export default function urlBuilder(currentRegionSelection, currentTimeSelection, currentAggregateSelection) { - let url = "https://data.wowtoken.app/token/history/"; - if (currentAggregateSelection !== 'none') { - url += `${currentAggregateSelection}/` + let url = "https://data.wowtoken.app/v2/"; + if (currentAggregateSelection !== '' && currentAggregateSelection !== 'none'){ + url += `math/${currentAggregateSelection}/retail/` } - url += `${currentRegionSelection}/${currentTimeSelection}.json` + else { + url += `relative/retail/` + } + + url += `${currentRegionSelection}/${currentTimeSelection}.json`; return url; } \ No newline at end of file