diff --git a/index.html b/index.html index 71b522e..ef297fd 100644 --- a/index.html +++ b/index.html @@ -29,7 +29,6 @@ import NavBar from '/src/view/nav-bar.js'; import TeamCard from '/src/view/team-card.js'; import NewsCard from '/src/view/news-card.js'; - import HomeModule from '/src/view/home-module.js'; const app = createApp({ created(){}, @@ -47,7 +46,6 @@ }); app.component('TeamCard', TeamCard); app.component('NewsCard',NewsCard); - app.component('HomeModule',HomeModule); app.component('NavBar', NavBar); app.mount('#app'); diff --git a/src/class/api-service.js b/src/class/api-service.js index 42542ad..ce73fc4 100644 --- a/src/class/api-service.js +++ b/src/class/api-service.js @@ -7,7 +7,7 @@ class ApiService{ }; let response = await fetch(baseUrl, headers); let responseJson = await response.json() - return responseJson; + return responseJson } async post(link){ const baseUrl = `${link}`;//edit diff --git a/src/class/news-service.js b/src/class/news-service.js index d1cb85c..8b5de71 100644 --- a/src/class/news-service.js +++ b/src/class/news-service.js @@ -1,13 +1,13 @@ class NewsService{ constructor(){} - getNews(){ + async getNews(){ const url = "https://newsapi.org/v2/everything?q=esport&apiKey=1639059dc5a942089bd2d29db40ee7e7"; const api = new ApiService() - let response = api.get(url); + let response = await api.get(url); let tab = [] for (let i = 0; i < 5; i++) { - tab.push(response[i]); + tab.push(response.articles[i]); } return tab; } diff --git a/src/view/home-module.js b/src/view/home-module.js deleted file mode 100644 index 8bcf50f..0000000 --- a/src/view/home-module.js +++ /dev/null @@ -1,16 +0,0 @@ -export default{ - props:{ - news:Array - }, - data:function(){ - return {} - }, - methods:{ - }, - template:` -

Home

-
- -
- ` -} diff --git a/src/view/nav-bar.js b/src/view/nav-bar.js index 7314259..887e857 100644 --- a/src/view/nav-bar.js +++ b/src/view/nav-bar.js @@ -2,7 +2,7 @@ export default{ data : function(){ return { teams:[], - news: [], + news: [], id: 1, name:'', description:'', @@ -23,14 +23,13 @@ export default{ this.teamClicked=false; } }, - clickHome: function() { + clickHome: async function() { if(!this.homeClicked){ - const api = new NewsService(); - let infos = api.getNews(); - console.log(infos) - this.news = infos - this.homeClicked=true; - this.teamClicked=false; + const api = new NewsService(); + let infos = await api.getNews(); + this.news = infos + this.homeClicked=true; + this.teamClicked=false; } else{ @@ -109,7 +108,9 @@ export default{ Results - +
diff --git a/src/view/news-card.js b/src/view/news-card.js index 16c18ba..55cc2cd 100644 --- a/src/view/news-card.js +++ b/src/view/news-card.js @@ -6,7 +6,7 @@ export default{ template: `
{{title}} -

{{date}}

+

{{date.replace(/-/gi, "/").replace("Z", "").replace("T"," ").replace(":","h").split(":")[0]}}

` }