Merge branch '26-make-new-home-screen' into 'master'

Resolve "make new home screen" See merge request bloodyhealth/drip!1
2018-05-31 10:58:50 +00:00
parent 52b04a5115 63b8049d32
commit 36ee9867be
4 changed files with 161 additions and 12 deletions
@@ -1,22 +1,37 @@
 import React, { Component } from 'react'
 import {
  View,
-  Button
+  Button,
+  Text
 } from 'react-native'
-import * as styles from './styles'
+import styles from './styles'
+import { createStackNavigator } from 'react-navigation'
+import temperatureList from './List'

-export default class home extends Component {
+class home extends Component {
  constructor(props) {
    super(props)
  }

  render() {
+    const navigate = this.props.navigation.navigate
    return (
      <View style={styles.container}>
+        <Text style={styles.welcome}>Welcome! Today is day 6 of your current cycle</Text>
+        <Button
+          onPress={() => navigate('temperatureList')}
+          title="Edit symptoms for today">
+        </Button>
        <Button
          onPress={() => {}}
-          title="Home"></Button>
+          title="Go to calendar">
+        </Button>
      </View>
    )
  }
 }
+
+export default createStackNavigator({
+  home: { screen: home },
+  temperatureList: { screen: temperatureList }
+})
@@ -2218,6 +2218,11 @@
      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
      "dev": true
    },
+    "clamp": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
+      "integrity": "sha1-ZqDmQBGBbjcZaCj9yMjBRzEshjQ="
+    },
    "class-utils": {
      "version": "0.3.6",
      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -2433,6 +2438,15 @@
        "object-assign": "^4.1.1"
      }
    },
+    "create-react-context": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.2.tgz",
+      "integrity": "sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==",
+      "requires": {
+        "fbjs": "^0.8.0",
+        "gud": "^1.0.0"
+      }
+    },
    "cross-spawn": {
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -3761,6 +3775,11 @@
      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
    },
+    "gud": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
+      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
+    },
    "has": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
@@ -3848,6 +3867,11 @@
      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
      "dev": true
    },
+    "hoist-non-react-statics": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz",
+      "integrity": "sha512-6Bl6XsDT1ntE0lHbIhr4Kp2PGcleGZ66qu5Jqk8lc0Xc/IeG6gVLmwUGs/K0Us+L8VWoKgj0uWdPMataOsm31w=="
+    },
    "home-or-tmp": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
@@ -5299,6 +5323,21 @@
      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
    },
+    "path-to-regexp": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
+      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+      "requires": {
+        "isarray": "0.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        }
+      }
+    },
    "path-type": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
@@ -5546,6 +5585,11 @@
      "integrity": "sha512-8ADZg/mBw+t2Fbr5Hm1K64v8q8Q6E+DprV5wQ5A8PSLW6XP0XJFMdUskVEW8efQ5oUgWHn8EYdHEPAMF0Co6hA==",
      "dev": true
    },
+    "react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    },
    "react-native": {
      "version": "0.55.4",
      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.55.4.tgz",
@@ -5612,6 +5656,27 @@
        "yargs": "^9.0.0"
      }
    },
+    "react-native-dismiss-keyboard": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-dismiss-keyboard/-/react-native-dismiss-keyboard-1.0.0.tgz",
+      "integrity": "sha1-MohiQrPyMX4SHzrrmwpYXiuHm0k="
+    },
+    "react-native-drawer-layout": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/react-native-drawer-layout/-/react-native-drawer-layout-1.3.2.tgz",
+      "integrity": "sha512-fjO0scqbJUfNu2wuEpvywL7DYLXuCXJ2W/zYhWz986rdLytidbys1QGVvkaszHrb4Y7OqO96mTkgpOcP8KWevw==",
+      "requires": {
+        "react-native-dismiss-keyboard": "1.0.0"
+      }
+    },
+    "react-native-drawer-layout-polyfill": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/react-native-drawer-layout-polyfill/-/react-native-drawer-layout-polyfill-1.3.2.tgz",
+      "integrity": "sha512-XzPhfLDJrYHru+e8+dFwhf0FtTeAp7JXPpFYezYV6P1nTeA1Tia/kDpFT+O2DWTrBKBEI8FGhZnThrroZmHIxg==",
+      "requires": {
+        "react-native-drawer-layout": "1.3.2"
+      }
+    },
    "react-native-local-mongodb": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/react-native-local-mongodb/-/react-native-local-mongodb-2.1.0.tgz",
@@ -5632,6 +5697,77 @@
        }
      }
    },
+    "react-native-safe-area-view": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.8.0.tgz",
+      "integrity": "sha512-uAUzpBxXPVmfupz71GYcPjUBnZFtDuThKO/Q4FWEUykSuML78lItYR6JRsE006CY6gw6mUwpk4MJjhDE4uZ+Ww==",
+      "requires": {
+        "hoist-non-react-statics": "^2.3.1"
+      }
+    },
+    "react-native-tab-view": {
+      "version": "0.0.77",
+      "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-0.0.77.tgz",
+      "integrity": "sha512-9vjD4Ly1Zlum1Y4g23ODpi/F3gYIUIsKWrsZO/Oh5cuX1eiB1DRVn11nY1z+j/hsQfhfyW6nDlmySyDvYQvYCA==",
+      "requires": {
+        "prop-types": "^15.6.0"
+      }
+    },
+    "react-navigation": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/react-navigation/-/react-navigation-2.0.4.tgz",
+      "integrity": "sha512-mGCGw7h2XgYPKeHvn+HnSRz2zl1fmNaANSxlcmMwXimMomUHWhAAt27xFI06A0IWsuOVlW4Fla7KPc0hgbYY6w==",
+      "requires": {
+        "clamp": "^1.0.1",
+        "create-react-context": "^0.2.1",
+        "hoist-non-react-statics": "^2.2.0",
+        "path-to-regexp": "^1.7.0",
+        "prop-types": "^15.5.10",
+        "react-lifecycles-compat": "^3",
+        "react-native-drawer-layout-polyfill": "^1.3.2",
+        "react-native-safe-area-view": "^0.8.0",
+        "react-navigation-deprecated-tab-navigator": "1.3.0",
+        "react-navigation-tabs": "0.3.0"
+      }
+    },
+    "react-navigation-deprecated-tab-navigator": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/react-navigation-deprecated-tab-navigator/-/react-navigation-deprecated-tab-navigator-1.3.0.tgz",
+      "integrity": "sha512-Cm+qYOPFWbvvcuv0YYX0ioYwLGgw7XAqdhAfpo3sIr3trxRW8871ePmfFOPezjQtz4v6ItjZt6LPgtBAVZoroQ==",
+      "requires": {
+        "react-native-tab-view": "^0.0.77"
+      }
+    },
+    "react-navigation-tabs": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/react-navigation-tabs/-/react-navigation-tabs-0.3.0.tgz",
+      "integrity": "sha512-7Bo4bIGc8mI3gtDf2xgheghm1epQeK8q+i9ad/FHSBgaAKV+o0TUfj/kvblSASmYqQcAerYuWgnI16H8W6Juvg==",
+      "requires": {
+        "hoist-non-react-statics": "^2.5.0",
+        "prop-types": "^15.6.0",
+        "react-lifecycles-compat": "^3.0.4",
+        "react-native-safe-area-view": "^0.7.0",
+        "react-native-tab-view": "~0.0.78"
+      },
+      "dependencies": {
+        "react-native-safe-area-view": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.7.0.tgz",
+          "integrity": "sha512-SjLdW/Th0WVMhyngH4O6yC21S+O4U4AAG3QxBr7fZ2ftgjXSpKbDHAhEpxBdFwei6HsnsC2h9oYMtPpaW9nfGg==",
+          "requires": {
+            "hoist-non-react-statics": "^2.3.1"
+          }
+        },
+        "react-native-tab-view": {
+          "version": "0.0.78",
+          "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-0.0.78.tgz",
+          "integrity": "sha512-DUEM7oqLR0HZHvySahX0YcGMXHnZveMVhIiYFEqWvtVI6mjsnwg9GwEidde2l10KTXi6tzIqPy3B4J+ktBD3CQ==",
+          "requires": {
+            "prop-types": "^15.6.0"
+          }
+        }
+      }
+    },
    "react-proxy": {
      "version": "1.1.8",
      "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.8.tgz",
@@ -16,7 +16,8 @@
  "dependencies": {
    "react": "16.3.1",
    "react-native": "0.55.4",
-    "react-native-local-mongodb": "^2.1.0"
+    "react-native-local-mongodb": "^2.1.0",
+    "react-navigation": "^2.0.4"
  },
  "devDependencies": {
    "babel-preset-react-native": "4.0.0",
@@ -1,16 +1,13 @@
 import { StyleSheet } from 'react-native'

-const ourStyle = StyleSheet.create({
+export default StyleSheet.create({
  container: {
-    flex: 1,
    justifyContent: 'center',
    alignItems: 'center'
  },
  welcome: {
    fontSize: 20,
-    textAlign: 'center',
-    margin: 10,
+    margin: 30,
+    textAlign: 'center'
  }
 })
-
-export { ourStyle }