diff --git a/app/components/Navigation/Navigation.js b/app/components/Navigation/Navigation.js index 7f180b5..11dbe83 100644 --- a/app/components/Navigation/Navigation.js +++ b/app/components/Navigation/Navigation.js @@ -110,7 +110,7 @@ class Navigation extends React.Component { setMenuButtonVisible(): void { let width = window.innerWidth; this.setState({ - showMenuButton: width < 1225 ? true : false, + showMenuButton: width < 1320 ? true : false, showMenu: width >= 1120 ? false : this.state.showMenu, showOnlyIcon: width < 545 ? true : false }) @@ -142,6 +142,7 @@ class Navigation extends React.Component { PROGRAM WORKSHOPS PARTNERS + MOVIE KIDS JOURNEYZONE diff --git a/app/routes.js b/app/routes.js index 3c932b5..2b7bbf2 100644 --- a/app/routes.js +++ b/app/routes.js @@ -36,6 +36,7 @@ const routes = compile({ '/kids': kids, '/speakers': speakers, '/countdown': movie, + '/movie': movie, '/workshops': workshops, '/speakers/monetary-policy': monetaryPolicy, '/speakers/tips': tipsAndTricks, @@ -77,6 +78,7 @@ function navigate(ev) { return true; } + window.history.pushState(null, null, url); dispatchPage(url); ev.preventDefault(); @@ -84,10 +86,17 @@ function navigate(ev) { } export function getPage(requestedPage) { + + if (requestedPage === '/countdown') { + history.pushState('', 'JavaZone 2018', '/movie'); + requestedPage = '/movie'; + } + if (requestedPage[requestedPage.length - 1] === '/' && requestedPage.length > 1) { requestedPage = requestedPage.substring(0, requestedPage.length - 1); } + const page = routes.find((routes) => { return routes.pattern.test(requestedPage); }); @@ -95,6 +104,9 @@ export function getPage(requestedPage) { if (!page) { pageview('/404'); return notFound; + } else if (page === '/countdown') { + pageview('/movie'); + return movie; } pageview(requestedPage);