-
-
this.clearTempStates()} />
-
- )}
-
- )
- }
-}
-
-export default New
diff --git a/client/src/Components/HostedEvents/index.js b/client/src/Components/HostedEvents/index.js
index 248d0d929..32989e655 100644
--- a/client/src/Components/HostedEvents/index.js
+++ b/client/src/Components/HostedEvents/index.js
@@ -1,81 +1,30 @@
-import React from 'react'
-import { Query } from 'react-apollo'
+import React from 'react';
+import { Query } from 'react-apollo';
-import {
- Button,
- Dialog,
- DialogContent,
- DialogContentText,
- DialogTitle
-} from '@material-ui/core'
+import { hostedEventsCalls } from '../../GraphQL/Calls/index';
-import { withStyles } from '@material-ui/core/styles'
-import styles from './styles'
+import Event from './Event';
-import { hostedEventsCalls } from '../../GraphQL/Calls/index'
+const HostedEvent = () => (
+
+
+ {({ loading, error, data }) => {
+ if (loading) return 'Loading...';
+ if (error) return `Error! ${error.message}`;
+ const list = data.events_EventsByHost.map((event, index) => (
+
+ ));
+ return (
+
+ { list }
+
+ );
+ }}
+
+
+);
-import New from './New'
-import Event from './Event'
-class HostedEvent extends React.Component {
- constructor (props) {
- super(props)
- this.state = {
- isNewEventOpen: false
- }
- }
-
- handleNewEvent = (event) => {
- this.props.history.push(`/edit/${event.designator}`)
- };
-
- render () {
- const { classes } = this.props
- return (
-
-
-
-
- {({ loading, error, data }) => {
- if (loading) return 'Loading...'
- if (error) return `Error! ${error.message}`
- const list = data.events_EventsByHost.map((event, index) => {
- return (
-
- )
- })
- return (
-
- { list }
-
- )
- }}
-
-
-
-
- )
- }
-}
-
-export default withStyles(styles)(HostedEvent)
+export default HostedEvent;
diff --git a/client/src/Components/HostedEvents/styles.js b/client/src/Components/HostedEvents/styles.js
index e867e8174..866f1e2fc 100644
--- a/client/src/Components/HostedEvents/styles.js
+++ b/client/src/Components/HostedEvents/styles.js
@@ -5,22 +5,15 @@ const styles = theme => ({
marginTop: 20,
marginBottom: 20,
marginLeft: 400,
- marginRight: 400
+ marginRight: 400,
},
buttonList: {
margin: theme.spacing.unit,
- float: 'right'
+ float: 'right',
},
buttonGrid: {
- marginTop: -20
+ marginTop: -20,
},
- addButton: {
- display: 'block',
- padding: 20,
- marginTop: 20,
- marginRight: 20,
- marginLeft: 'auto'
- }
-})
+});
-export default styles
+export default styles;
diff --git a/client/src/Components/Search/Event.js b/client/src/Components/Search/Event.js
index 8a3579416..1736098ee 100644
--- a/client/src/Components/Search/Event.js
+++ b/client/src/Components/Search/Event.js
@@ -1,27 +1,27 @@
-import React from 'react'
-import { Link } from 'react-router-dom'
+import React from 'react';
+import { Link } from 'react-router-dom';
import {
Grid, Paper,
Typography,
- Button
-} from '@material-ui/core'
-import { withStyles } from '@material-ui/core/styles'
-import styles from './styles'
+ Button,
+} from '@material-ui/core';
+import { withStyles } from '@material-ui/core/styles';
+import styles from './styles';
-import { toLocalTime } from '../../utils'
+import { toLocalTime } from '../../utils';
class Event extends React.Component {
- render () {
- const classes = this.props.classes
+ render() {
+ const { classes } = this.props;
const {
+ id,
name,
- designator,
startDatetime,
finishDatetime,
host,
- description
- } = this.props.event
+ description,
+ } = this.props.event;
return (
@@ -31,7 +31,9 @@ class Event extends React.Component {
To : {toLocalTime(finishDatetime)}
- Hosted by: {host.alias} ({host.lastName} {host.firstName})
+
+ Hosted by: {host.alias} ({host.lastName} {host.firstName})
+
Formula:
First prize:
@@ -48,7 +50,7 @@ class Event extends React.Component {
color='primary'
size='small'
component={Link}
- to={'/show/' + designator}
+ to={`/events/show/${id}`}
>
Show
@@ -57,8 +59,8 @@ class Event extends React.Component {
- )
+ );
}
}
-export default withStyles(styles)(Event)
+export default withStyles(styles)(Event);
diff --git a/client/src/Components/Search/Tabs/Future.js b/client/src/Components/Search/Tabs/Future.js
index 2a46f4995..d5dbfc089 100644
--- a/client/src/Components/Search/Tabs/Future.js
+++ b/client/src/Components/Search/Tabs/Future.js
@@ -1,21 +1,19 @@
-import React from 'react'
-import { Typography } from '@material-ui/core'
+import React from 'react';
+import { Typography } from '@material-ui/core';
-import { withStyles } from '@material-ui/core/styles'
-import styles from '../styles'
+import { withStyles } from '@material-ui/core/styles';
+import styles from '../styles';
-import Event from '../Event'
+import Event from '../Event';
class Future extends React.Component {
- render () {
- const classes = this.props.classes
- const { FutureEvents } = this.props
+ render() {
+ const { classes } = this.props;
+ const { FutureEvents } = this.props;
- const futureEvents = FutureEvents.map((event, index) => {
- return (
-
- )
- })
+ const futureEvents = FutureEvents.map((event, index) => (
+
+ ));
return (
{futureEvents}
- )
+ );
}
}
-export default withStyles(styles)(Future)
+export default withStyles(styles)(Future);
diff --git a/client/src/Components/Search/Tabs/History.js b/client/src/Components/Search/Tabs/History.js
index 0db046e5c..21d848289 100644
--- a/client/src/Components/Search/Tabs/History.js
+++ b/client/src/Components/Search/Tabs/History.js
@@ -1,12 +1,12 @@
-import React from 'react'
-import { Typography } from '@material-ui/core'
+import React from 'react';
+import { Typography } from '@material-ui/core';
-import { withStyles } from '@material-ui/core/styles'
-import styles from '../styles'
+import { withStyles } from '@material-ui/core/styles';
+import styles from '../styles';
class History extends React.Component {
- render () {
- const classes = this.props.classes
+ render() {
+ const { classes } = this.props;
return (
Your old events (maybe here, maybe not, who knows)
- )
+ );
}
}
-export default withStyles(styles)(History)
+export default withStyles(styles)(History);
diff --git a/client/src/Components/Search/Tabs/Incoming.js b/client/src/Components/Search/Tabs/Incoming.js
index 3956aa6d7..ab6b070dc 100644
--- a/client/src/Components/Search/Tabs/Incoming.js
+++ b/client/src/Components/Search/Tabs/Incoming.js
@@ -1,26 +1,22 @@
-import React from 'react'
-import { Typography } from '@material-ui/core'
+import React from 'react';
+import { Typography } from '@material-ui/core';
-import { withStyles } from '@material-ui/core/styles'
-import styles from '../styles'
+import { withStyles } from '@material-ui/core/styles';
+import styles from '../styles';
-import Event from '../Event'
+import Event from '../Event';
class Incoming extends React.Component {
- render () {
- const classes = this.props.classes
- const { IncomingEvents, OngoingEvents } = this.props
+ render() {
+ const { classes } = this.props;
+ const { IncomingEvents, OngoingEvents } = this.props;
- const incomingEvents = IncomingEvents.map((event, index) => {
- return (
-
- )
- })
- const ongoingEvents = OngoingEvents.map((event, index) => {
- return (
-
- )
- })
+ const incomingEvents = IncomingEvents.map((event, index) => (
+
+ ));
+ const ongoingEvents = OngoingEvents.map((event, index) => (
+
+ ));
return (
{incomingEvents}
- )
+ );
}
}
-export default withStyles(styles)(Incoming)
+export default withStyles(styles)(Incoming);
diff --git a/client/src/Components/Search/Tabs/Past.js b/client/src/Components/Search/Tabs/Past.js
index 60a6bc5aa..b01cb0684 100644
--- a/client/src/Components/Search/Tabs/Past.js
+++ b/client/src/Components/Search/Tabs/Past.js
@@ -1,21 +1,19 @@
-import React from 'react'
-import { Typography } from '@material-ui/core'
+import React from 'react';
+import { Typography } from '@material-ui/core';
-import { withStyles } from '@material-ui/core/styles'
-import styles from '../styles'
+import { withStyles } from '@material-ui/core/styles';
+import styles from '../styles';
-import Event from '../Event'
+import Event from '../Event';
class Past extends React.Component {
- render () {
- const classes = this.props.classes
- const { PastEvents } = this.props
+ render() {
+ const { classes } = this.props;
+ const { PastEvents } = this.props;
- const pastEvents = PastEvents.map((event, index) => {
- return (
-
- )
- })
+ const pastEvents = PastEvents.map((event, index) => (
+
+ ));
return (
{pastEvents}
- )
+ );
}
}
-export default withStyles(styles)(Past)
+export default withStyles(styles)(Past);
diff --git a/client/src/Components/Search/Tabs/index.js b/client/src/Components/Search/Tabs/index.js
index a4077c1ac..d15abeb9c 100644
--- a/client/src/Components/Search/Tabs/index.js
+++ b/client/src/Components/Search/Tabs/index.js
@@ -1,11 +1,11 @@
-import Future from './Future'
-import History from './History'
-import Incoming from './Incoming'
-import Past from './Past'
+import Future from './Future';
+import History from './History';
+import Incoming from './Incoming';
+import Past from './Past';
export {
Future,
History,
Incoming,
- Past
-}
+ Past,
+};
diff --git a/client/src/Components/Search/index.js b/client/src/Components/Search/index.js
index 0d50b2f86..d1799aa7f 100644
--- a/client/src/Components/Search/index.js
+++ b/client/src/Components/Search/index.js
@@ -1,68 +1,70 @@
-import React from 'react'
-import { Query } from 'react-apollo'
-import { DateTime } from 'luxon'
+import React from 'react';
+import { Query } from 'react-apollo';
+import { DateTime } from 'luxon';
import {
Typography,
AppBar,
Tabs,
- Tab
-} from '@material-ui/core'
+ Tab,
+} from '@material-ui/core';
import {
GetApp as IncomingIcon,
AlarmAdd as FutureIcon,
- History as HistoryIcon
-} from '@material-ui/icons'
+ History as HistoryIcon,
+} from '@material-ui/icons';
-import { withStyles } from '@material-ui/core/styles'
-import styles from './styles'
+import { withStyles } from '@material-ui/core/styles';
+import styles from './styles';
-import { listEventsCalls } from '../../GraphQL/Calls/index'
+import { listEventsCalls } from '../../GraphQL/Calls/index';
import {
Future,
History,
Incoming,
- Past
-} from './Tabs'
+ Past,
+} from './Tabs';
-function TabContainer (props) {
+function TabContainer(props) {
return (
{props.children}
- )
+ );
}
class Search extends React.Component {
- constructor (props) {
- super(props)
+ constructor(props) {
+ super(props);
this.state = {
- value: 0
- }
+ value: 0,
+ };
}
handleChange = (event, value) => {
- this.setState({ value })
+ this.setState({ value });
}
- render () {
- const classes = this.props.classes
- const { value } = this.state
+ render() {
+ const { classes } = this.props;
+ const { value } = this.state;
return (
{({ loading, error, data }) => {
- if (loading) return 'Loading...'
- if (error) return `Error! ${error.message}`
- const now = ~~(DateTime.local().valueOf() / 1000)
- const inTwoWeeks = ~~(DateTime.local().plus({ weeks: 2 }).valueOf() / 1000)
+ if (loading) return 'Loading...';
+ if (error) return `Error! ${error.message}`;
+ const now = Math.floor(DateTime.local().valueOf() / 1000);
+ const inTwoWeeks = Math.floor(DateTime.local().plus({ weeks: 2 }).valueOf() / 1000);
- const IncomingEvents = data.events_Events.filter(event => event.startDatetime > now && event.startDatetime < inTwoWeeks)
- const OngoingEvents = data.events_Events.filter(event => event.finishDatetime > now && event.startDatetime < now)
- const FutureEvents = data.events_Events.filter(event => event.startDatetime > now)
- const PastEvents = data.events_Events.filter(event => event.finishDatetime < now)
+ const IncomingEvents = data.events_Events.filter(event => event.startDatetime > now
+ && event.startDatetime < inTwoWeeks);
+ const OngoingEvents = data.events_Events.filter(event => event.finishDatetime > now
+ && event.startDatetime < now);
+ const FutureEvents = data.events_Events.filter(event => event.startDatetime > now);
+ const PastEvents = data.events_Events.filter(event => event.finishDatetime < now);
return (
@@ -98,17 +100,19 @@ class Search extends React.Component {
/>
- {value === 0 && }
+ {value === 0 &&
+
+ }
{value === 1 && }
{value === 2 && }
{value === 3 && }