diff --git a/.gitignore b/.gitignore index 94fc867..823e35d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ local.properties # node_modules/ npm-debug.log +yarn.lock +yarn-error.log \ No newline at end of file diff --git a/package.json b/package.json index 8f660c8..7deb9db 100644 --- a/package.json +++ b/package.json @@ -7,24 +7,23 @@ }, "dependencies": { "immutable": "^3.8.1", - "lodash": "^4.16.4", - "moment": "^2.15.1", + "lodash": "^4.16.6", + "moment": "^2.15.2", "normalizr": "^2.2.1", "react": "^15.3.2", - "react-native": "0.34.1", + "react-native": "0.36.1", "react-native-button": "^1.7.1", "react-native-calendar-picker": "^3.0.0", - "react-native-code-push": "^1.14.6-beta", + "react-native-code-push": "^1.15.1-beta", "react-native-drawer": "^2.3.0", - "react-native-maps": "https://github.com/kfiroo/react-native-maps.git#1d1758fbf95c91e5b6e57d4dcac12344c2fc60a5", - "react-native-modalbox": "^1.3.7", - "react-native-router-flux": "3.35.0", - "react-native-swiper": "^1.4.11", - "react-native-vector-icons": "^2.1.0", + "react-native-maps": "^0.11.0", + "react-native-modalbox": "^1.3.8", + "react-native-router-flux": "3.36.0", + "react-native-swiper": "^1.5.3", + "react-native-vector-icons": "^3.0.0", "react-redux": "^4.4.5", "redux": "^3.6.0", - "redux-logger": "^2.7.0", - "redux-storage": "^4.1.1", + "redux-logger": "^2.7.4", "redux-thunk": "^2.1.0", "reselect": "^2.5.4" } diff --git a/src/containers/User/Appointments.js b/src/containers/User/Appointments.js index 94f1d2e..9cb505f 100644 --- a/src/containers/User/Appointments.js +++ b/src/containers/User/Appointments.js @@ -39,7 +39,6 @@ class Appointments extends Component { } followLocation(company) { - console.log('following map' ,company); ActionSheetIOS.showActionSheetWithOptions( { title: `${company.name_en}, ${company.address_en} - ${company.city_en}`, @@ -81,6 +80,7 @@ class Appointments extends Component { render() { const { userReducer,appointments,companies,services,timings,users,employees } = this.props; + //@todo: move to selector const appointmentsArray = mapValues(appointments,(appointment) => { return Object.assign({},appointment,{ company:companies[appointment.company], @@ -91,9 +91,6 @@ class Appointments extends Component { }); }); - - console.log('appointments',appointments); - console.log('appointmentsarrya',appointmentsArray); return (