From 430b39e977cb12d84700f4f0f6b1eb34972f1ac4 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Fri, 15 Nov 2019 15:46:28 +0700 Subject: [PATCH] removed console.log --- src/redux/store.ts | 86 +++++++++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 32 deletions(-) diff --git a/src/redux/store.ts b/src/redux/store.ts index 4c0ec13f..81084ce9 100644 --- a/src/redux/store.ts +++ b/src/redux/store.ts @@ -1,36 +1,46 @@ -import { createStore, applyMiddleware, combineReducers, compose, Store } from 'redux'; +import { + createStore, + applyMiddleware, + combineReducers, + compose, + Store +} from "redux"; -import { persistStore, persistReducer } from 'redux-persist'; -import storage from 'redux-persist/lib/storage'; -import createSagaMiddleware from 'redux-saga'; -import { connectRouter, RouterState, routerMiddleware } from 'connected-react-router'; -import { createBrowserHistory } from 'history'; -import { PersistConfig, Persistor } from 'redux-persist/es/types'; +import { persistStore, persistReducer } from "redux-persist"; +import storage from "redux-persist/lib/storage"; +import createSagaMiddleware from "redux-saga"; +import { + connectRouter, + RouterState, + routerMiddleware +} from "connected-react-router"; +import { createBrowserHistory } from "history"; +import { PersistConfig, Persistor } from "redux-persist/es/types"; -import authReducer from '~/redux/auth/reducer'; -import authSaga from '~/redux/auth/sagas'; +import authReducer from "~/redux/auth/reducer"; +import authSaga from "~/redux/auth/sagas"; -import nodeReducer, { INodeState } from '~/redux/node/reducer'; -import nodeSaga from '~/redux/node/sagas'; +import nodeReducer, { INodeState } from "~/redux/node/reducer"; +import nodeSaga from "~/redux/node/sagas"; -import flowReducer, { IFlowState } from '~/redux/flow/reducer'; -import flowSaga from '~/redux/flow/sagas'; +import flowReducer, { IFlowState } from "~/redux/flow/reducer"; +import flowSaga from "~/redux/flow/sagas"; -import uploadReducer, { IUploadState } from '~/redux/uploads/reducer'; -import uploadSaga from '~/redux/uploads/sagas'; +import uploadReducer, { IUploadState } from "~/redux/uploads/reducer"; +import uploadSaga from "~/redux/uploads/sagas"; -import playerReducer, { IPlayerState } from '~/redux/player/reducer'; -import playerSaga from '~/redux/player/sagas'; +import playerReducer, { IPlayerState } from "~/redux/player/reducer"; +import playerSaga from "~/redux/player/sagas"; -import { IAuthState } from '~/redux/auth/types'; +import { IAuthState } from "~/redux/auth/types"; -import modalReducer, { IModalState } from '~/redux/modal/reducer'; -import { gotAuthPostMessage, authOpenProfile } from './auth/actions'; +import modalReducer, { IModalState } from "~/redux/modal/reducer"; +import { gotAuthPostMessage, authOpenProfile } from "./auth/actions"; const authPersistConfig: PersistConfig = { - key: 'auth', - whitelist: ['token', 'user', 'updates'], - storage, + key: "auth", + whitelist: ["token", "user", "updates"], + storage }; export interface IState { @@ -47,16 +57,15 @@ export const sagaMiddleware = createSagaMiddleware(); export const history = createBrowserHistory(); history.listen(({ pathname }) => { - console.log({ pathname }); - if (pathname.match(/~([\wа-яА-Я]+)/)) { const [, username] = pathname.match(/~([\wа-яА-Я]+)/); - window.postMessage({ type: 'username', username }, '*'); + window.postMessage({ type: "username", username }, "*"); } }); const composeEnhancers = - typeof window === 'object' && (window).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ + typeof window === "object" && + (window).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ ? (window).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({}) : compose; @@ -68,23 +77,36 @@ export const store = createStore( node: nodeReducer, uploads: uploadReducer, flow: flowReducer, - player: playerReducer, + player: playerReducer }), composeEnhancers(applyMiddleware(routerMiddleware(history), sagaMiddleware)) ); -export function configureStore(): { store: Store; persistor: Persistor } { +export function configureStore(): { + store: Store; + persistor: Persistor; +} { sagaMiddleware.run(authSaga); sagaMiddleware.run(nodeSaga); sagaMiddleware.run(uploadSaga); sagaMiddleware.run(flowSaga); sagaMiddleware.run(playerSaga); - window.addEventListener('message', message => { - if (message && message.data && message.data.type === 'oauth_login' && message.data.token) + window.addEventListener("message", message => { + if ( + message && + message.data && + message.data.type === "oauth_login" && + message.data.token + ) return store.dispatch(gotAuthPostMessage({ token: message.data.token })); - if (message && message.data && message.data.type === 'username' && message.data.username) + if ( + message && + message.data && + message.data.type === "username" && + message.data.username + ) return store.dispatch(authOpenProfile(message.data.username)); });