From a1e78f1d17fa722ca85a8a88d853159148f390f3 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sat, 7 Aug 2021 14:47:25 +1200
Subject: [PATCH] Add `createdTime` to G-Drive fields to retrieve Add Moment to
 UserPage sorting

---
 client/homebrew/pages/userPage/userPage.jsx | 15 ++++++++-------
 server/googleActions.js                     |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index e5b9d5d77..5cc4213ee 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -4,6 +4,8 @@ const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 
+const moment = require('moment');
+
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 
@@ -42,7 +44,7 @@ const UserPage = createClass({
 	renderBrews : function(brews){
 		if(!brews || !brews.length) return <div className='noBrews'>No Brews.</div>;
 
-		const sortedBrews = this.sortBrews(brews);
+		const sortedBrews = this.sortBrews(brews, this.state.sortType);
 
 		return _.map(sortedBrews, (brew, idx)=>{
 			return <BrewItem brew={brew} key={idx}/>;
@@ -50,13 +52,12 @@ const UserPage = createClass({
 	},
 
 	sortBrewOrder : function(brew){
-		if(!brew.title){brew.title = 'No Title';};
 		const mapping = {
 			'alpha'   : _.deburr(brew.title.toLowerCase()),
-			'created' : brew.createdAt,
-			'updated' : brew.updatedAt,
+			'created' : moment(brew.createdAt).format(),
+			'updated' : moment(brew.updatedAt).format(),
 			'views'   : brew.views,
-			'latest'  : brew.lastViewed
+			'latest'  : moment(brew.lastViewed).format()
 		};
 		return mapping[this.state.sortType];
 	},
@@ -141,11 +142,11 @@ const UserPage = createClass({
 			<div className='content V3'>
 				<div className='phb'>
 					{this.renderSortOptions()}
-					<div>
+					<div className='published'>
 						<h1>{this.getUsernameWithS()} brews</h1>
 						{this.renderBrews(brews.published)}
 					</div>
-					<div>
+					<div className='unpublished'>
 						<h1>{this.getUsernameWithS()} unpublished brews</h1>
 						{this.renderBrews(brews.private)}
 					</div>
diff --git a/server/googleActions.js b/server/googleActions.js
index 8faa0c720..ff5fd0662 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -95,7 +95,7 @@ GoogleActions = {
 
 		const obj = await drive.files.list({
 			pageSize : 100,
-			fields   : 'nextPageToken, files(id, name, description, modifiedTime, properties)',
+			fields   : 'nextPageToken, files(id, name, description, createdTime, modifiedTime, properties)',
 			q        : 'mimeType != \'application/vnd.google-apps.folder\' and trashed = false'
 		})
 		.catch((err)=>{