diff --git a/client/src/Components/Event/Edit/index.js b/client/src/Components/Event/Edit/index.js index 6fc58c7f0..f63874df6 100644 --- a/client/src/Components/Event/Edit/index.js +++ b/client/src/Components/Event/Edit/index.js @@ -22,7 +22,7 @@ class Edit extends React.Component { {({ loading, error, data }) => { if (loading) return 'Loading...'; diff --git a/client/src/Components/Event/Show/index.js b/client/src/Components/Event/Show/index.js index 86b2b61bc..4c83b98bd 100644 --- a/client/src/Components/Event/Show/index.js +++ b/client/src/Components/Event/Show/index.js @@ -22,7 +22,7 @@ class Show extends React.Component { {({ loading, error, data }) => { if (loading) return 'Loading...'; diff --git a/client/src/Components/HostedEvents/Event.js b/client/src/Components/HostedEvents/Event.js index 7ccb22ec7..4ba395132 100644 --- a/client/src/Components/HostedEvents/Event.js +++ b/client/src/Components/HostedEvents/Event.js @@ -15,8 +15,8 @@ class Event extends React.Component { render() { const { classes } = this.props; const { + id, name, - designator, startDatetime, finishDatetime, host, @@ -50,7 +50,7 @@ class Event extends React.Component { color='primary' size='small' component={Link} - to={`/edit/${designator}`} + to={`/edit/${id}`} > Edit @@ -60,7 +60,7 @@ class Event extends React.Component { color='primary' size='small' component={Link} - to={`/show/${designator}`} + to={`/show/${id}`} > Show diff --git a/client/src/Components/HostedEvents/New.js b/client/src/Components/HostedEvents/New.js index 3b2d41245..3d2012f24 100644 --- a/client/src/Components/HostedEvents/New.js +++ b/client/src/Components/HostedEvents/New.js @@ -26,16 +26,16 @@ class New extends React.Component { name, description, startDatetime, finishDatetime, } = this.state; return ( - { const { events_EventsByHost: hostedEvents } = store.readQuery({ query: hostedEventsCalls.EVENTS_EVENTSBYHOST, }); store.writeQuery({ query: hostedEventsCalls.EVENTS_EVENTSBYHOST, - data: { events_EventsByHost: hostedEvents.concat([data.events_HostEvent]) }, + data: { events_EventsByHost: hostedEvents.concat([data.events_CreateEvent]) }, }); - this.props.handleNewEvent(data.events_HostEvent); + this.props.handleNewEvent(data.events_CreateEvent); } } > @@ -46,10 +46,12 @@ class New extends React.Component { e.preventDefault(); hostEvent({ variables: { - name, - description, - startDatetime: startDatetime.valueOf() / 1000, - finishDatetime: startDatetime.valueOf() / 1000, + event: { + name, + description, + startDatetime: startDatetime.valueOf() / 1000, + finishDatetime: startDatetime.valueOf() / 1000, + }, }, }); }} diff --git a/client/src/Components/HostedEvents/index.js b/client/src/Components/HostedEvents/index.js index dfd5b8353..bc25a705d 100644 --- a/client/src/Components/HostedEvents/index.js +++ b/client/src/Components/HostedEvents/index.js @@ -26,7 +26,7 @@ class HostedEvent extends React.Component { } handleNewEvent = (event) => { - this.props.history.push(`/edit/${event.designator}`); + this.props.history.push(`/edit/${event.id}`); }; render() { diff --git a/client/src/Components/Search/Event.js b/client/src/Components/Search/Event.js index 42865cc2c..43c72f0ec 100644 --- a/client/src/Components/Search/Event.js +++ b/client/src/Components/Search/Event.js @@ -15,8 +15,8 @@ class Event extends React.Component { render() { const { classes } = this.props; const { + id, name, - designator, startDatetime, finishDatetime, host, @@ -50,7 +50,7 @@ class Event extends React.Component { color='primary' size='small' component={Link} - to={`/show/${designator}`} + to={`/show/${id}`} > Show diff --git a/client/src/GraphQL/Calls/hostedEvents.js b/client/src/GraphQL/Calls/hostedEvents.js index badd88e1e..2fe4460be 100644 --- a/client/src/GraphQL/Calls/hostedEvents.js +++ b/client/src/GraphQL/Calls/hostedEvents.js @@ -1,16 +1,16 @@ import gql from 'graphql-tag'; import { eventMinimalInfo } from '../Fragments'; -const EVENTS_HOSTEVENT = gql` - mutation Hosts_HostEvent($name: String!, $description: String!, $startDatetime: Int!, $finishDatetime: Int!) { - events_HostEvent(name: $name, description: $description, startDatetime: $startDatetime, finishDatetime: $finishDatetime) { +const EVENTS_CREATEEVENT = gql` + mutation Events_CreateEvent($event:events_EventInput!) { + events_CreateEvent(event: $event) { ...EventMinimalInfo } } ${eventMinimalInfo} `; const EVENTS_EVENTSBYHOST = gql` - query Hosts_EventsByHost{ + query Events_EventsByHost{ events_EventsByHost { ...EventMinimalInfo } @@ -18,6 +18,6 @@ const EVENTS_EVENTSBYHOST = gql` ${eventMinimalInfo} `; export default { - EVENTS_HOSTEVENT, + EVENTS_CREATEEVENT, EVENTS_EVENTSBYHOST, }; diff --git a/client/src/GraphQL/Calls/listEvents.js b/client/src/GraphQL/Calls/listEvents.js index f5c3204e0..6941002fc 100644 --- a/client/src/GraphQL/Calls/listEvents.js +++ b/client/src/GraphQL/Calls/listEvents.js @@ -2,7 +2,7 @@ import gql from 'graphql-tag'; import { eventMinimalInfo } from '../Fragments'; const EVENTS_EVENTS = gql` - query Hosts_Events{ + query Events_Events{ events_Events { ...EventMinimalInfo } diff --git a/client/src/GraphQL/Calls/showEvent.js b/client/src/GraphQL/Calls/showEvent.js index 105e09779..855c9b510 100644 --- a/client/src/GraphQL/Calls/showEvent.js +++ b/client/src/GraphQL/Calls/showEvent.js @@ -2,8 +2,8 @@ import gql from 'graphql-tag'; import { eventFullInfo } from '../Fragments'; const EVENTS_EVENT = gql` - query Hosts_Event($designator: ID!) { - events_Event(designator: $designator) { + query Events_Event($eventId: ID!) { + events_Event(eventId: $eventId) { ...EventFullInfo } } diff --git a/client/src/GraphQL/Fragments/event.js b/client/src/GraphQL/Fragments/event.js index bf1bba058..299f00687 100644 --- a/client/src/GraphQL/Fragments/event.js +++ b/client/src/GraphQL/Fragments/event.js @@ -2,8 +2,8 @@ import gql from 'graphql-tag'; export const eventMinimalInfo = gql` fragment EventMinimalInfo on events_Event { + id name - designator startDatetime finishDatetime host { @@ -17,7 +17,7 @@ export const eventMinimalInfo = gql` export const eventFullInfo = gql` fragment EventFullInfo on events_Event { - designator + id name host{ alias diff --git a/client/src/index.js b/client/src/index.js index 3f1c182da..f1f7dc90c 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -44,7 +44,7 @@ class App extends Component { - +