Skip to content

Commit

Permalink
Merge pull request #4 from lbratkovskaya/main-page
Browse files Browse the repository at this point in the history
fix: fix redux router types
  • Loading branch information
lbratkovskaya authored Mar 10, 2021
2 parents 0c300d6 + e97c2d5 commit 29304f0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/store/rootConnector.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { connect, ConnectedProps } from 'react-redux';
import { Dispatch } from 'redux';
import { IAppState } from './rootReducer';
import { IAppState } from './types';

export type rootProps = ConnectedProps<typeof rootConnector>;

Expand Down
4 changes: 2 additions & 2 deletions src/store/types.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Country } from '../types';

export interface IAppState {
lang: 'EN' | 'RU' | 'DE',
lang: 'EN' | 'RU' | 'DE' | undefined,
countries: Country[],
}

export interface RootReducerAction {
type: string,
payload: {
lang?: string,
lang?: 'EN' | 'RU' | 'DE',
countries?: Country[],
}
}
2 changes: 2 additions & 0 deletions src/types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ export interface Country {
id: string,
name: string,
pictureURL: string,
capitalLatLng?: [number, number] | undefined,
}

export interface URLParamTypes {
countryId: string,
}

0 comments on commit 29304f0

Please sign in to comment.