Folder structure #398

Merged
bones7242 merged 76 commits from folder-structure into master 2018-03-20 00:01:08 +01:00
147 changed files with 61 additions and 61 deletions
Showing only changes of commit c23b6192f9 - Show all commits

View file

@ -2,7 +2,7 @@ import React from 'react';
import { Route, Switch } from 'react-router-dom'; import { Route, Switch } from 'react-router-dom';
import HomePage from 'pages/HomePage'; // or use the provided local homepage import HomePage from 'pages/HomePage'; // or use the provided local homepage
import AboutPage from 'pages/AboutPage'; import AboutPage from 'pages/AboutPage';
import LoginPage from 'containers/LoginPage'; import LoginPage from 'pages/LoginPage';
import ShowPage from 'pages/ShowPage'; import ShowPage from 'pages/ShowPage';
import FourOhFourPage from 'containers/FourOhFourPage'; import FourOhFourPage from 'containers/FourOhFourPage';

View file

@ -21,25 +21,29 @@ const sagaMiddleware = createSagaMiddleware();
const middleware = applyMiddleware(sagaMiddleware); const middleware = applyMiddleware(sagaMiddleware);
const reduxMiddleware = window.__REDUX_DEVTOOLS_EXTENSION__ ? compose(middleware, window.__REDUX_DEVTOOLS_EXTENSION__()) : middleware; const reduxMiddleware = window.__REDUX_DEVTOOLS_EXTENSION__ ? compose(middleware, window.__REDUX_DEVTOOLS_EXTENSION__()) : middleware;
// create teh store const SpeechClient = () => {
let store; // create teh store
if (preloadedState) { let store;
store = createStore(Reducer, preloadedState, reduxMiddleware); if (preloadedState) {
} else { store = createStore(Reducer, preloadedState, reduxMiddleware);
store = createStore(Reducer, reduxMiddleware); } else {
} store = createStore(Reducer, reduxMiddleware);
}
// run the saga middlweare // run the saga middlweare
sagaMiddleware.run(rootSaga); sagaMiddleware.run(rootSaga);
// render the app // render the app
hydrate( hydrate(
<Provider store={store}> <Provider store={store}>
<BrowserRouter> <BrowserRouter>
<GAListener> <GAListener>
<App /> <App />
</GAListener> </GAListener>
</BrowserRouter> </BrowserRouter>
</Provider>, </Provider>,
document.getElementById('react-app') document.getElementById('react-app')
); );
};
module.exports = SpeechClient;

Some files were not shown because too many files have changed in this diff Show more