From 418453dd02283bf81e4ccc8f57ef872879279a94 Mon Sep 17 00:00:00 2001
From: Qolzam <amir.gholzam@live.com>
Date: Sat, 7 Oct 2017 11:12:07 +0700
Subject: [PATCH] Migrate store to tsx file

---
 CHANGELOG.md                                  |  8 -------
 app/api/AuthAPI.jsx                           | 12 +++++-----
 ...{configureStore.jsx => configureStore.tsx} | 24 +++++++++----------
 package.json                                  |  6 +++--
 webpack.config.js                             |  1 +
 5 files changed, 23 insertions(+), 28 deletions(-)
 rename app/store/{configureStore.jsx => configureStore.tsx} (58%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 297ca46..1931ff5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,5 @@
 # Change Log
 
-## [Unreleased](https://github.com/Qolzam/react-social-network/tree/HEAD)
-
-[Full Changelog](https://github.com/Qolzam/react-social-network/compare/v0.2...HEAD)
-
-**Implemented enhancements:**
-
-- Upgrade to react version 16 [\#14](https://github.com/Qolzam/react-social-network/issues/14)
-
 ## [v0.2](https://github.com/Qolzam/react-social-network/tree/v0.2) (2017-10-06)
 [Full Changelog](https://github.com/Qolzam/react-social-network/compare/v0.1...v0.2)
 
diff --git a/app/api/AuthAPI.jsx b/app/api/AuthAPI.jsx
index d02e0dc..4529aa9 100644
--- a/app/api/AuthAPI.jsx
+++ b/app/api/AuthAPI.jsx
@@ -1,16 +1,16 @@
 // - Import firebase components
-import {firebaseAuth, firebaseRef} from 'app/firebase/'
-import store from 'configureStore'
+import {firebaseAuth, firebaseRef} from 'app/firebase/';
+import store from 'store/configureStore';
 
 // - Check user if is authorized
 export var isAuthorized = () => {
-  var state = store.getState()
-  return state.authorize.authed
+  var state = store.getState();
+  return state.authorize.authed;
 
-}
+};
 
 export var isAdmin = () =>{
 
 return true;
 
-}
+};
diff --git a/app/store/configureStore.jsx b/app/store/configureStore.tsx
similarity index 58%
rename from app/store/configureStore.jsx
rename to app/store/configureStore.tsx
index 10f4021..6620f6a 100644
--- a/app/store/configureStore.jsx
+++ b/app/store/configureStore.tsx
@@ -6,15 +6,15 @@ import createHistory from 'history/createBrowserHistory'
 import {createLogger} from 'redux-logger';
 
 // - Import reducers
-import {imageGalleryReducer} from 'imageGalleryReducer'
-import {postReducer} from 'postReducer'
-import {commentReducer} from 'commentReducer'
-import {voteReducer} from 'voteReducer'
-import {authorizeReducer} from 'authorizeReducer'
-import {globalReducer} from 'globalReducer'
-import {userReducer} from 'userReducer'
-import {circleReducer} from 'circleReducer'
-import {notifyReducer} from 'notifyReducer'
+import {imageGalleryReducer} from 'reducers/imageGalleryReducer'
+import {postReducer} from 'reducers/postReducer'
+import {commentReducer} from 'reducers/commentReducer'
+import {voteReducer} from 'reducers/voteReducer'
+import {authorizeReducer} from 'reducers/authorizeReducer'
+import {globalReducer} from 'reducers/globalReducer'
+import {userReducer} from 'reducers/userReducer'
+import {circleReducer} from 'reducers/circleReducer'
+import {notifyReducer} from 'reducers/notifyReducer'
 
 // Create a history of your choosing (we're using a browser history in this case)
 export const history = createHistory()
@@ -24,7 +24,7 @@ const middleware = routerMiddleware(history)
 const logger = createLogger()
 
 // - Reducers
-var reducer = redux.combineReducers({
+let reducer = redux.combineReducers({
   imageGallery: imageGalleryReducer,
   post: postReducer,
   circle: circleReducer,
@@ -44,9 +44,9 @@ var initialState = {
 }
 
 // - Config and create store of redux
-var store = redux.createStore(reducer, initialState, redux.compose(
+var store : redux.Store<{}>  = redux.createStore(reducer, initialState, redux.compose(
   redux.applyMiddleware(logger,thunk,middleware),
-  window.devToolsExtension ? window.devToolsExtension() : f => f
+  (window as any).devToolsExtension ? (window as any).devToolsExtension() : (f:any) => f
 ))
 
 export default store
diff --git a/package.json b/package.json
index 8f45aa8..d7361ac 100644
--- a/package.json
+++ b/package.json
@@ -53,13 +53,15 @@
   },
   "devDependencies": {
     "@types/material-ui": "^0.18.2",
+    "@types/node": "^8.0.33",
     "@types/react": "^16.0.10",
     "@types/react-dom": "^16.0.1",
     "@types/react-redux": "^5.0.10",
     "@types/react-router-dom": "^4.0.8",
     "@types/react-router-redux": "^5.0.8",
+    "@types/react-tap-event-plugin": "0.0.30",
+    "@types/redux-logger": "^3.0.4",
     "@types/webpack": "^3.0.13",
-    "@types/node": "^8.0.33",
     "babel-core": "^6.24.1",
     "babel-loader": "^7.1.2",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
@@ -78,9 +80,9 @@
     "redux-mock-store": "^1.2.3",
     "source-map-loader": "^0.2.2",
     "ts-loader": "^2.3.7",
-    "typescript": "^2.5.3",
     "ts-node": "^3.3.0",
     "tslint": "^5.7.0",
+    "typescript": "^2.5.3",
     "webpack": "^3.6.0"
   },
   "engines": {
diff --git a/webpack.config.js b/webpack.config.js
index 646f940..d8d1cc4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -81,6 +81,7 @@ module.exports = {
     alias: {
       app: 'app',
       components: 'app/components',
+      reducers: 'app/reducers',
       db: 'app/db',
       store: 'app/store',
       applicationStyles: 'app/styles/app.scss',