Skip to content

Commit 29050d6

Browse files
committed
Updated counter sample
1 parent a6a6faa commit 29050d6

File tree

6 files changed

+53
-38
lines changed

6 files changed

+53
-38
lines changed

.babelrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

examples/counter/devTools.js

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
import { persistState } from 'redux-devtools';
2-
import { DevTools, DebugPanel, LogMonitor } from 'redux-devtools/lib/react';
3-
import React, { Component } from 'react';
4-
5-
angular.module('counter')
6-
.run(($ngRedux, $rootScope) => {
7-
React.render(
8-
<App store={ $ngRedux }/>,
9-
document.getElementById('devTools')
10-
);
11-
//Hack to reflect state changes when disabling/enabling actions via the monitor
12-
$ngRedux.subscribe(_ => {
13-
setTimeout($rootScope.$apply.bind($rootScope), 100);
14-
});
15-
});
1+
import { createDevTools} from 'redux-devtools';
2+
import { render } from 'react-dom';
3+
import LogMonitor from 'redux-devtools-log-monitor';
4+
import DockMonitor from 'redux-devtools-dock-monitor';
5+
import React from 'react'
6+
import { Provider } from 'react-redux';
167

8+
const DevTools = createDevTools(
9+
<DockMonitor toggleVisibilityKey='ctrl-h'
10+
changePositionKey='ctrl-q'>
11+
<LogMonitor theme='tomorrow' />
12+
</DockMonitor>
13+
);
1714

18-
class App extends Component {
19-
render() {
20-
return (
15+
export function runDevTools($ngRedux, $rootScope) {
16+
render(
17+
<Provider store={$ngRedux}>
2118
<div>
22-
<DebugPanel top right bottom>
23-
<DevTools store={ this.props.store } monitor = { LogMonitor } />
24-
</DebugPanel>
19+
<DevTools />
2520
</div>
26-
);
27-
}
21+
</Provider>,
22+
document.getElementById('devTools')
23+
);
24+
//Hack to reflect state changes when disabling/enabling actions via the monitor
25+
$ngRedux.subscribe(_ => {
26+
setTimeout($rootScope.$apply.bind($rootScope), 100);
27+
});
2828
}
2929

30+
export default DevTools;
31+
3032

examples/counter/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ import ngRedux from 'ng-redux';
33
import rootReducer from './reducers';
44
import thunk from 'redux-thunk';
55
import counter from './components/counter';
6-
import { devTools } from 'redux-devtools';
6+
import { default as DevTools, runDevTools} from './devTools';
77

88
angular.module('counter', [ngRedux])
99
.config(($ngReduxProvider) => {
10-
$ngReduxProvider.createStoreWith(rootReducer, [thunk], [devTools()]);
10+
$ngReduxProvider.createStoreWith(rootReducer, [thunk], [DevTools.instrument()]);
1111
})
12-
.directive('ngrCounter', counter);
12+
.directive('ngrCounter', counter)
13+
.run(runDevTools);

examples/counter/jsconfig.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"compilerOptions": {
3+
"module": "commonjs",
4+
"target": "ES6"
5+
}
6+
}

examples/counter/package.json

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,25 @@
1717
},
1818
"homepage": "https://github.com/wbuchwalter/ngRedux#readme",
1919
"devDependencies": {
20-
"babel-core": "^5.8.22",
21-
"babel-loader": "^5.3.2",
20+
"babel-core": "^6.3.21",
21+
"babel-loader": "^6.2.0",
22+
"babel-preset-es2015": "^6.3.13",
23+
"babel-preset-react": "^6.3.13",
2224
"html-loader": "^0.3.0",
2325
"html-webpack-plugin": "^1.6.1",
24-
"react": "^0.13.3",
25-
"webpack": "^1.11.0",
26-
"webpack-dev-server": "^1.10.1"
26+
"react": "^0.14.3",
27+
"react-dom": "^0.14.3",
28+
"redux-devtools-dock-monitor": "^1.0.1",
29+
"redux-devtools-log-monitor": "^1.0.1",
30+
"webpack": "^1.12.9",
31+
"webpack-dev-server": "^1.14.0"
2732
},
2833
"dependencies": {
2934
"angular": "^1.4.4",
3035
"ng-redux": "^3.0.0",
36+
"react-redux": "^4.0.1",
3137
"redux": "^3.0.0",
32-
"redux-devtools": "^2.1.0",
33-
"redux-thunk": "^0.1.0"
38+
"redux-devtools": "^3.0.0",
39+
"redux-thunk": "^1.0.2"
3440
}
3541
}

examples/counter/webpack.config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ module.exports = {
2626
{
2727
test: /\.js$/,
2828
loader: "babel",
29-
exclude: /node_modules/
29+
exclude: /node_modules/,
30+
query:
31+
{
32+
presets:['es2015','react']
33+
}
3034
},
3135
{
3236
test: /\.html$/,

0 commit comments

Comments
 (0)