krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Login Incentives (#8230)

Browse Source 
* feat(incentives): login bennies WIP

* feat(content): incentive prize content WIP

* fix(content): placeholders pass tests

* WIP(content): Bard instrument placeholder

* feat(content): Incentives build

* chore(sprites): compile
and fix some strings

* WIP(incentives): quests and backgrounds

* fix(quests): correct buy/launch handling

* [WIP] Incentives rewarding (#8226)

* Added login incentive rewards

* Updated incentive rewards

* Added incentive modal and updated notification structure

* Added analytics to sleeping

* Added login incentives to user analytics

* Fixed unit tests and ensured that prizes are incremented and not replaced

* Updated style of daily login incentive modal

* Added rewards modal

* Added translations

* Added loigin incentive ui elements to profile

* Updated login incentives structure and abstracted to common.content

* Added dynamic display for login incentives on profile

* Added purple potion image

* Updated daily login modal

* Fixed progress calculation

* Added bard gear

* Updated login incentive rewards

* Fixed styles and text

* Added multiple read for notifications

* Fixed lint issues

* Fixed styles and added 50 limit

* Updated quest keys

* Added login incentives reward page

* Fixed tests

* Fixed linting and tests

* Read named notifications route. Add image for backgrounds

* Fixed style issues and added tranlsations to login incentive notification

* Hided abiltiy to purchase incentive backgrounds and added message to detail how to unlock

* Updated awarded message

* Fixed text and updated progress counter to display better

* Fixed purple potion reward text

* Fixed check in backgrouns reward text

* fix(quest): pass tests

* Added display of multiple rewards

* Updated modal styles

* Fixed neagtive 50 issue

* Remvoed total count from daily login incentives modal

* Fixed magic paw display

* fix(awards): give bunnies again

* WIP(incentives): more progress on BG shop

* fix(incentives): actually award backgrounds

* fix(incentives): more BG fixy

* fix(backgrounds): don't gem-buy checkin bgs

* Added dust bunny notification

* fix(incentives): don't redisplay bunny award

* chore(news): Bailey
and different promo sprite
This commit is contained in:
Sabe Jones
2016-11-23 19:34:09 -06:00
committed by GitHub
parent dcc06931cc
commit 25b0ff38c4
180 changed files with 34773 additions and 32923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
website/client-old/js/services/notificationServices.js
View File

@@ -3,7 +3,7 @@
Set up "+1 Exp", "Level Up", etc notifications
*/
angular.module("habitrpg").factory("Notification",
['$filter', function($filter) {
['$filter', 'Shared', '$rootScope', function($filter, Shared, $rootScope) {
/**
Show "+ 5 {gold_coin} 3 {silver_coin}"
@@ -139,6 +139,28 @@ angular.module("habitrpg").factory("Notification",
});
}
// Login incentive
// @TODO: Document reward data param
// @TODO: loadWidgets is a circular dependency but we should not inject it this way
function showLoginIncentive (user, rewardData, loadWidgets) {
var modalScope = $rootScope.$new();
modalScope.data = rewardData;
var nextRewardKey = Shared.content.loginIncentives[user.loginIncentives].nextRewardAt;
modalScope.nextReward = Shared.content.loginIncentives[nextRewardKey];
modalScope.user = user;
// modalScope.loadWidgets = Social.loadWidgets;
modalScope.loadWidgets = loadWidgets;
var modalKey = 'login-incentives';
if (rewardData.rewardKey) {
modalKey = 'login-incentives-reward-unlocked';
}
$rootScope.openModal(modalKey, {
scope: modalScope
});
}
return {
coins: coins,
crit: crit,
@@ -152,6 +174,7 @@ angular.module("habitrpg").factory("Notification",
mp: mp,
streak: streak,
text: text,
quest: quest
quest: quest,
showLoginIncentive: showLoginIncentive,
};
}]);