From 48e28842effbafe4046a403e7dbaffe69ae05d64 Mon Sep 17 00:00:00 2001 From: Hongchao Yu Date: Thu, 25 Aug 2016 22:47:30 -0700 Subject: [PATCH 1/4] Fixed the back problem --- index.ios.js | 1 - 1 file changed, 1 deletion(-) diff --git a/index.ios.js b/index.ios.js index a3caad3..57b67cd 100644 --- a/index.ios.js +++ b/index.ios.js @@ -529,7 +529,6 @@ class bof extends Component { if (route.index === 5) { //go back to the scan page navigator.pop(); - navigator.pop(); } else if (route.index > 0) { navigator.pop(); } From b1ca603032b9877d63e7fca44ff49250a493586f Mon Sep 17 00:00:00 2001 From: Hongchao Yu Date: Fri, 26 Aug 2016 10:49:13 -0700 Subject: [PATCH 2/4] Fixed Summary text conflicts --- ios/bof.xcodeproj/project.pbxproj | 18 ++++++++--------- public/components/Summary.js | 33 ++++++++++++++++--------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/ios/bof.xcodeproj/project.pbxproj b/ios/bof.xcodeproj/project.pbxproj index 587c227..ec6145d 100644 --- a/ios/bof.xcodeproj/project.pbxproj +++ b/ios/bof.xcodeproj/project.pbxproj @@ -22,11 +22,11 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; settings = {COMPILER_FLAGS = "-w"; }; }; 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; + 35A236701D70159100A87F5F /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 35A2366F1D70159100A87F5F /* main.jsbundle */; }; 35C4A97B1D5AE31400B190C1 /* libRCTFBLogin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C4A9711D5AE2E100B190C1 /* libRCTFBLogin.a */; }; 35C4A97F1D5AE35200B190C1 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C4A97C1D5AE35200B190C1 /* FBSDKCoreKit.framework */; }; 35C4A9801D5AE35200B190C1 /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C4A97D1D5AE35200B190C1 /* FBSDKLoginKit.framework */; }; 35C4A9811D5AE35200B190C1 /* FBSDKShareKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C4A97E1D5AE35200B190C1 /* FBSDKShareKit.framework */; }; - 35C556C71D6F9F5000176E6F /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 35C556C61D6F9F5000176E6F /* main.jsbundle */; }; 35E9FC491D6D47A8004C4E2E /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 35E9FC411D6D47A8004C4E2E /* Entypo.ttf */; }; 35E9FC4A1D6D47A8004C4E2E /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 35E9FC421D6D47A8004C4E2E /* EvilIcons.ttf */; }; 35E9FC4B1D6D47A8004C4E2E /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 35E9FC431D6D47A8004C4E2E /* FontAwesome.ttf */; }; @@ -154,11 +154,11 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = bof/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = bof/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; + 35A2366F1D70159100A87F5F /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = bof/main.jsbundle; sourceTree = ""; }; 35C4A96B1D5AE2E000B190C1 /* RCTFBLogin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTFBLogin.xcodeproj; path = "../node_modules/react-native-facebook-login/RCTFBLogin.xcodeproj"; sourceTree = ""; }; 35C4A97C1D5AE35200B190C1 /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKCoreKit.framework; path = "../node_modules/react-native-facebook-login/FacebookSDK/FBSDKCoreKit.framework"; sourceTree = ""; }; 35C4A97D1D5AE35200B190C1 /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKLoginKit.framework; path = "../node_modules/react-native-facebook-login/FacebookSDK/FBSDKLoginKit.framework"; sourceTree = ""; }; 35C4A97E1D5AE35200B190C1 /* FBSDKShareKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKShareKit.framework; path = "../node_modules/react-native-facebook-login/FacebookSDK/FBSDKShareKit.framework"; sourceTree = ""; }; - 35C556C61D6F9F5000176E6F /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = bof/main.jsbundle; sourceTree = ""; }; 35E9FC411D6D47A8004C4E2E /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Entypo.ttf; sourceTree = ""; }; 35E9FC421D6D47A8004C4E2E /* EvilIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = EvilIcons.ttf; sourceTree = ""; }; 35E9FC431D6D47A8004C4E2E /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = ""; }; @@ -373,7 +373,7 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 35C556C61D6F9F5000176E6F /* main.jsbundle */, + 35A2366F1D70159100A87F5F /* main.jsbundle */, 35E9FC401D6D47A8004C4E2E /* Fonts */, 35C4A97C1D5AE35200B190C1 /* FBSDKCoreKit.framework */, 35C4A97D1D5AE35200B190C1 /* FBSDKLoginKit.framework */, @@ -450,7 +450,7 @@ TestTargetID = 13B07F861A680F5B00A75B9A; }; 13B07F861A680F5B00A75B9A = { - DevelopmentTeam = VBLZZ294T3; + DevelopmentTeam = P6A5K67373; }; }; }; @@ -625,13 +625,13 @@ 35E9FC4F1D6D47A8004C4E2E /* Octicons.ttf in Resources */, 8DA1904E1D63DE430090D7EE /* main.jsbundle in Resources */, 35E9FC4C1D6D47A8004C4E2E /* Foundation.ttf in Resources */, + 35A236701D70159100A87F5F /* main.jsbundle in Resources */, 35E9FC4D1D6D47A8004C4E2E /* Ionicons.ttf in Resources */, 35E9FC491D6D47A8004C4E2E /* Entypo.ttf in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 35E9FC501D6D47A8004C4E2E /* Zocial.ttf in Resources */, 35E9FC4E1D6D47A8004C4E2E /* MaterialIcons.ttf in Resources */, 35E9FC4A1D6D47A8004C4E2E /* EvilIcons.ttf in Resources */, - 35C556C71D6F9F5000176E6F /* main.jsbundle in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, 35E9FC4B1D6D47A8004C4E2E /* FontAwesome.ttf in Resources */, ); @@ -763,10 +763,10 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test3.bof; + PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test4.bof; PRODUCT_NAME = bof; PROVISIONING_PROFILE = ""; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; @@ -791,10 +791,10 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test3.bof; + PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test4.bof; PRODUCT_NAME = bof; PROVISIONING_PROFILE = ""; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; diff --git a/public/components/Summary.js b/public/components/Summary.js index 8bf56c2..62ce7d5 100644 --- a/public/components/Summary.js +++ b/public/components/Summary.js @@ -175,29 +175,29 @@ export default class Summary extends Component { } return ( - + - - - - - - - - - - Grade: - {this.props.grade} + + + + + + Grade: + {this.props.grade} + + + + - - Allergies - {productAllergies} - Dietary Concerns + Allergies + {productAllergies} + Dietary Concerns + {dietIcon} @@ -229,6 +229,7 @@ export default class Summary extends Component { + Date: Fri, 26 Aug 2016 12:04:07 -0700 Subject: [PATCH 3/4] Finalized Summary page --- ios/bof.xcodeproj/project.pbxproj | 8 ++++---- ios/bof/Info.plist | 4 ++-- public/components/CommentForm.js | 1 + public/components/Summary.js | 28 ++++++---------------------- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/ios/bof.xcodeproj/project.pbxproj b/ios/bof.xcodeproj/project.pbxproj index ec6145d..0e25a91 100644 --- a/ios/bof.xcodeproj/project.pbxproj +++ b/ios/bof.xcodeproj/project.pbxproj @@ -22,7 +22,7 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; settings = {COMPILER_FLAGS = "-w"; }; }; 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; - 35A236701D70159100A87F5F /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 35A2366F1D70159100A87F5F /* main.jsbundle */; }; + 3578D3291D70BFEE00773402 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 3578D3281D70BFEE00773402 /* main.jsbundle */; }; 35C4A97B1D5AE31400B190C1 /* libRCTFBLogin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C4A9711D5AE2E100B190C1 /* libRCTFBLogin.a */; }; 35C4A97F1D5AE35200B190C1 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C4A97C1D5AE35200B190C1 /* FBSDKCoreKit.framework */; }; 35C4A9801D5AE35200B190C1 /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C4A97D1D5AE35200B190C1 /* FBSDKLoginKit.framework */; }; @@ -154,7 +154,7 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = bof/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = bof/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; - 35A2366F1D70159100A87F5F /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = bof/main.jsbundle; sourceTree = ""; }; + 3578D3281D70BFEE00773402 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = bof/main.jsbundle; sourceTree = ""; }; 35C4A96B1D5AE2E000B190C1 /* RCTFBLogin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTFBLogin.xcodeproj; path = "../node_modules/react-native-facebook-login/RCTFBLogin.xcodeproj"; sourceTree = ""; }; 35C4A97C1D5AE35200B190C1 /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKCoreKit.framework; path = "../node_modules/react-native-facebook-login/FacebookSDK/FBSDKCoreKit.framework"; sourceTree = ""; }; 35C4A97D1D5AE35200B190C1 /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKLoginKit.framework; path = "../node_modules/react-native-facebook-login/FacebookSDK/FBSDKLoginKit.framework"; sourceTree = ""; }; @@ -373,7 +373,7 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 35A2366F1D70159100A87F5F /* main.jsbundle */, + 3578D3281D70BFEE00773402 /* main.jsbundle */, 35E9FC401D6D47A8004C4E2E /* Fonts */, 35C4A97C1D5AE35200B190C1 /* FBSDKCoreKit.framework */, 35C4A97D1D5AE35200B190C1 /* FBSDKLoginKit.framework */, @@ -625,7 +625,7 @@ 35E9FC4F1D6D47A8004C4E2E /* Octicons.ttf in Resources */, 8DA1904E1D63DE430090D7EE /* main.jsbundle in Resources */, 35E9FC4C1D6D47A8004C4E2E /* Foundation.ttf in Resources */, - 35A236701D70159100A87F5F /* main.jsbundle in Resources */, + 3578D3291D70BFEE00773402 /* main.jsbundle in Resources */, 35E9FC4D1D6D47A8004C4E2E /* Ionicons.ttf in Resources */, 35E9FC491D6D47A8004C4E2E /* Entypo.ttf in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, diff --git a/ios/bof/Info.plist b/ios/bof/Info.plist index ce28b08..d7598b1 100644 --- a/ios/bof/Info.plist +++ b/ios/bof/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 2.0 CFBundleSignature ???? CFBundleURLTypes @@ -28,7 +28,7 @@ CFBundleVersion - 4 + 5 FacebookAppID 284103155283115 FacebookDisplayName diff --git a/public/components/CommentForm.js b/public/components/CommentForm.js index 67c1c3e..00228ed 100644 --- a/public/components/CommentForm.js +++ b/public/components/CommentForm.js @@ -47,6 +47,7 @@ export default class CommentForm extends Component { /> + {'\n'} + {`${comment.userName}: `} {this._isFollowing(comment.userId, comment.userName)} @@ -193,21 +193,21 @@ export default class Summary extends Component { - + {'\n'} Allergies {productAllergies} + {'\n'} Dietary Concerns {dietIcon} + {'\n'} - Healthy - Unhealthy - Controversial - Avoid + Ingredients To Avoid {ingredientsToAvoid} + {'\n'} - - - Back - - ); From df0213f9c65e23ad9dd4abe6df1d167e476d315c Mon Sep 17 00:00:00 2001 From: Hongchao Yu Date: Tue, 30 Aug 2016 15:47:55 -0700 Subject: [PATCH 4/4] Final Commit after presentation --- ios/bof.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/bof.xcodeproj/project.pbxproj b/ios/bof.xcodeproj/project.pbxproj index 0e25a91..bf8193d 100644 --- a/ios/bof.xcodeproj/project.pbxproj +++ b/ios/bof.xcodeproj/project.pbxproj @@ -763,7 +763,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test4.bof; + PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test5.bof; PRODUCT_NAME = bof; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = 1; @@ -791,7 +791,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test4.bof; + PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test5.bof; PRODUCT_NAME = bof; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = 1;