diff --git a/client/homebrew/pages/accountPage/accountPage.jsx b/client/homebrew/pages/accountPage/accountPage.jsx index 9a9512527..644ab13d8 100644 --- a/client/homebrew/pages/accountPage/accountPage.jsx +++ b/client/homebrew/pages/accountPage/accountPage.jsx @@ -43,26 +43,28 @@ const AccountPage = createClass({ renderUiItems : function() { // console.log(this.props.uiItems); - return [ - <> + return <> +

Account Information

Username: {this.props.uiItems.username || 'No user currently logged in'}

Last Login: {moment(this.props.uiItems.issued).format('dddd, MMMM Do YYYY, h:mm:ss a ZZ') || '-'}

- , - <> +
+

Homebrewery Information

Brews on Homebrewery: {this.props.uiItems.mongoCount || '-'}

- , - <> +
+

Google Information

Linked to Google: {this.props.uiItems.googleId ? 'YES' : 'NO'}

{this.props.uiItems.googleId ?

Brews on Google Drive: {this.props.uiItems.fileCount || '-'}

: '' } - - ]; +
+ ; }, render : function(){ - return ; + return + {this.renderUiItems()} + ; } }); diff --git a/client/homebrew/pages/basePages/uiPage/uiPage.jsx b/client/homebrew/pages/basePages/uiPage/uiPage.jsx index 6ba8b4a09..20dc6b26b 100644 --- a/client/homebrew/pages/basePages/uiPage/uiPage.jsx +++ b/client/homebrew/pages/basePages/uiPage/uiPage.jsx @@ -13,20 +13,6 @@ const Account = require('../../../navbar/account.navitem.jsx'); const UIPage = createClass({ displayName : 'UIPage', - getDefaultProps : function(){ - return { - renderUiItems : ()=>{ - return <> -

H1 Header

-

H2 Header

-

H3 Header

-

H4 Header

-

This is some test text.

- ; - } - }; - }, - render : function(){ return
@@ -43,11 +29,7 @@ const UIPage = createClass({
- {this.props.renderUiItems().map((item, index)=>{ - return
- {item} -
; - })} + {this.props.children}
; }