fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14 from nikolabjelo/master

Browse Source 
Full rename from hosts to events
This commit is contained in:
Luis Fernando Molina authored and GitHub committed 2018-11-01 08:56:31 +01:00
2 parents 548b275968 46f2bf04cb
commit 0102e47127
18 files changed
+47 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

README.md
+1 -1
View File
@@ -1,2 +1,2 @@
# HostsModule
This module manages competition hosts
This module manages competition events
client/package-lock.json
Generated
+1 -1
View File
@@ -1,5 +1,5 @@
{
"name": "@advancedalgos/hosts-client",
"name": "@advancedalgos/events-client",
"version": "0.0.1",
"lockfileVersion": 1,
"requires": true,
client/package.json
+2 -2
View File
@@ -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",
client/src/Components/Event/Edit/index.js
+2 -2
View File
@@ -21,7 +21,7 @@ class Edit extends React.Component {
Enroll in an competition {this.props.match.params.slug}
</Typography>
<Query
query={showEventCalls.HOSTS_EVENT}
query={showEventCalls.EVENTS_EVENT}
variables={{ designator: this.props.match.params.slug }}
>
{({ loading, error, data }) => {
@@ -29,7 +29,7 @@ class Edit extends React.Component {
if (error) return `Error! ${error.message}`
return (
<p>
{data.hosts_Event.description}
{data.events_Event.description}
</p>
)
}}
client/src/Components/Event/Show/index.js
+2 -2
View File
@@ -21,7 +21,7 @@ class Show extends React.Component {
Enroll in an competition {this.props.match.params.slug}
</Typography>
<Query
query={showEventCalls.HOSTS_EVENT}
query={showEventCalls.EVENTS_EVENT}
variables={{ designator: this.props.match.params.slug }}
>
{({ loading, error, data }) => {
@@ -29,7 +29,7 @@ class Show extends React.Component {
if (error) return `Error! ${error.message}`
return (
<p>
{data.hosts_Event.description}
{data.events_Event.description}
</p>
)
}}
client/src/Components/HostedEvents/Event.js
+2 -2
View File
@@ -48,7 +48,7 @@ class Event extends React.Component {
color='primary'
size='small'
component={Link}
to={`/event/${designator}/edit`}
to={`/edit/${designator}`}
>
Edit
</Button>
@@ -58,7 +58,7 @@ class Event extends React.Component {
color='primary'
size='small'
component={Link}
to={'/event/' + designator}
to={'/show/' + designator}
>
Show
</Button>
client/src/Components/HostedEvents/New.js
+5 -5
View File
@@ -24,14 +24,14 @@ class New extends React.Component {
render () {
const { name, description, startDatetime, finishDatetime } = this.state
return (
<Mutation mutation={hostedEventsCalls.HOSTS_HOSTEVENT}
<Mutation mutation={hostedEventsCalls.EVENTS_HOSTEVENT}
update={(store, { data }) => {
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)
}
}
>
client/src/Components/HostedEvents/index.js
+3 -3
View File
@@ -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 () {
@@ -40,12 +40,12 @@ class HostedEvent extends React.Component {
</Button>
<Query
query={hostedEventsCalls.HOSTS_EVENTSBYHOST}
query={hostedEventsCalls.EVENTS_EVENTSBYHOST}
>
{({ 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 (
<Event key={index} event={event} />
)
client/src/Components/Search/Event.js
+1 -1
View File
@@ -48,7 +48,7 @@ class Event extends React.Component {
color='primary'
size='small'
component={Link}
to={'/event/' + designator}
to={'/show/' + designator}
>
Show
</Button>
client/src/Components/Search/index.js
+5 -5
View File
@@ -51,7 +51,7 @@ class Search extends React.Component {
const { value } = this.state
return (
<Query
query={listEventsCalls.HOSTS_EVENTS}
query={listEventsCalls.EVENTS_EVENTS}
>
{({ 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 (
<React.Fragment>
client/src/Components/TopBar/data.js
+2 -2
View File
@@ -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
client/src/GraphQL/Calls/hostedEvents.js
+6 -6
View File
@@ -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
}
client/src/GraphQL/Calls/listEvents.js
+3 -3
View File
@@ -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
}
client/src/GraphQL/Calls/showEvent.js
+3 -3
View File
@@ -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
}
client/src/GraphQL/Fragments/event.js
+2 -2
View File
@@ -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{
client/src/index.js
+4 -4
View File
@@ -43,10 +43,10 @@ class App extends Component {
{loggedIn}
<Switch>
<Route exact path='/' component={Search} />
<Route path='/events' component={Events} />
<Route path='/event/:slug/edit' component={EditEvent} />
<Route path='/event/:slug' component={EditEvent} />
<Route path='/hosted-events' component={HostedEvents} />
<Route path='/my' component={Events} />
<Route path='/exact/:slug' component={EditEvent} />
<Route path='/show/:slug' component={EditEvent} />
<Route path='/host' component={HostedEvents} />
</Switch>
</div>
</BrowserRouter>
server/package-lock.json
Generated
+1 -1
View File
@@ -1,5 +1,5 @@
{
"name": "hosts-server",
"name": "events-server",
"version": "0.1.0",
"lockfileVersion": 1,
"requires": true,
server/package.json
+2 -2
View File
@@ -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",