From d8fc9fa0e3d60f2cfaf88fc4d6c9bb0ac4511222 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Fri, 14 Sep 2018 12:49:47 +0100 Subject: [PATCH 01/24] first attempt at populating articles with help from James RE populating articles --- index.html | 51 +++++++++++++++++++++++++ index.js | 97 +++++++++++++++++++++++++++++++++++++++++++++++ styles.css | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 257 insertions(+) create mode 100644 index.html create mode 100644 index.js create mode 100644 styles.css diff --git a/index.html b/index.html new file mode 100644 index 0000000..156008a --- /dev/null +++ b/index.html @@ -0,0 +1,51 @@ + + + + + + + + News Reader + + + + + +
+ +
+

NEWS READER

+
+ + +
+
+ +
+ + + +
+
+
    +
    + + + +
    + Footer content +
    +
    +
    + + + \ No newline at end of file diff --git a/index.js b/index.js new file mode 100644 index 0000000..3097c44 --- /dev/null +++ b/index.js @@ -0,0 +1,97 @@ +// documentation: +// https://newsapi.org/docs +// https://newsapi.org/docs/get-started +// everything: https://newsapi.org/docs/endpoints/everything + +const apiKey = "apiKey=756ef978eb384d9cb3ecdab2d9bac0da"; +const newsURL = "https://newsapi.org/v2/"; +const sectionEverything = "everything"; +const sectionHeadlines = "top-headlines"; +const querySources = "sources=bbc-news&"; // choose sources +const queryCountry = "country=gb&"; // choose country (UK) +const querySubject = "q=bitcoin"; // choose subject + +const topUKHeadlinesURL = newsURL + sectionHeadlines + "?" + queryCountry + apiKey; +const bbcNewsURL = newsURL + sectionEverything + "?" + querySources + apiKey; +const newsApiURL = topUKHeadlinesURL; + +const loadAPI = function () { + fetch(newsApiURL) + .then(function(response) { + return response.json(); + }) + .then(function(body) { + displayDataOnPage(body); + }) + .catch(function(error) { + displayErrorToUser(error); + }); +} + +const articleTemplate = article => { + return ` +
    + ${article.title} +
    +
    + ${article.source.name} +
    + `; +} + +const parentNode = document.querySelector(".content__body"); +const articleNode = document.querySelector(".article__list"); + +function displayDataOnPage(body) { + const articleKeys = Object.keys(body.articles[0]); + + body.articles.forEach(function(article) { + const node = document.createElement("li"); + node.innerHTML = articleTemplate(article) + articleNode.appendChild(node); + + + + // articleKeys.forEach(function(key) { + // // if (typeof article[key] === "object" && key === "source") { + // // let articleDescription = `${article[key].name}`; + // // let articleKey = ""; + // // let className = "article-name"; + // // } else { + // // let articleDescription = `${key.toUpperCase()}
    `; + // // let articleKey = article[key]; + // // let className = "article-other-props"; + // // } + + // let articleKeyName = (typeof article[key] === "object" && key === "source") ? article[key].name : ""; + // const articleDescription = key === "source" ? `${articleKeyName}` : article[key]; + // //console.log(articleDescription) + // const outputString = `${key}
    ${articleDescription}`; + // const className = key === "source" ? "article-name" : "article-other-props"; + // //node.innerHTML = outputString; + // node.className = className; + // }); + }); + const displayURL = document.querySelector(".display-url"); + displayURL.innerHTML = `View JSON: ${newsApiURL}`; +} + +const displayErrorToUser = error => console.log(error); + +loadAPI(); + +/* +====================================================== +*/ + +const navButton = document.querySelector(".header__nav-button") +const navBar = document.querySelector(".content__nav"); +let state = 1; + +navButton.addEventListener("click", function(event){ + event.preventDefault(); + navBar.style.display = state ? "flex" : "none"; + navButtonIcon = state ? "x" : "+"; + navButton.innerHTML = `${navButtonIcon}`; + state = !state; +}); diff --git a/styles.css b/styles.css new file mode 100644 index 0000000..e92c702 --- /dev/null +++ b/styles.css @@ -0,0 +1,109 @@ +* { + box-sizing: inherit; +} + +body { + margin: 0; + box-sizing: border-box; + background: white; + font-family: Georgia, Times, 'Times New Roman', serif +} + +h1 { + margin: 0; +} + + +a { + color: rgb(4, 217, 255); +} + +.news-app { + display: flex; + flex-direction: column; + min-height: 100vh; +} + +.header { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + background-color: #e0e0e0; + padding: 0.5em; +} + +.header__nav-button a { + text-decoration: none; + background-color: #999999; + color: #ffffff; + padding: 0 0.4em; + font-size: 1.2em; +} + +.header__nav-button a:hover { + background-color: #666666; +} + +.content { + display: flex; + flex-direction: column; + flex: 1; +} + +.content__nav { + display: none; + flex: 1; + flex-direction: row; + align-items: center; + justify-content: center; + flex-wrap: wrap; + text-decoration: none; + list-style: none; + background-color: #f0f0f0; +} + +.content__nav li { + padding: 0 0.5em; +} + +.content__body { + flex: 8; + text-align: left; + padding: 1em; +} + +.content__aside { + display: none; + flex: 4; + text-align: center; +} + +.content__footer { + flex: 1; + text-align: center; +} + +.key { + font-weight: 700; +} + +.description-text { + font-weight: 100; +} + +.article-name { + font-size: 1.5rem; + background: #303030; + color: white; + padding: 1.5rem 1rem; + margin: 1rem 0 0 0; +} + +.article-other-props { + font-size: 1rem; + background: #f0f0f0; + color: black; + padding: 1rem; + margin: 0.2rem 0; +} \ No newline at end of file From 7fee7f3efcb4c743862871245fbf47a3bee4b1dd Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Fri, 14 Sep 2018 13:18:41 +0100 Subject: [PATCH 02/24] starting to create articles - still with basic styling --- index.js | 48 +++++++++++++++++++++--------------------------- styles.css | 13 ++++++++++--- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/index.js b/index.js index 3097c44..8949c36 100644 --- a/index.js +++ b/index.js @@ -3,13 +3,13 @@ // https://newsapi.org/docs/get-started // everything: https://newsapi.org/docs/endpoints/everything -const apiKey = "apiKey=756ef978eb384d9cb3ecdab2d9bac0da"; const newsURL = "https://newsapi.org/v2/"; const sectionEverything = "everything"; const sectionHeadlines = "top-headlines"; const querySources = "sources=bbc-news&"; // choose sources -const queryCountry = "country=gb&"; // choose country (UK) +const queryCountry = "country=us&"; // choose country (UK) const querySubject = "q=bitcoin"; // choose subject +const apiKey = "apiKey=756ef978eb384d9cb3ecdab2d9bac0da"; const topUKHeadlinesURL = newsURL + sectionHeadlines + "?" + queryCountry + apiKey; const bbcNewsURL = newsURL + sectionEverything + "?" + querySources + apiKey; @@ -31,12 +31,29 @@ const loadAPI = function () { const articleTemplate = article => { return `
    - ${article.title} + ${article.source.name}
    - ${article.source.name} + +
      +
    • ${article.title}
      • +
    • ${article.description}
      • +
    • Author: ${article.author}
      • +
    `; + // source: { + // id: null, + // name: "Birminghammail.co.uk" + // }, + // author: "James Rodger", + // title: "This is why your Wetherspoons food AND drink order is set to get more expensive", + // description: "Profit before tax was up 4.3% to £107.2 million, the group's highest profit in its 39-year history", + // url: "https://www.birminghammail.co.uk/whats-on/food-drink-news/your-wetherspoons-food-drink-order-15151668", + // urlToImage: "https://i2-prod.walesonline.co.uk/incoming/article14267365.ece/ALTERNATES/s1200/1_2jpeg.jpg", + // publishedAt: "2018-09-14T11:26:20Z", + // content: "JD Wetherspoon's profits..." + } const parentNode = document.querySelector(".content__body"); @@ -44,33 +61,10 @@ const articleNode = document.querySelector(".article__list"); function displayDataOnPage(body) { const articleKeys = Object.keys(body.articles[0]); - body.articles.forEach(function(article) { const node = document.createElement("li"); node.innerHTML = articleTemplate(article) articleNode.appendChild(node); - - - - // articleKeys.forEach(function(key) { - // // if (typeof article[key] === "object" && key === "source") { - // // let articleDescription = `${article[key].name}`; - // // let articleKey = ""; - // // let className = "article-name"; - // // } else { - // // let articleDescription = `${key.toUpperCase()}
    `; - // // let articleKey = article[key]; - // // let className = "article-other-props"; - // // } - - // let articleKeyName = (typeof article[key] === "object" && key === "source") ? article[key].name : ""; - // const articleDescription = key === "source" ? `${articleKeyName}` : article[key]; - // //console.log(articleDescription) - // const outputString = `${key}
    ${articleDescription}`; - // const className = key === "source" ? "article-name" : "article-other-props"; - // //node.innerHTML = outputString; - // node.className = className; - // }); }); const displayURL = document.querySelector(".display-url"); displayURL.innerHTML = `View JSON: ${newsApiURL}`; diff --git a/styles.css b/styles.css index e92c702..88c617a 100644 --- a/styles.css +++ b/styles.css @@ -61,6 +61,7 @@ a { text-decoration: none; list-style: none; background-color: #f0f0f0; + padding: 1em } .content__nav li { @@ -92,7 +93,8 @@ a { font-weight: 100; } -.article-name { +.article__header { + display: block; font-size: 1.5rem; background: #303030; color: white; @@ -100,10 +102,15 @@ a { margin: 1rem 0 0 0; } -.article-other-props { +.article__list { + list-style: none; + padding: 0; +} + +.article__main { font-size: 1rem; background: #f0f0f0; color: black; padding: 1rem; - margin: 0.2rem 0; + display: block; } \ No newline at end of file From c8850dd0f8aa824ecfe7dbfb77d6ce3e8d4002a7 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Fri, 14 Sep 2018 13:53:14 +0100 Subject: [PATCH 03/24] added button for loading different URL to fetch --- index.html | 1 + index.js | 34 ++++++++++++++++++++++++---------- styles.css | 24 +++++++++++++++++++----- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/index.html b/index.html index 156008a..31d4b46 100644 --- a/index.html +++ b/index.html @@ -34,6 +34,7 @@

    NEWS READER

    +
      diff --git a/index.js b/index.js index 8949c36..8fde758 100644 --- a/index.js +++ b/index.js @@ -11,12 +11,11 @@ const queryCountry = "country=us&"; // choose country (UK) const querySubject = "q=bitcoin"; // choose subject const apiKey = "apiKey=756ef978eb384d9cb3ecdab2d9bac0da"; -const topUKHeadlinesURL = newsURL + sectionHeadlines + "?" + queryCountry + apiKey; +const topUSHeadlinesURL = newsURL + sectionHeadlines + "?" + queryCountry + apiKey; const bbcNewsURL = newsURL + sectionEverything + "?" + querySources + apiKey; -const newsApiURL = topUKHeadlinesURL; -const loadAPI = function () { - fetch(newsApiURL) +const loadAPI = function (url) { + fetch(url) .then(function(response) { return response.json(); }) @@ -31,15 +30,19 @@ const loadAPI = function () { const articleTemplate = article => { return `
      - ${article.source.name} + ${article.source.name}
      -
      - +
      +
      + +
      +
      • ${article.title}
      • ${article.description}
      • Author: ${article.author}
        • - +
      +
      `; // source: { @@ -58,8 +61,10 @@ const articleTemplate = article => { const parentNode = document.querySelector(".content__body"); const articleNode = document.querySelector(".article__list"); +const sectionButtonsNode = document.querySelector(".content__section__buttons"); function displayDataOnPage(body) { + // parentNode.removeChild(articleNode); const articleKeys = Object.keys(body.articles[0]); body.articles.forEach(function(article) { const node = document.createElement("li"); @@ -67,12 +72,21 @@ function displayDataOnPage(body) { articleNode.appendChild(node); }); const displayURL = document.querySelector(".display-url"); - displayURL.innerHTML = `View JSON: ${newsApiURL}`; + displayURL.innerHTML = `View JSON: ${topUSHeadlinesURL}`; + + const buttonNode = document.createElement("button"); + buttonNode.innerHTML = "US Headlines"; + sectionButtonsNode.appendChild(buttonNode); + buttonNode.addEventListener('click', function(event){ + event.preventDefault(); + console.log(topUSHeadlinesURL) + // loadAPI(topUSHeadlinesURL); + }); } const displayErrorToUser = error => console.log(error); -loadAPI(); +loadAPI(bbcNewsURL); /* ====================================================== diff --git a/styles.css b/styles.css index 88c617a..2dfefe8 100644 --- a/styles.css +++ b/styles.css @@ -93,6 +93,17 @@ a { font-weight: 100; } +.article__list { + list-style: none; + padding: 0; +} + +.article__main { + display: flex; + justify-content: flex-start; + flex-direction: row; +} + .article__header { display: block; font-size: 1.5rem; @@ -102,15 +113,18 @@ a { margin: 1rem 0 0 0; } -.article__list { - list-style: none; - padding: 0; +.article__image { + width: 100%; + display: flex; + flex: 1; + background: #e0e0e0; } -.article__main { +.article__text { font-size: 1rem; background: #f0f0f0; color: black; padding: 1rem; - display: block; + display: flex; + flex: 3; } \ No newline at end of file From 71b6f07efe8e86fbe2a92927138e79b305bcda84 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Fri, 14 Sep 2018 16:03:12 +0100 Subject: [PATCH 04/24] made buttons that fetch different URLs --- index.js | 104 +++++++++++++++++++++++++++++++++-------------------- styles.css | 7 ++++ 2 files changed, 73 insertions(+), 38 deletions(-) diff --git a/index.js b/index.js index 8fde758..d8f5a16 100644 --- a/index.js +++ b/index.js @@ -3,16 +3,19 @@ // https://newsapi.org/docs/get-started // everything: https://newsapi.org/docs/endpoints/everything -const newsURL = "https://newsapi.org/v2/"; -const sectionEverything = "everything"; -const sectionHeadlines = "top-headlines"; -const querySources = "sources=bbc-news&"; // choose sources -const queryCountry = "country=us&"; // choose country (UK) -const querySubject = "q=bitcoin"; // choose subject -const apiKey = "apiKey=756ef978eb384d9cb3ecdab2d9bac0da"; -const topUSHeadlinesURL = newsURL + sectionHeadlines + "?" + queryCountry + apiKey; -const bbcNewsURL = newsURL + sectionEverything + "?" + querySources + apiKey; +const parentNode = document.querySelector(".content__body"); +const articleNode = document.querySelector(".article__list"); +const sectionButtonsNode = document.querySelector(".content__section__buttons"); +const displayJSON = document.querySelector(".display-url"); + +// const topUSHeadlinesURL = newsURL + sectionHeadlines + "?" + queryCountry + apiKey; +// const bbcNewsURL = newsURL + sectionEverything + "?" + querySources + apiKey; +// const sectionHeadlines = "top-headlines"; +// const sectionHeadlines = "top-headlines"; +// const querySources = "sources=bbc-news&"; // choose sources +// const queryCountry = "country=us&"; // choose country (UK) +// const querySubject = "q=bitcoin"; // choose subject const loadAPI = function (url) { fetch(url) @@ -20,7 +23,7 @@ const loadAPI = function (url) { return response.json(); }) .then(function(body) { - displayDataOnPage(body); + displayDataOnPage(body, url); }) .catch(function(error) { displayErrorToUser(error); @@ -28,9 +31,14 @@ const loadAPI = function (url) { } const articleTemplate = article => { + const description = (article.description !== null) ? `
    • ${article.description}
      • ` : ""; + const content = (article.content !== null) ? `
    • ${article.content}
      • ` : ""; + const author = (article.author !== null) ? `
    • Author: ${article.author}
      • ` : ""; return `
      @@ -40,53 +48,60 @@ const articleTemplate = article => {
      • ${article.title}
      • ${article.description}
        • -
      • Author: ${article.author}
        • + ${description} + ${content} + ${author}
      `; - // source: { - // id: null, - // name: "Birminghammail.co.uk" - // }, - // author: "James Rodger", - // title: "This is why your Wetherspoons food AND drink order is set to get more expensive", - // description: "Profit before tax was up 4.3% to £107.2 million, the group's highest profit in its 39-year history", - // url: "https://www.birminghammail.co.uk/whats-on/food-drink-news/your-wetherspoons-food-drink-order-15151668", - // urlToImage: "https://i2-prod.walesonline.co.uk/incoming/article14267365.ece/ALTERNATES/s1200/1_2jpeg.jpg", - // publishedAt: "2018-09-14T11:26:20Z", - // content: "JD Wetherspoon's profits..." - } -const parentNode = document.querySelector(".content__body"); -const articleNode = document.querySelector(".article__list"); -const sectionButtonsNode = document.querySelector(".content__section__buttons"); - -function displayDataOnPage(body) { - // parentNode.removeChild(articleNode); - const articleKeys = Object.keys(body.articles[0]); +function displayDataOnPage(body, url) { + articleNode.innerHTML = ""; body.articles.forEach(function(article) { const node = document.createElement("li"); node.innerHTML = articleTemplate(article) articleNode.appendChild(node); }); - const displayURL = document.querySelector(".display-url"); - displayURL.innerHTML = `View JSON: ${topUSHeadlinesURL}`; + displayJSON.innerHTML = `View JSON: ${url}`; +} - const buttonNode = document.createElement("button"); - buttonNode.innerHTML = "US Headlines"; +const createSectionButton = function (url, title){ + let buttonNode = document.createElement("button"); + buttonNode.innerHTML = title; sectionButtonsNode.appendChild(buttonNode); buttonNode.addEventListener('click', function(event){ event.preventDefault(); - console.log(topUSHeadlinesURL) - // loadAPI(topUSHeadlinesURL); + loadAPI(url); }); } +const newsURL = "https://newsapi.org/v2/"; +const apiKey = "756ef978eb384d9cb3ecdab2d9bac0da"; + +const queryHeadlines = function (country) { + const url = `${newsURL}top-headlines?country=${country}&apiKey=${apiKey}`; + console.log(url); + return url; +} +const queryEverything = function (subject) { + const url = `${newsURL}everything?q=${subject}&apiKey=${apiKey}`; + console.log(url); + return url; +} + +const headlinesUS = queryHeadlines("us"); +createSectionButton(headlinesUS, "US Headlines"); + +const ukMusic = queryEverything("music"); +createSectionButton(ukMusic, "Music UK"); + + const displayErrorToUser = error => console.log(error); -loadAPI(bbcNewsURL); +loadAPI(ukMusic) +// loadAPI("https://newsapi.org/v2/everything?sources=bbc-news&apiKey=756ef978eb384d9cb3ecdab2d9bac0da"); /* ====================================================== @@ -103,3 +118,16 @@ navButton.addEventListener("click", function(event){ navButton.innerHTML = `${navButtonIcon}`; state = !state; }); + + + // source: { + // id: null, + // name: "Birminghammail.co.uk" + // }, + // author: "James Rodger", + // title: "This is why your Wetherspoons food AND drink order is set to get more expensive", + // description: "Profit before tax was up 4.3% to £107.2 million, the group's highest profit in its 39-year history", + // url: "https://www.birminghammail.co.uk/whats-on/food-drink-news/your-wetherspoons-food-drink-order-15151668", + // urlToImage: "https://i2-prod.walesonline.co.uk/incoming/article14267365.ece/ALTERNATES/s1200/1_2jpeg.jpg", + // publishedAt: "2018-09-14T11:26:20Z", + // content: "JD Wetherspoon's profits..." diff --git a/styles.css b/styles.css index 2dfefe8..8194af3 100644 --- a/styles.css +++ b/styles.css @@ -115,9 +115,11 @@ a { .article__image { width: 100%; + min-width: 150px; display: flex; flex: 1; background: #e0e0e0; + padding: 0.2em; } .article__text { @@ -127,4 +129,9 @@ a { padding: 1rem; display: flex; flex: 3; +} + +.article__text ul { + padding: 0 0 0 1em; + margin: 0; } \ No newline at end of file From a8353ea67fa255e3b2c28aa847ebf7b001500984 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Fri, 14 Sep 2018 17:36:31 +0100 Subject: [PATCH 05/24] dropdown menu and buttons working --- index.html | 18 +++++++++- index.js | 96 ++++++++++++++++++++++++++++++++---------------------- styles.css | 11 ++++++- 3 files changed, 84 insertions(+), 41 deletions(-) diff --git a/index.html b/index.html index 31d4b46..58efaa5 100644 --- a/index.html +++ b/index.html @@ -33,7 +33,23 @@

      NEWS READER

      -
      +
      +
      +
      + Top Headlines Around the World: + +

      + +
      +
        diff --git a/index.js b/index.js index d8f5a16..58b823d 100644 --- a/index.js +++ b/index.js @@ -1,21 +1,16 @@ -// documentation: -// https://newsapi.org/docs -// https://newsapi.org/docs/get-started -// everything: https://newsapi.org/docs/endpoints/everything - - const parentNode = document.querySelector(".content__body"); const articleNode = document.querySelector(".article__list"); const sectionButtonsNode = document.querySelector(".content__section__buttons"); -const displayJSON = document.querySelector(".display-url"); +const displayJSONNode = document.querySelector(".display__url"); +const countryMenuNode = document.querySelector(".country"); +const newsURL = "https://newsapi.org/v2/"; +const apiKey = "756ef978eb384d9cb3ecdab2d9bac0da"; -// const topUSHeadlinesURL = newsURL + sectionHeadlines + "?" + queryCountry + apiKey; -// const bbcNewsURL = newsURL + sectionEverything + "?" + querySources + apiKey; -// const sectionHeadlines = "top-headlines"; -// const sectionHeadlines = "top-headlines"; -// const querySources = "sources=bbc-news&"; // choose sources -// const queryCountry = "country=us&"; // choose country (UK) -// const querySubject = "q=bitcoin"; // choose subject +/* +====================================================== +FETCH DATA +====================================================== +*/ const loadAPI = function (url) { fetch(url) @@ -30,10 +25,17 @@ const loadAPI = function (url) { }); } +/* +====================================================== +FETCH DATA FOR ARTICLES +====================================================== +*/ + const articleTemplate = article => { const description = (article.description !== null) ? `
      • ${article.description}
        • ` : ""; const content = (article.content !== null) ? `
      • ${article.content}
        • ` : ""; const author = (article.author !== null) ? `
      • Author: ${article.author}
        • ` : ""; + const title = (article.title !== null) ? `
      • Author: ${article.title}
        • ` : ""; return `
        @@ -46,8 +48,7 @@ const articleTemplate = article => {
          -
        • ${article.title}
          • -
        • ${article.description}
          • + ${title} ${description} ${content} ${author} @@ -64,9 +65,21 @@ function displayDataOnPage(body, url) { node.innerHTML = articleTemplate(article) articleNode.appendChild(node); }); - displayJSON.innerHTML = `View JSON: ${url}`; + displayJSONNode.innerHTML = `View JSON: ${url}`; } +/* +====================================================== +CREATE MENU AND BUTTONS +====================================================== +*/ + +countryMenuNode.addEventListener('change', function(event){ + event.preventDefault(); + const countryURL = queryHeadlines(event.target.value, "business"); + loadAPI(countryURL); +}); + const createSectionButton = function (url, title){ let buttonNode = document.createElement("button"); buttonNode.innerHTML = title; @@ -77,31 +90,31 @@ const createSectionButton = function (url, title){ }); } -const newsURL = "https://newsapi.org/v2/"; -const apiKey = "756ef978eb384d9cb3ecdab2d9bac0da"; +const buttons = { + // 'uk': `top-headlines?country=uk&apiKey=${apiKey}` + 'top-headlines': ['category', 'country', 'q'], + 'sources': ['language','country'], + 'everything': ['q'] +} -const queryHeadlines = function (country) { - const url = `${newsURL}top-headlines?country=${country}&apiKey=${apiKey}`; - console.log(url); +const queryHeadlines = function (country, category) { + // categories are: business entertainment general health science sports technology + let validCategory = category ? `&category=${category}` : ""; + const url = `${newsURL}top-headlines?country=${country}${validCategory}&apiKey=${apiKey}`; return url; } const queryEverything = function (subject) { const url = `${newsURL}everything?q=${subject}&apiKey=${apiKey}`; - console.log(url); return url; } const headlinesUS = queryHeadlines("us"); createSectionButton(headlinesUS, "US Headlines"); - const ukMusic = queryEverything("music"); createSectionButton(ukMusic, "Music UK"); - - const displayErrorToUser = error => console.log(error); -loadAPI(ukMusic) -// loadAPI("https://newsapi.org/v2/everything?sources=bbc-news&apiKey=756ef978eb384d9cb3ecdab2d9bac0da"); +loadAPI(ukMusic); /* ====================================================== @@ -120,14 +133,19 @@ navButton.addEventListener("click", function(event){ }); - // source: { - // id: null, - // name: "Birminghammail.co.uk" - // }, - // author: "James Rodger", - // title: "This is why your Wetherspoons food AND drink order is set to get more expensive", - // description: "Profit before tax was up 4.3% to £107.2 million, the group's highest profit in its 39-year history", - // url: "https://www.birminghammail.co.uk/whats-on/food-drink-news/your-wetherspoons-food-drink-order-15151668", - // urlToImage: "https://i2-prod.walesonline.co.uk/incoming/article14267365.ece/ALTERNATES/s1200/1_2jpeg.jpg", - // publishedAt: "2018-09-14T11:26:20Z", - // content: "JD Wetherspoon's profits..." +// source: { +// id: null, +// name: "Birminghammail.co.uk" +// }, +// author: "James Rodger", +// title: "This is why your Wetherspoons food AND drink order is set to get more expensive", +// description: "Profit before tax was up 4.3% to £107.2 million, the group's highest profit in its 39-year history", +// url: "https://www.birminghammail.co.uk/whats-on/food-drink-news/your-wetherspoons-food-drink-order-15151668", +// urlToImage: "https://i2-prod.walesonline.co.uk/incoming/article14267365.ece/ALTERNATES/s1200/1_2jpeg.jpg", +// publishedAt: "2018-09-14T11:26:20Z", +// content: "JD Wetherspoon's profits..." + +// documentation: +// https://newsapi.org/docs +// https://newsapi.org/docs/get-started +// everything: https://newsapi.org/docs/endpoints/everything diff --git a/styles.css b/styles.css index 8194af3..b2b884d 100644 --- a/styles.css +++ b/styles.css @@ -119,7 +119,8 @@ a { display: flex; flex: 1; background: #e0e0e0; - padding: 0.2em; + padding: 0; + border: 0; } .article__text { @@ -134,4 +135,12 @@ a { .article__text ul { padding: 0 0 0 1em; margin: 0; +} + +.display__url { + padding: 0 0 1em 0; +} + +.country { + } \ No newline at end of file From a72627393b4c2e82c3ec17aa0485f540f1ffae4c Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Sat, 15 Sep 2018 00:54:18 +0100 Subject: [PATCH 06/24] added full countries menu --- countries-object.js | 62 ++++++++++++++++++++++++ countries-object.src | 109 ++++++++++++++++++++++++++++++++++++++++++ countries-options.txt | 55 +++++++++++++++++++++ countries.txt | 108 +++++++++++++++++++++++++++++++++++++++++ index.html | 14 +----- index.js | 75 ++++++++++++++++------------- 6 files changed, 377 insertions(+), 46 deletions(-) create mode 100644 countries-object.js create mode 100644 countries-object.src create mode 100644 countries-options.txt create mode 100644 countries.txt diff --git a/countries-object.js b/countries-object.js new file mode 100644 index 0000000..1d01806 --- /dev/null +++ b/countries-object.js @@ -0,0 +1,62 @@ +const getCountries = function () { + return Object.keys(countries).map(function(key){ + return `/n/r`; + }); +} +const countries = { + gb: 'United Kingdom', + ar: 'Argentina', + au: 'Australia', + at: 'Austria', + be: 'Belgium', + br: 'Brazil', + bg: 'Bulgaria', + ca: 'Canada', + cn: 'China', + co: 'Colombia', + cu: 'Cuba', + cz: 'Czech Republic', + eg: 'Egypt', + fr: 'France', + de: 'Germany', + gr: 'Greece', + hk: 'Hong Kong', + hu: 'Hungary', + in: 'India', + id: 'Indonesia', + ie: 'Ireland', + il: 'Israel', + it: 'Italy', + jp: 'Japan', + lv: 'Latvia', + lt: 'Lithuania', + my: 'Malaysia', + mx: 'Mexico', + ma: 'Morocco', + nl: 'Netherlands', + nz: 'New Zealand', + ng: 'Nigeria', + no: 'Norway', + ph: 'Philippines', + pl: 'Poland', + pt: 'Portugal', + ro: 'Romania', + ru: 'Russia', + sa: 'Saudi Arabia', + rs: 'Serbia', + sg: 'Singapore', + sk: 'Slovakia', + si: 'Slovenia', + za: 'South Africa', + kr: 'South Korea', + se: 'Sweden', + ch: 'Switzerland', + tw: 'Taiwan', + th: 'Thailand', + tr: 'Turkey', + ae: 'UAE', + ua: 'Ukraine', + gb: 'United Kingdom', + us: 'United States', + ve: 'Venuzuela' +} \ No newline at end of file diff --git a/countries-object.src b/countries-object.src new file mode 100644 index 0000000..29a6453 --- /dev/null +++ b/countries-object.src @@ -0,0 +1,109 @@ +countries = { + Argentina +ar +Australia +au +Austria +at +Belgium +be +Brazil +br +Bulgaria +bg +Canada +ca +China +cn +Colombia +co +Cuba +cu +Czech Republic +cz +Egypt +eg +France +fr +Germany +de +Greece +gr +Hong Kong +hk +Hungary +hu +India +in +Indonesia +id +Ireland +ie +Israel +il +Italy +it +Japan +jp +Latvia +lv +Lithuania +lt +Malaysia +my +Mexico +mx +Morocco +ma +Netherlands +nl +New Zealand +nz +Nigeria +ng +Norway +no +Philippines +ph +Poland +pl +Portugal +pt +Romania +ro +Russia +ru +Saudi Arabia +sa +Serbia +rs +Singapore +sg +Slovakia +sk +Slovenia +si +South Africa +za +South Korea +kr +Sweden +se +Switzerland +ch +Taiwan +tw +Thailand +th +Turkey +tr +UAE +ae +Ukraine +ua +United Kingdom +gb +United States +us +Venuzuela +ve diff --git a/countries-options.txt b/countries-options.txt new file mode 100644 index 0000000..b0a01af --- /dev/null +++ b/countries-options.txt @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/countries.txt b/countries.txt new file mode 100644 index 0000000..ba0cf60 --- /dev/null +++ b/countries.txt @@ -0,0 +1,108 @@ +Argentina +ar +Australia +au +Austria +at +Belgium +be +Brazil +br +Bulgaria +bg +Canada +ca +China +cn +Colombia +co +Cuba +cu +Czech Republic +cz +Egypt +eg +France +fr +Germany +de +Greece +gr +Hong Kong +hk +Hungary +hu +India +in +Indonesia +id +Ireland +ie +Israel +il +Italy +it +Japan +jp +Latvia +lv +Lithuania +lt +Malaysia +my +Mexico +mx +Morocco +ma +Netherlands +nl +New Zealand +nz +Nigeria +ng +Norway +no +Philippines +ph +Poland +pl +Portugal +pt +Romania +ro +Russia +ru +Saudi Arabia +sa +Serbia +rs +Singapore +sg +Slovakia +sk +Slovenia +si +South Africa +za +South Korea +kr +Sweden +se +Switzerland +ch +Taiwan +tw +Thailand +th +Turkey +tr +UAE +ae +Ukraine +ua +United Kingdom +gb +United States +us +Venuzuela +ve diff --git a/index.html b/index.html index 58efaa5..24290b3 100644 --- a/index.html +++ b/index.html @@ -35,18 +35,7 @@

          NEWS READER

          -
          - Top Headlines Around the World: - -

          + Top Headlines Worldwide:
          @@ -63,6 +52,7 @@

          NEWS READER

        + \ No newline at end of file diff --git a/index.js b/index.js index 58b823d..00f720c 100644 --- a/index.js +++ b/index.js @@ -3,8 +3,6 @@ const articleNode = document.querySelector(".article__list"); const sectionButtonsNode = document.querySelector(".content__section__buttons"); const displayJSONNode = document.querySelector(".display__url"); const countryMenuNode = document.querySelector(".country"); -const newsURL = "https://newsapi.org/v2/"; -const apiKey = "756ef978eb384d9cb3ecdab2d9bac0da"; /* ====================================================== @@ -32,10 +30,10 @@ FETCH DATA FOR ARTICLES */ const articleTemplate = article => { + const title = (article.title !== null) ? `
      • ${article.title}
        • ` : ""; const description = (article.description !== null) ? `
      • ${article.description}
        • ` : ""; const content = (article.content !== null) ? `
      • ${article.content}
        • ` : ""; const author = (article.author !== null) ? `
      • Author: ${article.author}
        • ` : ""; - const title = (article.title !== null) ? `
      • Author: ${article.title}
        • ` : ""; return `
        @@ -69,52 +67,40 @@ function displayDataOnPage(body, url) { } /* -====================================================== CREATE MENU AND BUTTONS -====================================================== */ -countryMenuNode.addEventListener('change', function(event){ - event.preventDefault(); - const countryURL = queryHeadlines(event.target.value, "business"); - loadAPI(countryURL); -}); - -const createSectionButton = function (url, title){ - let buttonNode = document.createElement("button"); - buttonNode.innerHTML = title; - sectionButtonsNode.appendChild(buttonNode); - buttonNode.addEventListener('click', function(event){ +const createCountriesMenu = function() { + const menuNode = document.createElement("select"); + menuNode.innerHTML = getCountries(); + countryMenuNode.appendChild(menuNode); + countryMenuNode.addEventListener('change', function(event){ event.preventDefault(); - loadAPI(url); + const countryURL = queryHeadlines(event.target.value); + loadAPI(countryURL); }); } -const buttons = { - // 'uk': `top-headlines?country=uk&apiKey=${apiKey}` - 'top-headlines': ['category', 'country', 'q'], - 'sources': ['language','country'], - 'everything': ['q'] -} +/* +CREATE QUERIES +*/ + +const newsURL = "https://newsapi.org/v2/"; +const apiKey = "756ef978eb384d9cb3ecdab2d9bac0da"; -const queryHeadlines = function (country, category) { +const queryHeadlines = function (country, category="") { // categories are: business entertainment general health science sports technology let validCategory = category ? `&category=${category}` : ""; - const url = `${newsURL}top-headlines?country=${country}${validCategory}&apiKey=${apiKey}`; - return url; + return `${newsURL}top-headlines?country=${country}${validCategory}&apiKey=${apiKey}`; } const queryEverything = function (subject) { - const url = `${newsURL}everything?q=${subject}&apiKey=${apiKey}`; - return url; + return `${newsURL}everything?q=${subject}&apiKey=${apiKey}`; } -const headlinesUS = queryHeadlines("us"); -createSectionButton(headlinesUS, "US Headlines"); -const ukMusic = queryEverything("music"); -createSectionButton(ukMusic, "Music UK"); const displayErrorToUser = error => console.log(error); -loadAPI(ukMusic); +createCountriesMenu(); +loadAPI(queryHeadlines("gb")); /* ====================================================== @@ -132,7 +118,6 @@ navButton.addEventListener("click", function(event){ state = !state; }); - // source: { // id: null, // name: "Birminghammail.co.uk" @@ -145,7 +130,29 @@ navButton.addEventListener("click", function(event){ // publishedAt: "2018-09-14T11:26:20Z", // content: "JD Wetherspoon's profits..." +// const buttons = { +// 'top-headlines': ['category', 'country', 'q'], +// 'sources': ['language','country'], +// 'everything': ['q'] +// } +// const createSectionButton = function (url, title){ +// let buttonNode = document.createElement("button"); +// buttonNode.innerHTML = title; +// sectionButtonsNode.appendChild(buttonNode); +// buttonNode.addEventListener('click', function(event){ +// event.preventDefault(); +// loadAPI(url); +// }); +// } + +// const headlinesUS = queryHeadlines("us"); +// createSectionButton(headlinesUS, "US Headlines"); +// const ukMusic = queryEverything("music"); +// createSectionButton(ukMusic, "Music UK"); + + // documentation: +// https://newsapi.org/sources // https://newsapi.org/docs // https://newsapi.org/docs/get-started // everything: https://newsapi.org/docs/endpoints/everything From 36efae38d885941c3c81c84939cb7b8ae5a6a84a Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Sat, 15 Sep 2018 01:02:55 +0100 Subject: [PATCH 07/24] improved country menu --- countries-object.js | 2 +- countries-object.src | 109 ------------------------------------------- index.html | 3 +- index.js | 2 +- 4 files changed, 4 insertions(+), 112 deletions(-) delete mode 100644 countries-object.src diff --git a/countries-object.js b/countries-object.js index 1d01806..b19f8b8 100644 --- a/countries-object.js +++ b/countries-object.js @@ -1,6 +1,6 @@ const getCountries = function () { return Object.keys(countries).map(function(key){ - return `/n/r`; + return `\n`; }); } const countries = { diff --git a/countries-object.src b/countries-object.src deleted file mode 100644 index 29a6453..0000000 --- a/countries-object.src +++ /dev/null @@ -1,109 +0,0 @@ -countries = { - Argentina -ar -Australia -au -Austria -at -Belgium -be -Brazil -br -Bulgaria -bg -Canada -ca -China -cn -Colombia -co -Cuba -cu -Czech Republic -cz -Egypt -eg -France -fr -Germany -de -Greece -gr -Hong Kong -hk -Hungary -hu -India -in -Indonesia -id -Ireland -ie -Israel -il -Italy -it -Japan -jp -Latvia -lv -Lithuania -lt -Malaysia -my -Mexico -mx -Morocco -ma -Netherlands -nl -New Zealand -nz -Nigeria -ng -Norway -no -Philippines -ph -Poland -pl -Portugal -pt -Romania -ro -Russia -ru -Saudi Arabia -sa -Serbia -rs -Singapore -sg -Slovakia -sk -Slovenia -si -South Africa -za -South Korea -kr -Sweden -se -Switzerland -ch -Taiwan -tw -Thailand -th -Turkey -tr -UAE -ae -Ukraine -ua -United Kingdom -gb -United States -us -Venuzuela -ve diff --git a/index.html b/index.html index 24290b3..96c14a6 100644 --- a/index.html +++ b/index.html @@ -35,7 +35,8 @@

        NEWS READER

        -
        Top Headlines Worldwide: + + Top Headlines Worldwide:
        diff --git a/index.js b/index.js index 00f720c..02e9e1c 100644 --- a/index.js +++ b/index.js @@ -72,7 +72,7 @@ CREATE MENU AND BUTTONS const createCountriesMenu = function() { const menuNode = document.createElement("select"); - menuNode.innerHTML = getCountries(); + menuNode.innerHTML = getCountries().join(""); countryMenuNode.appendChild(menuNode); countryMenuNode.addEventListener('change', function(event){ event.preventDefault(); From 1c2f7483ddb1c88c24ef2e223c17442127102bf9 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Sat, 15 Sep 2018 12:59:31 +0100 Subject: [PATCH 08/24] removed collasping nav button and replaced with search functionality --- .DS_Store | Bin 0 -> 6148 bytes index.html | 13 +- index.js | 67 +++++--- sources-object.js | 413 ++++++++++++++++++++++++++++++++++++++++++++++ styles.css | 62 +++++-- 5 files changed, 520 insertions(+), 35 deletions(-) create mode 100644 .DS_Store create mode 100644 sources-object.js diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d05e0a6a7ab55f127deb2aa9f0ad1cd791d25dc5 GIT binary patch literal 6148 zcmeHKO-sW-5Pee%wiTfuqQ@M)81U>RmiFMmi~fPqR;mWm=&&iay6hTE?`x}BD|q&a;$p1uf;sN7#CdJD zIsT#ox_3vIBEuRB6!$N~1drUyDZMdA%j-0oPSR{b245FBA-;b(a|=7(5#^cuIpZ(* zR>T}{uqsEwWhK&KL!?Hge3E%qc!nM`EimI#ZvZG+1+@t$+uyaQMVw-Mf9P3#^IZ?nQVD6E3XyU0vPnB@Q5KpH+3iFbHxkpcj zgu{n~%o0v0;<7V-

        NEWS READER

        -
        - + +
        +
        + +
        +
        + 🔍 +
        @@ -36,8 +41,7 @@

        NEWS READER

        - Top Headlines Worldwide: - + Worldwide News:
        @@ -54,6 +58,7 @@

        NEWS READER

        + \ No newline at end of file diff --git a/index.js b/index.js index 02e9e1c..0506f3b 100644 --- a/index.js +++ b/index.js @@ -3,6 +3,7 @@ const articleNode = document.querySelector(".article__list"); const sectionButtonsNode = document.querySelector(".content__section__buttons"); const displayJSONNode = document.querySelector(".display__url"); const countryMenuNode = document.querySelector(".country"); +const categories = ["business", "entertainment", "general", "health", "science", "sports", "technology"]; /* ====================================================== @@ -25,7 +26,7 @@ const loadAPI = function (url) { /* ====================================================== -FETCH DATA FOR ARTICLES +FORMAT DATA FOR ARTICLES ====================================================== */ @@ -34,15 +35,18 @@ const articleTemplate = article => { const description = (article.description !== null) ? `
      • ${article.description}
        • ` : ""; const content = (article.content !== null) ? `
      • ${article.content}
        • ` : ""; const author = (article.author !== null) ? `
      • Author: ${article.author}
        • ` : ""; + const source = (article.source.name !== null) ? `
      • Source: ${article.source.name}
        • ` : ""; + const url = (article.url !== null) ? `READ FULL STORY...` : ""; + const urlToImage = (article.urlToImage !== null) ? `` : ""; return `
        - ${article.source.name} + ${title}
        - + ${urlToImage}
          @@ -50,12 +54,18 @@ const articleTemplate = article => { ${description} ${content} ${author} + ${source} + ${url}
        `; } +/* +DISPLAY DATA +*/ + function displayDataOnPage(body, url) { articleNode.innerHTML = ""; body.articles.forEach(function(article) { @@ -63,7 +73,7 @@ function displayDataOnPage(body, url) { node.innerHTML = articleTemplate(article) articleNode.appendChild(node); }); - displayJSONNode.innerHTML = `View JSON: ${url}`; + displayJSONNode.innerHTML = `View JSON`; } /* @@ -76,7 +86,7 @@ const createCountriesMenu = function() { countryMenuNode.appendChild(menuNode); countryMenuNode.addEventListener('change', function(event){ event.preventDefault(); - const countryURL = queryHeadlines(event.target.value); + const countryURL = queryAPI(event.target.value); loadAPI(countryURL); }); } @@ -88,36 +98,48 @@ CREATE QUERIES const newsURL = "https://newsapi.org/v2/"; const apiKey = "756ef978eb384d9cb3ecdab2d9bac0da"; -const queryHeadlines = function (country, category="") { - // categories are: business entertainment general health science sports technology - let validCategory = category ? `&category=${category}` : ""; - return `${newsURL}top-headlines?country=${country}${validCategory}&apiKey=${apiKey}`; -} -const queryEverything = function (subject) { - return `${newsURL}everything?q=${subject}&apiKey=${apiKey}`; +const queryAPI = function (type, country="", category="", search="") { + let validCountry = country ? `country=${country}&` : ""; + let validCategory = category ? `category=${category}&` : ""; + let validSearch = search ? `q=${search}&` : ""; + let query = `${newsURL}${type}?${validCountry}${validCategory}${validSearch}apiKey=${apiKey}` + console.log(query); + return query; } const displayErrorToUser = error => console.log(error); createCountriesMenu(); -loadAPI(queryHeadlines("gb")); +loadAPI(queryAPI("everything", "", "", "Donald+Trump")); /* ====================================================== */ -const navButton = document.querySelector(".header__nav-button") const navBar = document.querySelector(".content__nav"); -let state = 1; +const navButton = document.querySelector(".header__nav__button") +const navSearch = document.querySelector(".search"); +// search from top nav navButton.addEventListener("click", function(event){ event.preventDefault(); - navBar.style.display = state ? "flex" : "none"; - navButtonIcon = state ? "x" : "+"; - navButton.innerHTML = `${navButtonIcon}`; - state = !state; + let searchQuery = navSearch.value.split(" ").join("+"); + loadAPI(queryAPI("everything", "", "", searchQuery)); + }); +// collapse main nav +// let state = 1; +// navButton.addEventListener("click", function(event){ +// event.preventDefault(); +// navBar.style.display = state ? "flex" : "none"; +// navButtonIcon = state ? "x" : "+"; +// navButton.innerHTML = `${navButtonIcon}`; +// state = !state; +// }); + + + // source: { // id: null, // name: "Birminghammail.co.uk" @@ -130,6 +152,13 @@ navButton.addEventListener("click", function(event){ // publishedAt: "2018-09-14T11:26:20Z", // content: "JD Wetherspoon's profits..." +// sources: from US, in English +// loadAPI(`https://newsapi.org/v2/sources?language=en&country=us&apiKey=756ef978eb384d9cb3ecdab2d9bac0da`); + +// everything: q=trump+(fake+news) +//loadAPI(`https://newsapi.org/v2/everything?q=trump+(fake+news)&language=en&apiKey=756ef978eb384d9cb3ecdab2d9bac0da`); + + // const buttons = { // 'top-headlines': ['category', 'country', 'q'], // 'sources': ['language','country'], diff --git a/sources-object.js b/sources-object.js new file mode 100644 index 0000000..8466373 --- /dev/null +++ b/sources-object.js @@ -0,0 +1,413 @@ +const getSources = function () { + return Object.keys(sources).map(function(key){ + return `\n`; + }); +} + +const sources = { + 'abc-news': 'ABC News', + 'abc-news-au': 'ABC News (AU)', + 'aftenposten': 'Aftenposten', + 'al-jazeera-english': 'Al Jazeera English', + 'ansa': 'ANSA.it', + 'argaam': 'Argaam' +} + +/* +Ars Technica +Ars Technica +ars-technica +Ary News +Ary News +ary-news +Associated Press +Associated Press +associated-press +Australian Financial Review +Australian Financial Review +australian-financial-review +Axios +Axios +axios +BBC News +BBC News +bbc-news +BBC Sport +BBC Sport +bbc-sport +Bild +Bild +bild +Blasting News (BR) +Blasting News (BR) +blasting-news-br +Bleacher Report +Bleacher Report +bleacher-report +Bloomberg +Bloomberg +bloomberg +Breitbart News +Breitbart News +breitbart-news +Business Insider +Business Insider +business-insider +Business Insider (UK) +Business Insider (UK) +business-insider-uk +Buzzfeed +Buzzfeed +buzzfeed +CBC News +CBC News +cbc-news +CBS News +CBS News +cbs-news +CNBC +CNBC +cnbc +CNN +CNN +cnn +CNN Spanish +CNN Spanish +cnn-es +Crypto Coins News +Crypto Coins News +crypto-coins-news +Daily Mail +Daily Mail +daily-mail +Der Tagesspiegel +Der Tagesspiegel +der-tagesspiegel +Die Zeit +Die Zeit +die-zeit +El Mundo +El Mundo +el-mundo +Engadget +Engadget +engadget +Entertainment Weekly +Entertainment Weekly +entertainment-weekly +ESPN +ESPN +espn +ESPN Cric Info +ESPN Cric Info +espn-cric-info +Financial Post +Financial Post +financial-post +Financial Times +Financial Times +financial-times +Focus +Focus +focus +Football Italia +Football Italia +football-italia +Fortune +Fortune +fortune +FourFourTwo +FourFourTwo +four-four-two +Fox News +Fox News +fox-news +Fox Sports +Fox Sports +fox-sports +Globo +Globo +globo +Google News +Google News +google-news +Google News (Argentina) +Google News (Argentina) +google-news-ar +Google News (Australia) +Google News (Australia) +google-news-au +Google News (Brasil) +Google News (Brasil) +google-news-br +Google News (Canada) +Google News (Canada) +google-news-ca +Google News (France) +Google News (France) +google-news-fr +Google News (India) +Google News (India) +google-news-in +Google News (Israel) +Google News (Israel) +google-news-is +Google News (Italy) +Google News (Italy) +google-news-it +Google News (Russia) +Google News (Russia) +google-news-ru +Google News (Saudi Arabia) +Google News (Saudi Arabia) +google-news-sa +Google News (UK) +Google News (UK) +google-news-uk +Göteborgs-Posten +Göteborgs-Posten +goteborgs-posten +Gruenderszene +Gruenderszene +gruenderszene +Hacker News +Hacker News +hacker-news +Handelsblatt +Handelsblatt +handelsblatt +IGN +IGN +ign +Il Sole 24 Ore +Il Sole 24 Ore +il-sole-24-ore +Independent +Independent +independent +Infobae +Infobae +infobae +InfoMoney +InfoMoney +info-money +La Gaceta +La Gaceta +la-gaceta +La Nacion +La Nacion +la-nacion +La Repubblica +La Repubblica +la-repubblica +Le Monde +Le Monde +le-monde +Lenta +Lenta +lenta +L'equipe +L'equipe +lequipe +Les Echos +Les Echos +les-echos +Libération +Libération +liberation +Marca +Marca +marca +Mashable +Mashable +mashable +Medical News Today +Medical News Today +medical-news-today +Metro +Metro +metro +Mirror +Mirror +mirror +MSNBC +MSNBC +msnbc +MTV News +MTV News +mtv-news +MTV News (UK) +MTV News (UK) +mtv-news-uk +National Geographic +National Geographic +national-geographic +National Review +National Review +national-review +NBC News +NBC News +nbc-news +News24 +News24 +news24 +New Scientist +New Scientist +new-scientist +News.com.au +News.com.au +news-com-au +Newsweek +Newsweek +newsweek +New York Magazine +New York Magazine +new-york-magazine +Next Big Future +Next Big Future +next-big-future +NFL News +NFL News +nfl-news +NHL News +NHL News +nhl-news +NRK +NRK +nrk +Politico +Politico +politico +Polygon +Polygon +polygon +RBC +RBC +rbc +Recode +Recode +recode +Reddit /r/all +Reddit /r/all +reddit-r-all +Reuters +Reuters +reuters +RT +RT +rt +RTE +RTE +rte +RTL Nieuws +RTL Nieuws +rtl-nieuws +SABQ +SABQ +sabq +Spiegel Online +Spiegel Online +spiegel-online +Svenska Dagbladet +Svenska Dagbladet +svenska-dagbladet +T3n +T3n +t3n +TalkSport +TalkSport +talksport +TechCrunch +TechCrunch +techcrunch +TechCrunch (CN) +TechCrunch (CN) +techcrunch-cn +TechRadar +TechRadar +techradar +The American Conservative +The American Conservative +the-american-conservative +The Economist +The Economist +the-economist +The Globe And Mail +The Globe And Mail +the-globe-and-mail +The Guardian (AU) +The Guardian (AU) +the-guardian-au +The Guardian (UK) +The Guardian (UK) +the-guardian-uk +The Hill +The Hill +the-hill +The Hindu +The Hindu +the-hindu +The Huffington Post +The Huffington Post +the-huffington-post +The Irish Times +The Irish Times +the-irish-times +The Jerusalem Post +The Jerusalem Post +the-jerusalem-post +The Lad Bible +The Lad Bible +the-lad-bible +The New York Times +The New York Times +the-new-york-times +The Next Web +The Next Web +the-next-web +The Sport Bible +The Sport Bible +the-sport-bible +The Telegraph +The Telegraph +the-telegraph +The Times of India +The Times of India +the-times-of-india +The Verge +The Verge +the-verge +The Wall Street Journal +The Wall Street Journal +the-wall-street-journal +The Washington Post +The Washington Post +the-washington-post +The Washington Times +The Washington Times +the-washington-times +Time +Time +time +USA Today +USA Today +usa-today +Vice News +Vice News +vice-news +Wired +Wired +wired +Wired.de +Wired.de +wired-de +Wirtschafts Woche +Wirtschafts Woche +wirtschafts-woche +Xinhua Net +Xinhua Net +xinhua-net +Ynet +Ynet +ynet +*/ \ No newline at end of file diff --git a/styles.css b/styles.css index b2b884d..1001135 100644 --- a/styles.css +++ b/styles.css @@ -6,11 +6,12 @@ body { margin: 0; box-sizing: border-box; background: white; - font-family: Georgia, Times, 'Times New Roman', serif + font-family: Arial, Helvetica, sans-serif; } h1 { margin: 0; + font-family: Georgia, Times, 'Times New Roman', serif; } @@ -24,6 +25,10 @@ a { min-height: 100vh; } +/* +// HEADER //////////////////////////// +*/ + .header { display: flex; flex-direction: row; @@ -33,16 +38,46 @@ a { padding: 0.5em; } -.header__nav-button a { +.header__nav { + display: flex; + flex-direction: row; + align-items: flex-end; +} + +/* .header__nav__search input { + width: 100%; +} */ + +input[type=text] { + width: 100%; + padding: 0.5em; + margin: 1em 0; + box-sizing: border-box; + border: none; + border-bottom: 1px solid black; + background-color: #f4f4f4; +} + +.header__nav__button { + text-decoration: none; + padding: 0 0 0.3em 0; + border: 0.4em; + font-size: 1.5em; + vertical-align: middle; +} + +.header__nav__button a { text-decoration: none; - background-color: #999999; + /* background-color: #999999; */ color: #ffffff; - padding: 0 0.4em; - font-size: 1.2em; + padding: 0 0.4em 0 0.4em; + border: 1em; + opacity:0.6; } -.header__nav-button a:hover { - background-color: #666666; +.header__nav__button a:hover { + /* background-color: #666666; */ + opacity: 1; } .content { @@ -114,12 +149,15 @@ a { } .article__image { - width: 100%; min-width: 150px; display: flex; flex: 1; background: #e0e0e0; padding: 0; +} + +.article__image__src { + width: 100%; border: 0; } @@ -137,10 +175,10 @@ a { margin: 0; } -.display__url { - padding: 0 0 1em 0; +a.article__text ul { + text-decoration: none; } -.country { - +.display__url { + padding: 0 0 1em 0; } \ No newline at end of file From d67bc4050e1bd308e337de9d00093d415af0f429 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Sat, 15 Sep 2018 13:52:03 +0100 Subject: [PATCH 09/24] Improved search functionality with Search Results For --- index.html | 7 +++++-- index.js | 37 +++++++++++++++++++++++++------------ styles.css | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 60 insertions(+), 17 deletions(-) diff --git a/index.html b/index.html index f1398cc..707957a 100644 --- a/index.html +++ b/index.html @@ -20,8 +20,11 @@

        NEWS READER

        -
        - +
        + Worldwide News: + +
        +
        +
        🔍 diff --git a/index.js b/index.js index 0506f3b..fdf66d9 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,7 @@ const sectionButtonsNode = document.querySelector(".content__section__buttons"); const displayJSONNode = document.querySelector(".display__url"); const countryMenuNode = document.querySelector(".country"); const categories = ["business", "entertainment", "general", "health", "science", "sports", "technology"]; - +let queryType = ""; /* ====================================================== FETCH DATA @@ -68,6 +68,7 @@ DISPLAY DATA function displayDataOnPage(body, url) { articleNode.innerHTML = ""; + displaySearchMessage(url) body.articles.forEach(function(article) { const node = document.createElement("li"); node.innerHTML = articleTemplate(article) @@ -86,7 +87,7 @@ const createCountriesMenu = function() { countryMenuNode.appendChild(menuNode); countryMenuNode.addEventListener('change', function(event){ event.preventDefault(); - const countryURL = queryAPI(event.target.value); + const countryURL = queryAPI("top-headlines", event.target.value, "", ""); loadAPI(countryURL); }); } @@ -117,7 +118,8 @@ loadAPI(queryAPI("everything", "", "", "Donald+Trump")); */ const navBar = document.querySelector(".content__nav"); -const navButton = document.querySelector(".header__nav__button") +const navButton = document.querySelector(".header__nav__button"); +const navSections = document.querySelector(".header__nav__sections a"); const navSearch = document.querySelector(".search"); // search from top nav @@ -125,18 +127,29 @@ navButton.addEventListener("click", function(event){ event.preventDefault(); let searchQuery = navSearch.value.split(" ").join("+"); loadAPI(queryAPI("everything", "", "", searchQuery)); - }); +// display "search results for:" +const displaySearchMessage = function(url) { + if (url.indexOf("everything?") >= 0) { + // console.log(url) + let searchNode = document.createElement("li"); + searchNode.innerHTML = "Your search results for: xxx"; + articleNode.appendChild(searchNode); + } else { + if (typeof searchNode === "object") searchNode.innerHTML = ""; + } +} + // collapse main nav -// let state = 1; -// navButton.addEventListener("click", function(event){ -// event.preventDefault(); -// navBar.style.display = state ? "flex" : "none"; -// navButtonIcon = state ? "x" : "+"; -// navButton.innerHTML = `${navButtonIcon}`; -// state = !state; -// }); +let state = 1; +navSections.addEventListener("click", function(event){ + event.preventDefault(); + navBar.style.display = state ? "flex" : "none"; + navSearchIcon = state ? "x" : "+"; + navSections.innerHTML = `${navSearchIcon}`; + state = !state; +}); diff --git a/styles.css b/styles.css index 1001135..0265d4e 100644 --- a/styles.css +++ b/styles.css @@ -44,18 +44,42 @@ a { align-items: flex-end; } -/* .header__nav__search input { +/* .header__nav__input { width: 100%; } */ +/* .header__nav__sections { + background-color: #999999; +} */ + +.header__nav__sections a { + text-decoration: none; + color: #ffffff; + padding: 0 0.4em 0 0.4em; + opacity:0.6; + background-color: #999999; +} + +.header__nav__sections a:hover { + background-color: #666666; + opacity: 1; +} + input[type=text] { - width: 100%; padding: 0.5em; margin: 1em 0; box-sizing: border-box; border: none; border-bottom: 1px solid black; background-color: #f4f4f4; + -webkit-transition: width 0.4s ease-in-out; + transition: width 0.4s ease-in-out; +} + +input[type=text]:focus { + border: 2px solid #555; + background-color: #fff; + width: 100%; } .header__nav__button { @@ -68,7 +92,6 @@ input[type=text] { .header__nav__button a { text-decoration: none; - /* background-color: #999999; */ color: #ffffff; padding: 0 0.4em 0 0.4em; border: 1em; @@ -80,6 +103,10 @@ input[type=text] { opacity: 1; } +/* /////////////// +// MAIN CONTENT // +////////////////*/ + .content { display: flex; flex-direction: column; From ec354f5257497f0f87b3b5d3bbac1a1531263508 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Sat, 15 Sep 2018 16:10:33 +0100 Subject: [PATCH 10/24] completed search highlighting for results --- index.js | 99 ++++++++++++++++++++++-------------------------------- styles.css | 16 ++++++--- 2 files changed, 52 insertions(+), 63 deletions(-) diff --git a/index.js b/index.js index fdf66d9..2dc63d2 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,7 @@ const sectionButtonsNode = document.querySelector(".content__section__buttons"); const displayJSONNode = document.querySelector(".display__url"); const countryMenuNode = document.querySelector(".country"); const categories = ["business", "entertainment", "general", "health", "science", "sports", "technology"]; -let queryType = ""; + /* ====================================================== FETCH DATA @@ -32,7 +32,8 @@ FORMAT DATA FOR ARTICLES const articleTemplate = article => { const title = (article.title !== null) ? `
      • ${article.title}
        • ` : ""; - const description = (article.description !== null) ? `
      • ${article.description}
        • ` : ""; + const convertedDescription = (article.description !== null) ? highlightFoundWords(article.description) : null; + const description = (article.description !== null) ? `
      • ${convertedDescription}
        • ` : ""; const content = (article.content !== null) ? `
      • ${article.content}
        • ` : ""; const author = (article.author !== null) ? `
      • Author: ${article.author}
        • ` : ""; const source = (article.source.name !== null) ? `
      • Source: ${article.source.name}
        • ` : ""; @@ -68,18 +69,19 @@ DISPLAY DATA function displayDataOnPage(body, url) { articleNode.innerHTML = ""; - displaySearchMessage(url) + displaySearchMessage(url); body.articles.forEach(function(article) { + // console.log(body) const node = document.createElement("li"); - node.innerHTML = articleTemplate(article) + node.innerHTML = articleTemplate(article); articleNode.appendChild(node); }); displayJSONNode.innerHTML = `View JSON`; } -/* +/* ///////////////////// CREATE MENU AND BUTTONS -*/ +//////////////////////*/ const createCountriesMenu = function() { const menuNode = document.createElement("select"); @@ -92,10 +94,11 @@ const createCountriesMenu = function() { }); } -/* +/* /////////////////////////////////// CREATE QUERIES -*/ +////////////////////////////////////*/ +let bodyURL = ""; const newsURL = "https://newsapi.org/v2/"; const apiKey = "756ef978eb384d9cb3ecdab2d9bac0da"; @@ -103,9 +106,8 @@ const queryAPI = function (type, country="", category="", search="") { let validCountry = country ? `country=${country}&` : ""; let validCategory = category ? `category=${category}&` : ""; let validSearch = search ? `q=${search}&` : ""; - let query = `${newsURL}${type}?${validCountry}${validCategory}${validSearch}apiKey=${apiKey}` - console.log(query); - return query; + bodyURL = `${newsURL}${type}?${validCountry}${validCategory}${validSearch}apiKey=${apiKey}`; + return bodyURL; } const displayErrorToUser = error => console.log(error); @@ -113,9 +115,9 @@ const displayErrorToUser = error => console.log(error); createCountriesMenu(); loadAPI(queryAPI("everything", "", "", "Donald+Trump")); -/* -====================================================== -*/ +/* /////////////////////////////////// +NAVIGATION SEARCH AND BUTTONS +////////////////////////////////////*/ const navBar = document.querySelector(".content__nav"); const navButton = document.querySelector(".header__nav__button"); @@ -132,15 +134,36 @@ navButton.addEventListener("click", function(event){ // display "search results for:" const displaySearchMessage = function(url) { if (url.indexOf("everything?") >= 0) { - // console.log(url) - let searchNode = document.createElement("li"); - searchNode.innerHTML = "Your search results for: xxx"; + const searchNode = document.createElement("li"); + searchNode.innerHTML = `Your search results for: "${convertedSearchArray(url).join(" ")}"`; articleNode.appendChild(searchNode); } else { if (typeof searchNode === "object") searchNode.innerHTML = ""; } } +// convert the URL from search results to an array +const convertedSearchArray = function (url) { + let regex = /\A?q=[^&]*/g; + const found = url.match(regex).toString(); + return found.split("=")[1].split("+"); +} + +// highlight found search terms +const highlightFoundWords = function (descriptionText) { + if (bodyURL.indexOf("everything?") >= 0) { + const searchResultsArray = convertedSearchArray(bodyURL); + const updatedWords = descriptionText.split(" ").map(function(item){ + const found = searchResultsArray.find(function(searchItem) { + return searchItem === item; + }); + return found ? `${found}` : item; + }); + return updatedWords.join(" "); + } else { + return descriptionText; + } +} // collapse main nav let state = 1; navSections.addEventListener("click", function(event){ @@ -151,48 +174,6 @@ navSections.addEventListener("click", function(event){ state = !state; }); - - -// source: { -// id: null, -// name: "Birminghammail.co.uk" -// }, -// author: "James Rodger", -// title: "This is why your Wetherspoons food AND drink order is set to get more expensive", -// description: "Profit before tax was up 4.3% to £107.2 million, the group's highest profit in its 39-year history", -// url: "https://www.birminghammail.co.uk/whats-on/food-drink-news/your-wetherspoons-food-drink-order-15151668", -// urlToImage: "https://i2-prod.walesonline.co.uk/incoming/article14267365.ece/ALTERNATES/s1200/1_2jpeg.jpg", -// publishedAt: "2018-09-14T11:26:20Z", -// content: "JD Wetherspoon's profits..." - -// sources: from US, in English -// loadAPI(`https://newsapi.org/v2/sources?language=en&country=us&apiKey=756ef978eb384d9cb3ecdab2d9bac0da`); - -// everything: q=trump+(fake+news) -//loadAPI(`https://newsapi.org/v2/everything?q=trump+(fake+news)&language=en&apiKey=756ef978eb384d9cb3ecdab2d9bac0da`); - - -// const buttons = { -// 'top-headlines': ['category', 'country', 'q'], -// 'sources': ['language','country'], -// 'everything': ['q'] -// } -// const createSectionButton = function (url, title){ -// let buttonNode = document.createElement("button"); -// buttonNode.innerHTML = title; -// sectionButtonsNode.appendChild(buttonNode); -// buttonNode.addEventListener('click', function(event){ -// event.preventDefault(); -// loadAPI(url); -// }); -// } - -// const headlinesUS = queryHeadlines("us"); -// createSectionButton(headlinesUS, "US Headlines"); -// const ukMusic = queryEverything("music"); -// createSectionButton(ukMusic, "Music UK"); - - // documentation: // https://newsapi.org/sources // https://newsapi.org/docs diff --git a/styles.css b/styles.css index 0265d4e..c27a4b7 100644 --- a/styles.css +++ b/styles.css @@ -5,8 +5,9 @@ body { margin: 0; box-sizing: border-box; - background: white; + background: rgb(244, 244, 244); font-family: Arial, Helvetica, sans-serif; + line-height: 1.5em } h1 { @@ -16,7 +17,8 @@ h1 { a { - color: rgb(4, 217, 255); + /* color: rgb(0, 217, 255); */ + color: rgb(0, 84, 99); } .news-app { @@ -155,6 +157,12 @@ input[type=text]:focus { font-weight: 100; } +.highlighted { + background-color:rgb(79, 229, 255); + font-weight: bold; + padding: 0.1em; +} + .article__list { list-style: none; padding: 0; @@ -169,7 +177,7 @@ input[type=text]:focus { .article__header { display: block; font-size: 1.5rem; - background: #303030; + background: #f0f0f0; color: white; padding: 1.5rem 1rem; margin: 1rem 0 0 0; @@ -190,7 +198,7 @@ input[type=text]:focus { .article__text { font-size: 1rem; - background: #f0f0f0; + background: #ffffff; color: black; padding: 1rem; display: flex; From cae0e40eca0a4a8cf968fb96df68937ad52e1e58 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Sat, 15 Sep 2018 19:10:47 +0100 Subject: [PATCH 11/24] buggy version that doesn't have highlighting working on title or content --- index.js | 41 ++++++++++++++++++++++++++--------------- styles.css | 13 ++++++++++--- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/index.js b/index.js index 2dc63d2..e3d35e4 100644 --- a/index.js +++ b/index.js @@ -31,18 +31,23 @@ FORMAT DATA FOR ARTICLES */ const articleTemplate = article => { + const keys = Object.keys(article); + // ["title", "description", "content"].forEach(function(key){ + // const convertedText = (article[key] !== null) ? highlightFoundWords(article[key]) : ""; + // article[key] = convertedText; + // }); const title = (article.title !== null) ? `
      • ${article.title}
        • ` : ""; const convertedDescription = (article.description !== null) ? highlightFoundWords(article.description) : null; const description = (article.description !== null) ? `
      • ${convertedDescription}
        • ` : ""; const content = (article.content !== null) ? `
      • ${article.content}
        • ` : ""; - const author = (article.author !== null) ? `
      • Author: ${article.author}
        • ` : ""; - const source = (article.source.name !== null) ? `
      • Source: ${article.source.name}
        • ` : ""; - const url = (article.url !== null) ? `READ FULL STORY...` : ""; + const author = (article.author !== null) ? `Author: ${article.author}` : ""; + const source = (article.source.name !== null) ? `Source: ${article.source.name}` : ""; + const url = (article.url !== null) ? `READ FULL STORY` : ""; const urlToImage = (article.urlToImage !== null) ? `` : ""; return `
        @@ -51,27 +56,26 @@ const articleTemplate = article => {
          - ${title} - ${description} - ${content} - ${author} - ${source} - ${url} +
        • ${title}
          • +
        • ${description}
          • +
        • ${content}
          • +
        • ${author}
          • +
        • ${source}
          • +
        • ${url}
        `; } -/* -DISPLAY DATA -*/ +/* ////////////////////////// +// DISPLAY DATA +///////////////////////////*/ function displayDataOnPage(body, url) { articleNode.innerHTML = ""; displaySearchMessage(url); body.articles.forEach(function(article) { - // console.log(body) const node = document.createElement("li"); node.innerHTML = articleTemplate(article); articleNode.appendChild(node); @@ -149,6 +153,12 @@ const convertedSearchArray = function (url) { return found.split("=")[1].split("+"); } +Array.prototype.intersect = function(secondArray) { + return this.filter(function(item) { + return (secondArray.indexOf(item) != -1); + }); +} + // highlight found search terms const highlightFoundWords = function (descriptionText) { if (bodyURL.indexOf("everything?") >= 0) { @@ -157,13 +167,14 @@ const highlightFoundWords = function (descriptionText) { const found = searchResultsArray.find(function(searchItem) { return searchItem === item; }); - return found ? `${found}` : item; + return found !== undefined ? `${found}` : item; }); return updatedWords.join(" "); } else { return descriptionText; } } + // collapse main nav let state = 1; navSections.addEventListener("click", function(event){ diff --git a/styles.css b/styles.css index c27a4b7..c82ed5d 100644 --- a/styles.css +++ b/styles.css @@ -70,10 +70,12 @@ a { input[type=text] { padding: 0.5em; margin: 1em 0; + width: 10em; box-sizing: border-box; border: none; border-bottom: 1px solid black; background-color: #f4f4f4; + font-size: 0.8em; -webkit-transition: width 0.4s ease-in-out; transition: width 0.4s ease-in-out; } @@ -81,7 +83,7 @@ input[type=text] { input[type=text]:focus { border: 2px solid #555; background-color: #fff; - width: 100%; + width: 20em; } .header__nav__button { @@ -158,7 +160,7 @@ input[type=text]:focus { } .highlighted { - background-color:rgb(79, 229, 255); + background-color:rgb(255, 234, 141); font-weight: bold; padding: 0.1em; } @@ -178,11 +180,16 @@ input[type=text]:focus { display: block; font-size: 1.5rem; background: #f0f0f0; - color: white; + color: black; padding: 1.5rem 1rem; margin: 1rem 0 0 0; } +.article__header a { + text-decoration: none; + color: black; +} + .article__image { min-width: 150px; display: flex; From 9c8b692a9136e7487e00c5d2e4b750ebcd4f21d9 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Sat, 15 Sep 2018 21:40:50 +0100 Subject: [PATCH 12/24] fixed bugs and improved layout and styling --- index.html | 16 ++----- index.js | 56 +++++++++++++++---------- styles.css | 119 ++++++++++++++++++++++++++++++++++++----------------- 3 files changed, 120 insertions(+), 71 deletions(-) diff --git a/index.html b/index.html index 707957a..cab9453 100644 --- a/index.html +++ b/index.html @@ -20,9 +20,6 @@

        NEWS READER

        -
        - Worldwide News: + -
        @@ -33,21 +30,16 @@

        NEWS READER

        - - -
        -
        Worldwide News:
        -
        + + +
        +
          diff --git a/index.js b/index.js index e3d35e4..2dd66ba 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,7 @@ const parentNode = document.querySelector(".content__body"); const articleNode = document.querySelector(".article__list"); const sectionButtonsNode = document.querySelector(".content__section__buttons"); -const displayJSONNode = document.querySelector(".display__url"); +const displayJSONNode = document.querySelector(".content__footer"); const countryMenuNode = document.querySelector(".country"); const categories = ["business", "entertainment", "general", "health", "science", "sports", "technology"]; @@ -31,7 +31,7 @@ FORMAT DATA FOR ARTICLES */ const articleTemplate = article => { - const keys = Object.keys(article); + // const keys = Object.keys(article); // ["title", "description", "content"].forEach(function(key){ // const convertedText = (article[key] !== null) ? highlightFoundWords(article[key]) : ""; // article[key] = convertedText; @@ -39,15 +39,19 @@ const articleTemplate = article => { const title = (article.title !== null) ? `
        • ${article.title}
          • ` : ""; const convertedDescription = (article.description !== null) ? highlightFoundWords(article.description) : null; const description = (article.description !== null) ? `
        • ${convertedDescription}
          • ` : ""; - const content = (article.content !== null) ? `
        • ${article.content}
          • ` : ""; - const author = (article.author !== null) ? `Author: ${article.author}` : ""; - const source = (article.source.name !== null) ? `Source: ${article.source.name}` : ""; - const url = (article.url !== null) ? `READ FULL STORY` : ""; + // const content = (article.content !== null) ? `
        • ${article.content}
          • ` : ""; + const author = (article.author !== null) ? `${article.author}` : ""; + const source = (article.source.name !== null) ? `${article.source.name}` : ""; + const separator = (author && source) ? ", " : ""; + const publishedBy = `
        • Published by: ${author}${separator}${source}
          • `; + const readMoreURL = (article.url !== null) ? `
        • READ FULL STORY...
          • ` : ""; const urlToImage = (article.urlToImage !== null) ? `` : ""; + const publishedAt = (article.publishedAt !== null) ? `Time: ${convertDate(article.publishedAt)}` : ""; + return `
          @@ -56,12 +60,10 @@ const articleTemplate = article => {
            -
          • ${title}
            • -
          • ${description}
            • -
          • ${content}
            • -
          • ${author}
            • -
          • ${source}
            • -
          • ${url}
            • + ${description} + ${publishedBy} + ${publishedAt} + ${readMoreURL}
          @@ -125,8 +127,8 @@ NAVIGATION SEARCH AND BUTTONS const navBar = document.querySelector(".content__nav"); const navButton = document.querySelector(".header__nav__button"); -const navSections = document.querySelector(".header__nav__sections a"); const navSearch = document.querySelector(".search"); +// const navSections = document.querySelector(".header__nav__sections a"); // search from top nav navButton.addEventListener("click", function(event){ @@ -175,15 +177,25 @@ const highlightFoundWords = function (descriptionText) { } } +const convertDate = function (string) { + const date = new Date(string); + const months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; + return `${formatTime(date.getHours())}:${formatTime(date.getMinutes())}, ${date.getDate()} ${ months[date.getMonth()]} ${date.getFullYear()}` +} + +const formatTime = function (n) { + return n <10 ? "0" + n : n; +} + // collapse main nav -let state = 1; -navSections.addEventListener("click", function(event){ - event.preventDefault(); - navBar.style.display = state ? "flex" : "none"; - navSearchIcon = state ? "x" : "+"; - navSections.innerHTML = `${navSearchIcon}`; - state = !state; -}); +// let state = 1; +// navSections.addEventListener("click", function(event){ +// event.preventDefault(); +// navBar.style.display = state ? "flex" : "none"; +// navSearchIcon = state ? "x" : "+"; +// navSections.innerHTML = `${navSearchIcon}`; +// state = !state; +// }); // documentation: // https://newsapi.org/sources diff --git a/styles.css b/styles.css index c82ed5d..798ecd0 100644 --- a/styles.css +++ b/styles.css @@ -5,9 +5,10 @@ body { margin: 0; box-sizing: border-box; - background: rgb(244, 244, 244); + background: rgb(232, 226, 217); font-family: Arial, Helvetica, sans-serif; - line-height: 1.5em + line-height: 1.5em; + letter-spacing: 0.02em; } h1 { @@ -15,12 +16,6 @@ h1 { font-family: Georgia, Times, 'Times New Roman', serif; } - -a { - /* color: rgb(0, 217, 255); */ - color: rgb(0, 84, 99); -} - .news-app { display: flex; flex-direction: column; @@ -36,8 +31,8 @@ a { flex-direction: row; align-items: center; justify-content: space-between; - background-color: #e0e0e0; - padding: 0.5em; + background-color: rgb(255, 182, 57); + padding: 1em; } .header__nav { @@ -70,20 +65,17 @@ a { input[type=text] { padding: 0.5em; margin: 1em 0; - width: 10em; + width: 12em; box-sizing: border-box; border: none; border-bottom: 1px solid black; - background-color: #f4f4f4; - font-size: 0.8em; - -webkit-transition: width 0.4s ease-in-out; - transition: width 0.4s ease-in-out; + background-color: rgb(255, 212, 139); + font-size: 0.9em; } input[type=text]:focus { - border: 2px solid #555; - background-color: #fff; - width: 20em; + border: 2px solid #555; + background-color: white; } .header__nav__button { @@ -118,15 +110,15 @@ input[type=text]:focus { } .content__nav { - display: none; + display: flex; flex: 1; flex-direction: row; - align-items: center; - justify-content: center; + align-items: flex-start; + justify-content: flex-start; flex-wrap: wrap; text-decoration: none; list-style: none; - background-color: #f0f0f0; + background-color: rgb(255, 212, 139); padding: 1em } @@ -171,36 +163,60 @@ input[type=text]:focus { } .article__main { - display: flex; - justify-content: flex-start; - flex-direction: row; + display: flex; + justify-content: flex-start; + flex-direction: row; +} + +.article__main li { + padding: 0.3em 0; +} + +.article__main li a { + background-color: #ff9900; + color: white; + font-weight: normal; + line-height: 1em; + text-decoration: none; + padding: 0.3em 0.6em; +} + +.article__main li a:hover { + background-color: #ffc062; + color: rgb(120, 46, 0); } .article__header { display: block; - font-size: 1.5rem; - background: #f0f0f0; + font-size: 1.2rem; + background: rgb(245, 244, 241); color: black; - padding: 1.5rem 1rem; + padding: 1rem 1rem; margin: 1rem 0 0 0; + border-top: 3px solid rgb(235, 223, 204); } .article__header a { - text-decoration: none; color: black; + text-decoration: none; +} + +.article__header a:hover { + color: #ff9900; + text-decoration: underline; } .article__image { + display: none; + /* flex: 1; min-width: 150px; - display: flex; - flex: 1; background: #e0e0e0; - padding: 0; + padding: 0; */ } .article__image__src { - width: 100%; - border: 0; + /* width: 100%; + border: 0; */ } .article__text { @@ -213,14 +229,43 @@ input[type=text]:focus { } .article__text ul { - padding: 0 0 0 1em; + padding: 0 0 0 0; margin: 0; } -a.article__text ul { +.article__text ul li { + list-style: none; +} + +a.article__text ul li { text-decoration: none; } .display__url { padding: 0 0 1em 0; -} \ No newline at end of file +} + +@media (min-width: 768px) { + + .article__image { + min-width: 150px; + display: flex; + flex: 1; + background: #e0e0e0; + padding: 0; + } + + .article__image__src { + width: 100%; + border: 0; + } + + input[type=text] { + -webkit-transition: width 0.4s ease-in-out; + transition: width 0.4s ease-in-out; + } + + input[type=text]:focus { + width: 20em; + } + } \ No newline at end of file From 629dbdb5b51befe543ecc5e7fd8bbee5984ab61c Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Sun, 16 Sep 2018 00:20:03 +0100 Subject: [PATCH 13/24] recovered a previous version as the CSS for the articles is messing up the spacing --- .DS_Store | Bin 6148 -> 10244 bytes countries-object.js | 62 ------- index.html | 7 +- index.js | 204 ---------------------- sources-object.js | 413 -------------------------------------------- styles.css | 6 +- 6 files changed, 7 insertions(+), 685 deletions(-) delete mode 100644 countries-object.js delete mode 100644 index.js delete mode 100644 sources-object.js diff --git a/.DS_Store b/.DS_Store index d05e0a6a7ab55f127deb2aa9f0ad1cd791d25dc5..75b02301cf7df0f89af60dae09cefc88717382bb 100644 GIT binary patch literal 10244 zcmeHMUu+ab82`Su!0yu0ZKbq(fITUd3N5y^wm^Yg+pD$#0^wR({#ovBmv-ac?s>a+ zEgUs9$eRK62~eXkz8LVugcmjOU!oX%kfagi!3TZu(MUA$3BQ@$JMY>ni4R&6caoiN zX1?#6nf=XgcJ|u^0PIhz9RNW95a?o3uB5C)VtRHhN@ZS49Z4jA00&Z_g9bLVEwc6- zd<1+1d<1+1d<1+1{tF1unaz^0+LeCpBj6+8BalacJs*N}F&XmYoGbaGgEAfhkgT9) zo~TT50QU)cGUUlQS8`YC(~Ta`b44%2K-Zo0L1s=ehHM^m88pAA!XPu-Ls0;$T4<%%b?+f+W>-(wG#_Z>RDMIKze&j~P~syx2zTrR(y2 zo~Q&+RidYoo_LR}TM9f^(ntx2!X*28P-2uNZDZ4R(wos&v818fPJ8Nu+%iaJvy>xu5!Sy8BO?$|SY zDskp)_T23AS2$RJ-m?s<-FiO1N~Iz|jLD8j+)5<#77O$VD;!qSP8{IQ=eve4Z(Zo0 zu+#_YlT#1wKNCrrhGkAtziiGDEtUx?E!7MWV~VJe0Hb)(@B-NtE}963VG#Nt3}-)0vg<0ZW`2Qvt6A;gB?8&WWi;+UrI}|fU(58yAtc4 z)7Y5-m;Pn1=I;Bu9Q{RUwK6m;?VFHmGsNnHNk_L#`-qmZNlwVsHtmGrxMdznX-q#B zw~Tbcv?t`6c+`leji{sb8Ae1utJ&j@Hsi3;G22Qx1Ke;zmeaO&SR*?ulQr_n^_SQRZ|5)XbQD(P5{4su_@HFRz+ch#8H+KtN`+5qNcTGgZro)&koSinKLAmQg`2 z=heXDQinjylvlXgE~#52?#dOecBj-U5JlycysJIyB}oP%HXBB44oGx#{cYO44cFiU z_<{&`8@`1f;3xP6{y@Z4ScCQ0fa`GsK8#!NG2Di&*oNJ>19xFB?#4lU3Wso*h&O_x zIELeRjEJXl;^~+|8`GE}0=|If@x?p=Um*g%iEp{Q%F}Jg9EyEw57KptE|!?xoGZBtWz2-N r^Uv{AVV~o9EK6;gp?<*6A%>SV8~?1V@Lt& zt$^s994ZvJ*o*pDXP(Tj;s|md10w?i3y5ZdI1nth JIi6<@GXU`WB?|xm diff --git a/countries-object.js b/countries-object.js deleted file mode 100644 index b19f8b8..0000000 --- a/countries-object.js +++ /dev/null @@ -1,62 +0,0 @@ -const getCountries = function () { - return Object.keys(countries).map(function(key){ - return `\n`; - }); -} -const countries = { - gb: 'United Kingdom', - ar: 'Argentina', - au: 'Australia', - at: 'Austria', - be: 'Belgium', - br: 'Brazil', - bg: 'Bulgaria', - ca: 'Canada', - cn: 'China', - co: 'Colombia', - cu: 'Cuba', - cz: 'Czech Republic', - eg: 'Egypt', - fr: 'France', - de: 'Germany', - gr: 'Greece', - hk: 'Hong Kong', - hu: 'Hungary', - in: 'India', - id: 'Indonesia', - ie: 'Ireland', - il: 'Israel', - it: 'Italy', - jp: 'Japan', - lv: 'Latvia', - lt: 'Lithuania', - my: 'Malaysia', - mx: 'Mexico', - ma: 'Morocco', - nl: 'Netherlands', - nz: 'New Zealand', - ng: 'Nigeria', - no: 'Norway', - ph: 'Philippines', - pl: 'Poland', - pt: 'Portugal', - ro: 'Romania', - ru: 'Russia', - sa: 'Saudi Arabia', - rs: 'Serbia', - sg: 'Singapore', - sk: 'Slovakia', - si: 'Slovenia', - za: 'South Africa', - kr: 'South Korea', - se: 'Sweden', - ch: 'Switzerland', - tw: 'Taiwan', - th: 'Thailand', - tr: 'Turkey', - ae: 'UAE', - ua: 'Ukraine', - gb: 'United Kingdom', - us: 'United States', - ve: 'Venuzuela' -} \ No newline at end of file diff --git a/index.html b/index.html index cab9453..cb85413 100644 --- a/index.html +++ b/index.html @@ -18,6 +18,7 @@
          +

          NEWS READER

          @@ -52,8 +53,8 @@

          NEWS READER

          - - - + + + \ No newline at end of file diff --git a/index.js b/index.js deleted file mode 100644 index 2dd66ba..0000000 --- a/index.js +++ /dev/null @@ -1,204 +0,0 @@ -const parentNode = document.querySelector(".content__body"); -const articleNode = document.querySelector(".article__list"); -const sectionButtonsNode = document.querySelector(".content__section__buttons"); -const displayJSONNode = document.querySelector(".content__footer"); -const countryMenuNode = document.querySelector(".country"); -const categories = ["business", "entertainment", "general", "health", "science", "sports", "technology"]; - -/* -====================================================== -FETCH DATA -====================================================== -*/ - -const loadAPI = function (url) { - fetch(url) - .then(function(response) { - return response.json(); - }) - .then(function(body) { - displayDataOnPage(body, url); - }) - .catch(function(error) { - displayErrorToUser(error); - }); -} - -/* -====================================================== -FORMAT DATA FOR ARTICLES -====================================================== -*/ - -const articleTemplate = article => { - // const keys = Object.keys(article); - // ["title", "description", "content"].forEach(function(key){ - // const convertedText = (article[key] !== null) ? highlightFoundWords(article[key]) : ""; - // article[key] = convertedText; - // }); - const title = (article.title !== null) ? `
        • ${article.title}
          • ` : ""; - const convertedDescription = (article.description !== null) ? highlightFoundWords(article.description) : null; - const description = (article.description !== null) ? `
        • ${convertedDescription}
          • ` : ""; - // const content = (article.content !== null) ? `
        • ${article.content}
          • ` : ""; - const author = (article.author !== null) ? `${article.author}` : ""; - const source = (article.source.name !== null) ? `${article.source.name}` : ""; - const separator = (author && source) ? ", " : ""; - const publishedBy = `
        • Published by: ${author}${separator}${source}
          • `; - const readMoreURL = (article.url !== null) ? `
        • READ FULL STORY...
          • ` : ""; - const urlToImage = (article.urlToImage !== null) ? `` : ""; - const publishedAt = (article.publishedAt !== null) ? `Time: ${convertDate(article.publishedAt)}` : ""; - - return ` -
          - - ${title} - -
          -
          -
          - ${urlToImage} -
          -
          -
            - ${description} - ${publishedBy} - ${publishedAt} - ${readMoreURL} -
          -
          -
          - `; -} - -/* ////////////////////////// -// DISPLAY DATA -///////////////////////////*/ - -function displayDataOnPage(body, url) { - articleNode.innerHTML = ""; - displaySearchMessage(url); - body.articles.forEach(function(article) { - const node = document.createElement("li"); - node.innerHTML = articleTemplate(article); - articleNode.appendChild(node); - }); - displayJSONNode.innerHTML = `View JSON`; -} - -/* ///////////////////// -CREATE MENU AND BUTTONS -//////////////////////*/ - -const createCountriesMenu = function() { - const menuNode = document.createElement("select"); - menuNode.innerHTML = getCountries().join(""); - countryMenuNode.appendChild(menuNode); - countryMenuNode.addEventListener('change', function(event){ - event.preventDefault(); - const countryURL = queryAPI("top-headlines", event.target.value, "", ""); - loadAPI(countryURL); - }); -} - -/* /////////////////////////////////// -CREATE QUERIES -////////////////////////////////////*/ - -let bodyURL = ""; -const newsURL = "https://newsapi.org/v2/"; -const apiKey = "756ef978eb384d9cb3ecdab2d9bac0da"; - -const queryAPI = function (type, country="", category="", search="") { - let validCountry = country ? `country=${country}&` : ""; - let validCategory = category ? `category=${category}&` : ""; - let validSearch = search ? `q=${search}&` : ""; - bodyURL = `${newsURL}${type}?${validCountry}${validCategory}${validSearch}apiKey=${apiKey}`; - return bodyURL; -} - -const displayErrorToUser = error => console.log(error); - -createCountriesMenu(); -loadAPI(queryAPI("everything", "", "", "Donald+Trump")); - -/* /////////////////////////////////// -NAVIGATION SEARCH AND BUTTONS -////////////////////////////////////*/ - -const navBar = document.querySelector(".content__nav"); -const navButton = document.querySelector(".header__nav__button"); -const navSearch = document.querySelector(".search"); -// const navSections = document.querySelector(".header__nav__sections a"); - -// search from top nav -navButton.addEventListener("click", function(event){ - event.preventDefault(); - let searchQuery = navSearch.value.split(" ").join("+"); - loadAPI(queryAPI("everything", "", "", searchQuery)); -}); - -// display "search results for:" -const displaySearchMessage = function(url) { - if (url.indexOf("everything?") >= 0) { - const searchNode = document.createElement("li"); - searchNode.innerHTML = `Your search results for: "${convertedSearchArray(url).join(" ")}"`; - articleNode.appendChild(searchNode); - } else { - if (typeof searchNode === "object") searchNode.innerHTML = ""; - } -} - -// convert the URL from search results to an array -const convertedSearchArray = function (url) { - let regex = /\A?q=[^&]*/g; - const found = url.match(regex).toString(); - return found.split("=")[1].split("+"); -} - -Array.prototype.intersect = function(secondArray) { - return this.filter(function(item) { - return (secondArray.indexOf(item) != -1); - }); -} - -// highlight found search terms -const highlightFoundWords = function (descriptionText) { - if (bodyURL.indexOf("everything?") >= 0) { - const searchResultsArray = convertedSearchArray(bodyURL); - const updatedWords = descriptionText.split(" ").map(function(item){ - const found = searchResultsArray.find(function(searchItem) { - return searchItem === item; - }); - return found !== undefined ? `${found}` : item; - }); - return updatedWords.join(" "); - } else { - return descriptionText; - } -} - -const convertDate = function (string) { - const date = new Date(string); - const months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; - return `${formatTime(date.getHours())}:${formatTime(date.getMinutes())}, ${date.getDate()} ${ months[date.getMonth()]} ${date.getFullYear()}` -} - -const formatTime = function (n) { - return n <10 ? "0" + n : n; -} - -// collapse main nav -// let state = 1; -// navSections.addEventListener("click", function(event){ -// event.preventDefault(); -// navBar.style.display = state ? "flex" : "none"; -// navSearchIcon = state ? "x" : "+"; -// navSections.innerHTML = `${navSearchIcon}`; -// state = !state; -// }); - -// documentation: -// https://newsapi.org/sources -// https://newsapi.org/docs -// https://newsapi.org/docs/get-started -// everything: https://newsapi.org/docs/endpoints/everything diff --git a/sources-object.js b/sources-object.js deleted file mode 100644 index 8466373..0000000 --- a/sources-object.js +++ /dev/null @@ -1,413 +0,0 @@ -const getSources = function () { - return Object.keys(sources).map(function(key){ - return `\n`; - }); -} - -const sources = { - 'abc-news': 'ABC News', - 'abc-news-au': 'ABC News (AU)', - 'aftenposten': 'Aftenposten', - 'al-jazeera-english': 'Al Jazeera English', - 'ansa': 'ANSA.it', - 'argaam': 'Argaam' -} - -/* -Ars Technica -Ars Technica -ars-technica -Ary News -Ary News -ary-news -Associated Press -Associated Press -associated-press -Australian Financial Review -Australian Financial Review -australian-financial-review -Axios -Axios -axios -BBC News -BBC News -bbc-news -BBC Sport -BBC Sport -bbc-sport -Bild -Bild -bild -Blasting News (BR) -Blasting News (BR) -blasting-news-br -Bleacher Report -Bleacher Report -bleacher-report -Bloomberg -Bloomberg -bloomberg -Breitbart News -Breitbart News -breitbart-news -Business Insider -Business Insider -business-insider -Business Insider (UK) -Business Insider (UK) -business-insider-uk -Buzzfeed -Buzzfeed -buzzfeed -CBC News -CBC News -cbc-news -CBS News -CBS News -cbs-news -CNBC -CNBC -cnbc -CNN -CNN -cnn -CNN Spanish -CNN Spanish -cnn-es -Crypto Coins News -Crypto Coins News -crypto-coins-news -Daily Mail -Daily Mail -daily-mail -Der Tagesspiegel -Der Tagesspiegel -der-tagesspiegel -Die Zeit -Die Zeit -die-zeit -El Mundo -El Mundo -el-mundo -Engadget -Engadget -engadget -Entertainment Weekly -Entertainment Weekly -entertainment-weekly -ESPN -ESPN -espn -ESPN Cric Info -ESPN Cric Info -espn-cric-info -Financial Post -Financial Post -financial-post -Financial Times -Financial Times -financial-times -Focus -Focus -focus -Football Italia -Football Italia -football-italia -Fortune -Fortune -fortune -FourFourTwo -FourFourTwo -four-four-two -Fox News -Fox News -fox-news -Fox Sports -Fox Sports -fox-sports -Globo -Globo -globo -Google News -Google News -google-news -Google News (Argentina) -Google News (Argentina) -google-news-ar -Google News (Australia) -Google News (Australia) -google-news-au -Google News (Brasil) -Google News (Brasil) -google-news-br -Google News (Canada) -Google News (Canada) -google-news-ca -Google News (France) -Google News (France) -google-news-fr -Google News (India) -Google News (India) -google-news-in -Google News (Israel) -Google News (Israel) -google-news-is -Google News (Italy) -Google News (Italy) -google-news-it -Google News (Russia) -Google News (Russia) -google-news-ru -Google News (Saudi Arabia) -Google News (Saudi Arabia) -google-news-sa -Google News (UK) -Google News (UK) -google-news-uk -Göteborgs-Posten -Göteborgs-Posten -goteborgs-posten -Gruenderszene -Gruenderszene -gruenderszene -Hacker News -Hacker News -hacker-news -Handelsblatt -Handelsblatt -handelsblatt -IGN -IGN -ign -Il Sole 24 Ore -Il Sole 24 Ore -il-sole-24-ore -Independent -Independent -independent -Infobae -Infobae -infobae -InfoMoney -InfoMoney -info-money -La Gaceta -La Gaceta -la-gaceta -La Nacion -La Nacion -la-nacion -La Repubblica -La Repubblica -la-repubblica -Le Monde -Le Monde -le-monde -Lenta -Lenta -lenta -L'equipe -L'equipe -lequipe -Les Echos -Les Echos -les-echos -Libération -Libération -liberation -Marca -Marca -marca -Mashable -Mashable -mashable -Medical News Today -Medical News Today -medical-news-today -Metro -Metro -metro -Mirror -Mirror -mirror -MSNBC -MSNBC -msnbc -MTV News -MTV News -mtv-news -MTV News (UK) -MTV News (UK) -mtv-news-uk -National Geographic -National Geographic -national-geographic -National Review -National Review -national-review -NBC News -NBC News -nbc-news -News24 -News24 -news24 -New Scientist -New Scientist -new-scientist -News.com.au -News.com.au -news-com-au -Newsweek -Newsweek -newsweek -New York Magazine -New York Magazine -new-york-magazine -Next Big Future -Next Big Future -next-big-future -NFL News -NFL News -nfl-news -NHL News -NHL News -nhl-news -NRK -NRK -nrk -Politico -Politico -politico -Polygon -Polygon -polygon -RBC -RBC -rbc -Recode -Recode -recode -Reddit /r/all -Reddit /r/all -reddit-r-all -Reuters -Reuters -reuters -RT -RT -rt -RTE -RTE -rte -RTL Nieuws -RTL Nieuws -rtl-nieuws -SABQ -SABQ -sabq -Spiegel Online -Spiegel Online -spiegel-online -Svenska Dagbladet -Svenska Dagbladet -svenska-dagbladet -T3n -T3n -t3n -TalkSport -TalkSport -talksport -TechCrunch -TechCrunch -techcrunch -TechCrunch (CN) -TechCrunch (CN) -techcrunch-cn -TechRadar -TechRadar -techradar -The American Conservative -The American Conservative -the-american-conservative -The Economist -The Economist -the-economist -The Globe And Mail -The Globe And Mail -the-globe-and-mail -The Guardian (AU) -The Guardian (AU) -the-guardian-au -The Guardian (UK) -The Guardian (UK) -the-guardian-uk -The Hill -The Hill -the-hill -The Hindu -The Hindu -the-hindu -The Huffington Post -The Huffington Post -the-huffington-post -The Irish Times -The Irish Times -the-irish-times -The Jerusalem Post -The Jerusalem Post -the-jerusalem-post -The Lad Bible -The Lad Bible -the-lad-bible -The New York Times -The New York Times -the-new-york-times -The Next Web -The Next Web -the-next-web -The Sport Bible -The Sport Bible -the-sport-bible -The Telegraph -The Telegraph -the-telegraph -The Times of India -The Times of India -the-times-of-india -The Verge -The Verge -the-verge -The Wall Street Journal -The Wall Street Journal -the-wall-street-journal -The Washington Post -The Washington Post -the-washington-post -The Washington Times -The Washington Times -the-washington-times -Time -Time -time -USA Today -USA Today -usa-today -Vice News -Vice News -vice-news -Wired -Wired -wired -Wired.de -Wired.de -wired-de -Wirtschafts Woche -Wirtschafts Woche -wirtschafts-woche -Xinhua Net -Xinhua Net -xinhua-net -Ynet -Ynet -ynet -*/ \ No newline at end of file diff --git a/styles.css b/styles.css index 798ecd0..b0d944b 100644 --- a/styles.css +++ b/styles.css @@ -80,7 +80,7 @@ input[type=text]:focus { .header__nav__button { text-decoration: none; - padding: 0 0 0.3em 0; + padding: 0 0 0.7em 0; border: 0.4em; font-size: 1.5em; vertical-align: middle; @@ -91,7 +91,7 @@ input[type=text]:focus { color: #ffffff; padding: 0 0.4em 0 0.4em; border: 1em; - opacity:0.6; + opacity: 0.7; } .header__nav__button a:hover { @@ -165,7 +165,7 @@ input[type=text]:focus { .article__main { display: flex; justify-content: flex-start; - flex-direction: row; + flex-direction: column; } .article__main li { From 8c774872e92ad8f190aed7f1b42a3a0baeffd915 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Sun, 16 Sep 2018 00:22:40 +0100 Subject: [PATCH 14/24] reverted back to an earlier version as the CSS for the spacing of the articles isn't working --- images/.DS_Store | Bin 0 -> 6148 bytes images/eyes.png | Bin 0 -> 69441 bytes src/countries-object.js | 62 ++++++ src/index.html | 59 ++++++ src/index.js | 204 ++++++++++++++++++++ src/sources-object.js | 413 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 738 insertions(+) create mode 100644 images/.DS_Store create mode 100644 images/eyes.png create mode 100644 src/countries-object.js create mode 100644 src/index.html create mode 100644 src/index.js create mode 100644 src/sources-object.js diff --git a/images/.DS_Store b/images/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ef17e55ee327bdcbd9a28520bc32f9db50f4d3c2 GIT binary patch literal 6148 zcmeHKJ!=9%5S=j=2R2ux-28!nwap@0So;U$l8{ECAQpC4<#*+u>6;Hi1>4-ZW$e#hzg+>MbT7e4)RvSkE literal 0 HcmV?d00001 diff --git a/images/eyes.png b/images/eyes.png new file mode 100644 index 0000000000000000000000000000000000000000..c48fd36d9e5edcf0973449f1933090c2e7269d1d GIT binary patch literal 69441 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 HDWM4f%vf71 literal 0 HcmV?d00001 diff --git a/src/countries-object.js b/src/countries-object.js new file mode 100644 index 0000000..b19f8b8 --- /dev/null +++ b/src/countries-object.js @@ -0,0 +1,62 @@ +const getCountries = function () { + return Object.keys(countries).map(function(key){ + return `\n`; + }); +} +const countries = { + gb: 'United Kingdom', + ar: 'Argentina', + au: 'Australia', + at: 'Austria', + be: 'Belgium', + br: 'Brazil', + bg: 'Bulgaria', + ca: 'Canada', + cn: 'China', + co: 'Colombia', + cu: 'Cuba', + cz: 'Czech Republic', + eg: 'Egypt', + fr: 'France', + de: 'Germany', + gr: 'Greece', + hk: 'Hong Kong', + hu: 'Hungary', + in: 'India', + id: 'Indonesia', + ie: 'Ireland', + il: 'Israel', + it: 'Italy', + jp: 'Japan', + lv: 'Latvia', + lt: 'Lithuania', + my: 'Malaysia', + mx: 'Mexico', + ma: 'Morocco', + nl: 'Netherlands', + nz: 'New Zealand', + ng: 'Nigeria', + no: 'Norway', + ph: 'Philippines', + pl: 'Poland', + pt: 'Portugal', + ro: 'Romania', + ru: 'Russia', + sa: 'Saudi Arabia', + rs: 'Serbia', + sg: 'Singapore', + sk: 'Slovakia', + si: 'Slovenia', + za: 'South Africa', + kr: 'South Korea', + se: 'Sweden', + ch: 'Switzerland', + tw: 'Taiwan', + th: 'Thailand', + tr: 'Turkey', + ae: 'UAE', + ua: 'Ukraine', + gb: 'United Kingdom', + us: 'United States', + ve: 'Venuzuela' +} \ No newline at end of file diff --git a/src/index.html b/src/index.html new file mode 100644 index 0000000..cab9453 --- /dev/null +++ b/src/index.html @@ -0,0 +1,59 @@ + + + + + + + + News Reader + + + + + +
          + +
          +

          NEWS READER

          +
          +
          + +
          +
          + 🔍 +
          +
          +
          + +
          + + +
          +
          +
            +
            + + + +
            + Footer content +
            +
            +
            + + + + + \ No newline at end of file diff --git a/src/index.js b/src/index.js new file mode 100644 index 0000000..54f7f71 --- /dev/null +++ b/src/index.js @@ -0,0 +1,204 @@ +const parentNode = document.querySelector(".content__body"); +const articleNode = document.querySelector(".article__list"); +const sectionButtonsNode = document.querySelector(".content__section__buttons"); +const displayJSONNode = document.querySelector(".content__footer"); +const countryMenuNode = document.querySelector(".country"); +const categories = ["business", "entertainment", "general", "health", "science", "sports", "technology"]; + +/* +====================================================== +FETCH DATA +====================================================== +*/ + +const loadAPI = function (url) { + fetch(url) + .then(function(response) { + return response.json(); + }) + .then(function(body) { + displayDataOnPage(body, url); + }) + .catch(function(error) { + displayErrorToUser(error); + }); +} + +/* +====================================================== +FORMAT DATA FOR ARTICLES +====================================================== +*/ + +const articleTemplate = article => { + // const keys = Object.keys(article); + // ["title", "description", "content"].forEach(function(key){ + // const convertedText = (article[key] !== null) ? highlightFoundWords(article[key]) : ""; + // article[key] = convertedText; + // }); + const title = (article.title !== null) ? `
          • ${article.title}
            • ` : ""; + const convertedDescription = (article.description !== null) ? highlightFoundWords(article.description) : null; + const description = (article.description !== null) ? `
          • ${convertedDescription}
            • ` : ""; + // const content = (article.content !== null) ? `
          • ${article.content}
            • ` : ""; + const author = (article.author !== null) ? `${article.author}` : ""; + const source = (article.source.name !== null) ? `${article.source.name}` : ""; + const separator = (author && source) ? ", " : ""; + const publishedBy = `
          • Published by: ${author}${separator}${source}
            • `; + const readMoreURL = (article.url !== null) ? `
          • READ FULL STORY...
            • ` : ""; + const urlToImage = (article.urlToImage !== null) ? `` : ""; + const publishedAt = (article.publishedAt !== null) ? `Time: ${convertDate(article.publishedAt)}` : ""; + + return ` +
            +
            + ${urlToImage} +
            +
            + + ${title} + +
            +
            +
              + ${description} + ${publishedBy} + ${publishedAt} + ${readMoreURL} +
            +
            +
            + `; +} + +/* ////////////////////////// +// DISPLAY DATA +///////////////////////////*/ + +function displayDataOnPage(body, url) { + articleNode.innerHTML = ""; + displaySearchMessage(url); + body.articles.forEach(function(article) { + const node = document.createElement("li"); + node.innerHTML = articleTemplate(article); + articleNode.appendChild(node); + }); + displayJSONNode.innerHTML = `View JSON`; +} + +/* ///////////////////// +CREATE MENU AND BUTTONS +//////////////////////*/ + +const createCountriesMenu = function() { + const menuNode = document.createElement("select"); + menuNode.innerHTML = getCountries().join(""); + countryMenuNode.appendChild(menuNode); + countryMenuNode.addEventListener('change', function(event){ + event.preventDefault(); + const countryURL = queryAPI("top-headlines", event.target.value, "", ""); + loadAPI(countryURL); + }); +} + +/* /////////////////////////////////// +CREATE QUERIES +////////////////////////////////////*/ + +let bodyURL = ""; +const newsURL = "https://newsapi.org/v2/"; +const apiKey = "756ef978eb384d9cb3ecdab2d9bac0da"; + +const queryAPI = function (type, country="", category="", search="") { + let validCountry = country ? `country=${country}&` : ""; + let validCategory = category ? `category=${category}&` : ""; + let validSearch = search ? `q=${search}&` : ""; + bodyURL = `${newsURL}${type}?${validCountry}${validCategory}${validSearch}apiKey=${apiKey}`; + return bodyURL; +} + +const displayErrorToUser = error => console.log(error); + +createCountriesMenu(); +loadAPI(queryAPI("everything", "", "", "Donald+Trump")); + +/* /////////////////////////////////// +NAVIGATION SEARCH AND BUTTONS +////////////////////////////////////*/ + +const navBar = document.querySelector(".content__nav"); +const navButton = document.querySelector(".header__nav__button"); +const navSearch = document.querySelector(".search"); +// const navSections = document.querySelector(".header__nav__sections a"); + +// search from top nav +navButton.addEventListener("click", function(event){ + event.preventDefault(); + let searchQuery = navSearch.value.split(" ").join("+"); + loadAPI(queryAPI("everything", "", "", searchQuery)); +}); + +// display "search results for:" +const displaySearchMessage = function(url) { + if (url.indexOf("everything?") >= 0) { + const searchNode = document.createElement("li"); + searchNode.innerHTML = `Your search results for: "${convertedSearchArray(url).join(" ")}"`; + articleNode.appendChild(searchNode); + } else { + if (typeof searchNode === "object") searchNode.innerHTML = ""; + } +} + +// convert the URL from search results to an array +const convertedSearchArray = function (url) { + let regex = /\A?q=[^&]*/g; + const found = url.match(regex).toString(); + return found.split("=")[1].split("+"); +} + +Array.prototype.intersect = function(secondArray) { + return this.filter(function(item) { + return (secondArray.indexOf(item) != -1); + }); +} + +// highlight found search terms +const highlightFoundWords = function (descriptionText) { + if (bodyURL.indexOf("everything?") >= 0) { + const searchResultsArray = convertedSearchArray(bodyURL); + const updatedWords = descriptionText.split(" ").map(function(item){ + const found = searchResultsArray.find(function(searchItem) { + return searchItem === item; + }); + return found !== undefined ? `${found}` : item; + }); + return updatedWords.join(" "); + } else { + return descriptionText; + } +} + +const convertDate = function (string) { + const date = new Date(string); + const months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; + return `${formatTime(date.getHours())}:${formatTime(date.getMinutes())}, ${date.getDate()} ${ months[date.getMonth()]} ${date.getFullYear()}` +} + +const formatTime = function (n) { + return n <10 ? "0" + n : n; +} + +// collapse main nav +// let state = 1; +// navSections.addEventListener("click", function(event){ +// event.preventDefault(); +// navBar.style.display = state ? "flex" : "none"; +// navSearchIcon = state ? "x" : "+"; +// navSections.innerHTML = `${navSearchIcon}`; +// state = !state; +// }); + +// documentation: +// https://newsapi.org/sources +// https://newsapi.org/docs +// https://newsapi.org/docs/get-started +// everything: https://newsapi.org/docs/endpoints/everything \ No newline at end of file diff --git a/src/sources-object.js b/src/sources-object.js new file mode 100644 index 0000000..8466373 --- /dev/null +++ b/src/sources-object.js @@ -0,0 +1,413 @@ +const getSources = function () { + return Object.keys(sources).map(function(key){ + return `\n`; + }); +} + +const sources = { + 'abc-news': 'ABC News', + 'abc-news-au': 'ABC News (AU)', + 'aftenposten': 'Aftenposten', + 'al-jazeera-english': 'Al Jazeera English', + 'ansa': 'ANSA.it', + 'argaam': 'Argaam' +} + +/* +Ars Technica +Ars Technica +ars-technica +Ary News +Ary News +ary-news +Associated Press +Associated Press +associated-press +Australian Financial Review +Australian Financial Review +australian-financial-review +Axios +Axios +axios +BBC News +BBC News +bbc-news +BBC Sport +BBC Sport +bbc-sport +Bild +Bild +bild +Blasting News (BR) +Blasting News (BR) +blasting-news-br +Bleacher Report +Bleacher Report +bleacher-report +Bloomberg +Bloomberg +bloomberg +Breitbart News +Breitbart News +breitbart-news +Business Insider +Business Insider +business-insider +Business Insider (UK) +Business Insider (UK) +business-insider-uk +Buzzfeed +Buzzfeed +buzzfeed +CBC News +CBC News +cbc-news +CBS News +CBS News +cbs-news +CNBC +CNBC +cnbc +CNN +CNN +cnn +CNN Spanish +CNN Spanish +cnn-es +Crypto Coins News +Crypto Coins News +crypto-coins-news +Daily Mail +Daily Mail +daily-mail +Der Tagesspiegel +Der Tagesspiegel +der-tagesspiegel +Die Zeit +Die Zeit +die-zeit +El Mundo +El Mundo +el-mundo +Engadget +Engadget +engadget +Entertainment Weekly +Entertainment Weekly +entertainment-weekly +ESPN +ESPN +espn +ESPN Cric Info +ESPN Cric Info +espn-cric-info +Financial Post +Financial Post +financial-post +Financial Times +Financial Times +financial-times +Focus +Focus +focus +Football Italia +Football Italia +football-italia +Fortune +Fortune +fortune +FourFourTwo +FourFourTwo +four-four-two +Fox News +Fox News +fox-news +Fox Sports +Fox Sports +fox-sports +Globo +Globo +globo +Google News +Google News +google-news +Google News (Argentina) +Google News (Argentina) +google-news-ar +Google News (Australia) +Google News (Australia) +google-news-au +Google News (Brasil) +Google News (Brasil) +google-news-br +Google News (Canada) +Google News (Canada) +google-news-ca +Google News (France) +Google News (France) +google-news-fr +Google News (India) +Google News (India) +google-news-in +Google News (Israel) +Google News (Israel) +google-news-is +Google News (Italy) +Google News (Italy) +google-news-it +Google News (Russia) +Google News (Russia) +google-news-ru +Google News (Saudi Arabia) +Google News (Saudi Arabia) +google-news-sa +Google News (UK) +Google News (UK) +google-news-uk +Göteborgs-Posten +Göteborgs-Posten +goteborgs-posten +Gruenderszene +Gruenderszene +gruenderszene +Hacker News +Hacker News +hacker-news +Handelsblatt +Handelsblatt +handelsblatt +IGN +IGN +ign +Il Sole 24 Ore +Il Sole 24 Ore +il-sole-24-ore +Independent +Independent +independent +Infobae +Infobae +infobae +InfoMoney +InfoMoney +info-money +La Gaceta +La Gaceta +la-gaceta +La Nacion +La Nacion +la-nacion +La Repubblica +La Repubblica +la-repubblica +Le Monde +Le Monde +le-monde +Lenta +Lenta +lenta +L'equipe +L'equipe +lequipe +Les Echos +Les Echos +les-echos +Libération +Libération +liberation +Marca +Marca +marca +Mashable +Mashable +mashable +Medical News Today +Medical News Today +medical-news-today +Metro +Metro +metro +Mirror +Mirror +mirror +MSNBC +MSNBC +msnbc +MTV News +MTV News +mtv-news +MTV News (UK) +MTV News (UK) +mtv-news-uk +National Geographic +National Geographic +national-geographic +National Review +National Review +national-review +NBC News +NBC News +nbc-news +News24 +News24 +news24 +New Scientist +New Scientist +new-scientist +News.com.au +News.com.au +news-com-au +Newsweek +Newsweek +newsweek +New York Magazine +New York Magazine +new-york-magazine +Next Big Future +Next Big Future +next-big-future +NFL News +NFL News +nfl-news +NHL News +NHL News +nhl-news +NRK +NRK +nrk +Politico +Politico +politico +Polygon +Polygon +polygon +RBC +RBC +rbc +Recode +Recode +recode +Reddit /r/all +Reddit /r/all +reddit-r-all +Reuters +Reuters +reuters +RT +RT +rt +RTE +RTE +rte +RTL Nieuws +RTL Nieuws +rtl-nieuws +SABQ +SABQ +sabq +Spiegel Online +Spiegel Online +spiegel-online +Svenska Dagbladet +Svenska Dagbladet +svenska-dagbladet +T3n +T3n +t3n +TalkSport +TalkSport +talksport +TechCrunch +TechCrunch +techcrunch +TechCrunch (CN) +TechCrunch (CN) +techcrunch-cn +TechRadar +TechRadar +techradar +The American Conservative +The American Conservative +the-american-conservative +The Economist +The Economist +the-economist +The Globe And Mail +The Globe And Mail +the-globe-and-mail +The Guardian (AU) +The Guardian (AU) +the-guardian-au +The Guardian (UK) +The Guardian (UK) +the-guardian-uk +The Hill +The Hill +the-hill +The Hindu +The Hindu +the-hindu +The Huffington Post +The Huffington Post +the-huffington-post +The Irish Times +The Irish Times +the-irish-times +The Jerusalem Post +The Jerusalem Post +the-jerusalem-post +The Lad Bible +The Lad Bible +the-lad-bible +The New York Times +The New York Times +the-new-york-times +The Next Web +The Next Web +the-next-web +The Sport Bible +The Sport Bible +the-sport-bible +The Telegraph +The Telegraph +the-telegraph +The Times of India +The Times of India +the-times-of-india +The Verge +The Verge +the-verge +The Wall Street Journal +The Wall Street Journal +the-wall-street-journal +The Washington Post +The Washington Post +the-washington-post +The Washington Times +The Washington Times +the-washington-times +Time +Time +time +USA Today +USA Today +usa-today +Vice News +Vice News +vice-news +Wired +Wired +wired +Wired.de +Wired.de +wired-de +Wirtschafts Woche +Wirtschafts Woche +wirtschafts-woche +Xinhua Net +Xinhua Net +xinhua-net +Ynet +Ynet +ynet +*/ \ No newline at end of file From 2615ae5702d184da829914b68b152faad170b1b6 Mon Sep 17 00:00:00 2001 From: Roland Levy Date: Sun, 16 Sep 2018 09:28:09 +0100 Subject: [PATCH 15/24] Mel kindly fixed the CSS spacing problem with the article boxes --- .DS_Store | Bin 10244 -> 10244 bytes index.html | 10 ++++--- src/countries-object.js | 1 + src/index.html | 59 ---------------------------------------- src/index.js | 22 +++++++++------ styles.css | 48 ++++++++++++++++++++++++-------- 6 files changed, 57 insertions(+), 83 deletions(-) delete mode 100644 src/index.html diff --git a/.DS_Store b/.DS_Store index 75b02301cf7df0f89af60dae09cefc88717382bb..81471bcce8f582a17e26fefcc4d3859ddb8f153f 100644 GIT binary patch delta 977 zcmd^-%TE(Q9LML&tFx=n!AiSjU1+ETL>?7Ts7k;G5_t%RBGd=E%dRlm7wl5hnBW2R zO0p+!9u0ai4SF!%H1TmI(W7VM!Fbg8m~OfH7dVGWe&25<-QF1NTE90@eK*c(ulYAthX|s?)37bQY7kJ#S@9o>`d5bDJ9}Yj(xpODo*D#iEpM zvl@SOL!&BRGIhtA$eR2bw@kK0CC`aAs_Mm}b86WVyD1J-*Z7&-s8-Q<_fchLtKweR7<#F=-}mE!#YsDT#aJ0V>VTXVYmb8j5%C|js@hf1RDDLbDtQdxtLvZRqqaodT-KB26X0yR6L*UjLljL6%Dbn?PAjh z+BBJ!i!vl{?Cg>?Rw=MkZ|v!nWmX}IDY^Y|;Z}(TsN&fJs<4SLi#c+$CP~!wD