From 8cf29dbfc811e876f719f9a035fa28ff0d3a56c1 Mon Sep 17 00:00:00 2001 From: Nikola Bjelo Date: Thu, 1 Nov 2018 08:19:27 +0100 Subject: [PATCH 1/4] updating package-lock --- server/package-lock.json | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index 7a13f7e72..24a7e0716 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -2584,12 +2584,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2604,17 +2606,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2731,7 +2736,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2743,6 +2749,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2757,6 +2764,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2764,12 +2772,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2788,6 +2798,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2868,7 +2879,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2880,6 +2892,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3001,6 +3014,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", From a94371f750ff3f3db6c16b0345a45b40e44da746 Mon Sep 17 00:00:00 2001 From: Nikola Bjelo Date: Thu, 1 Nov 2018 08:28:17 +0100 Subject: [PATCH 2/4] renaming in packages --- client/package-lock.json | 2 +- client/package.json | 4 ++-- server/package-lock.json | 30 ++++++++---------------------- server/package.json | 4 ++-- 4 files changed, 13 insertions(+), 27 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 01e8e63e4..9ebb00764 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@advancedalgos/hosts-client", + "name": "@advancedalgos/events-client", "version": "0.0.1", "lockfileVersion": 1, "requires": true, diff --git a/client/package.json b/client/package.json index 9d800caa2..96d0f6959 100644 --- a/client/package.json +++ b/client/package.json @@ -1,7 +1,7 @@ { - "name": "@advancedalgos/hosts-client", + "name": "@advancedalgos/events-client", "version": "0.0.1", - "description": "Advanced Algos Host client-side web app", + "description": "Advanced Algos Event client-side web app", "author": "", "license": "", "main": "src/index.js", diff --git a/server/package-lock.json b/server/package-lock.json index 24a7e0716..c44492725 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,5 +1,5 @@ { - "name": "hosts-server", + "name": "events-server", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -2584,14 +2584,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2606,20 +2604,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -2736,8 +2731,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -2749,7 +2743,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2764,7 +2757,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2772,14 +2764,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2798,7 +2788,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -2879,8 +2868,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -2892,7 +2880,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3014,7 +3001,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/server/package.json b/server/package.json index a783ba4fc..73c601f30 100644 --- a/server/package.json +++ b/server/package.json @@ -1,7 +1,7 @@ { - "name": "hosts-server", + "name": "events-server", "version": "0.1.0", - "description": "Advanced Algos Host backend API", + "description": "Advanced Algos Event backend API", "author": "", "license": "", "main": "src/index.js", From 7e7dbc140182b7c8b4e4ed3b6e8762e86639b9a0 Mon Sep 17 00:00:00 2001 From: Nikola Bjelo Date: Thu, 1 Nov 2018 08:28:43 +0100 Subject: [PATCH 3/4] Renaming hosts to events at as many places as possible --- README.md | 2 +- client/src/Components/Event/Edit/index.js | 4 ++-- client/src/Components/Event/Show/index.js | 4 ++-- client/src/Components/HostedEvents/New.js | 10 +++++----- client/src/Components/HostedEvents/index.js | 4 ++-- client/src/Components/Search/index.js | 10 +++++----- client/src/GraphQL/Calls/hostedEvents.js | 12 ++++++------ client/src/GraphQL/Calls/listEvents.js | 6 +++--- client/src/GraphQL/Calls/showEvent.js | 6 +++--- client/src/GraphQL/Fragments/event.js | 4 ++-- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 0bd7356a6..7efa4baa6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # HostsModule -This module manages competition hosts +This module manages competition events diff --git a/client/src/Components/Event/Edit/index.js b/client/src/Components/Event/Edit/index.js index 803c9e2cc..1a17154bb 100644 --- a/client/src/Components/Event/Edit/index.js +++ b/client/src/Components/Event/Edit/index.js @@ -21,7 +21,7 @@ class Edit extends React.Component { Enroll in an competition {this.props.match.params.slug} {({ loading, error, data }) => { @@ -29,7 +29,7 @@ class Edit extends React.Component { if (error) return `Error! ${error.message}` return (

- {data.hosts_Event.description} + {data.events_Event.description}

) }} diff --git a/client/src/Components/Event/Show/index.js b/client/src/Components/Event/Show/index.js index d0e89c9d6..aaf59fb06 100644 --- a/client/src/Components/Event/Show/index.js +++ b/client/src/Components/Event/Show/index.js @@ -21,7 +21,7 @@ class Show extends React.Component { Enroll in an competition {this.props.match.params.slug} {({ loading, error, data }) => { @@ -29,7 +29,7 @@ class Show extends React.Component { if (error) return `Error! ${error.message}` return (

- {data.hosts_Event.description} + {data.events_Event.description}

) }} diff --git a/client/src/Components/HostedEvents/New.js b/client/src/Components/HostedEvents/New.js index f5567122d..61b4d72ff 100644 --- a/client/src/Components/HostedEvents/New.js +++ b/client/src/Components/HostedEvents/New.js @@ -24,14 +24,14 @@ class New extends React.Component { render () { const { name, description, startDatetime, finishDatetime } = this.state return ( - { - const { hosts_EventsByHost: hostedEvents } = store.readQuery({ query: hostedEventsCalls.HOSTS_EVENTSBYHOST }) + const { events_EventsByHost: hostedEvents } = store.readQuery({ query: hostedEventsCalls.EVENTS_EVENTSBYHOST }) store.writeQuery({ - query: hostedEventsCalls.HOSTS_EVENTSBYHOST, - data: { hosts_EventsByHost: hostedEvents.concat([data.hosts_HostEvent]) } + query: hostedEventsCalls.EVENTS_EVENTSBYHOST, + data: { events_EventsByHost: hostedEvents.concat([data.events_HostEvent]) } }) - this.props.handleNewEvent(data.hosts_HostEvent) + this.props.handleNewEvent(data.events_HostEvent) } } > diff --git a/client/src/Components/HostedEvents/index.js b/client/src/Components/HostedEvents/index.js index ff6b6e600..4ccfd907d 100644 --- a/client/src/Components/HostedEvents/index.js +++ b/client/src/Components/HostedEvents/index.js @@ -40,12 +40,12 @@ class HostedEvent extends React.Component { {({ loading, error, data }) => { if (loading) return 'Loading...' if (error) return `Error! ${error.message}` - const list = data.hosts_EventsByHost.map((event, index) => { + const list = data.events_EventsByHost.map((event, index) => { return ( ) diff --git a/client/src/Components/Search/index.js b/client/src/Components/Search/index.js index e432c8a8c..0d50b2f86 100644 --- a/client/src/Components/Search/index.js +++ b/client/src/Components/Search/index.js @@ -51,7 +51,7 @@ class Search extends React.Component { const { value } = this.state return ( {({ loading, error, data }) => { if (loading) return 'Loading...' @@ -59,10 +59,10 @@ class Search extends React.Component { const now = ~~(DateTime.local().valueOf() / 1000) const inTwoWeeks = ~~(DateTime.local().plus({ weeks: 2 }).valueOf() / 1000) - const IncomingEvents = data.hosts_Events.filter(event => event.startDatetime > now && event.startDatetime < inTwoWeeks) - const OngoingEvents = data.hosts_Events.filter(event => event.finishDatetime > now && event.startDatetime < now) - const FutureEvents = data.hosts_Events.filter(event => event.startDatetime > now) - const PastEvents = data.hosts_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 ( diff --git a/client/src/GraphQL/Calls/hostedEvents.js b/client/src/GraphQL/Calls/hostedEvents.js index 850290690..05b3f77f2 100644 --- a/client/src/GraphQL/Calls/hostedEvents.js +++ b/client/src/GraphQL/Calls/hostedEvents.js @@ -1,23 +1,23 @@ import gql from 'graphql-tag' import { eventMinimalInfo } from '../Fragments' -const HOSTS_HOSTEVENT = gql` +const EVENTS_HOSTEVENT = gql` mutation Hosts_HostEvent($name: String!, $description: String!, $startDatetime: Int!, $finishDatetime: Int!) { - hosts_HostEvent(name: $name, description: $description, startDatetime: $startDatetime, finishDatetime: $finishDatetime) { + events_HostEvent(name: $name, description: $description, startDatetime: $startDatetime, finishDatetime: $finishDatetime) { ...EventMinimalInfo } } ${eventMinimalInfo} ` -const HOSTS_EVENTSBYHOST = gql` +const EVENTS_EVENTSBYHOST = gql` query Hosts_EventsByHost{ - hosts_EventsByHost { + events_EventsByHost { ...EventMinimalInfo } } ${eventMinimalInfo} ` export default { - HOSTS_HOSTEVENT, - HOSTS_EVENTSBYHOST + EVENTS_HOSTEVENT, + EVENTS_EVENTSBYHOST } diff --git a/client/src/GraphQL/Calls/listEvents.js b/client/src/GraphQL/Calls/listEvents.js index 39084f491..c115eb746 100644 --- a/client/src/GraphQL/Calls/listEvents.js +++ b/client/src/GraphQL/Calls/listEvents.js @@ -1,14 +1,14 @@ import gql from 'graphql-tag' import { eventMinimalInfo } from '../Fragments' -const HOSTS_EVENTS = gql` +const EVENTS_EVENTS = gql` query Hosts_Events{ - hosts_Events { + events_Events { ...EventMinimalInfo } } ${eventMinimalInfo} ` export default { - HOSTS_EVENTS + EVENTS_EVENTS } diff --git a/client/src/GraphQL/Calls/showEvent.js b/client/src/GraphQL/Calls/showEvent.js index 1f06bf226..b26b0e0dc 100644 --- a/client/src/GraphQL/Calls/showEvent.js +++ b/client/src/GraphQL/Calls/showEvent.js @@ -1,9 +1,9 @@ import gql from 'graphql-tag' import { eventFullInfo } from '../Fragments' -const HOSTS_EVENT = gql` +const EVENTS_EVENT = gql` query Hosts_Event($designator: ID!) { - hosts_Event(designator: $designator) { + events_Event(designator: $designator) { ...EventFullInfo } } @@ -11,5 +11,5 @@ const HOSTS_EVENT = gql` ` export default { - HOSTS_EVENT + EVENTS_EVENT } diff --git a/client/src/GraphQL/Fragments/event.js b/client/src/GraphQL/Fragments/event.js index 3b5f3c3ac..9fd7a4610 100644 --- a/client/src/GraphQL/Fragments/event.js +++ b/client/src/GraphQL/Fragments/event.js @@ -1,7 +1,7 @@ import gql from 'graphql-tag' export const eventMinimalInfo = gql` - fragment EventMinimalInfo on hosts_Event { + fragment EventMinimalInfo on events_Event { name designator startDatetime @@ -16,7 +16,7 @@ export const eventMinimalInfo = gql` ` export const eventFullInfo = gql` - fragment EventFullInfo on hosts_Event { + fragment EventFullInfo on events_Event { designator name host{ From 46f2bf04cbcd25922ae27b921e15cbc70045503c Mon Sep 17 00:00:00 2001 From: Nikola Bjelo Date: Thu, 1 Nov 2018 08:34:26 +0100 Subject: [PATCH 4/4] renaming routes --- client/src/Components/HostedEvents/Event.js | 4 ++-- client/src/Components/HostedEvents/index.js | 2 +- client/src/Components/Search/Event.js | 2 +- client/src/Components/TopBar/data.js | 4 ++-- client/src/index.js | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/src/Components/HostedEvents/Event.js b/client/src/Components/HostedEvents/Event.js index 37599da1b..47ad49c54 100644 --- a/client/src/Components/HostedEvents/Event.js +++ b/client/src/Components/HostedEvents/Event.js @@ -48,7 +48,7 @@ class Event extends React.Component { color='primary' size='small' component={Link} - to={`/event/${designator}/edit`} + to={`/edit/${designator}`} > Edit @@ -58,7 +58,7 @@ class Event extends React.Component { color='primary' size='small' component={Link} - to={'/event/' + designator} + to={'/show/' + designator} > Show diff --git a/client/src/Components/HostedEvents/index.js b/client/src/Components/HostedEvents/index.js index 4ccfd907d..248d0d929 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(`/event/${event.designator}/edit`) + this.props.history.push(`/edit/${event.designator}`) }; render () { diff --git a/client/src/Components/Search/Event.js b/client/src/Components/Search/Event.js index bce6d2433..8a3579416 100644 --- a/client/src/Components/Search/Event.js +++ b/client/src/Components/Search/Event.js @@ -48,7 +48,7 @@ class Event extends React.Component { color='primary' size='small' component={Link} - to={'/event/' + designator} + to={'/show/' + designator} > Show diff --git a/client/src/Components/TopBar/data.js b/client/src/Components/TopBar/data.js index 37d33c471..8726e606d 100644 --- a/client/src/Components/TopBar/data.js +++ b/client/src/Components/TopBar/data.js @@ -4,8 +4,8 @@ import LibraryAddIcon from '@material-ui/icons/LibraryAdd' const data = [ { title: 'Look for an event', to: '/', icon: SearchIcon, text: '' }, - { title: 'Events you are enrolled in', to: '/events', icon: GamesIcon, text: '' }, - { title: 'Host your own competition', to: '/hosted-events', icon: LibraryAddIcon, text: '' } + { title: 'Events you are enrolled in', to: '/my', icon: GamesIcon, text: '' }, + { title: 'Host your own competition', to: '/host', icon: LibraryAddIcon, text: '' } ] export default data diff --git a/client/src/index.js b/client/src/index.js index 245f4fa01..6989c8551 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -43,10 +43,10 @@ class App extends Component { {loggedIn} - - - - + + + +