diff --git a/src/main/resources/static/contentUtility.js b/src/main/resources/static/contentUtility.js index 2f14c10..deb5658 100644 --- a/src/main/resources/static/contentUtility.js +++ b/src/main/resources/static/contentUtility.js @@ -16,7 +16,6 @@ function parseContent(content) { } else { searchSection.querySelector("#nothing-found").classList.add("hidden"); const datasets = content.map(dataset => new Dataset(dataset)); - console.log(datasets); //TODO: remove Array.from(searchSection.querySelectorAll(".datasets .dataset")).forEach(e => e.remove()); for (const dataset of datasets) { searchSection.querySelector(".datasets").appendChild(dataset.createDatasetHTMLElement()); diff --git a/src/main/resources/static/main.js b/src/main/resources/static/main.js index 65a8ef8..6ff68c4 100644 --- a/src/main/resources/static/main.js +++ b/src/main/resources/static/main.js @@ -1,5 +1,5 @@ import {fetchQuery} from "./contentUtility.js"; -import Dataset from "./dataset"; +import Dataset from "./dataset.js"; const apiEndpoint = "/api/v1/datasets"; const baseURL = location.origin; @@ -183,15 +183,30 @@ function fetchCategories() { }); } +// fetches entries for the initial page function fetchInitialEntries() { - let topVotedQueryURL = new URL(apiEndpoint + "/search" + baseURL); - topVotedQueryURL.searchParams.append("sort", getSortQuery()[0]); - topVotedQueryURL.searchParams.append("direction", getSortQuery()[1]); + let recentsQueryURL = new URL(apiEndpoint + "/search", baseURL); + recentsQueryURL.searchParams.append("sort", "date"); + recentsQueryURL.searchParams.append("direction", "desc"); + recentsQueryURL.searchParams.append("size", "6"); + fetch(recentsQueryURL) + .then(resp => resp.json()) + .then((data) => { + const datasets = data.content.map(dataset => new Dataset(dataset)); + for (const dataset of datasets) { + document.querySelector("#recents .datasets").appendChild(dataset.createDatasetHTMLElement()); + } + }); + + let topVotedQueryURL = new URL(apiEndpoint + "/search", baseURL); + topVotedQueryURL.searchParams.append("sort", "upvotes"); + topVotedQueryURL.searchParams.append("direction", "desc"); topVotedQueryURL.searchParams.append("size", "1"); fetch(topVotedQueryURL) .then(resp => resp.json()) .then((data) => { - document.querySelector("#top .datasets").appendChild(new Dataset(data[0]).createDatasetHTMLElement()); + document.querySelector("#top .datasets") + .appendChild(new Dataset(data.content[0]).createDatasetHTMLElement()); }); }