From 40900759d854f40b770a016a3959825966f4d7b6 Mon Sep 17 00:00:00 2001 From: Mario Basic Date: Fri, 29 May 2015 02:08:19 +0200 Subject: [PATCH] Auth now works. Added user profile panel with gravatar. --- assets/js/components/MainList.react.js | 80 ++- assets/js/components/Navbar.react.js | 5 - assets/js/components/WakaTime.react.js | 106 ++- gulpfile.js | 4 +- manifest.json | 2 + package.json | 1 + public/js/bundle.js | 849 +++++++++++++++++++------ 7 files changed, 813 insertions(+), 234 deletions(-) diff --git a/assets/js/components/MainList.react.js b/assets/js/components/MainList.react.js index 3eae0a3..f971876 100644 --- a/assets/js/components/MainList.react.js +++ b/assets/js/components/MainList.react.js @@ -1,5 +1,7 @@ var React = require('react'); +var md5 = require('blueimp-md5').md5; + class MainList extends React.Component { componentDidMount() @@ -20,24 +22,68 @@ class MainList extends React.Component render() { + var loginLogoutButton = () => { + if(this.props.loggedIn === true) + { + return ( +
+ + Custom Rules + + + Dashboard + + + Logout + +
+ ); + } + + return ( + + Login + + ); + }; + + var signedInAs = () => { + if(this.props.loggedIn === true) + { + var src = "https://secure.gravatar.com/avatar/" + md5(this.props.user.email) + "/?s=48"; + + return ( +
+
+
+
+ +
+
+ Signed in as {this.props.user.full_name}
+ {this.props.user.email} +
+
+
+
+ ); + } + }; + return( -
- - Options - - - Custom Rules - - - Dashboard - - - Login - - - Logout - -
+
+ + {signedInAs()} + +
+ + Options + + + {loginLogoutButton()} + +
+
); } } diff --git a/assets/js/components/Navbar.react.js b/assets/js/components/Navbar.react.js index 859d7d5..3c8af6a 100644 --- a/assets/js/components/Navbar.react.js +++ b/assets/js/components/Navbar.react.js @@ -3,7 +3,6 @@ var React = require('react'); class Navbar extends React.Component{ render() { - return (