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} - - - - + + + +