mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-01 07:21:15 +00:00
reactive model fucntion seems to bust the app, may need to send to use
model.subscribe on get '/' and redirect on friend-add
This commit is contained in:
parent
57ab186a62
commit
519dcf256e
3 changed files with 13 additions and 10 deletions
|
|
@ -34,9 +34,9 @@ setupModelFns = (model) ->
|
|||
else
|
||||
"armor#{armor}_m.png"
|
||||
|
||||
model.fn '_user._friends', '_user.friends', (friendIds) ->
|
||||
model.subscribe model.query('users').friends(friendIds), (err, friends) ->
|
||||
model.ref '_view.party', friends
|
||||
# model.fn '_user._friends', '_user.friends', (friendIds) ->
|
||||
# model.fetch model.query('users').friends(friendIds), (err, friends) ->
|
||||
# model.set '_view.friends', friends
|
||||
|
||||
# ========== ROUTES ==========
|
||||
|
||||
|
|
@ -79,6 +79,10 @@ get '/', (page, model, next) ->
|
|||
setupListReferences(model)
|
||||
setupModelFns(model)
|
||||
|
||||
if !_.isEmpty(userObj.friends)
|
||||
model.subscribe model.query('users').friends(userObj.friends), (err, friends) ->
|
||||
model.ref '_friends', friends
|
||||
|
||||
page.render()
|
||||
|
||||
# ========== CONTROLLER FUNCTIONS ==========
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ module.exports.newUserObject = ->
|
|||
items: { itemsEnabled: false, armor: 0, weapon: 0 }
|
||||
notifications: { kickstarter: 'show' }
|
||||
preferences: { gender: 'm', armorSet: 'v1' }
|
||||
friends: []
|
||||
tasks: {}
|
||||
habitIds: []
|
||||
dailyIds: []
|
||||
|
|
@ -36,6 +37,8 @@ module.exports.updateUser = (user, userObj) ->
|
|||
_.defaults prefs, { gender: 'm', armorSet: 'v1', api_token: derby.uuid() }
|
||||
user.set 'preferences', prefs unless _.isEqual(prefs, userObj.preferences)
|
||||
|
||||
user.setNull 'friends', []
|
||||
|
||||
## Task List Cleanup
|
||||
# FIXME temporary hack to fix lists (Need to figure out why these are happening)
|
||||
# FIXME consolidate these all under user.listIds so we can set them en-masse
|
||||
|
|
|
|||
|
|
@ -190,16 +190,12 @@
|
|||
</td>
|
||||
|
||||
<!-- Party -->
|
||||
<!--#if _user.flags.partyUnlocked-->
|
||||
<!--if _user.flags.partyUnlocked-->
|
||||
<td>
|
||||
<ul>
|
||||
{#each _view.friends}
|
||||
{#each _friends as :friend}
|
||||
<li>
|
||||
<div class='avatar-sprites'>
|
||||
<img class='weapon weapon-{_user.items.weapon}' src="/img/BrowserQuest/habitrpg_mods/weapon{_user.items.weapon}.png" />
|
||||
<img class='armor armor-{_user.items.armor}' src="/img/BrowserQuest/habitrpg_mods/{_user._armor}" />
|
||||
</div>
|
||||
<div id="lvl"><span class="badge badge-info">Lvl {_user.stats.lvl}</span></div>
|
||||
{:friend.id}
|
||||
</li>
|
||||
|
||||
{/}
|
||||
|
|
|
|||
Loading…
Reference in a new issue