X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/cf48e928d4d334b0b6434529d7619c616da319f2..b0cb49beedbfcac126469abb37cdf8a061081075:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index a92e486e..13c7ea22 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -9,10 +9,21 @@ import Drawer from '@material-ui/core/Drawer'; import AppBar from '@material-ui/core/AppBar'; import Toolbar from '@material-ui/core/Toolbar'; import Typography from '@material-ui/core/Typography'; -import { connect } from "react-redux"; +import { connect, DispatchProp } from "react-redux"; import Tree from "../../components/tree/tree"; import { Project } from "../../models/project"; import { RootState } from "../../store/root-reducer"; +import ProjectList from "../../components/project-list/project-list"; +import { Route, Switch } from "react-router"; +import { Link } from "react-router-dom"; +import Button from "@material-ui/core/Button/Button"; +import authActions from "../../store/auth-action"; +import { authService } from "../../services/services"; +import IconButton from "@material-ui/core/IconButton/IconButton"; +import Menu from "@material-ui/core/Menu/Menu"; +import MenuItem from "@material-ui/core/MenuItem/MenuItem"; +import { AccountCircle } from "@material-ui/icons"; +import { User } from "../../models/user"; const drawerWidth = 240; @@ -25,8 +36,8 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ overflow: 'hidden', position: 'relative', display: 'flex', - width: '100%', - height: '100%' + width: '100vw', + height: '100vh' }, appBar: { zIndex: theme.zIndex.drawer + 1, @@ -40,31 +51,100 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ flexGrow: 1, backgroundColor: theme.palette.background.default, padding: theme.spacing.unit * 3, + height: '100%', minWidth: 0, }, toolbar: theme.mixins.toolbar }); -interface WorkbenchProps { - projects: Project[] +interface WorkbenchDataProps { + projects: Project[]; + user: User; } +interface WorkbenchActionProps { +} + +type WorkbenchProps = WorkbenchDataProps & WorkbenchActionProps & DispatchProp & WithStyles; + interface WorkbenchState { + anchorEl: any; } -class Workbench extends React.Component, WorkbenchState> { +class Workbench extends React.Component { + constructor(props: WorkbenchProps) { + super(props); + this.state = { + anchorEl: null + } + } + + login = () => { + this.props.dispatch(authActions.LOGIN()); + }; + + logout = () => { + this.handleClose(); + this.props.dispatch(authActions.LOGOUT()); + }; + + handleOpenMenu = (event: React.MouseEvent) => { + this.setState({ + anchorEl: event.currentTarget + }); + }; + + handleClose = () => { + this.setState({ + anchorEl: null + }); + }; + render() { const {classes} = this.props; - + const userLoggedIn = authService.isUserLoggedIn(); return (
- - Arvados
Workbench 2 + + Arvados
Workbench 2
+ {userLoggedIn ? +
+ + {this.props.user.firstName} {this.props.user.lastName} + + + + + + Logout + My account + +
+ : + + }
+ {userLoggedIn && , W }}>
- {p.name} + {p.name} }/> - + }
- Hello new workbench! + + +
); } } -export default connect( +export default connect( (state: RootState) => ({ - projects: state.projects + projects: state.projects, + user: state.auth.user! }) )( withStyles(styles)(Workbench)