updated data formatting from server to client

the-robot · Feb 18, 2020 · c21db87 · c21db87
1 parent 653d606
commit c21db87
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/src/web/routes/index.js b/src/web/routes/index.js
@@ -1,5 +1,4 @@
 const express = require('express');
-const moment = require('moment');
 const router = express.Router();
 
 const utils = require('../views/utils');
@@ -58,7 +57,7 @@ router.get(`${routes.api.news}:page/`, async (req, res, next) => {
       title: newsData[i].title,
       link: newsData[i].link,
       author: newsData[i].articleSource.name,
-      date: moment(newsData[i].isoDate).format('DD-MM-YYYY HH:mm'),
+      date: newsData[i].isoDate,
     });
   }
 
@@ -86,7 +85,7 @@ router.get(`${routes.api.reddit}:page/`, async (req, res, next) => {
       title: redditPostsData[i].title,
       link: redditPostsData[i].link,
       author: redditPostsData[i].articleSource.name,
-      date: moment(redditPostsData[i].isoDate).format('DD-MM-YYYY HH:mm'),
+      date: redditPostsData[i].isoDate,
     });
   }
 
@@ -114,7 +113,7 @@ router.get(`${routes.api.tweets}:page/`, async (req, res, next) => {
       title: tweetsData[i].title,
       link: tweetsData[i].link,
       author: tweetsData[i].articleSource.name,
-      date: moment(tweetsData[i].isoDate).format('DD-MM-YYYY HH:mm'),
+      date: tweetsData[i].isoDate,
     });
   }
 

diff --git a/src/web/views/dynamic/News/NewsFeed.jsx b/src/web/views/dynamic/News/NewsFeed.jsx
@@ -1,6 +1,7 @@
 import { ButtonToolbar, Icon, IconButton, Timeline } from 'rsuite';
 import React from 'react';
 import axios from 'axios';
+import moment from 'moment';
 
 import routes from '../../../routes/urls';
 
@@ -61,6 +62,11 @@ class NewsFeed extends React.Component {
     axios.get(`${routes.api.news}${page}`)
         .then(res => {
           const { data, page, total_pages } = res.data;
+          // format date data
+          for (let i=0; i<data.length; i++) {
+            data[i].date = moment(data[i].date).format('DD-MM-YYYY HH:mm');
+          }
+
           this.setState({
             data,
             page,

diff --git a/src/web/views/dynamic/News/Reddit.jsx b/src/web/views/dynamic/News/Reddit.jsx
@@ -1,6 +1,7 @@
 import { ButtonToolbar, Icon, IconButton, Timeline } from 'rsuite';
 import React from 'react';
 import axios from 'axios';
+import moment from 'moment';
 
 import routes from '../../../routes/urls';
 
@@ -62,6 +63,11 @@ class Reddit extends React.Component {
     axios.get(`${routes.api.reddit}${page}`)
         .then(res => {
           const { data, page, total_pages } = res.data;
+          // format date data
+          for (let i=0; i<data.length; i++) {
+            data[i].date = moment(data[i].date).format('DD-MM-YYYY HH:mm');
+          }
+
           this.setState({
             data,
             page,

diff --git a/src/web/views/dynamic/News/Tweets.jsx b/src/web/views/dynamic/News/Tweets.jsx
@@ -1,6 +1,7 @@
 import { ButtonToolbar, Icon, IconButton, Timeline } from 'rsuite';
 import React from 'react';
 import axios from 'axios';
+import moment from 'moment';
 
 import routes from '../../../routes/urls';
 
@@ -62,6 +63,11 @@ class Tweets extends React.Component {
     axios.get(`${routes.api.tweets}${page}`)
         .then(res => {
           const { data, page, total_pages } = res.data;
+          // format date data
+          for (let i=0; i<data.length; i++) {
+            data[i].date = moment(data[i].date).format('DD-MM-YYYY HH:mm');
+          }
+
           this.setState({
             data,
             page,