Skip to content

Final commit after presentation #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hcynnn216 wants to merge 4 commits into
base: staging
Choose a base branch
from
Open

Final commit after presentation #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48e2884
Fixed the back problem
hcynnn216 Aug 26, 2016
b1ca603
Fixed Summary text conflicts
hcynnn216 Aug 26, 2016
731f5ea
Finalized Summary page
hcynnn216 Aug 26, 2016
df0213f
Final Commit after presentation
hcynnn216 Aug 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion index.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
18 changes: 9 additions & 9 deletions ios/bof.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
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 */; };
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 */; };
Expand Down Expand Up @@ -154,11 +154,11 @@
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = bof/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = bof/main.m; sourceTree = "<group>"; };
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
3578D3281D70BFEE00773402 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = bof/main.jsbundle; sourceTree = "<group>"; };
35C4A96B1D5AE2E000B190C1 /* RCTFBLogin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTFBLogin.xcodeproj; path = "../node_modules/react-native-facebook-login/RCTFBLogin.xcodeproj"; sourceTree = "<group>"; };
35C4A97C1D5AE35200B190C1 /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKCoreKit.framework; path = "../node_modules/react-native-facebook-login/FacebookSDK/FBSDKCoreKit.framework"; sourceTree = "<group>"; };
35C4A97D1D5AE35200B190C1 /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKLoginKit.framework; path = "../node_modules/react-native-facebook-login/FacebookSDK/FBSDKLoginKit.framework"; sourceTree = "<group>"; };
35C4A97E1D5AE35200B190C1 /* FBSDKShareKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKShareKit.framework; path = "../node_modules/react-native-facebook-login/FacebookSDK/FBSDKShareKit.framework"; sourceTree = "<group>"; };
35C556C61D6F9F5000176E6F /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = bof/main.jsbundle; sourceTree = "<group>"; };
35E9FC411D6D47A8004C4E2E /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Entypo.ttf; sourceTree = "<group>"; };
35E9FC421D6D47A8004C4E2E /* EvilIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = EvilIcons.ttf; sourceTree = "<group>"; };
35E9FC431D6D47A8004C4E2E /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = "<group>"; };
Expand Down Expand Up @@ -373,7 +373,7 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
35C556C61D6F9F5000176E6F /* main.jsbundle */,
3578D3281D70BFEE00773402 /* main.jsbundle */,
35E9FC401D6D47A8004C4E2E /* Fonts */,
35C4A97C1D5AE35200B190C1 /* FBSDKCoreKit.framework */,
35C4A97D1D5AE35200B190C1 /* FBSDKLoginKit.framework */,
Expand Down Expand Up @@ -450,7 +450,7 @@
TestTargetID = 13B07F861A680F5B00A75B9A;
};
13B07F861A680F5B00A75B9A = {
DevelopmentTeam = VBLZZ294T3;
DevelopmentTeam = P6A5K67373;
};
};
};
Expand Down Expand Up @@ -625,13 +625,13 @@
35E9FC4F1D6D47A8004C4E2E /* Octicons.ttf in Resources */,
8DA1904E1D63DE430090D7EE /* main.jsbundle in Resources */,
35E9FC4C1D6D47A8004C4E2E /* Foundation.ttf in Resources */,
3578D3291D70BFEE00773402 /* 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 */,
);
Expand Down Expand Up @@ -763,10 +763,10 @@
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test3.bof;
PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test5.bof;
PRODUCT_NAME = bof;
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
};
Expand All @@ -791,10 +791,10 @@
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test3.bof;
PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.test5.bof;
PRODUCT_NAME = bof;
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
};
Expand Down
4 changes: 2 additions & 2 deletions ios/bof/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -28,7 +28,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>4</string>
<string>5</string>
<key>FacebookAppID</key>
<string>284103155283115</string>
<key>FacebookDisplayName</key>
Expand Down
1 change: 1 addition & 0 deletions public/components/CommentForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export default class CommentForm extends Component {
/>
<View style={{width: 130}}></View>
</View>
<Text>{'\n'}</Text>
<View style={{
width: 280,
borderWidth: 0,
Expand Down
59 changes: 22 additions & 37 deletions public/components/Summary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default class Summary extends Component {
return;
}
return (
<View>
<View style={{marginLeft: 10}}>
<View style={{flexDirection:'row', flexWrap:'wrap'}}>
<Text>{`${comment.userName}: `}</Text>
{this._isFollowing(comment.userId, comment.userName)}
Expand Down Expand Up @@ -175,39 +175,39 @@ export default class Summary extends Component {
}
return (
<View>
<View style={{marginTop: 20, marginLeft: 350}}>
<View style={{marginTop: 10, marginRight: 10, flexDirection: 'row', justifyContent: 'flex-end'}}>
<TouchableHighlight onPress={this.props.goToAllergiesAndDiet}>
<Image style={{height: 50, width: 50}} source={require('image!menu')}></Image>
</TouchableHighlight>
</View>
<View>
<TouchableHighlight style={{height: 30, width: 43, marginLeft: 30, marginBottom: 20}} onPress={this.props.favoriteProduct}>
<Image source={{uri: favoriteProductIcon}} style={{height: 39, width: 43, marginBottom: 10}}></Image>
</TouchableHighlight>
</View>
<View style={{flex: 1, flexDirection: 'row'}}>
<Image source={{uri: this.props.productImage }} style={{height: 150, width: 150}}></Image>
<View style={{backgroundColor: '#00e6b8', height: 160, width: 160, borderRadius: 160 / 2, marginTop: 30, marginLeft: 80}}>
<View style={{width: 100, marginLeft: 30}}>
<Text style={{textAlign: 'center', fontSize: 30, fontFamily: 'Didot-Italic', color: 'white', marginTop: 40}}>Grade:</Text>
<Text style={{textAlign: 'center', fontSize: 30, fontFamily: 'Didot-Italic', color: 'white'}}>{this.props.grade}</Text>
<View style={{flexDirection: 'column', marginLeft: 10}}>
<View style={{flexDirection: 'row'}}>
<Image source={{uri: this.props.productImage }} style={{height: 150, width: 150}}></Image>
<View style={{backgroundColor: '#00e6b8', height: 160, width: 160, borderRadius: 160 / 2, marginLeft: 50}}>
<View style={{width: 100, marginLeft: 30}}>
<Text style={{textAlign: 'center', fontSize: 30, fontFamily: 'Didot-Italic', color: 'white', marginTop: 40}}>Grade:</Text>
<Text style={{textAlign: 'center', fontSize: 30, fontFamily: 'Didot-Italic', color: 'white'}}>{this.props.grade}</Text>
</View>
<TouchableHighlight style={{height: 30, width: 43, marginLeft: 120, marginBottom: 20}} onPress={this.props.favoriteProduct}>
<Image source={{uri: favoriteProductIcon}} style={{height: 39, width: 43}}></Image>
</TouchableHighlight>
</View>
</View>
<Text>{'\n'}</Text>
<Text style={{fontSize: 20, fontFamily: 'Didot-Italic', marginLeft: 10}}>Allergies</Text>
<Text style={{color: 'red', fontFamily: 'Didot-Italic', marginLeft: 10}}>{productAllergies}</Text>
<Text>{'\n'}</Text>
<Text style={{fontSize: 20, fontFamily: 'Didot-Italic', marginLeft: 10}}>Dietary Concerns</Text>
</View>

<Text style={{fontSize: 20, fontFamily: 'Didot-Italic', marginLeft: 8}}>Allergies</Text>
<Text style={{color: 'red', fontFamily: 'Didot-Italic', marginLeft: 8}}>{productAllergies}</Text>
<Text style={{fontSize: 20, fontFamily: 'Didot-Italic', marginLeft: 8}}>Dietary Concerns</Text>
<View style={{flex: 0.5, flexDirection: 'row'}}>
{dietIcon}
</View>
<Text>{'\n'}</Text>
<View style={{flex: 0.5, flexDirection: 'row'}}>
<Text style={{marginLeft: 10, fontFamily: 'Didot', fontSize: 18, color: 'green'}}>Healthy</Text>
<Text style={{marginLeft: 10, fontFamily: 'Didot', fontSize: 18, color: '#ffd633'}}>Unhealthy</Text>
<Text style={{marginLeft: 10, fontFamily: 'Didot', fontSize: 18, color: 'purple'}}>Controversial</Text>
<Text style={{marginLeft: 10, fontFamily: 'Didot', fontSize: 18, color: 'red'}}>Avoid</Text>
<Text style={{fontSize: 20, fontFamily: 'Didot-Italic', marginLeft: 10}}>Ingredients To Avoid</Text>
</View>
<Text style={{color: 'red', fontFamily: 'Didot', textAlign: 'center'}}>{ingredientsToAvoid}</Text>
<Text>{'\n'}</Text>
<ListView
dataSource={this.state.ingrediantsDataSource}
renderRow={this.renderRow.bind(this, allIngredients)}
Expand All @@ -229,22 +229,7 @@ export default class Summary extends Component {
<View style={{width: 130}}></View>
</View>
</View>
<View style={{flex: 0.5, flexDirection: 'column', justifyContent: 'center', alignItems: 'center',}}>
<TouchableHighlight style={{
height: 30,
width: 175,
backgroundColor: '#ffcc80',
borderColor: '#ff9900',
borderWidth: 0,
borderRadius: 8,
marginBottom: 10,
alignSelf: 'center',
justifyContent: 'center'
}}
onPress={this.props.onBack}>
<Text style={{fontSize: 20, fontWeight: 'bold', color: 'white', alignSelf: 'center'}}>Back</Text>
</TouchableHighlight>
</View>
<Text> </Text>
<CommentForm addComment={this._addComment.bind(this)} rootParent={this.props.rootParent} />
</View>
);
Expand Down