diff --git a/package.json b/package.json index 678e512..4ebb101 100644 --- a/package.json +++ b/package.json @@ -7,19 +7,22 @@ "test": "jest" }, "dependencies": { - "react": "16.0.0-alpha.6", - "react-native": "0.43.3", - "react-native-material-kit": "^0.4.1", - "react-redux": "^5.0.2", - "redux": "^3.6.0" + "prop-types": "^15.5.10", + "react": "16.0.0-alpha.12", + "react-native": "0.46.3", + "react-redux": "^5.0.5", + "redux": "^3.7.2" }, "devDependencies": { - "babel-jest": "18.0.0", - "babel-preset-react-native": "1.9.1", - "jest": "18.1.0", - "react-test-renderer": "~15.4.0-rc.4" + "babel-jest": "20.0.3", + "babel-preset-react-native": "1.9.2", + "jest": "20.0.4", + "react-test-renderer": "16.0.0-alpha.12" }, "jest": { - "preset": "react-native" + "preset": "react-native", + "transformIgnorePatterns": [ + "node_modules/(?!react-native|tcomb-form-native|apsl-react-native-button,react-native-device-info|react-clone-referenced-element)" + ] } } diff --git a/src/modules/login/Login.js b/src/modules/login/Login.js index d993147..5ec50c8 100644 --- a/src/modules/login/Login.js +++ b/src/modules/login/Login.js @@ -1,6 +1,5 @@ import React, { Component } from 'react'; -import { Image, StyleSheet, Text, View } from 'react-native'; -import { MKButton, MKColor, MKTextField } from 'react-native-material-kit'; +import {Button, Image, StyleSheet, Text, TextInput, View} from 'react-native'; import { loginStart } from "../../actions"; @@ -12,9 +11,7 @@ export default class Login extends Component { } } componentWillReceiveProps(nextProps) { - console.log("IN Login.componentWillReceiveProps"); - console.log(nextProps); - if(this.state.loggedIn != nextProps.loggedIn) { + if(this.state.loggedIn !== nextProps.loggedIn) { this.setState({ loggedIn: nextProps.loggedIn }) @@ -26,32 +23,29 @@ export default class Login extends Component { }; return ( - Chateau Neuf - The Norwegian Student Society + The Norwegian Student Society + Chateau Neuf - - - - Log in - + +