Fix routing 2

diff --git a/src/Welcome.js b/src/Welcome.js
index 7665c82ddfea8a5ead8a22c525d7f617525a8e50..46a6736fc6478a29a091d84d8a11e3aad6e5241b 100644 (file)
--- a/src/Welcome.js
+++ b/src/Welcome.js
@@ -14,28 +14,28 @@ export function Welcome() {
         <p>
           Выберите город
         </p>
-        <Link href="/game/Екатеринбург">
+        <Link href="/game?city=Екатеринбург">
           Екатеринбург
         </Link>
-        <Link href="/game/Санкт-Петербург">
+        <Link href="/game?city=Санкт-Петербург">
           Санкт-Петербург
         </Link>
-        <Link href="/game/Новосибирск">
+        <Link href="/game?city=Новосибирск">
           Новосибирск
         </Link>
-        <Link href="/game/Пермь">
+        <Link href="/game?city=Пермь">
           Пермь
         </Link>
-        <Link href="/game/Ижевск">
+        <Link href="/game?city=Ижевск">
           Ижевск
         </Link>
-        <Link href="/game/Казань">
+        <Link href="/game?city=Казань">
           Казань
         </Link>
-        <Link href="/game/Самара">
+        <Link href="/game?city=Самара">
           Самара
         </Link>
-        <Link href="/game/Лондон">
+        <Link href="/game?city=Лондон">
           Лондон
         </Link>
       </header>

diff --git a/src/index.js b/src/index.js
index c3a36048d5217375531dff33051e679a85ebc962..52e8c2aae385033ad0d2c3704d86cc1e5f85fbb6 100644 (file)
--- a/src/index.js
+++ b/src/index.js
@@ -5,10 +5,16 @@ import * as serviceWorker from './serviceWorker';
 import { router } from './router';
 import { render } from './render';
 
-router.resolve(window.location.pathname).then(render);
+router.resolve({
+    pathname: window.location.pathname || '',
+    query: new URLSearchParams(window.location.search || '')
+}).then(render);
 
 window.onpopstate = function() {
-  router.resolve(window.location.pathname).then(render);
+  router.resolve({
+    pathname: window.location.pathname || '',
+    query: new URLSearchParams(window.location.search || '')
+}).then(render);
 };
 
 // If you want your app to work offline and load faster, you can change

diff --git a/src/routes.js b/src/routes.js
index 7282a56b61dad74162bd8f3936a74c32001869a6..10d44e1eb1bcac99e509bd1587ce7fa8dbaa77ac 100644 (file)
--- a/src/routes.js
+++ b/src/routes.js
@@ -10,8 +10,8 @@ export const routes = [
     action: Welcome
   },
   {
-    path: '/game/:city',
-    action: (context) => <Game city={context.params.city}/>
+    path: '/game',
+    action: (context) => <Game city={context.query.get('city') || 'Екатеринбург'}/>
   },
   {
     path: '(.*)',