diff --git a/android/app/src/main/assets/fonts/Feather.ttf b/android/app/src/main/assets/fonts/Feather.ttf index 244854c..fc963df 100644 Binary files a/android/app/src/main/assets/fonts/Feather.ttf and b/android/app/src/main/assets/fonts/Feather.ttf differ diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf index 307ad88..67bd842 100644 Binary files a/android/app/src/main/assets/fonts/Ionicons.ttf and b/android/app/src/main/assets/fonts/Ionicons.ttf differ diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf index 82524a0..f29f606 100644 Binary files a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf and b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Roboto.ttf b/android/app/src/main/assets/fonts/Roboto.ttf new file mode 100644 index 0000000..3e6e2e7 Binary files /dev/null and b/android/app/src/main/assets/fonts/Roboto.ttf differ diff --git a/android/app/src/main/assets/fonts/Roboto_medium.ttf b/android/app/src/main/assets/fonts/Roboto_medium.ttf new file mode 100644 index 0000000..aa00de0 Binary files /dev/null and b/android/app/src/main/assets/fonts/Roboto_medium.ttf differ diff --git a/android/app/src/main/assets/fonts/rubicon-icon-font.ttf b/android/app/src/main/assets/fonts/rubicon-icon-font.ttf new file mode 100644 index 0000000..25e7d92 Binary files /dev/null and b/android/app/src/main/assets/fonts/rubicon-icon-font.ttf differ diff --git a/app/screens/main.js b/app/screens/main.js index 254deea..949fa9c 100644 --- a/app/screens/main.js +++ b/app/screens/main.js @@ -13,8 +13,9 @@ import { } from 'react-native-router-flux'; import { Fonts } from '../utils/Fonts.js'; +import { Drawer } from 'native-base'; + // imported components for different sections in main component -imoprt Dash from './main/dashboard.js'; import Navbar from './main/navbar.js'; import Chat from './main/chat.js'; import AdSpace from './main/adspace.js'; @@ -34,11 +35,16 @@ export default class Main extends Component { render() { console.log('in Main'); + + closeDrawer = () => { + this.drawer._root.close() + }; + openDrawer = () => { + this.drawer._root.open() + }; + return ( - - - @@ -60,11 +66,6 @@ const styles = { justifyContent: 'space-between', position: 'relative' }, - dashboard: { - height: windowHeight, - width: windowWidth - 60, - backgroundColor: '#595a5b' - }, navbar: { flex: 2 }, diff --git a/app/screens/main/chat.js b/app/screens/main/chat.js index c5abe01..f06aad6 100644 --- a/app/screens/main/chat.js +++ b/app/screens/main/chat.js @@ -16,9 +16,11 @@ import { } from 'react-native-router-flux'; import Icon from 'react-native-vector-icons/MaterialIcons'; import { Fonts } from '../../utils/Fonts.js'; +require('react-native'); // Socket.io imports import './UserAgent'; +window.navigator.userAgent = "react-native"; import io from 'socket.io-client/dist/socket.io'; const windowWidth = Dimensions.get('window').width; @@ -32,34 +34,19 @@ export default class Chat extends Component { this.state = { messageToSend : '', messagesDOM: [], - prevMessageUser: -1 + prevMessageUser: -1, + messages: [(adf), (second)] }; /** * todo fix AsyncStorage */ - this.getValues(); // from AsyncStorage this.position = this.props.position; } - getValues = async () => { - try { - await AsyncStorage.multiGet(['long', 'lat'], (err, stores) => { - stores.map((result, i, store) => { - let key = store[i][0]; - let value = store[i][1]; - key == 'long' ? this.long = parseFloat(value) : this.lat = parseFloat(value); - }); - }); - console.log(this.long + ' ' + this.lat); - } catch (error) { - console.log(error); - // tell UI that cannot find location - } - } - - componentDidMount() { + componentWillMount() { this.socket = io('10.0.2.2:3000', {jsonp: false}); this.socket.on('connect', () => { + console.log('again'); this.socket.emit('initial', this.position); }); @@ -76,9 +63,11 @@ export default class Chat extends Component { } addMessage = (msg) => { - console.log('New message received: ' + msg); + console.log('New message received: '); + console.log(msg); var oldDOM = this.state.messagesDOM; var newMessage = this.createMessage(msg); + oldDOM.push(newMessage); if (this.state.prevMessageUser != msg.userId) { var dotSeparator = ( @@ -88,7 +77,7 @@ export default class Chat extends Component { oldDOM.push(dotSeparator); } this.setState({ - messagesDOM: oldDOM.concat(newMessage), + messagesDOM: oldDOM, prevMessageUser: msg.userId }); } @@ -127,6 +116,7 @@ export default class Chat extends Component { {isUser && !avatarAlready ? avatar : null} ); + console.log(result); return result; } @@ -141,19 +131,21 @@ export default class Chat extends Component { } render() { + console.log('rrendering'); + console.log(this.state.messagesDOM); return ( {this.state.messagesDOM.length == 0 ? - + ( No one's talkin around you! Start it up! - + ) : - + ( {this.state.messagesDOM} - + ) } diff --git a/ios/Nexto.xcodeproj/project.pbxproj b/ios/Nexto.xcodeproj/project.pbxproj index 487598a..f8e6788 100644 --- a/ios/Nexto.xcodeproj/project.pbxproj +++ b/ios/Nexto.xcodeproj/project.pbxproj @@ -52,6 +52,20 @@ E6CE4C9E77E94D47BAC97E48 /* Sunflower-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 888EBBB9C2644F7BA1DA20F0 /* Sunflower-Bold.ttf */; }; 2C56BD85C0514ADEB5492343 /* Sunflower-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0A832156A25C44219D3322EB /* Sunflower-Light.ttf */; }; 431EB10EAF874768AF164A41 /* Sunflower-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C74E215F6DC640C1BA5635D1 /* Sunflower-Medium.ttf */; }; + B488158DE4E74FE1B9652C88 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D242CF238F5549908EB79C0F /* Entypo.ttf */; }; + 7A2D9786A353461DACCBF607 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 517FB83D13774CBF9374E710 /* EvilIcons.ttf */; }; + C2DECE3C0AB54A7DA562080C /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D95BBCAF528A43AC86AB69D8 /* Feather.ttf */; }; + 32E73348DBA444D9A7F268A9 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E6F5D0F289504C1C8FA28245 /* FontAwesome.ttf */; }; + 8FD438D5C6C1422EA1C3C12C /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F82C1132DC954054A2F86592 /* Foundation.ttf */; }; + 5E2370528CCB4CF792A5DA48 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 87007AB444714085B0E52ABA /* Ionicons.ttf */; }; + 90CFE48D8E544DC8BF142DDB /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 817E1A88533242BC9A5054EE /* MaterialCommunityIcons.ttf */; }; + 94F5C6815CB2408E84C54BDB /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0DFB03D70C484819914796C2 /* MaterialIcons.ttf */; }; + C8EF34C1CB7E4D39A4275E33 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2B00460EFCB54B17A54E5A5B /* Octicons.ttf */; }; + BE1FBD11CC844E7494443EA1 /* Roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9ECDBFFDA6DB4D4BB56CCEAB /* Roboto_medium.ttf */; }; + 288D79D03F7B43248CC94203 /* Roboto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7FF3604E83254367AF2B3B18 /* Roboto.ttf */; }; + 69C69E842D4A4D8EB4C8A5AD /* rubicon-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7E1EBAD1AC22428684C84DEA /* rubicon-icon-font.ttf */; }; + 6EDAAD5131A04FBAB06F8902 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CCDBEDCF9F4A43E59ACAF449 /* SimpleLineIcons.ttf */; }; + 3B945B6420244E8680DCFB2D /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C0DDA61EAA5048AF81063C3B /* Zocial.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -373,6 +387,20 @@ 888EBBB9C2644F7BA1DA20F0 /* Sunflower-Bold.ttf */ = {isa = PBXFileReference; name = "Sunflower-Bold.ttf"; path = "../app/assets/fonts/Sunflower-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; 0A832156A25C44219D3322EB /* Sunflower-Light.ttf */ = {isa = PBXFileReference; name = "Sunflower-Light.ttf"; path = "../app/assets/fonts/Sunflower-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; C74E215F6DC640C1BA5635D1 /* Sunflower-Medium.ttf */ = {isa = PBXFileReference; name = "Sunflower-Medium.ttf"; path = "../app/assets/fonts/Sunflower-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + D242CF238F5549908EB79C0F /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/native-base/Fonts/Entypo.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 517FB83D13774CBF9374E710 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/native-base/Fonts/EvilIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + D95BBCAF528A43AC86AB69D8 /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/native-base/Fonts/Feather.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + E6F5D0F289504C1C8FA28245 /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/native-base/Fonts/FontAwesome.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + F82C1132DC954054A2F86592 /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/native-base/Fonts/Foundation.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 87007AB444714085B0E52ABA /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/native-base/Fonts/Ionicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 817E1A88533242BC9A5054EE /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/native-base/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 0DFB03D70C484819914796C2 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/native-base/Fonts/MaterialIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 2B00460EFCB54B17A54E5A5B /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/native-base/Fonts/Octicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 9ECDBFFDA6DB4D4BB56CCEAB /* Roboto_medium.ttf */ = {isa = PBXFileReference; name = "Roboto_medium.ttf"; path = "../node_modules/native-base/Fonts/Roboto_medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 7FF3604E83254367AF2B3B18 /* Roboto.ttf */ = {isa = PBXFileReference; name = "Roboto.ttf"; path = "../node_modules/native-base/Fonts/Roboto.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 7E1EBAD1AC22428684C84DEA /* rubicon-icon-font.ttf */ = {isa = PBXFileReference; name = "rubicon-icon-font.ttf"; path = "../node_modules/native-base/Fonts/rubicon-icon-font.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + CCDBEDCF9F4A43E59ACAF449 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/native-base/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C0DDA61EAA5048AF81063C3B /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/native-base/Fonts/Zocial.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -654,6 +682,20 @@ 888EBBB9C2644F7BA1DA20F0 /* Sunflower-Bold.ttf */, 0A832156A25C44219D3322EB /* Sunflower-Light.ttf */, C74E215F6DC640C1BA5635D1 /* Sunflower-Medium.ttf */, + D242CF238F5549908EB79C0F /* Entypo.ttf */, + 517FB83D13774CBF9374E710 /* EvilIcons.ttf */, + D95BBCAF528A43AC86AB69D8 /* Feather.ttf */, + E6F5D0F289504C1C8FA28245 /* FontAwesome.ttf */, + F82C1132DC954054A2F86592 /* Foundation.ttf */, + 87007AB444714085B0E52ABA /* Ionicons.ttf */, + 817E1A88533242BC9A5054EE /* MaterialCommunityIcons.ttf */, + 0DFB03D70C484819914796C2 /* MaterialIcons.ttf */, + 2B00460EFCB54B17A54E5A5B /* Octicons.ttf */, + 9ECDBFFDA6DB4D4BB56CCEAB /* Roboto_medium.ttf */, + 7FF3604E83254367AF2B3B18 /* Roboto.ttf */, + 7E1EBAD1AC22428684C84DEA /* rubicon-icon-font.ttf */, + CCDBEDCF9F4A43E59ACAF449 /* SimpleLineIcons.ttf */, + C0DDA61EAA5048AF81063C3B /* Zocial.ttf */, ); name = Resources; sourceTree = ""; @@ -1119,6 +1161,20 @@ E6CE4C9E77E94D47BAC97E48 /* Sunflower-Bold.ttf in Resources */, 2C56BD85C0514ADEB5492343 /* Sunflower-Light.ttf in Resources */, 431EB10EAF874768AF164A41 /* Sunflower-Medium.ttf in Resources */, + B488158DE4E74FE1B9652C88 /* Entypo.ttf in Resources */, + 7A2D9786A353461DACCBF607 /* EvilIcons.ttf in Resources */, + C2DECE3C0AB54A7DA562080C /* Feather.ttf in Resources */, + 32E73348DBA444D9A7F268A9 /* FontAwesome.ttf in Resources */, + 8FD438D5C6C1422EA1C3C12C /* Foundation.ttf in Resources */, + 5E2370528CCB4CF792A5DA48 /* Ionicons.ttf in Resources */, + 90CFE48D8E544DC8BF142DDB /* MaterialCommunityIcons.ttf in Resources */, + 94F5C6815CB2408E84C54BDB /* MaterialIcons.ttf in Resources */, + C8EF34C1CB7E4D39A4275E33 /* Octicons.ttf in Resources */, + BE1FBD11CC844E7494443EA1 /* Roboto_medium.ttf in Resources */, + 288D79D03F7B43248CC94203 /* Roboto.ttf in Resources */, + 69C69E842D4A4D8EB4C8A5AD /* rubicon-icon-font.ttf in Resources */, + 6EDAAD5131A04FBAB06F8902 /* SimpleLineIcons.ttf in Resources */, + 3B945B6420244E8680DCFB2D /* Zocial.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/Nexto/Info.plist b/ios/Nexto/Info.plist index 6bfdb34..74aa0a0 100644 --- a/ios/Nexto/Info.plist +++ b/ios/Nexto/Info.plist @@ -67,6 +67,9 @@ Sunflower-Bold.ttf Sunflower-Light.ttf Sunflower-Medium.ttf + Roboto_medium.ttf + Roboto.ttf + rubicon-icon-font.ttf diff --git a/package-lock.json b/package-lock.json index 2431381..161b9f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2086,6 +2086,11 @@ "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=" }, + "blueimp-md5": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz", + "integrity": "sha512-EkNUOi7tpV68TqjpiUz9D9NcT8um2+qtgntmMbi5UKssVX2m/2PLqotcric0RE63pB3HPN/fjf3cKHN2ufGSUQ==" + }, "body-parser": { "version": "1.18.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", @@ -2382,6 +2387,15 @@ "object-visit": "1.0.1" } }, + "color": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz", + "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=", + "requires": { + "color-convert": "1.9.1", + "color-string": "1.5.2" + } + }, "color-convert": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", @@ -2395,6 +2409,15 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, + "color-string": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz", + "integrity": "sha1-JuRYFLw8mny9Z1FkikFDRRSnc6k=", + "requires": { + "color-name": "1.1.3", + "simple-swizzle": "0.2.2" + } + }, "color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -5656,6 +5679,11 @@ "integrity": "sha512-+4R6mH5M1G4NK16CKg9N1DtCaFmuxhcIqF4lQK/Q1CIotqMs/XBemfpDPeVZBFow6iyUNu6EBT9ugdNOTT5o5Q==", "dev": true }, + "jest-react-native": { + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/jest-react-native/-/jest-react-native-18.0.0.tgz", + "integrity": "sha1-d92QnwaTJFmfInxYxhwuYhaHJro=" + }, "jest-regex-util": { "version": "22.4.3", "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-22.4.3.tgz", @@ -6869,6 +6897,60 @@ } } }, + "native-base": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/native-base/-/native-base-2.7.1.tgz", + "integrity": "sha512-mNIPsFuNoCx4i4yaz3rpHKC8GQzqJzAfTUZekDUlkrzC40oLFxAoCww2dL5JDk48z+iGmqX5jhBjA7yAFDtNXA==", + "requires": { + "blueimp-md5": "2.10.0", + "clamp": "1.0.1", + "color": "1.0.3", + "fs-extra": "2.1.2", + "jest-react-native": "18.0.0", + "lodash": "4.11.2", + "native-base-shoutem-theme": "0.2.2", + "print-message": "2.1.0", + "prop-types": "15.6.1", + "react-native-easy-grid": "0.2.0", + "react-native-keyboard-aware-scroll-view": "0.5.0", + "react-native-vector-icons": "4.6.0", + "react-tween-state": "0.1.5", + "tween-functions": "1.2.0" + }, + "dependencies": { + "fs-extra": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", + "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0" + } + }, + "lodash": { + "version": "4.11.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.11.2.tgz", + "integrity": "sha1-1rQzixEKWOIdrlzrz9u/0rxM2zs=" + } + } + }, + "native-base-shoutem-theme": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/native-base-shoutem-theme/-/native-base-shoutem-theme-0.2.2.tgz", + "integrity": "sha1-WCMxBFX+ORrfciNkacA5/UT1aiA=", + "requires": { + "hoist-non-react-statics": "1.2.0", + "lodash": "4.17.5", + "prop-types": "15.6.1" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" + } + } + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -7354,8 +7436,7 @@ "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pify": { "version": "3.0.0", @@ -7477,6 +7558,28 @@ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-4.3.1.tgz", "integrity": "sha1-UwvlxCs8BbNkFKeipDN6qArNDo0=" }, + "print-message": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/print-message/-/print-message-2.1.0.tgz", + "integrity": "sha1-tViO0IsOG/d6x7y1y3gASvr5qJE=", + "requires": { + "chalk": "1.1.1" + }, + "dependencies": { + "chalk": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", + "integrity": "sha1-UJr7ZwZudJn36zU1x3RFdyri0Bk=", + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + } + } + }, "private": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", @@ -7535,6 +7638,14 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" }, + "raf": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz", + "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==", + "requires": { + "performance-now": "2.1.0" + } + }, "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", @@ -7760,6 +7871,28 @@ "react-native-drawer-layout": "1.3.2" } }, + "react-native-easy-grid": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/react-native-easy-grid/-/react-native-easy-grid-0.2.0.tgz", + "integrity": "sha512-ZTi84+nJq2wwov55s1rHez0twk/8bs/AGnA5ERF8eYsMbOhBhOzzclj+TyY+/woB/2REAd9QQmWmIT/L999n6Q==", + "requires": { + "lodash": "4.17.5" + } + }, + "react-native-iphone-x-helper": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.0.3.tgz", + "integrity": "sha512-QHzpx4fv9u30VVU1DMgotiZsUB+m4BRjypca2rOczyj3cZBny5I+QDplrpFIBhzsa1iADNkziWa7kInzmKs00Q==" + }, + "react-native-keyboard-aware-scroll-view": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.5.0.tgz", + "integrity": "sha512-nGXsACZBCiWuwRrZy+UjiSJqb4tZ/6ePHUSY8M+09g4VfNm/ogvvWpwBa6B999NZ6DwhZTKBjVWeZxX9XG8bbQ==", + "requires": { + "prop-types": "15.6.1", + "react-native-iphone-x-helper": "1.0.3" + } + }, "react-native-router-flux": { "version": "4.0.0-beta.28", "resolved": "https://registry.npmjs.org/react-native-router-flux/-/react-native-router-flux-4.0.0-beta.28.tgz", @@ -7873,6 +8006,15 @@ "react-proxy": "1.1.8" } }, + "react-tween-state": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/react-tween-state/-/react-tween-state-0.1.5.tgz", + "integrity": "sha1-6YsGZVHvuTy5LdG+FJlcLj3q4zk=", + "requires": { + "raf": "3.4.0", + "tween-functions": "1.2.0" + } + }, "read-pkg": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", @@ -8607,6 +8749,21 @@ } } }, + "simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "requires": { + "is-arrayish": "0.3.2" + }, + "dependencies": { + "is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + } + } + }, "slash": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", @@ -9554,6 +9711,11 @@ "safe-buffer": "5.1.1" } }, + "tween-functions": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tween-functions/-/tween-functions-1.2.0.tgz", + "integrity": "sha1-GuOlDnxguz3vd06scHrLynO7w/8=" + }, "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", diff --git a/package.json b/package.json index 9b90f34..680e8ed 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "dependencies": { "express": "^4.16.3", "mysql": "^2.15.0", + "native-base": "^2.7.1", "react": "16.3.1", "react-native": "^0.55.3", "react-native-router-flux": "^4.0.0-beta.28",