From ead5a878582c41a30a365901f1f37be0a97d1d9c Mon Sep 17 00:00:00 2001 From: George Lima Date: Wed, 30 Jan 2019 21:22:24 -0300 Subject: [PATCH] feat(error-modal): hookup ErrorModal in app layout --- app/components/layout.js | 25 ++++++++++++++++++++----- app/redux/create.js | 4 +++- app/router/router.js | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/app/components/layout.js b/app/components/layout.js index 8841e65..695dec7 100644 --- a/app/components/layout.js +++ b/app/components/layout.js @@ -1,7 +1,9 @@ // @flow -import React from 'react'; +import React, { type Element } from 'react'; import styled from 'styled-components'; +import { ErrorModalComponent } from './error-modal'; + const Layout = styled.div` display: flex; flex-direction: column; @@ -14,12 +16,25 @@ const Layout = styled.div` `; type Props = { - chidren: any, // eslint-disable-line + children: Element<*>, + closeErrorModal: () => void, + isErrorModalVisible: boolean, + error: string, }; export const LayoutComponent = (props: Props) => { - // $FlowFixMe - const { children } = props; // eslint-disable-line + const { + children, error, isErrorModalVisible, closeErrorModal, + } = props; - return {children}; + return ( + + {children} + + + ); }; diff --git a/app/redux/create.js b/app/redux/create.js index 1c5749b..fe65d9e 100644 --- a/app/redux/create.js +++ b/app/redux/create.js @@ -7,6 +7,7 @@ import thunk from 'redux-thunk'; import type { RouterHistory } from 'react-router-dom'; import { createRootReducer } from './modules/reducer'; +import { errorHandler } from './errorHandler'; export const history: RouterHistory = createHashHistory(); @@ -14,7 +15,8 @@ const shouldEnableDevTools = (process.env.NODE_ENV !== 'production' || process.e && window.devToolsExtension; export const configureStore = (initialState: Object) => { - const middleware = applyMiddleware(thunk, routerMiddleware(history)); + // $FlowFixMe + const middleware = applyMiddleware(thunk, routerMiddleware(history), errorHandler); const enhancer = compose( middleware, diff --git a/app/router/router.js b/app/router/router.js index dfa5be6..fb801ad 100644 --- a/app/router/router.js +++ b/app/router/router.js @@ -15,7 +15,7 @@ import { ReceiveContainer } from '../containers/receive'; import { SettingsContainer } from '../containers/settings'; import { NotFoundView } from '../views/not-found'; import { ConsoleView } from '../views/console'; -import { LayoutComponent } from '../components/layout'; +import { AppContainer as LayoutComponent } from '../containers/app'; import { HeaderComponent } from '../components/header'; import {