Skip to content

Made minor changes to verify and profile #250

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
meghatron3000 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Made minor changes to verify and profile #250

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
2fa1f44
made small changes
meghatron3000 Apr 28, 2019
ba4c9a9
Merge branch 'master' of https://github.com/hack4impact-uiuc/c2tc-spr…
meghatron3000 Apr 28, 2019
aab75ec
minor changes
meghatron3000 May 2, 2019
5044535
Merge branch 'master' into prof-pic
meghatron3000 May 2, 2019
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
2 changes: 1 addition & 1 deletion c2tc-mobile/components/Tag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Tag extends React.Component {
const styles = StyleSheet.create({
tag: {
minWidth: 50,
maxWidth: 100,
maxWidth: 150,
borderRadius: 5,
padding: 5,
alignItems: "center",
Expand Down
4 changes: 2 additions & 2 deletions c2tc-mobile/screens/ProfileScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default class ProfileScreen extends React.Component {
displayName: user.username,
user,
karmaScore: user.karma,
verified: user.verified,
verified: user.trusted,
anonymousToOthers: user.anon,
email: user.email,
proPic: user.pro_pic
Expand Down Expand Up @@ -91,7 +91,7 @@ export default class ProfileScreen extends React.Component {
let data = {
anon: anonymousToOthers
};
await API.updateUser(this.state.user_id, data);
await API.updateUser(this.state.token, data);
}

render() {
Expand Down
7 changes: 5 additions & 2 deletions c2tc-mobile/screens/TipOverviewScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,18 @@ class TipOverviewScreen extends React.Component {
}

async componentWillMount() {
// await AsyncStorage.removeItem("token");

await AsyncStorage.removeItem("token");
await AsyncStorage.removeItem("verifiedPin");

this.setDate();
this.setGreeting();
let tipsResponse = await API.getVerifiedTips();
this.setState({ tips: tipsResponse, hasLoaded: true });
let token = await AsyncStorage.getItem("token");
let verifiedPin = await AsyncStorage.getItem("verifiedPin");
let user;

if (token) {
user = await API.getUser(token);
this.setState({
Expand All @@ -78,7 +82,6 @@ class TipOverviewScreen extends React.Component {
if (this.state.hasLoaded) {
let tipsResponse = await API.getVerifiedTips();
this.setState({ tips: tipsResponse });
// await AsyncStorage.removeItem("verifiedPin");
let token = await AsyncStorage.getItem("token");
let verifiedPin = await AsyncStorage.getItem("verifiedPin");
let user;
Expand Down