From 22ec4505216a0f7f070c1e95a79d87ffc20733ed Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 16 Oct 2015 23:36:57 -0400 Subject: [PATCH] feat(modals): Won Challenge Draft of the modal that appears when a user wins a challenge. Needs better logic for when to display. --- .../achievements/achievement-karaoke-2x.png | Bin 0 -> 3284 bytes common/locales/en/challenge.json | 4 ++- common/locales/en/settings.json | 2 +- .../public/js/controllers/notificationCtrl.js | 7 +++++ website/views/shared/modals/index.jade | 1 + .../views/shared/modals/won-challenge.jade | 28 ++++++++++++++++++ 6 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 common/img/sprites/spritesmith/achievements/achievement-karaoke-2x.png create mode 100644 website/views/shared/modals/won-challenge.jade diff --git a/common/img/sprites/spritesmith/achievements/achievement-karaoke-2x.png b/common/img/sprites/spritesmith/achievements/achievement-karaoke-2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a859f46562c531a9a63892f17994b10d505bd775 GIT binary patch literal 3284 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", "loginNameDescription3": "to change the name that appears in your avatar and chat messages.", "emailNotifications": "Email Notifications", - "wonChallenge": "You Won a Challenge", + "wonChallenge": "You won a Challenge!", "newPM": "Received Private Message", "giftedGems": "Gifted Gems", "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>", diff --git a/website/public/js/controllers/notificationCtrl.js b/website/public/js/controllers/notificationCtrl.js index 180dad860e..3063f70594 100644 --- a/website/public/js/controllers/notificationCtrl.js +++ b/website/public/js/controllers/notificationCtrl.js @@ -27,6 +27,13 @@ habitrpg.controller('NotificationCtrl', $rootScope.playSound('Achievement_Unlocked'); }, true); + $rootScope.$watch('user.achievements.challenges.length', function(after, before) { + if (after === before) return; + if (after > before) { + $rootScope.openModal('wonChallenge', {controller: 'UserCtrl', size: 'sm'}); + } + }); + $rootScope.$watch('user.stats.gp', function(after, before) { if (after == before) return; if (User.user.stats.lvl == 0) return; diff --git a/website/views/shared/modals/index.jade b/website/views/shared/modals/index.jade index 932cbba3ba..b3973ec68b 100644 --- a/website/views/shared/modals/index.jade +++ b/website/views/shared/modals/index.jade @@ -17,6 +17,7 @@ include ./low-health.jade include ./level-up.jade include ./hatch-pet.jade include ./raise-pet.jade +include ./won-challenge.jade //- Settings script(type='text/ng-template', id='modals/change-day-start.html') diff --git a/website/views/shared/modals/won-challenge.jade b/website/views/shared/modals/won-challenge.jade new file mode 100644 index 0000000000..81bc9febcb --- /dev/null +++ b/website/views/shared/modals/won-challenge.jade @@ -0,0 +1,28 @@ +include ../avatar/generated_avatar + +script(type='text/ng-template', id='modals/wonChallenge.html') + .modal-content(style='min-width:28em') + .modal-body.text-center + h3(style='margin-bottom: 0')=env.t('wonChallenge') + h4 {{::user.achievements.challenges[user.achievements.challenges.length - 1]}} + .container-fluid + .row(style='margin-bottom:1em', ng-controller='UserCtrl') + .col-xs-4(style='padding:0') + .container-fluid + .row + .col-xs-4(style='padding:0') + .col-xs-4(style='padding:0') + .achievement-karaoke-2x(style='margin-top: 2em') + .col-xs-4(style='padding:0') + .herobox(style='padding:0; width:0; height:7em') + .character-sprites(style='width:0') + +generatedAvatar + .col-xs-4(style='padding:0') + .container-fluid + .row + .col-xs-4(style='padding:0') + .col-xs-4(style='padding:0') + .achievement-karaoke-2x(style='margin-top: 2em') + p=env.t('congratulations') + .modal-footer(style='margin-top:0') + button.btn.btn-primary(ng-click='$close()')=env.t('hurray')