From 777438fd940e74fe87f20887fddabd8d41e3f98a Mon Sep 17 00:00:00 2001
From: Gazook89 <John.W.Jones89@gmail.com>
Date: Sat, 6 Apr 2024 21:23:26 -0500
Subject: [PATCH] rename props.brew.uiItems to ...accountDetails

and destructure props at start of account page component.

`accountDetails` is more descriptive of what set of info is being passed through props to the account page, info which is only *then* displayed as UI items.
---
 client/homebrew/homebrew.jsx                  |  2 +-
 .../pages/accountPage/accountPage.jsx         | 26 +++++++++++--------
 server/app.js                                 |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index a08a39ea0..8c82f33e7 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -76,7 +76,7 @@ const Homebrew = createClass({
 						<Route path='/print' element={<WithRoute el={PrintPage} />} />
 						<Route path='/changelog' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
 						<Route path='/faq' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
-						<Route path='/account' element={<WithRoute el={AccountPage} brew={this.props.brew} uiItems={this.props.brew.uiItems} />} />
+						<Route path='/account' element={<WithRoute el={AccountPage} brew={this.props.brew} accountDetails={this.props.brew.accountDetails} />} />
 						<Route path='/legacy' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
 						<Route path='/error' element={<WithRoute el={ErrorPage} brew={this.props.brew} />} />
 					  	<Route path='/' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
diff --git a/client/homebrew/pages/accountPage/accountPage.jsx b/client/homebrew/pages/accountPage/accountPage.jsx
index 72d60a741..e65736a24 100644
--- a/client/homebrew/pages/accountPage/accountPage.jsx
+++ b/client/homebrew/pages/accountPage/accountPage.jsx
@@ -8,16 +8,20 @@ const NaturalCritIcon = require('naturalcrit/svg/naturalcrit.svg.jsx');
 let SAVEKEY = '';
 
 const AccountPage = (props)=>{
+	// destructure props
+	const { accountDetails, brew } = props;
+
+
 	// State for the save location
 	const [saveLocation, setSaveLocation] = React.useState('');
 
 	// initialize save location from local storage based on user id
 	React.useEffect(()=>{
-		if(!saveLocation && props.uiItems.username) {
-			SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${props.uiItems.username}`;
+		if(!saveLocation && accountDetails.username) {
+			SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${accountDetails.username}`;
 			// if no SAVEKEY in local storage, default save location to Google Drive.
 			let saveLocation = window.localStorage.getItem(SAVEKEY);
-			saveLocation = saveLocation ?? (props.uiItems.googleId ? 'GOOGLE-DRIVE' : 'HOMEBREWERY');
+			saveLocation = saveLocation ?? (accountDetails.googleId ? 'GOOGLE-DRIVE' : 'HOMEBREWERY');
 			makeActive(saveLocation);
 		}
 	}, []);
@@ -51,19 +55,19 @@ const AccountPage = (props)=>{
 			<>
 				<div className='dataGroup'>
 					<h1>Account Information <i className='fas fa-user'></i></h1>
-					<p><strong>Username: </strong>{props.uiItems.username || 'No user currently logged in'}</p>
-					<p><strong>Last Login: </strong>{moment(props.uiItems.issued).format('dddd, MMMM Do YYYY, h:mm:ss a ZZ') || '-'}</p>
+					<p><strong>Username: </strong>{accountDetails.username || 'No user currently logged in'}</p>
+					<p><strong>Last Login: </strong>{moment(accountDetails.issued).format('dddd, MMMM Do YYYY, h:mm:ss a ZZ') || '-'}</p>
 				</div>
 				<div className='dataGroup'>
 					<h3>Homebrewery Information <NaturalCritIcon /></h3>
-					<p><strong>Brews on Homebrewery: </strong>{props.uiItems.mongoCount}</p>
+					<p><strong>Brews on Homebrewery: </strong>{accountDetails.mongoCount}</p>
 				</div>
 				<div className='dataGroup'>
 					<h3>Google Information <i className='fab fa-google-drive'></i></h3>
-					<p><strong>Linked to Google: </strong>{props.uiItems.googleId ? 'YES' : 'NO'}</p>
-					{props.uiItems.googleId && (
+					<p><strong>Linked to Google: </strong>{accountDetails.googleId ? 'YES' : 'NO'}</p>
+					{accountDetails.googleId && (
 						<p>
-							<strong>Brews on Google Drive: </strong>{props.uiItems.googleCount ?? (
+							<strong>Brews on Google Drive: </strong>{accountDetails.googleCount ?? (
 								<>
 									Unable to retrieve files - <a href='https://github.com/naturalcrit/homebrewery/discussions/1580'>follow these steps to renew your Google credentials.</a>
 								</>
@@ -74,7 +78,7 @@ const AccountPage = (props)=>{
 				<div className='dataGroup'>
 					<h4>Default Save Location</h4>
 					{renderButton('Homebrewery', 'HOMEBREWERY')}
-					{renderButton('Google Drive', 'GOOGLE-DRIVE', props.uiItems.googleId)}
+					{renderButton('Google Drive', 'GOOGLE-DRIVE', accountDetails.googleId)}
 				</div>
 			</>
 		);
@@ -82,7 +86,7 @@ const AccountPage = (props)=>{
 
 	// return the account page inside the base layout wrapper (with navbar etc).
 	return (
-		<UIPage brew={props.brew}>
+		<UIPage brew={brew}>
 			{renderAccountPage()}
 		</UIPage>);
 };
diff --git a/server/app.js b/server/app.js
index 4c72b4924..c8fec4bc4 100644
--- a/server/app.js
+++ b/server/app.js
@@ -372,7 +372,7 @@ app.get('/account', asyncHandler(async (req, res, next)=>{
 				console.log(err);
 			});
 
-		data.uiItems = {
+		data.accountDetails = {
 			username    : req.account.username,
 			issued      : req.account.issued,
 			googleId    : Boolean(req.account.googleId),