diff --git a/script/views/mainPage.js b/script/views/mainPage.js index ac79355..fb77228 100644 --- a/script/views/mainPage.js +++ b/script/views/mainPage.js @@ -1,4 +1,4 @@ -define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], function (m, _ , util, resultParser, topNavBar, footer) { +define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer', 'articles/articles'], function (m, _ , util, resultParser, topNavBar, footer, articles) { var mainPageLogo = {}; mainPageLogo.view = function(){ @@ -12,12 +12,13 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu var mainPageNews = {}; mainPageNews.view = function(){ + var article = _.get(articles, 0, {}); return m('div.uk-panel.uk-panel-box',[ m('div.uk-panel-badge.uk-badge', [ m('i.fa.fa-newspaper-o') ]), - m('h3.uk-panel-title', m('a.uk-link-muted', {href: '#/nouvelles'}, 'Nouvelles')), - m('p', util.loremIpsum()) + m('h3.uk-panel-title', m('a.uk-link-muted', {href: '#/nouvelles'}, article.title)), + m('p', article.smallBody || article.body) ]); }; diff --git a/script/views/newsPage.js b/script/views/newsPage.js index b55146b..a321ab0 100644 --- a/script/views/newsPage.js +++ b/script/views/newsPage.js @@ -1,4 +1,4 @@ -define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], function (m, _ , util, resultParser, topNavBar, footer) { +define(['m', '_', 'util', 'resultParser', 'articles/articles', 'views/topNavBar', 'views/footer'], function (m, _ , util, resultParser, articles, topNavBar, footer) { var newsPageBody = {}; @@ -7,16 +7,16 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu return m('div.uk-cover-background.uk-container-center', {style: style}); }; - newsPageBody.getArticle = function(){ + newsPageBody.getArticle = function(article){ return m('article.uk-article.uk-margin-', - m('h1.uk-article-title', util.loremIpsum(5)), - m('p.uk-article-meta', util.loremIpsum(8)), - util.loremIpsum() + m('h1.uk-article-title', article.title), + m('p.uk-article-meta', article.meta), + article.body ); }; newsPageBody.view = function(){ - return m('div', [newsPageBody.getArticle(), newsPageBody.getArticle(), newsPageBody.getArticle(), newsPageBody.getArticle()]); + return m('div', _.map(articles, newsPageBody.getArticle)); };