mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-01 15:31:16 +00:00
begin party subscription & view
This commit is contained in:
parent
267dd60fd0
commit
57ab186a62
2 changed files with 54 additions and 1 deletions
|
|
@ -34,6 +34,10 @@ 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
|
||||
|
||||
# ========== ROUTES ==========
|
||||
|
||||
get '/', (page, model, next) ->
|
||||
|
|
@ -298,3 +302,17 @@ ready (model) ->
|
|||
exports.setFemale = -> user.set('preferences.gender', 'f')
|
||||
exports.setArmorsetV1 = -> user.set('preferences.armorSet', 'v1')
|
||||
exports.setArmorsetV2 = -> user.set('preferences.armorSet', 'v2')
|
||||
|
||||
exports.addFriend = ->
|
||||
friendId = model.get('_newFriend')
|
||||
return if /^(\s)*$/.test(friendId)
|
||||
query = model.query('users').friends([friendId])
|
||||
model.fetch query, (err, users) ->
|
||||
friend = users.get(0)
|
||||
unless friend
|
||||
model.set "_view.addFriendError", "User with id #{friendId} not found."
|
||||
return
|
||||
#TODO ensure unique
|
||||
user.push('friends', friendId)
|
||||
$('#add-friend-modal').modal('hide')
|
||||
model.set '_newFriend', ''
|
||||
|
|
|
|||
|
|
@ -61,6 +61,17 @@
|
|||
<button data-dismiss="modal" class="btn btn-success">Ok</button>
|
||||
</@footer>
|
||||
</app:myModal>
|
||||
|
||||
<app:myModal modalId="add-friend-modal" header="Add Friend">
|
||||
<form x-bind="submit: addFriend">
|
||||
{#if _view.addFriendError}
|
||||
<div class='alert alert-danger'>{_view.addFriendError}</div>
|
||||
{/}
|
||||
<input type="text" class="input-medium search-query" value="{_newFriend}">
|
||||
<input type="submit" class="btn" value="Add" />
|
||||
</form>
|
||||
</app:myModal>
|
||||
|
||||
{else}
|
||||
<app:myModal modalId="login-modal" header="Login / Register">
|
||||
<a href="/auth/facebook"><img src='/img/facebook-login-register.jpeg' alt="Login / Register With Facebook"/></a>
|
||||
|
|
@ -150,6 +161,8 @@
|
|||
<div id=character class='span4'>
|
||||
<table>
|
||||
<tr>
|
||||
|
||||
<!-- Avatar -->
|
||||
<td id="avatar">
|
||||
<div class='avatar-sprites'>
|
||||
<img class='weapon weapon-{_user.items.weapon}' src="/img/BrowserQuest/habitrpg_mods/weapon{_user.items.weapon}.png" />
|
||||
|
|
@ -157,6 +170,8 @@
|
|||
</div>
|
||||
<div id="lvl"><span class="badge badge-info">Lvl {_user.stats.lvl}</span></div>
|
||||
</td>
|
||||
|
||||
<!-- Progress Bars -->
|
||||
<td id="bars">
|
||||
<div class="progress progress-danger" rel=tooltip data-placement=bottom title="Health">
|
||||
<div class="bar" style="width: {percent(_user.stats.hp, 50)}%;"></div>
|
||||
|
|
@ -173,7 +188,27 @@
|
|||
</span>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<!-- Party -->
|
||||
<!--#if _user.flags.partyUnlocked-->
|
||||
<td>
|
||||
<ul>
|
||||
{#each _view.friends}
|
||||
<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>
|
||||
</li>
|
||||
|
||||
{/}
|
||||
</ul>
|
||||
<a class="btn" data-target="#add-friend-modal" data-toggle="modal"><i class="icon-user"></i></a>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
<div id="exp-chart" style="display:none;"></div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue