Merge branch 'wookiem-master'

README.md

@@ -8,8 +8,9 @@ Snowflake ![snowflake](https://cloud.githubusercontent.com/assets/1282364/115993
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/bartonhammond/snowflake/blob/master/LICENSE)
 
 --------------- 
+Navigation is handled with [React Native Router Flux](https://github.com/aksonov/react-native-router-flux)
 
-Using Redux and Immutable, the state of the application is fully testable with Jest, currently at 86% coverage. 
+Using [Redux](https://github.com/reactjs/react-redux) and [Immutable](https://facebook.github.io/immutable-js/), the state of the application is testable with Jest, currently at 80% coverage. 
 
 Snowflake supports Hot Reloading of its state.  Snowflake uses CI with [Bitrise.io]( https://www.bitrise.io) and has extensive docs and 45+ min of video demonstating implementation.
 

ios/Media.xcassets/AppIcon.appiconset/Contents.json

@@ -119,4 +119,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "snowflake",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "private": true,
   "jest": {
     "scriptPreprocessor": "jestSupport/scriptPreprocess.js",
@@ -20,6 +20,7 @@
     "unmockedModulePathPatterns": [
       "react",
       "react-addons-test-utils",
+      "react-native-router-flux",
       "promise",
       "source-map",
       "key-mirror",
@@ -29,6 +30,7 @@
       "redux-thunk",
       "fbjs"
     ],
+    "collectCoverage": false,
     "verbose": true,
     "testPathDirs": [
       "src/"
@@ -47,9 +49,10 @@
     "key-mirror": "^1.0.1",
     "react-native": "^0.18.1",
     "react-native-gifted-spinner": "0.0.3",
+    "react-native-navbar": "^1.2.1",
+    "react-native-router-flux": "^2.3.1",
     "react-native-simple-store": "^0.1.0",
     "react-native-simpledialog-android": "^1.0.2",
-    "react-native-tab-navigator": "^0.2.15",
     "react-native-vector-icons": "^1.1.0",
     "react-redux": "^4.1.1",
     "redux": "^3.1.2",

src/__mocks__/react-native-router-flux.js

@@ -0,0 +1,7 @@
+module.exports = {
+  Actions: {
+    push: function() {},
+    reset: function() {},
+    pop: function() {}
+  }
+}

src/components/LoginForm.js

@@ -21,9 +21,9 @@ const {
  * States of login display
  */
 const {
-  LOGIN_STATE_REGISTER,
-  LOGIN_STATE_LOGIN,
-  LOGIN_STATE_FORGOT_PASSWORD
+  REGISTER,
+  LOGIN,
+  FORGOT_PASSWORD
 } = require('../lib/constants').default;
 
 /**
@@ -41,6 +41,7 @@ var LoginForm = React.createClass({
    * * onChange: function to call when user enters text
    */
   propTypes: {
+    formType: PropTypes.string,
     form: PropTypes.object,
     value: PropTypes.object,
     onChange: PropTypes.func
@@ -54,6 +55,8 @@ var LoginForm = React.createClass({
    */
   render() {
 
+    let formType = this.props.formType;
+
     let options = {
       auto: 'placeholders',
       fields: {
@@ -98,12 +101,12 @@ var LoginForm = React.createClass({
     };
 
     let loginForm;
-    switch(this.props.form.state) {
+    switch(formType) {
       /**
        * ### Registration
        * The registration form has 4 fields
        */
-    case(LOGIN_STATE_REGISTER):
+    case(REGISTER):
       loginForm = t.struct({
         username: t.String,
         email: t.String,
@@ -120,20 +123,20 @@ var LoginForm = React.createClass({
        * ### Login
        * The login form has only 2 fields
        */
-    case(LOGIN_STATE_LOGIN):
+    case(LOGIN):
       loginForm = t.struct({
         username: t.String,
         password: t.String
       });
       options.fields['username'] = username;
       options.fields['password'] = password;
-        break;
-        
-        /**
-         * ### Reset password
-         * The password reset form has only 1 field
-         */
-    case(LOGIN_STATE_FORGOT_PASSWORD):
+      break;
+
+      /**
+       * ### Reset password
+       * The password reset form has only 1 field
+       */
+    case(FORGOT_PASSWORD):
       loginForm = t.struct({
         email: t.String
       });
@@ -146,12 +149,12 @@ var LoginForm = React.createClass({
      * returns the Form component with the correct structures
      */
     return (
-      <Form ref="form"
-            type={loginForm}
-            options={options}
-            value={this.props.value}
-            onChange={this.props.onChange}
-      />
+        <Form ref="form"
+      type={loginForm}
+      options={options}
+      value={this.props.value}
+      onChange={this.props.onChange}
+        />
 
     );
   }