Finalize findRelativeDate function

Author: Suhyma

src/dashboard/category-results-screen.js

@@ -1,7 +1,7 @@
 import { h } from 'preact';
 import { Link } from 'preact-router/match';
 import CategoryCard from './category-card.js';
-import { format, sub, isWithinInterval } from 'date-fns';
+import { sub } from 'date-fns';
 
 function Paper ({ paper }) {
   return h('div', { class: 'paper' }, [
@@ -18,78 +18,31 @@ function Paper ({ paper }) {
 
 function findRelativeDate (papers, range) {
   const now = new Date();
-  // const today = format(now, 'yyyy-MM-dd');
+  const today = now.toISOString().split('T')[0];
+  const daysAgo = sub(now, { days: 4 }).toISOString();
+  const weekAgo = sub(now, { weeks: 1 }).toISOString();
+  const monthAgo = sub(now, { months: 1 }).toISOString();
   const displayPapers = [];
 
   for (const paper of papers) {
-    const paperDate = new Date(paper.date);
+    const paperDate = paper.date.toISOString().split('T')[0];
 
-    if (range === 'today' && isWithinInterval(paperDate, { start: now, end: now })) { // Today's papers
+    if (range === 'today' && paperDate === today) { // Today's papers
       displayPapers.push(paper);
-    } else if (range === 'days' && isWithinInterval(paperDate, { start: sub(now, { days: 4 }), end: sub(now, { days: 1 }) })) { // Papers from 4 days ago
+    } else if (range === 'days' && paperDate >= daysAgo && paperDate < today) { // Papers from 4 days ago
       displayPapers.push(paper);
-    } else if (range === 'week' && isWithinInterval(paperDate, { start: sub(now, { weeks: 1 }), end: sub(now, { days: 4 }) })) { // Papers from past week
+    } else if (range === 'week' && paperDate >= weekAgo && paperDate < daysAgo) { // Papers from past week
       displayPapers.push(paper);
-    } else if (range === 'month' && isWithinInterval(paperDate, { start: sub(now, { months: 1 }), end: sub(now, { weeks: 1 }) })) { // Rest of the papers from the past month
+    } else if (range === 'month' && paperDate >= monthAgo && paperDate < weekAgo) { // Rest of the papers from the past month
       displayPapers.push(paper);
-    } else {
-      console.log('didnt work');
     }
   }
-
-  // if (range === 'today') {
-  //   console.log('today date: ' + today);
-  //   for (const paper of papers) {
-  //     const paperDate = format(paper.date, 'yyyy-MM-dd');
-  //     console.log('PAPER DATE: ' + paperDate);
-  //     if (paperDate === today) {
-  //       displayPapers.push(paper);
-  //     }
-  //   }
-  // } else if (range === 'days') { // within the past 4 days
-  //   const startOffset = { days: 4 };
-  //   const start = format(sub(now, startOffset), 'yyyy-MM-dd');
-
-  //   for (const paper of papers) {
-  //     const paperDate = format(paper.date, 'yyyy-MM-dd');
-  //     if (paperDate >= start && paperDate < today) {
-  //       displayPapers.push(paper);
-  //     }
-  //   }
-  // } else if (range === 'week') {
-  //   const startOffset = { weeks: 1 };
-  //   const endOffset = { days: 4 };
-  //   const start = format(sub(now, startOffset), 'yyyy-MM-dd');
-  //   const end = format(sub(now, endOffset), 'yyyy-MM-dd');
-
-  //   for (const paper of papers) {
-  //     const paperDate = format(paper.date, 'yyyy-MM-dd');
-  //     if (paperDate >= start && paperDate < end) { // within the past week
-  //       displayPapers.push(paper);
-  //     }
-  //   }
-  // } else {
-  //   const startOffset = { months: 1 };
-  //   const endOffset = { weeks: 1 };
-  //   const start = format(sub(now, startOffset), 'yyyy-MM-dd');
-  //   const end = format(sub(now, endOffset), 'yyyy-MM-dd');
-
-  //   for (const paper of papers) {
-  //     const paperDate = format(paper.date, 'yyyy-MM-dd');
-  //     if (paperDate >= start && paperDate < end) { // everything else within the past month
-  //       displayPapers.push(paper);
-  //     }
-  //   }
-  // }
   return displayPapers;
 }
 
 export default function CategoryResultsScreen ({ store }) {
   const { selectedPapers, selectedCategory } = store;
   const todayPapers = findRelativeDate(selectedPapers, 'today');
-  console.log('TODAYS PAPERS: ');
-  console.log(todayPapers);
-
   const fewDaysPapers = findRelativeDate(selectedPapers, 'days');
   const weekPapers = findRelativeDate(selectedPapers, 'week');
   const monthPapers = findRelativeDate(selectedPapers, 'month');

src/dashboard/category-selection-screen.js

@@ -8,7 +8,7 @@ export default function CategorySelectionScreen ({ store }) {
 
   return h('div', { class: 'category-selection-screen' }, [
     h('div', { class: 'app-name' }, 'The Digest'),
-    h('div', { class: 'app-tagline' }, 'Quick acess to the latest papers in the biomedicine.'),
+    h('div', { class: 'app-tagline' }, 'Quick access to the latest papers in the biomedicine.'),
     h('div', { class: 'categories' }, (haveCategories
       ? categories.map(category => h(CategoryCard, { category, store }))
       : h('div', {}, 'No categories!')