From a9478a3a1aebeff43e7cbd083c64224a4f9572de Mon Sep 17 00:00:00 2001
From: nicomiguelino <nicomiguelino2014@gmail.com>
Date: Wed, 26 Jul 2023 11:42:06 -0700
Subject: [PATCH] Do a minor code cleanup.

- Remove the links from the display. People won't be able to click on
  them anyways.
- Make `limit` a required settings field.
---
 edge-apps/rss-reader/index.html             |  1 -
 edge-apps/rss-reader/screenly.yml           |  4 ++--
 edge-apps/rss-reader/static/js/main.js      | 16 ++++------------
 edge-apps/rss-reader/static/styles/main.css |  4 ++++
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/edge-apps/rss-reader/index.html b/edge-apps/rss-reader/index.html
index f076c195..3d0f8c5e 100644
--- a/edge-apps/rss-reader/index.html
+++ b/edge-apps/rss-reader/index.html
@@ -13,7 +13,6 @@
       <div class="feed-container">
         <h2 class="feed-title mb-2"></h2>
         <p class="feed-date mb-3"></p>
-        <p><a class="feed-link text-white" href="#"></a></p>
         <p class="feed-description text-white mt-4">
         </p>
       </div>
diff --git a/edge-apps/rss-reader/screenly.yml b/edge-apps/rss-reader/screenly.yml
index 661ea4d6..dae0cf89 100644
--- a/edge-apps/rss-reader/screenly.yml
+++ b/edge-apps/rss-reader/screenly.yml
@@ -40,7 +40,7 @@ settings:
     help_text: Specify the URL to where to get the data from.
   limit:
     type: text
-    default: '1'
-    optional: true
+    default: ''
+    optional: false
     title: Limit
     help_text: Specify the number of feeds to include in the page.
diff --git a/edge-apps/rss-reader/static/js/main.js b/edge-apps/rss-reader/static/js/main.js
index 483559af..06b9533b 100644
--- a/edge-apps/rss-reader/static/js/main.js
+++ b/edge-apps/rss-reader/static/js/main.js
@@ -16,25 +16,17 @@ const initApp = () => {
 
     entries.forEach(entry => {
       const title = entry.title
-      const link = entry.link
       const date = moment(new Date(entry.pubDate))
         .format('MMMM DD, YYYY, h:mm A')
-      // @TODO: Some feeds don't have a `contentSnippet` property.
-      //        We should handle situations where the description is not available
-      //        or uses a different property name. Alternatively, we could
-      //        specify the name of the property in the settings.
-      const description = entry.contentSnippet
+      // @TODO: Handle content dynamically. Some have images, some have just text,
+      // some have both.
+      const description = entry.content
 
       const feedTemplate = document.querySelector('#feed-template')
       const feedContainer = feedTemplate.content.cloneNode(true)
+
       feedContainer.querySelector('.feed-title').innerHTML = title
       feedContainer.querySelector('.feed-date').innerHTML = date
-
-      feedLink = feedContainer.querySelector('.feed-link')
-      feedLink.innerHTML = link
-      feedLink.href = link
-      feedLink.target = '_blank'
-
       feedDescription = feedContainer.querySelector('.feed-description')
       feedDescription.innerHTML = description
 
diff --git a/edge-apps/rss-reader/static/styles/main.css b/edge-apps/rss-reader/static/styles/main.css
index 2e045dea..9c352d28 100644
--- a/edge-apps/rss-reader/static/styles/main.css
+++ b/edge-apps/rss-reader/static/styles/main.css
@@ -9,6 +9,10 @@ body {
     font-family: Barlow, sans-serif;
 }
 
+a {
+    color: #FFFFFF;
+}
+
 p {
     font-size: 1rem;
 }