diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js index d2c4463c82..6a98a76c2f 100644 --- a/public/js/controllers/groupsCtrl.js +++ b/public/js/controllers/groupsCtrl.js @@ -25,7 +25,6 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A } else { // We need the member information up top here, but then we pass it down to the modal controller // down below. Better way of handling this? - debugger Members.selectMember(uid); $rootScope.modals.member = true; } diff --git a/views/options/market.html b/views/options/market.html deleted file mode 100644 index 2e81c26d52..0000000000 --- a/views/options/market.html +++ /dev/null @@ -1,57 +0,0 @@ - - - -
- - - -
-
-
-

Alexander Augustin

-
Welcome to the Market! I'm the merchant, Alexander. Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here!
-
-
- -

Eggs

- {#with _items.pets as :egg} - - - {#with :egg[0]}{/} - {#with :egg[1]}{/} - {#with :egg[2]}{/} - {#with :egg[3]}{/} - - - {#with :egg[4]}{/} - {#with :egg[5]}{/} - {#with :egg[6]}{/} - {#with :egg[7]}{/} - - - {#with :egg[8]}{/} - -
- {/} -

Hatching Potions

- {#with _items.hatchingPotions as :hatchingPotion} - - - {#with :hatchingPotion[0]}{/} - {#with :hatchingPotion[1]}{/} - {#with :hatchingPotion[2]}{/} - {#with :hatchingPotion[3]}{/} - - - {#with :hatchingPotion[4]}{/} - {#with :hatchingPotion[5]}{/} - {#with :hatchingPotion[6]}{/} - {#with :hatchingPotion[7]}{/} - - - {#with :hatchingPotion[8]}{/} - {#with :hatchingPotion[9]}{/} - -
- {/} -
diff --git a/views/shared/modals/members.html b/views/shared/modals/members.html deleted file mode 100644 index f6f2d74d88..0000000000 --- a/views/shared/modals/members.html +++ /dev/null @@ -1,27 +0,0 @@ -
-
- - - -

{{username(profile.auth, profile.profile.name)}}

-
-
-
- -

{{profile.profile.blurb}}

-
    -
  • {{website}}
    • -
-

Stats

- -
-
-

Achievements

- -
-
-
- -
-
-
diff --git a/views/shared/modals/members.jade b/views/shared/modals/members.jade index de371b9d6b..5b635d689a 100644 --- a/views/shared/modals/members.jade +++ b/views/shared/modals/members.jade @@ -17,6 +17,6 @@ div(ng-controller='MemberModalCtrl') .span6 include ../header/avatar h3 Achievements - include ../profiles/achievements + include ../profiles/achievements .modal-footer button.btn.btn-default(ng-click='modals.member = false') Ok diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade index 1d84bc9c43..d0bc9f40fd 100644 --- a/views/shared/profiles/achievements.jade +++ b/views/shared/profiles/achievements.jade @@ -13,58 +13,65 @@ //
//
- .achievement.achievement-helm(ng-if='profile.backer.npc') div(ng-if='profile.backer.npc') + .achievement.achievement-helm h5 - span.label.label-success {{profile.backer.npc}} NPC + span.label.label-master {{profile.backer.npc}} NPC small Backed the Kickstarter project at the maximum level! hr - .achievement.achievement-firefox(ng-if='profile.backer.contributor') - div(ng-class='{muted: !profile.backer.contributor, hidden: user.id!=profile.id}') - h5 - span.label.label-inverse(ng-if='profile.backer.contributor') {{profile.backer.contributor}} - span.label(ng-if='!profile.backer.contributor') Contributor - small - | Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :) + div(ng-if='profile.backer.contributor || user._id == profile._id') + .achievement.achievement-firefox(ng-show='profile.backer.contributor') + div(ng-class='{muted: !profile.backer.contributor}') + h5 + span.label(ng-if='profile.backer.contributor', ng-class='nameTagClasses(profile.backer.contributor)') {{profile.backer.contributor}} + span.label(ng-if='!profile.backer.contributor') Contributor + small. + Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :) hr - .achievement.achievement-heart(ng-if='profile.backer.tier') div(ng-if='profile.backer.tier') + .achievement.achievement-heart h5 Kickstarter Backer - ${{profile.backer.tier}} Tier small Backed the Kickstarter Project hr - .achievement.achievement-thermometer(ng-show='profile.achievements.streak') - div(ng-class='{muted: !profile.achievements.streak, hidden: user.id!=profile.id}') - h5 {{profile.achievements.streak || 0 }} Streak Achievement(s) - small - | Has performed {{profile.achievements.streak || 0 }} 21-day streaks on Dailies + div(ng-if='profile.achievements.streak || user._id == profile._id') + .achievement.achievement-thermometer(ng-show='profile.achievements.streak') + div(ng-class='{muted: !profile.achievements.streak}') + h5 {{profile.achievements.streak || 0 }} Streak Achievement(s) + small Has performed {{profile.achievements.streak || 0 }} 21-day streaks on Dailies hr - .achievement.achievement-cake(ng-if='profile.achievements.originalUser') - div(ng-if='profile.achievements.originalUser') - h5 Original User - small - | Goes way back to the Habit's days of yore (bless them for soldiering through bugs!) + div(ng-if='profile.achievements.ultimateGear || user._id == profile._id') + .achievement.achievement-armor(ng-show='profile.achievements.ultimateGear') + div(ng-class='{muted: !profile.achievements.ultimateGear}') + h5 Ultimate Gear + small Has upgraded to the maximum weapon and armor set hr - .achievement.achievement-armor(ng-show='profile.achievements.ultimateGear') - div(ng-class='{muted: !profile.achievements.ultimateGear, hidden: user.id!=profile.id}') - h5 Ultimate Gear - small Has upgraded to the maximum weapon and armor set + div(ng-if='profile.achievements.beastMaster || user._id == profile._id') + .achievement.achievement-rat(ng-show='profile.achievements.beastMaster') + div(ng-class='{muted: !profile.achievements.beastMaster}') + h5 Beast Master + small Has found all 90 pets (insanely difficult, give this user props!) hr - .achievement.achievement-rat(ng-show='profile.achievements.beastMaster') - div(ng-class='{muted: !profile.achievements.beastMaster, hidden: user.id!=profile.id}') - h5 Beast Master - small Has found all 90 pets (insanely difficult, give this user props!) - hr - - .achievement.achievement-tree(ng-if='profile.achievements.helpedHabit') div(ng-if='profile.achievements.helpedHabit') + .achievement.achievement-tree h5 Helped Habit Grow - small - | Has helped HabitRPG grow by filling out - a(href='http://community.habitrpg.com/node/290', target='_blank') this survey. + small. + Helped HabitRPG grow by filling out this survey. + hr + + div(ng-if='profile.achievements.originalUser || profile.achievements.veteranUser') + .achievement.achievement-cake + div(ng-if='profile.achievements.veteran') + h5 Veteran + small + | Has weathered Habit The Grey (our pre Angular website), and has gained many battle-scars from its bugs. + div(ng-if='profile.achievements.originalUser') + h5 Original User! + small + | One of the very original early adopters, Talk about alpha tester! hr \ No newline at end of file