Skip to content
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

Humera fix x hours in x weeks streak badges #1208

Open
wants to merge 12 commits into
base: development
Choose a base branch
from
Open

Humera fix x hours in x weeks streak badges #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
43805ca
Merge pull request #1179 from OneCommunityGlobal/development
one-community Dec 17, 2024
0535d8b
Merge pull request #1190 from OneCommunityGlobal/development
one-community Dec 26, 2024
5e06739
Merge pull request #1199 from OneCommunityGlobal/development
one-community Jan 18, 2025
2147415
Merge pull request #1202 from OneCommunityGlobal/development
one-community Jan 24, 2025
fa62a33
Revert "Backend Release to Main [2.11]"
one-community Jan 24, 2025
55c5611
Merge pull request #1203 from OneCommunityGlobal/revert-1202-development
one-community Jan 24, 2025
f355217
Revert "Revert "Backend Release to Main [2.11]""
one-community Jan 24, 2025
52e6e29
Merge pull request #1205 from OneCommunityGlobal/revert-1203-revert-1…
one-community Jan 24, 2025
88e38b2
Merge pull request #1206 from OneCommunityGlobal/development
one-community Jan 25, 2025
c593c05
Fix X hours in X weeks streak badges
moyeed Jan 25, 2025
1ce804f
Fix issue with higher streak X hours in X weeks streak badges
humera314 Jan 30, 2025
a9c9d9a
Fix replace badge for higher level streaks
humera314 Feb 1, 2025
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
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions src/controllers/badgeController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const UserProfile = require('../models/userProfile');
const helper = require('../utilities/permissions');
const escapeRegex = require('../utilities/escapeRegex');
const cacheClosure = require('../utilities/nodeCache');
// const userHelper = require('../helpers/userHelper')();
const userHelper = require('../helpers/userHelper')();

const badgeController = function (Badge) {
/**
Expand All @@ -13,10 +13,10 @@ const badgeController = function (Badge) {
*/
const cache = cacheClosure();

// const awardBadgesTest = async function (req, res) {
// await userHelper.awardNewBadges();
// res.status(200).send('Badges awarded');
// };
const awardBadgesTest = async function (req, res) {
await userHelper.awardNewBadges();
res.status(200).send('Badges awarded');
};

const getAllBadges = async function (req, res) {
// console.log(req.body.requestor); // Retain logging from development branch for debugging
Expand Down Expand Up @@ -343,7 +343,7 @@ const badgeController = function (Badge) {


return {
// awardBadgesTest,
awardBadgesTest,
getAllBadges,
assignBadges,
postBadge,
Expand Down
Loading