Merge pull request #2 from matAlmeida/master

Upgrading Dependencies

Author: boadude

.expo/packager-info.json

@@ -4,5 +4,6 @@
   "packagerPid": null,
   "expoServerNgrokUrl": null,
   "packagerNgrokUrl": null,
-  "ngrokPid": null
+  "ngrokPid": null,
+  "devToolsPort": 19002
 }

.expo/settings.json

@@ -1,5 +1,5 @@
 {
-  "hostType": "tunnel",
+  "hostType": "lan",
   "lanType": "ip",
   "dev": true,
   "strict": false,

App.js

@@ -1,5 +1,5 @@
 import React from "react";
-import Expo from "expo";
+import * as Expo from "expo";
 import { Provider } from "react-redux";
 import { PersistGate } from "redux-persist/es/integration/react";
 import { StyleProvider } from "native-base";
@@ -41,7 +41,8 @@ export default class App extends React.Component {
   }
 
   render() {
-    if (!this.state.isReady) {
+    const { isReady } = this.state;
+    if (!isReady) {
       return <Expo.AppLoading />;
     }
 

app.json

@@ -1,6 +1,6 @@
 {
   "expo": {
-    "sdkVersion": "25.0.0",
+    "sdkVersion": "31.0.0",
     "name": "React Native Expo Starter",
     "slug": "React-Native-Expo-Starter",
     "icon": "src/assets/images/app-icon.png",

package-lock.json

@@ -3,41 +3,41 @@
   "homepage": "https://miguelmeza.me",
   "version": "1.0.0",
   "devDependencies": {
-    "eslint": "^4.18.2",
-    "eslint-config-airbnb": "^16.1.0",
-    "eslint-config-prettier": "^2.9.0",
+    "eslint": "^5.10.0",
+    "eslint-config-airbnb": "^17.1.0",
+    "eslint-config-prettier": "^3.3.0",
     "eslint-import-resolver-babel-module": "^4.0.0",
-    "eslint-plugin-flowtype": "^2.46.1",
-    "eslint-plugin-import": "^2.9.0",
-    "eslint-plugin-jsx-a11y": "^6.0.3",
-    "eslint-plugin-react": "^7.7.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "prettier": "^1.11.1",
-    "prettier-eslint": "^8.8.1",
-    "react-native-scripts": "^1.12.0",
-    "redux-logger": "^3.0.6"
+    "eslint-plugin-flowtype": "^3.2.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-jsx-a11y": "^6.1.2",
+    "eslint-plugin-react": "^7.11.1",
+    "eslint-plugin-standard": "^4.0.0",
+    "prettier": "^1.15.3",
+    "prettier-eslint": "^8.8.2",
+    "redux-logger": "^3.0.6",
+    "schedule": "^0.4.0"
   },
-  "main": "./node_modules/react-native-scripts/build/bin/crna-entry.js",
+  "main": "node_modules/expo/AppEntry.js",
   "scripts": {
-    "start": "react-native-scripts start",
-    "eject": "react-native-scripts eject",
-    "android": "react-native-scripts android",
-    "ios": "react-native-scripts ios"
+    "start": "expo start",
+    "eject": "expo eject",
+    "android": "expo android",
+    "ios": "expo ios"
   },
   "dependencies": {
-    "@expo/vector-icons": "^6.3.1",
+    "@expo/vector-icons": "^8.0.0",
     "axios": "^0.18.0",
     "babel": "^6.23.0",
-    "babel-eslint": "^8.2.2",
-    "babel-plugin-module-resolver": "^3.1.0",
-    "expo": "^25.0.0",
-    "native-base": "^2.3.9",
-    "prop-types": "^15.6.1",
-    "react": "^16.2.0",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-25.0.0.tar.gz",
-    "react-redux": "^5.0.7",
-    "redux": "^3.7.2",
-    "redux-persist": "^5.9.1",
-    "redux-thunk": "^2.2.0"
+    "babel-eslint": "^10.0.1",
+    "babel-plugin-module-resolver": "^3.1.1",
+    "expo": "^31.0.6",
+    "native-base": "^2.8.1",
+    "prop-types": "^15.6.2",
+    "react": "^16.6.3",
+    "react-native": "https://github.com/expo/react-native/archive/sdk-31.0.0.tar.gz",
+    "react-redux": "^6.0.0",
+    "redux": "^4.0.1",
+    "redux-persist": "^5.10.0",
+    "redux-thunk": "^2.3.0"
   }
 }

package.json

@@ -38,19 +38,21 @@ class Dashboard extends Component {
   };
 
   render = () => {
-    const { isAuthenticated, isLoading } = this.props;
+    const { isAuthenticated, isLoading, Logout: DashboardLogout } = this.props;
 
     if (!isAuthenticated) {
       return <LoginScreen />;
-    } else if (isLoading) {
+    }
+
+    if (isLoading) {
       return <Loading />;
     }
 
     return (
       <Container>
         <Header style={{ borderBottomWidth: 0 }}>
           <Left>
-            <Button transparent onPress={this.props.Logout}>
+            <Button transparent onPress={DashboardLogout}>
               <Icon name="exit" />
             </Button>
           </Left>
@@ -81,4 +83,7 @@ const mapDispatchToProps = {
   Logout
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(Dashboard);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(Dashboard);

src/components/dashboard/Dashboard.js

@@ -42,13 +42,17 @@ class LoginScreen extends Component {
   };
 
   handleSubmit = () => {
-    this.props
-      .FakeLogin(this.props.email, this.props.password)
-      .catch(e => console.log(`Error: ${e}`));
+    const { email, password, FakeLogin: LoginFakeLogin } = this.props;
+    LoginFakeLogin(email, password).catch(e => console.log(`Error: ${e}`));
   };
 
   render = () => {
-    const { isLoading, errorMessage } = this.props;
+    const {
+      isLoading,
+      errorMessage,
+      email,
+      ChangeInputLogin: LoginChangeInputLogin
+    } = this.props;
 
     if (isLoading) return <Loading />;
 
@@ -70,16 +74,16 @@ class LoginScreen extends Component {
                 <Input
                   style={{ fontFamily: "Questrial" }}
                   autoCapitalize="none"
-                  value={this.props.email}
+                  value={email}
                   keyboardType="email-address"
-                  onChangeText={v => this.props.ChangeInputLogin("email", v)}
+                  onChangeText={v => LoginChangeInputLogin("email", v)}
                 />
               </Item>
               <Item floatingLabel style={{ marginRight: 15 }}>
                 <Label style={Styles.defaultFont}>Password</Label>
                 <Input
                   secureTextEntry
-                  onChangeText={v => this.props.ChangeInputLogin("password", v)}
+                  onChangeText={v => LoginChangeInputLogin("password", v)}
                 />
               </Item>
 
@@ -114,4 +118,7 @@ const mapDispatchToProps = {
   ChangeInputLogin
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(LoginScreen);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(LoginScreen);