From 7eee3c8801c03b63299f4ecb5c906c24873de80e Mon Sep 17 00:00:00 2001
From: lbratkovskaya <lbratkovskaya@naumen.ru>
Date: Mon, 8 Mar 2021 12:23:33 +0500
Subject: [PATCH] fix: routing fix

---
 src/components/App.tsx               |  8 +++-----
 src/components/CountryPage/index.tsx |  6 ++++--
 src/components/ImagesGrid/index.tsx  |  5 +++--
 src/store/rootReducer.ts             |  9 ++-------
 src/store/types.ts                   | 14 ++++++++++++++
 5 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 src/store/types.ts

diff --git a/src/components/App.tsx b/src/components/App.tsx
index 43f2088..b77bd41 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import {
   BrowserRouter,
-  Redirect,
   Route,
   Switch,
 } from 'react-router-dom';
@@ -37,13 +36,12 @@ const App: React.FC<rootProps> = (props: rootProps) => (
     </Button>
     <BrowserRouter>
       <Switch>
-        <Route path="/countries">
-          <MainPage />
-        </Route>
         <Route path="/country/:countryId">
           <CountryPage />
         </Route>
-        <Redirect path="/" to="/countries" />
+        <Route path="/">
+          <MainPage />
+        </Route>
       </Switch>
     </BrowserRouter>
   </div>
diff --git a/src/components/CountryPage/index.tsx b/src/components/CountryPage/index.tsx
index 2e4adf2..55bf104 100644
--- a/src/components/CountryPage/index.tsx
+++ b/src/components/CountryPage/index.tsx
@@ -5,7 +5,9 @@ import {
 import {
   useParams,
 } from 'react-router-dom';
-import { rootProps } from '../../store/rootConnector';
+import rootConnector, {
+  rootProps,
+} from '../../store/rootConnector';
 import { URLParamTypes } from '../../types';
 
 const CountryPage: React.FC<rootProps> = () => {
@@ -18,4 +20,4 @@ const CountryPage: React.FC<rootProps> = () => {
   return (<div title={t(`${countryId}.name`)}>{t(`${countryId}.name`)}</div>);
 };
 
-export default CountryPage;
+export default rootConnector(CountryPage);
diff --git a/src/components/ImagesGrid/index.tsx b/src/components/ImagesGrid/index.tsx
index a036a4b..fb706c8 100644
--- a/src/components/ImagesGrid/index.tsx
+++ b/src/components/ImagesGrid/index.tsx
@@ -16,6 +16,7 @@ import rootConnector,
 {
   rootProps,
 } from '../../store/rootConnector';
+import { Country } from '../../types';
 
 const useStyles = makeStyles(() => createStyles({
   root: {
@@ -52,9 +53,9 @@ const ImagesGrid: React.FC<rootProps> = (props: rootProps) => {
   return (
     <div className={classes.root}>
       <GridList className={classes.gridList} cols={2.5}>
-        {countries.map((country) => (
+        {countries.map((country: Country) => (
           <GridListTile key={country.pictureURL}>
-            <Link to={`country/${country.id}`}>
+            <Link to={`/country/${country.id}`}>
               <img
                 src={country.pictureURL}
                 alt={t(`${country.id}.name`)}
diff --git a/src/store/rootReducer.ts b/src/store/rootReducer.ts
index 35dd757..f808bbb 100644
--- a/src/store/rootReducer.ts
+++ b/src/store/rootReducer.ts
@@ -1,9 +1,4 @@
-import { Country } from '../types';
-
-export interface IAppState {
-  lang: 'EN' | 'RU' | 'DE',
-  countries: Country[],
-}
+import { IAppState, RootReducerAction } from './types';
 
 const initialState: IAppState = {
   lang: 'EN',
@@ -55,7 +50,7 @@ const initialState: IAppState = {
   ],
 };
 
-const rootReducer = (state: IAppState = initialState, action: any) => {
+const rootReducer = (state: IAppState = initialState, action: RootReducerAction) => {
   switch (action.type) {
     case 'SET_LANG':
       return { ...state, lang: action.payload.lang };
diff --git a/src/store/types.ts b/src/store/types.ts
new file mode 100644
index 0000000..0133296
--- /dev/null
+++ b/src/store/types.ts
@@ -0,0 +1,14 @@
+import { Country } from '../types';
+
+export interface IAppState {
+  lang: 'EN' | 'RU' | 'DE',
+  countries: Country[],
+}
+
+export interface RootReducerAction {
+  type: string,
+  payload: {
+    lang?: string,
+    countries?: Country[],
+  }
+}