Migrate store to tsx file
This commit is contained in:
@@ -1,13 +1,5 @@
|
|||||||
# Change Log
|
# 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)
|
## [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)
|
[Full Changelog](https://github.com/Qolzam/react-social-network/compare/v0.1...v0.2)
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
// - Import firebase components
|
// - Import firebase components
|
||||||
import {firebaseAuth, firebaseRef} from 'app/firebase/'
|
import {firebaseAuth, firebaseRef} from 'app/firebase/';
|
||||||
import store from 'configureStore'
|
import store from 'store/configureStore';
|
||||||
|
|
||||||
// - Check user if is authorized
|
// - Check user if is authorized
|
||||||
export var isAuthorized = () => {
|
export var isAuthorized = () => {
|
||||||
var state = store.getState()
|
var state = store.getState();
|
||||||
return state.authorize.authed
|
return state.authorize.authed;
|
||||||
|
|
||||||
}
|
};
|
||||||
|
|
||||||
export var isAdmin = () =>{
|
export var isAdmin = () =>{
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
};
|
||||||
|
|||||||
@@ -6,15 +6,15 @@ import createHistory from 'history/createBrowserHistory'
|
|||||||
import {createLogger} from 'redux-logger';
|
import {createLogger} from 'redux-logger';
|
||||||
|
|
||||||
// - Import reducers
|
// - Import reducers
|
||||||
import {imageGalleryReducer} from 'imageGalleryReducer'
|
import {imageGalleryReducer} from 'reducers/imageGalleryReducer'
|
||||||
import {postReducer} from 'postReducer'
|
import {postReducer} from 'reducers/postReducer'
|
||||||
import {commentReducer} from 'commentReducer'
|
import {commentReducer} from 'reducers/commentReducer'
|
||||||
import {voteReducer} from 'voteReducer'
|
import {voteReducer} from 'reducers/voteReducer'
|
||||||
import {authorizeReducer} from 'authorizeReducer'
|
import {authorizeReducer} from 'reducers/authorizeReducer'
|
||||||
import {globalReducer} from 'globalReducer'
|
import {globalReducer} from 'reducers/globalReducer'
|
||||||
import {userReducer} from 'userReducer'
|
import {userReducer} from 'reducers/userReducer'
|
||||||
import {circleReducer} from 'circleReducer'
|
import {circleReducer} from 'reducers/circleReducer'
|
||||||
import {notifyReducer} from 'notifyReducer'
|
import {notifyReducer} from 'reducers/notifyReducer'
|
||||||
|
|
||||||
// Create a history of your choosing (we're using a browser history in this case)
|
// Create a history of your choosing (we're using a browser history in this case)
|
||||||
export const history = createHistory()
|
export const history = createHistory()
|
||||||
@@ -24,7 +24,7 @@ const middleware = routerMiddleware(history)
|
|||||||
const logger = createLogger()
|
const logger = createLogger()
|
||||||
|
|
||||||
// - Reducers
|
// - Reducers
|
||||||
var reducer = redux.combineReducers({
|
let reducer = redux.combineReducers({
|
||||||
imageGallery: imageGalleryReducer,
|
imageGallery: imageGalleryReducer,
|
||||||
post: postReducer,
|
post: postReducer,
|
||||||
circle: circleReducer,
|
circle: circleReducer,
|
||||||
@@ -44,9 +44,9 @@ var initialState = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// - Config and create store of redux
|
// - 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),
|
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
|
export default store
|
||||||
@@ -53,13 +53,15 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/material-ui": "^0.18.2",
|
"@types/material-ui": "^0.18.2",
|
||||||
|
"@types/node": "^8.0.33",
|
||||||
"@types/react": "^16.0.10",
|
"@types/react": "^16.0.10",
|
||||||
"@types/react-dom": "^16.0.1",
|
"@types/react-dom": "^16.0.1",
|
||||||
"@types/react-redux": "^5.0.10",
|
"@types/react-redux": "^5.0.10",
|
||||||
"@types/react-router-dom": "^4.0.8",
|
"@types/react-router-dom": "^4.0.8",
|
||||||
"@types/react-router-redux": "^5.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/webpack": "^3.0.13",
|
||||||
"@types/node": "^8.0.33",
|
|
||||||
"babel-core": "^6.24.1",
|
"babel-core": "^6.24.1",
|
||||||
"babel-loader": "^7.1.2",
|
"babel-loader": "^7.1.2",
|
||||||
"babel-plugin-transform-decorators-legacy": "^1.3.4",
|
"babel-plugin-transform-decorators-legacy": "^1.3.4",
|
||||||
@@ -78,9 +80,9 @@
|
|||||||
"redux-mock-store": "^1.2.3",
|
"redux-mock-store": "^1.2.3",
|
||||||
"source-map-loader": "^0.2.2",
|
"source-map-loader": "^0.2.2",
|
||||||
"ts-loader": "^2.3.7",
|
"ts-loader": "^2.3.7",
|
||||||
"typescript": "^2.5.3",
|
|
||||||
"ts-node": "^3.3.0",
|
"ts-node": "^3.3.0",
|
||||||
"tslint": "^5.7.0",
|
"tslint": "^5.7.0",
|
||||||
|
"typescript": "^2.5.3",
|
||||||
"webpack": "^3.6.0"
|
"webpack": "^3.6.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ module.exports = {
|
|||||||
alias: {
|
alias: {
|
||||||
app: 'app',
|
app: 'app',
|
||||||
components: 'app/components',
|
components: 'app/components',
|
||||||
|
reducers: 'app/reducers',
|
||||||
db: 'app/db',
|
db: 'app/db',
|
||||||
store: 'app/store',
|
store: 'app/store',
|
||||||
applicationStyles: 'app/styles/app.scss',
|
applicationStyles: 'app/styles/app.scss',
|
||||||
|
|||||||
Reference in New Issue
Block a user