diff --git a/frontend/src/components/EventList.jsx b/frontend/src/components/EventList.jsx index 3ab9050..a71ee4b 100644 --- a/frontend/src/components/EventList.jsx +++ b/frontend/src/components/EventList.jsx @@ -1,80 +1,3 @@ -/* import React from 'react'; -import { connect } from 'react-redux'; -// import Table from '@material-ui/core/Table'; -import TableBody from '@material-ui/core/TableBody'; -import TableRow from '@material-ui/core/TableRow'; -import TableCell from '@material-ui/core/TableCell'; -import PropTypes from 'prop-types'; -import { AutoSizer, Column, SortDirection, Table } from 'react-virtualized'; -import InfoIcon from '@material-ui/icons/InfoOutlined'; -import { actions as calendarActions, eventStruct } from '../redux/modules/calendar'; -import {actions as spaceDataActions, spacedataStruct} from '../redux/modules/spacedata'; - - - -class EventList extends React.Component { - static propTypes = { - events: PropTypes.arrayOf( - PropTypes.shape(eventStruct), - ), - fetchCalendars: PropTypes.func, - spacedata: spacedataStruct, - }; - - static defaultProps = { - events: [], - }; - - componentWillMount() { - this.props.fetchCalendars(); - } - - formatDate = date => (date.format('DD.MM.YYYY')); - formatTime = date => (date.format('HH:mm')); - - render() { - return ( - {}}> - - {this.props.events - .filter(event => - ( - this.props.spacedata.filter.indexOf(event.space) !== -1 - || this.props.spacedata.filter.length === 0 - ) - ) - .map(event => ( - - - {this.formatDate(event.start)} - - - {event.wholeDayEvent ? null : this.formatTime(event.start)} - - - {event.summary || event.description} - - - {event.space} - - - {event.url && - - } - - - ))} - -
- ); - } -} - -export default connect(mapStateToProps, mapDispatchToProps)(EventList); -*/ - import React from 'react'; import { connect } from 'react-redux'; import TableCell from '@material-ui/core/TableCell'; @@ -89,23 +12,26 @@ import { AutoSizer, Column, Table } from 'react-virtualized'; const styles = theme => ({ table: { fontFamily: theme.typography.fontFamily, + border: 0, }, flexContainer: { display: 'flex', alignItems: 'center', boxSizing: 'border-box', }, - tableRow: { - border: 0, - }, + tableRow: {}, tableRowHover: { '&:hover': { backgroundColor: theme.palette.grey[600], }, }, + tableRowEven: { + backgroundColor: theme.palette.grey[700], + }, tableCell: { flex: 1, color: '#fff', + border: 0, }, noClick: { cursor: 'initial', @@ -114,10 +40,11 @@ const styles = theme => ({ class MuiVirtualizedTable extends React.PureComponent { getRowClassName = ({ index }) => { - const { classes, rowClassName, onRowClick } = this.props; + const { classes, rowClassName } = this.props; return classNames(classes.tableRow, classes.flexContainer, rowClassName, { - [classes.tableRowHover]: index !== -1 && onRowClick != null, + [classes.tableRowHover]: index !== -1, + [classes.tableRowEven]: index % 2, }); }; diff --git a/frontend/src/components/SpaceApiInput.jsx b/frontend/src/components/SpaceApiInput.jsx index 9a2f3ef..7685666 100644 --- a/frontend/src/components/SpaceApiInput.jsx +++ b/frontend/src/components/SpaceApiInput.jsx @@ -2,11 +2,68 @@ import React from 'react'; import request from 'superagent'; import TextField from '@material-ui/core/TextField'; import FloatingActionButton from '@material-ui/core/Fab'; +import SnackbarContent from '@material-ui/core/SnackbarContent'; import ContentAdd from '@material-ui/icons/AddOutlined'; import Snackbar from '@material-ui/core/Snackbar'; import PropTypes from 'prop-types'; +import InfoIcon from '@material-ui/icons/Info'; +import CloseIcon from '@material-ui/icons/Close'; +import IconButton from '@material-ui/core/IconButton'; +import { withStyles } from '@material-ui/core/styles'; import config from '../api/config'; +const styles = theme => ({ + table: { + fontFamily: theme.typography.fontFamily, + border: 0, + }, + flexContainer: { + display: 'flex', + alignItems: 'center', + boxSizing: 'border-box', + }, + snackbar: { + backgroundColor: theme.palette.grey[700], + width: '100%', + }, +}); + + +class MuiSnackbarContent extends React.PureComponent { + render() { + console.log(this.props.classes); + return ( + + +
+ Die URL wurde hinzugefuegt und befindet sich nun im review. +
+ + } + action={[ + this.setState({open: false})} + > + + , + ]} + /> + ); + } +} + +MuiSnackbarContent.propTypes = { + classes: PropTypes.object.isRequired, +}; +const MySnackbarContent = withStyles(styles)(MuiSnackbarContent); + class SpaceApiInput extends React.Component { static propTypes = { style: PropTypes.shape({}), @@ -86,19 +143,20 @@ class SpaceApiInput extends React.Component { /> this.setState({ open: false })} - /> + onClose={() => this.setState({ open: false })} + > + + ); } diff --git a/frontend/src/components/SpaceList.jsx b/frontend/src/components/SpaceList.jsx index 2a90bdd..7d0aa69 100644 --- a/frontend/src/components/SpaceList.jsx +++ b/frontend/src/components/SpaceList.jsx @@ -4,7 +4,38 @@ import TableBody from '@material-ui/core/TableBody'; import TableRow from '@material-ui/core/TableRow'; import TableCell from '@material-ui/core/TableCell'; import PropTypes from 'prop-types'; +import classNames from 'classnames'; import { spacedataStruct } from '../redux/modules/spacedata'; +import {withStyles} from "@material-ui/core"; + +const styles = theme => ({ + table: { + fontFamily: theme.typography.fontFamily, + border: 0, + }, + flexContainer: { + display: 'flex', + alignItems: 'center', + boxSizing: 'border-box', + }, + tableRow: {}, + tableRowHover: { + '&:hover': { + backgroundColor: theme.palette.grey[600], + }, + }, + tableRowEven: { + backgroundColor: theme.palette.grey[700], + }, + tableCell: { + flex: 1, + color: '#fff', + border: 0, + }, + noClick: { + cursor: 'initial', + }, +}); export class SpaceList extends React.Component { static propTypes = { @@ -31,12 +62,14 @@ export class SpaceList extends React.Component { {items - .map(space => ( - - + .map((space, index) => ( + + {space.space} - +