mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-08-02 04:00:36 +00:00
challenges: remove username(), since we're now using user.profile.name
This commit is contained in:
parent
c5671550f1
commit
219318b405
6 changed files with 8 additions and 8 deletions
|
|
@ -201,7 +201,7 @@ api.postChat = function(req, res, next) {
|
|||
contributor: user.backer && user.backer.contributor,
|
||||
npc: user.backer && user.backer.npc,
|
||||
text: req.query.message, // FIXME this should be body, but ngResource is funky
|
||||
user: helpers.username(user.auth, user.profile.name),
|
||||
user: user.profile.name,
|
||||
timestamp: +(new Date)
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
li(ng-repeat='message in group.chat', ng-class='{highlight: message.text.indexOf(username(user.auth,user.profile.name)) != -1}')
|
||||
li(ng-repeat='message in group.chat', ng-class='{highlight: indexOf(message.text, user.profile.name)}')
|
||||
a.label.chat-message(class='{{nameTagClasses(message)}}', tooltip='{{message.contributor}}', ng-click='clickMember(message.uuid, true)')
|
||||
| {{message.user}}
|
||||
span
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
|
|||
|
||||
h4 Assign Group Leader
|
||||
select#group-leader-selection
|
||||
option(ng-repeat='member in group.members', selected='member._id == _new.groupLeader') {{username(member.auth,member.profile.name)}}
|
||||
option(ng-repeat='member in group.members', selected='member._id == _new.groupLeader') {{member.profile.name}}
|
||||
button(x-bind='click:assignGroupLeader', ng-click='notPorted()') Assign
|
||||
|
||||
div(ng-show='group.websites')
|
||||
|
|
@ -68,7 +68,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
|
|||
// {{/}}
|
||||
a(data-toggle='modal', data-target='#avatar-modal-{{member._id}}')
|
||||
span(ng-class='{"badge badge-info": group.leader==member._id}', ng-click='clickMember(member._id, true)')
|
||||
| {{username(member.auth, member.profile.name)}}
|
||||
| {{member.profile.name}}
|
||||
td ({{member._id}})
|
||||
.modal-footer.whatever-options
|
||||
form.form-inline(ng-submit='invite(group, invitee)')
|
||||
|
|
@ -107,7 +107,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
|
|||
td
|
||||
.popover.static-popover.fade.right.in.wide-popover
|
||||
.arrow
|
||||
h3.popover-title {{username(Members.members[group.leader].auth, Members.members[group.leader].profile.name)}}
|
||||
h3.popover-title {{Members.members[group.leader].profile.name}}
|
||||
.popover-content
|
||||
markdown(ng-model='group.leaderMessage')
|
||||
div(ng-controller='ChatCtrl')
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
figure.herobox(ng-click='clickMember(profile._id)', data-name='{{username(profile.auth, profile.profile.name)}}', ng-class='{isUser: profile.id==user.id, hasPet: profile.items.pet}', data-level='{{profile.stats.lvl}}', data-uid='{{profile.id}}', rel='popover', data-placement='bottom', data-trigger='hover', data-html='true', data-content="<div ng-hide='profile.id == user.id'> <div class='progress progress-danger' style='height:5px;'> <div class='bar' style='height: 5px; width: {{percent(profile.stats.hp, 50)}}%;'></div> </div> <div class='progress progress-warning' style='height:5px;'> <div class='bar' style='height: 5px; width: {{percent(profile.stats.exp, tnl(profile.stats.lvl))}}%;'></div> </div> <div>Level: {{profile.stats.lvl}}</div> <div>GP: {{profile.stats.gp | number:0}}</div> <div>{{count(profile.items.pets)}} / 90 Pets Found</div> </div>")
|
||||
figure.herobox(ng-click='clickMember(profile._id)', data-name='{{profile.profile.name}}', ng-class='{isUser: profile.id==user.id, hasPet: profile.items.pet}', data-level='{{profile.stats.lvl}}', data-uid='{{profile.id}}', rel='popover', data-placement='bottom', data-trigger='hover', data-html='true', data-content="<div ng-hide='profile.id == user.id'> <div class='progress progress-danger' style='height:5px;'> <div class='bar' style='height: 5px; width: {{percent(profile.stats.hp, 50)}}%;'></div> </div> <div class='progress progress-warning' style='height:5px;'> <div class='bar' style='height: 5px; width: {{percent(profile.stats.exp, tnl(profile.stats.lvl))}}%;'></div> </div> <div>Level: {{profile.stats.lvl}}</div> <div>GP: {{profile.stats.gp | number:0}}</div> <div>{{count(profile.items.pets)}} / 90 Pets Found</div> </div>")
|
||||
.character-sprites
|
||||
span(ng-class='{zzz:profile.flags.rest}')
|
||||
span(class='{{profile.preferences.gender}}_skin_{{profile.preferences.skin}}')
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
button.task-action-btn.tile.solid(ng-hide='authenticated()', style='cursor: pointer;', ng-click="modals.login = true") Login / Register
|
||||
ul.nav.site-nav(ng-show='authenticated()')
|
||||
li.flyout(ng-controller='MenuCtrl')
|
||||
h1.task-action-btn.tile.solid.user-reporter {{username(user.auth, user.profile.name)}}
|
||||
h1.task-action-btn.tile.solid.user-reporter {{user.profile.name}}
|
||||
ul.flyout-content.nav.stacked
|
||||
li
|
||||
a.task-action-btn.tile.solid
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ div(ng-controller='MemberModalCtrl')
|
|||
#memberModal(modal='modals.member')
|
||||
.modal-header
|
||||
h3
|
||||
span {{username(profile.auth, profile.profile.name)}}
|
||||
span {{profile.profile.name}}
|
||||
span(ng-show='profile.backer.contributor') - {{profile.backer.contributor}}
|
||||
.modal-body
|
||||
.row-fluid
|
||||
|
|
|
|||
Loading…
Reference in a new issue