Skip to content

New level noti #80

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

Merged
lilythchu merged 1 commit into from
Jul 25, 2022
Merged

New level noti #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions controllers/routineController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ var User = require('../models/User');
var CalendarList = require('../models/CalendarList');
var mongoose = require('mongoose');
var findPos = require('../utils/arrayUtil');
var { sendEmail } = require('../utils/email/sendEmail');

// Fetch user's own routines
exports.getMyRoutines = async (req, res) => {
Expand Down Expand Up @@ -191,13 +192,21 @@ exports.editRoutine = async (req, res) => {
*/
var addPointsHelper = (user, levelPoints) => {
var originalPoints = user.points;
var originalLevel = user.level;
user.points = (user.points + 100) % levelPoints;
user.level = originalPoints >= user.points
? ( user.level === 20
? ( user.points = 10000 )
: ++user.level
)
: user.level;
if (user.level > originalLevel) {
sendEmail(
user.email,
"[FUNFIT] NEW LEVEL UNLOCKED",
`Congratulations! You have reached level ${user.level}`
);
}
}

// Add a day to DaysFollow after completing a routine
Expand Down
31 changes: 2 additions & 29 deletions controllers/userController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
var User = require('../models/User');
var CalendarList = require('../models/CalendarList');
// var DaysFollow = require('../models/DaysFollow');
var bcrypt = require('bcryptjs/dist/bcrypt');
var jwt = require('jsonwebtoken');
var RefreshToken = require('../models/RefreshToken');
Expand Down Expand Up @@ -169,7 +168,7 @@ exports.forgotPassword = async (req, res) => {

sendEmail(
user.email,
"Password Reset Request",
"[FUNFIT] PASSWORD RESET REQUEST",
"Hi " + user.name + ", you have requested to reset your password on Funfit. Please enter the following code to reset password: " + code + "."
);
res.status(200).send({userId: user._id});
Expand Down Expand Up @@ -236,7 +235,7 @@ exports.passwordReset = async (req, res) => {

sendEmail(
user.email,
"Password Reset Successfully",
"[FUNFIT] PASSWORD RESET SUCCESSFULLY",
"Hi " + user.name + ", you have successfully reset your password on Funfit"
);

Expand Down Expand Up @@ -293,19 +292,6 @@ exports.getLevel = async (req, res) => {
}
}

// // Fetch days completing any routines and reminders
// exports.getDaysFollow = async (req, res) => {
// try {
// const item = await DaysFollow.findOne({ userId: req.user.id }, 'daysFollow');
// if (!item) {
// return res.status(200).send("You haven't completed any routine yet")
// }
// res.status(200).send(item.daysFollow);
// } catch (err) {
// res.status(500).send(err.message);
// }
// }

// Fetch days completing any routines and reminders
exports.getCalendarList = async (req, res) => {
try {
Expand Down Expand Up @@ -341,16 +327,3 @@ exports.getCalendarList = async (req, res) => {
// res.status(500).send(err.message);
// }
// }

// // Fetch list of reminders to do routines
// exports.getReminderList = async (req, res) => {
// try {
// const item = await ReminderList.findOne({ userId: req.user.id });
// if (!item) {
// return res.status(200).send("No reminder added yet")
// }
// res.status(200).send(item.reminderList);
// } catch (err) {
// res.status(500).send(err.message);
// }
// }
2 changes: 1 addition & 1 deletion utils/chatUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ exports.chatConfig = (io) => {

sendEmail(
receiver.email,
"New message in Funfit",
"[FUNFIT] NEW MESSAGE TO YOU",
`Hi, you received a new message from ${sender.name}`
);
} catch (err) {
Expand Down