diff --git a/package.json b/package.json
index 39e98fc..6ef1f01 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
"express": "^4.16.2",
"firebase": "^4.8.0",
"lodash": "^4.17.4",
- "material-ui": "^1.0.0-beta.36",
- "material-ui-icons": "^1.0.0-beta.17",
+ "material-ui": "1.0.0-beta.36",
+ "material-ui-icons": "1.0.0-beta.17",
"moment": "^2.20.1",
"numeral": "^2.0.6",
"react": "^16.2.0",
diff --git a/src/actions/auth.js b/src/actions/auth.js
index 83e2595..e37c02e 100644
--- a/src/actions/auth.js
+++ b/src/actions/auth.js
@@ -2,8 +2,10 @@ import {firebase, googleAuthProvider} from '../firebase/firebase';
export const login = ({
uid = '',
- photoURL = ''
-} = {}) => ({type: 'LOGIN', uid: uid, photoURL: photoURL});
+ photoURL = '',
+ name='',
+ email=''
+} = {}) => ({type: 'LOGIN', uid, photoURL , name, email});
export const startLoginGoogle = () => {
return () => {
diff --git a/src/components/CategoryStatisticTable.js b/src/components/CategoryStatisticTable.js
index 384f9a4..c2334e6 100644
--- a/src/components/CategoryStatisticTable.js
+++ b/src/components/CategoryStatisticTable.js
@@ -5,7 +5,7 @@ import Paper from 'material-ui/Paper';
const CustomTableCell = withStyles(theme => ({
head: {
- backgroundColor: theme.palette.common.black,
+ backgroundColor: '#3F51B5',
color: theme.palette.common.white,
textAlign: 'center'
},
diff --git a/src/components/Header.js b/src/components/Header.js
index 9b9166c..c4746b5 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -8,10 +8,8 @@ import Typography from 'material-ui/Typography';
import Toolbar from 'material-ui/Toolbar';
import MenuIcon from 'material-ui-icons/Menu';
import IconButton from 'material-ui/IconButton';
-import Button from 'material-ui/Button';
import {connect} from 'react-redux';
import {startLogout} from '../actions/auth';
-import Constants from '../utils/constants';
import AddIcon from 'material-ui-icons/NoteAdd';
import DashboardIcon from 'material-ui-icons/Dashboard';
import ShowChartIcon from 'material-ui-icons/ShowChart';
@@ -23,6 +21,9 @@ import Divider from 'material-ui/Divider';
import Drawer from 'material-ui/Drawer';
import ChevronLeftIcon from 'material-ui-icons/ChevronLeft';
import ChevronRightIcon from 'material-ui-icons/ChevronRight';
+import AccountCircle from 'material-ui-icons/AccountCircle';
+import Menu, { MenuItem } from 'material-ui/Menu';
+
const drawerWidth = 280;
const styles = theme => ({
@@ -143,6 +144,9 @@ const styles = theme => ({
marginTop: 44,
marginBottom: 80
}
+ },
+ menuIcon:{
+ marginRight:0
}
});
@@ -152,7 +156,8 @@ class Header extends React.Component {
super(props);
this.state = {
open: false,
- mobileOpen: false
+ mobileOpen: false,
+ anchorEl:null
}
}
handleDrawerToggle = () => {
@@ -168,8 +173,18 @@ class Header extends React.Component {
handleDrawerClose = () => {
this.setState({open: false});
};
+
+ handleMenu =(event)=>{
+ this.setState({ anchorEl: event.currentTarget });
+ };
+ handleCloseMenu = () => {
+ this.setState({ anchorEl: null });
+ };
+
render() {
const {classes, theme} = this.props;
+ const { anchorEl } = this.state;
+ const openMenuButton = Boolean(anchorEl);
const items = (
@@ -261,10 +276,38 @@ class Header extends React.Component {
{this.props.title}
- */}
+
+