Skip to content

Commit

Permalink
Remove console logs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Josephine-Chen
Josephine-Chen committed Mar 11, 2017
1 parent bf71e3f commit 7e58cd9
Show file tree
Hide file tree
Showing 11 changed files with 106 additions and 71 deletions.
42 changes: 26 additions & 16 deletions client/src/components/Dashboard2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ export default class Dashboard2 extends React.Component {
type: 'GET',
url: `api/users/${this.state.profile.user_id}`,
success: (data) => {
console.log('SUCCESS: GOT USER INFO', data.data[0]);
//console.log('SUCCESS: GOT USER INFO', data.data[0]);
that.setState({ userId: data.data[0].id });
that.setState({ username: data.data[0].username || this.state.profile.nickname });
that.setState({ dayGoalInput: data.data[0].daily_goal || '' });
},
error: (err) => {
console.log('ERROR: COULD NOT GET USERID', err);
//console.log('ERROR: COULD NOT GET USERID', err);
},
});
}
Expand All @@ -81,7 +81,7 @@ export default class Dashboard2 extends React.Component {
type: 'GET', // GET REQUEST
url: `/api/users/${this.state.profile.user_id}/setting`,
success: (data) => {
console.log('SUCCESS: OBTAINED SETTINGS: ', data.data[0]);
//console.log('SUCCESS: OBTAINED SETTINGS: ', data.data[0]);
that.setState({ setting: data.data[0] });
},
error: (err) => { console.log('ERROR: COULD NOT GET SETTINGS', err); },
Expand All @@ -94,7 +94,7 @@ export default class Dashboard2 extends React.Component {
type: 'GET', // GET REQUEST
url: `/api/users/${this.state.profile.user_id}/blacklist`,
success: (data) => {
console.log('SUCCESS: OBTAINED BLACKLIST: ', data.data);
//console.log('SUCCESS: OBTAINED BLACKLIST: ', data.data);
// Do not show blackout sites
const filtered = data.data.filter(e => e.blacklist_type !== '1');
that.setState({ blacklist: filtered });
Expand All @@ -109,10 +109,12 @@ export default class Dashboard2 extends React.Component {
type: 'GET', // GET REQUEST
url: `/api/users/${this.state.profile.user_id}/goals/`,
success: (data) => {
console.log('SUCCESS: OBTAINED ALL GOALS:', data);
//console.log('SUCCESS: OBTAINED ALL GOALS:', data);
that.setState({ goals: data.data });
},
error: (err) => { console.log('ERROR: COULD NOT GET ALL GOALS', err); },
error: (err) => {
//console.log('ERROR: COULD NOT GET ALL GOALS', err);
},
});
}

Expand All @@ -122,10 +124,12 @@ export default class Dashboard2 extends React.Component {
type: 'GET', // GET REQUEST
url: `/api/users/${this.state.profile.user_id}/extension_data`,
success: (data) => {
console.log('SUCCESS: OBTAINED EXTENSION DATA: ', data.data);
//console.log('SUCCESS: OBTAINED EXTENSION DATA: ', data.data);
that.setState({ extension: data.data });
},
error: (err) => { console.log('ERROR: COULD NOT GET EXTENSION DATA', err); },
error: (err) => {
//console.log('ERROR: COULD NOT GET EXTENSION DATA', err);
},
});
}

Expand All @@ -136,7 +140,7 @@ export default class Dashboard2 extends React.Component {
siteInfo = this.state.extension[i];
}
}
console.log('siteInfo', siteInfo);
//console.log('siteInfo', siteInfo);
return siteInfo;
}
handleChange(event, str) {
Expand Down Expand Up @@ -167,10 +171,12 @@ export default class Dashboard2 extends React.Component {
contentType: 'application/json',
data: JSON.stringify({ daily_goal: this.state.dayGoalInput }),
success: (data) => {
console.log('Update daily goal to', data);
//console.log('Update daily goal to', data);
that.alertGoalAdded('Goal of the Day');
},
error: (err) => { console.log('Error updating daily goal', err); },
error: (err) => {
//console.log('Error updating daily goal', err);
},
});
}

Expand All @@ -182,26 +188,30 @@ export default class Dashboard2 extends React.Component {
contentType: 'application/json',
data: JSON.stringify({ goal: this.state.goalInput, progress: 0, goal_picture: '', UserId: this.state.userId }),
success: (data) => {
console.log('SUCCESS: POSTED INDIVIDUAL GOAL: ', data);
//console.log('SUCCESS: POSTED INDIVIDUAL GOAL: ', data);
that.getAllGoals();
that.cleanInput();
that.alertGoalAdded('Goal');
},
error: (err) => { console.log('ERROR: COULD NOT POST INDIVIDUAL GOAL', err); },
error: (err) => {
//console.log('ERROR: COULD NOT POST INDIVIDUAL GOAL', err);
},
});
}

removeGoal(goal_id) {
const that = this;
console.log('goal_id', goal_id);
//console.log('goal_id', goal_id);
$.ajax({
type: 'DELETE',
url: `/api/goals/${goal_id}`,
success: (data) => {
console.log('Remove goal:', data);
//console.log('Remove goal:', data);
that.getAllGoals();
},
error: (err) => { console.log('ERROR: COULD NOT REMOVE THE GOAL', err); },
error: (err) => {
//console.log('ERROR: COULD NOT REMOVE THE GOAL', err);
},
});
}

Expand Down
8 changes: 6 additions & 2 deletions client/src/components/Goal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ export default class Goal extends React.Component {
that.setState({ subgoals: data.data });
that.checkStatus();
},
error: (err) => { console.log('ERROR: COULD NOT GET SUBGOALS', err); },
error: (err) => {
//console.log('ERROR: COULD NOT GET SUBGOALS', err);
},
});
}

Expand Down Expand Up @@ -128,7 +130,9 @@ export default class Goal extends React.Component {
that.cleanInput();
that.alertConfirmation();
},
error: (err) => { console.log('ERROR: COULD NOT POST INDIVIDUAL GOAL', err); },
error: (err) => {
//console.log('ERROR: COULD NOT POST INDIVIDUAL GOAL', err);
},
});
}

Expand Down
17 changes: 8 additions & 9 deletions client/src/components/ReflectionQuestion.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default class ReflectionQuestion extends React.Component {
// each url in DB, remove http://www
// return if blacklist contains the blacklist-url in DB
url = (urlObj.url).replace(/http(s*)\:\/\/([www.]*)/, '');
console.log('blacklist.url', blacklist.url, 'url', url, 'length', data.data.length);
//console.log('blacklist.url', blacklist.url, 'url', url, 'length', data.data.length);
return new RegExp(url).test(blacklist.url);
});

Expand Down Expand Up @@ -132,7 +132,7 @@ export default class ReflectionQuestion extends React.Component {
this.setState({
extensionData: exDataArr,
}, () => {
console.log('this.state.extensionData', this.state.extensionData);
//console.log('this.state.extensionData', this.state.extensionData);
});
}
}, blacklist); // end extension data Ajax
Expand All @@ -150,7 +150,7 @@ export default class ReflectionQuestion extends React.Component {
exDataArrTemp[i].color = 'text-green';
}
}
console.log('url color', exDataArrTemp[i].url, exDataArrTemp[i].color);
//console.log('url color', exDataArrTemp[i].url, exDataArrTemp[i].color);
}
this.setState({
extensionData: exDataArrTemp,
Expand All @@ -170,7 +170,7 @@ export default class ReflectionQuestion extends React.Component {
isStickToTime(exDataArr) {
return exDataArr.every((list) => {
const timeSpent = list.time_spent || 0;
console.log('time vs bt', timeSpent, list.blacklist_time);
//console.log('time vs bt', timeSpent, list.blacklist_time);
return (timeSpent <= list.blacklist_time);
});
}
Expand All @@ -180,9 +180,9 @@ export default class ReflectionQuestion extends React.Component {
let stickToTime = true;

awareOfTime = this.isAwareOfTime(this.state.extensionData);
console.log('awareOfTime', awareOfTime);
//console.log('awareOfTime', awareOfTime);
stickToTime = this.isStickToTime(this.state.extensionData);
console.log('stickToTime', stickToTime);
//console.log('stickToTime', stickToTime);


this.displayOpenQuestions(awareOfTime, stickToTime);
Expand All @@ -192,7 +192,7 @@ export default class ReflectionQuestion extends React.Component {
// save user guessed time with extensionData
handleTimeChange(event, key) {
const tempArr = this.state.extensionData;
console.log('extensionData change', tempArr, key);
//console.log('extensionData change', tempArr, key);
tempArr[key].time_guessed = event.target.value;
this.setState({
extensionData: tempArr,
Expand Down Expand Up @@ -229,7 +229,7 @@ export default class ReflectionQuestion extends React.Component {
const qaArray = this.transformQAData();
qaArray.forEach((qa) => {
postReflectionAjax(this.state.profile.user_id, qa, (data) => {
console.log('submit reflection', data);
//console.log('submit reflection', data);
window.location = '/#/selfreflection';
});
});
Expand Down Expand Up @@ -305,7 +305,6 @@ const OpenQuestions = ({ qSet, callback, submitCallback }) => (
<Row>
<h1>Reflection Questions</h1>
<Feedback feedback={qSet.feedback} />
{console.log('qset feedback', qSet, qSet.feedback)}
</Row>
{qSet.questions.map((question, ind) => (
<Row key={ind.toString()}>
Expand Down
46 changes: 31 additions & 15 deletions client/src/components/Settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,15 @@ export default class Settings extends React.Component {
type: 'GET',
url: `/api/users/${this.state.profile.user_id}`,
success: (data) => {
console.log('SUCCESS: GOT USERID', data.data[0].id);
//console.log('SUCCESS: GOT USERID', data.data[0].id);
that.setState({ userId: data.data[0].id });
that.setState({ username: data.data[0].username || this.state.profile.nickname }, () => {
that.initialiseSettings();
});
},
error: (err) => { console.log('ERROR: COULD NOT GET USERID', err); },
error: (err) => {
//console.log('ERROR: COULD NOT GET USERID', err);
},
});
}

Expand All @@ -75,7 +77,7 @@ export default class Settings extends React.Component {
type: 'GET', // GET REQUEST
url: `/api/users/${this.state.profile.user_id}/setting`,
success: (data) => {
console.log('SUCCESS: OBTAINED SETTINGS: ', data);
//console.log('SUCCESS: OBTAINED SETTINGS: ', data);
that.setState({ setting: data.data[0] }, () => {
that.initialiseSettings();
});
Expand All @@ -89,7 +91,9 @@ export default class Settings extends React.Component {
});
// that.initialiseSettings();
},
error: (err) => { console.log('ERROR: COULD NOT GET SETTINGS', err); },
error: (err) => {
//console.log('ERROR: COULD NOT GET SETTINGS', err);
},
});
}

Expand All @@ -99,10 +103,12 @@ export default class Settings extends React.Component {
type: 'GET', // GET REQUEST
url: `/api/users/${this.state.profile.user_id}/blacklist`,
success: (data) => {
console.log('SUCCESS: OBTAINED BLACKLIST: ', data.data);
//console.log('SUCCESS: OBTAINED BLACKLIST: ', data.data);
that.setState({ blacklist: data.data });
},
error: (err) => { console.log('ERROR: COULD NOT GET BLACKLIST', err); },
error: (err) => {
//console.log('ERROR: COULD NOT GET BLACKLIST', err);
},
});
}

Expand All @@ -120,10 +126,12 @@ export default class Settings extends React.Component {
type: 'DELETE',
url: `/api/blacklist/${url_id}`,
success: (data) => {
console.log('Sucessfully deleted', data);
//console.log('Sucessfully deleted', data);
that.getBlacklist();
},
error: (err) => { console.log('Error deleting', err); },
error: (err) => {
//console.log('Error deleting', err);
},
});
}

Expand All @@ -135,10 +143,12 @@ export default class Settings extends React.Component {
contentType: 'application/json',
data: JSON.stringify({ username }),
success: () => {
console.log('SUCCESS: UPDATED USERNAME');
//console.log('SUCCESS: UPDATED USERNAME');
that.alertUser('Username');
},
error: (err) => { console.log('ERROR: COULD NOT GET USERID', err); },
error: (err) => {
//console.log('ERROR: COULD NOT GET USERID', err);
},
});
}

Expand All @@ -153,7 +163,9 @@ export default class Settings extends React.Component {
that.alertUser('Notifications');
that.setState({ reminderAddress: '' });
},
error: (err) => { console.log('ERROR: COULD NOT SEND NOTIFICATIONS', err); },
error: (err) => {
//console.log('ERROR: COULD NOT SEND NOTIFICATIONS', err);
},
});
}

Expand Down Expand Up @@ -201,7 +213,7 @@ export default class Settings extends React.Component {
contentType: 'application/json',
data: JSON.stringify({ url: siteURL, blacklist_type: siteType, blacklist_time: siteTime, SettingId: that.state.setting.id }),
success: (data) => {
console.log('SUCCESS: POSTED BLACKLIST: ', data);
//console.log('SUCCESS: POSTED BLACKLIST: ', data);
that.getBlacklist();
that.alertUser('Blacklist site');
that.setState({
Expand All @@ -210,7 +222,9 @@ export default class Settings extends React.Component {
siteLimit: 0,
});
},
error: (err) => { console.log('ERROR: COULD NOT GET USERID', err); },
error: (err) => {
//console.log('ERROR: COULD NOT GET USERID', err);
},
});
}

Expand All @@ -227,10 +241,12 @@ export default class Settings extends React.Component {
reminder_freq: remind_freq || this.state.setting.reminder_freq,
reminder_address: remind_addr || this.state.setting.reminder_address }),
success: (data) => {
console.log('SUCCESS: POSTED SETTING: ', data);
//console.log('SUCCESS: POSTED SETTING: ', data);
this.getSetting();
},
error: (err) => { console.log('ERROR: COULD NOT POST SETTING', err); },
error: (err) => {
//console.log('ERROR: COULD NOT POST SETTING', err);
},
});
}

Expand Down
1 change: 0 additions & 1 deletion client/src/components/Site.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export default class Site extends React.Component {
}

openCollapsible() {
console.log('CLICK');
const open = this.state.open;
this.setState({ open: !open });
}
Expand Down
4 changes: 3 additions & 1 deletion client/src/components/Stat.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ export default class Stat extends React.Component {
}
that.setState({ data: pieData });
},
error: (err) => { console.log('ERROR: COULD NOT GET EXTENSION DATA', err); },
error: (err) => {
//console.log('ERROR: COULD NOT GET EXTENSION DATA', err);
},
});
}

Expand Down
Loading

0 comments on commit 7e58cd9

Please sign in to comment.