Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all dependencies #202

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions index.android.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import {Provider} from 'react-redux';
import store from './src/redux/store';
import AppViewContainer from './src/modules/AppViewContainer';
import React, {Component} from 'react';
import {AppRegistry, BackAndroid} from 'react-native';
import {AppRegistry, BackHandler} from 'react-native';
import {NavigationActions} from 'react-navigation';

class PepperoniAppTemplate extends Component {
componentWillMount() {
BackAndroid.addEventListener('hardwareBackPress', this.navigateBack);
BackHandler.addEventListener('hardwareBackPress', this.navigateBack);
}

navigateBack() {
Expand Down
70 changes: 36 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,49 +29,51 @@
},
"jest": {
"preset": "react-native",
"setupFiles": ["<rootDir>/test/setup.js"],
"setupFiles": [
"<rootDir>/test/setup.js"
],
"transformIgnorePatterns": [
"node_modules/(?!(jest-)?react-native|react-navigation)"
]
},
"dependencies": {
"bluebird": "^3.3.5",
"event-emitter": "^0.3.4",
"immutable": "^3.7.6",
"lodash": "^4.11.0",
"moment": "^2.12.0",
"react": "~15.4.2",
"react-dom": "~15.4.2",
"react-native": "0.42.0",
"react-native-vector-icons": "^4.0.0",
"react-navigation": "^1.0.0-beta.7",
"react-redux": "^4.4.5",
"redux": "^3.4.0",
"redux-logger": "^2.6.1",
"redux-loop-symbol-ponyfill": "^2.2.0",
"bluebird": "^3.5.0",
"event-emitter": "^0.3.5",
"immutable": "^3.8.1",
"lodash": "^4.17.4",
"moment": "^2.18.1",
"react": "16.0.0-alpha.6",
"react-dom": "~15.5.4",
"react-native": "0.44.0",
"react-native-vector-icons": "^4.1.1",
"react-navigation": "^1.0.0-beta.9",
"react-redux": "^5.0.5",
"redux": "^3.6.0",
"redux-logger": "^3.0.6",
"redux-loop-symbol-ponyfill": "^2.2.2",
"redux-promise": "^0.5.3",
"redux-thunk": "^2.0.1",
"redux-thunk": "^2.2.0",
"standard-http-error": "^2.0.0"
},
"devDependencies": {
"babel-core": "^6.9.0",
"babel-eslint": "^7.1.0",
"babel-jest": "^17.0.2",
"babel-polyfill": "^6.9.0",
"babel-preset-react-native": "^1.9.0",
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.9.0",
"enzyme": "^2.2.0",
"eslint": "^3.10.1",
"eslint-plugin-babel": "^3.2.0",
"eslint-plugin-react": "^6.7.1",
"fetch-mock": "^5.5.0",
"babel-core": "^6.24.1",
"babel-eslint": "^7.2.3",
"babel-jest": "^20.0.3",
"babel-polyfill": "^6.23.0",
"babel-preset-react-native": "^1.9.2",
"babel-preset-stage-0": "^6.24.1",
"babel-register": "^6.24.1",
"enzyme": "^2.8.2",
"eslint": "^3.19.0",
"eslint-plugin-babel": "^4.1.1",
"eslint-plugin-react": "^7.0.1",
"fetch-mock": "^5.10.1",
"istanbul": "1.0.0-alpha.2",
"jest": "^17.0.2",
"react-addons-test-utils": "~15.4.2",
"react-native-mock": "~0.2.5",
"react-test-renderer": "~15.4.2",
"remote-redux-devtools": "^0.5.7",
"rimraf": "^2.5.2"
"jest": "^20.0.3",
"react-addons-test-utils": "~15.5.1",
"react-native-mock": "~0.3.1",
"react-test-renderer": "~15.5.4",
"remote-redux-devtools": "^0.5.11",
"rimraf": "^2.6.1"
}
}
25 changes: 11 additions & 14 deletions src/modules/colors/ColorView.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,18 @@ const color = () => Math.floor(255 * Math.random());
class ColorView extends Component {
static displayName = 'ColorView';

static navigationOptions = {
title: 'Colors!',
tabBar: () => ({
icon: (props) => (
<Icon name='color-lens' size={24} color={props.tintColor} />
)
}),
// TODO: move this into global config?
header: {
tintColor: 'white',
style: {
backgroundColor: '#39babd'
}
static navigationOptions =
({navigation}) => ({
tabBarKey: navigation.state,
tabBarlabel: 'Colors!',
tabBarIcon: () => (
<Icon name='color-lens' size={24} color={props.tintColor} />
),
headerTintColor: 'white',
headerStyle: {
backgroundColor: '#39babd'
}
}
});

static propTypes = {
navigate: PropTypes.func.isRequired
Expand Down
16 changes: 8 additions & 8 deletions src/modules/counter/CounterView.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import Icon from 'react-native-vector-icons/MaterialIcons';
class CounterView extends Component {
static displayName = 'CounterView';

static navigationOptions = {
title: 'Counter',
tabBar: () => ({
icon: (props) => (
<Icon name='plus-one' size={24} color={props.tintColor} />
)
})
}
static navigationOptions =
({navigation}) => ({
tabBarKey: navigation.state,
tabBarLabel: 'Counter',
tabBarIcon: () => (
<Icon name='plus-one' size={24} color="red" />
)
});

static propTypes = {
counter: PropTypes.number.isRequired,
Expand Down
9 changes: 3 additions & 6 deletions src/modules/navigator/Navigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,9 @@ export const MainScreenNavigator = TabNavigator({

MainScreenNavigator.navigationOptions = {
title: 'Pepperoni App Template',
header: {
titleStyle: {color: 'white'},
style: {
backgroundColor: headerColor,
elevation: 0 // disable header elevation when TabNavigator visible
}
headerTintColor: 'white',
headerStyle: {
backgroundColor: headerColor
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/redux/middleware/loggerMiddleware.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import createLogger from 'redux-logger';
import {createLogger} from 'redux-logger';

// log actions in development mode
export default createLogger({
Expand Down
Loading