sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 23:40:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pretty up the html a bit

Browse source
This commit is contained in:
Tyler Renelle 2013-02-05 18:52:29 -05:00
parent 0505b3a4d7
commit c1ac873ad5
2 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/app/party.coffee
View file

@ -41,9 +41,7 @@ module.exports.app = (appExports, model) ->
appExports.partyAccept = -> appExports.partyAccept = ->
invitation = user.get('party.invitation') invitation = user.get('party.invitation')
debugger
model.subscribe model.query("parties").withId(invitation), (err, parties) -> model.subscribe model.query("parties").withId(invitation), (err, parties) ->
debugger
throw err if err throw err if err
party = parties.at(0) party = parties.at(0)
party.push 'members', user.get('id') party.push 'members', user.get('id')
@ -51,7 +49,6 @@ module.exports.app = (appExports, model) ->
user.set 'party.current', party.get('id') user.set 'party.current', party.get('id')
model.ref '_party', party model.ref '_party', party
model.subscribe model.query('users').party(party.get('members')), (err, members) -> model.subscribe model.query('users').party(party.get('members')), (err, members) ->
debugger
throw err if err throw err if err
model.ref '_partyMembers', members model.ref '_partyMembers', members
@ -63,8 +60,7 @@ module.exports.app = (appExports, model) ->
# TODO notify sender # TODO notify sender
appExports.partyLeave = -> appExports.partyLeave = ->
debugger id = user.set 'party.current', null
user.set 'party.current', null
party = model.at '_party' party = model.at '_party'
members = party.get('members') members = party.get('members')
index = members.indexOf(user.get('id')) index = members.indexOf(user.get('id'))
@ -72,9 +68,9 @@ module.exports.app = (appExports, model) ->
party.set 'members', members party.set 'members', members
if (members.length == 0) if (members.length == 0)
# last member out, kill the party # last member out, kill the party
model.del "parties.#{id}", -> window.location.reload() model.del "parties.#{id}"
else model.unsubscribe model.query('parties').withId(id)
window.location.reload() model.set('_party', null)
#exports.partyDisband = -> #exports.partyDisband = ->

39
views/app/index.html
View file

@ -52,9 +52,9 @@
<p>This resets your entire account - your tasks will be deleted and your character will start over.</p> <p>This resets your entire account - your tasks will be deleted and your character will start over.</p>
<p>This is highly discouraged because you'll lose historical data, which is useful for graphing your progress over time. However, some people find it useful in the beginning after playing with the app for a while.</p> <p>This is highly discouraged because you'll lose historical data, which is useful for graphing your progress over time. However, some people find it useful in the beginning after playing with the app for a while.</p>
<@footer> <@footer>
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
<button data-dismiss="modal" x-bind=click:reset class="btn btn-danger btn-large">Reset</button> <button data-dismiss="modal" x-bind=click:reset class="btn btn-danger btn-large">Reset</button>
</@footer> </@footer>
</app:myModal> </app:myModal>
<app:myModal modalId="why-ads-modal" header="Why Ads?"> <app:myModal modalId="why-ads-modal" header="Why Ads?">
@ -111,26 +111,28 @@
</@footer> </@footer>
</app:myModal> </app:myModal>
<app:myModal modalId="party-modal" header="Party"> <app:myModal modalId="party-modal">
<h2> <h2>
{#if _user.party.current}Invite Member To "{_party.name}" {#if _party}{_party.name}
{else if _user.party.invitation}You're Invited To "{_party.name}" {else if _user.party.invitation}You're Invited To {_party.name}
{else}Create A Party{/} {else}Create A Party{/}
</h2> </h2>
{#if _user.party.current} {#if _user.party.current}
<!-- In a party --> <!-- In a party -->
<ul> <table class="table table-stripe">
{#each _partyMembers as :member} {#each _partyMembers as :member}
<li>{username(:member.auth)}</li> <tr><td>{username(:member.auth)}</td><td>({:member.id})</td></tr>
{/} {/}
</ul> </table>
<form x-bind="submit: partyInvite"> <form class=form-inline x-bind="submit: partyInvite">
{#if _view.partyError} {#if _view.partyError}
<div class='alert alert-danger'>{_view.partyError}</div> <div class='alert alert-danger'>{_view.partyError}</div>
{/} {/}
<input type="text" class="input-medium search-query" value="{_newPartyMember}"> <div class='control-group'>
<input type="submit" class="btn" value="Add" /> <input type="text" class="input-medium" placeholder="User Id" value="{_newPartyMember}">
<input type="submit" class="btn" value="Invite" />
</div>
</form> </form>
<a class='btn btn-danger' x-bind="click: partyLeave">Leave</a> <a class='btn btn-danger' x-bind="click: partyLeave">Leave</a>
@ -143,17 +145,18 @@
<a class='btn btn-danger' x-bind="click: partyReject">Reject</a> <a class='btn btn-danger' x-bind="click: partyReject">Reject</a>
{else} {else}
<!-- Not in a party , no invites - create a new one --> <!-- Not in a party , no invites - create a new one -->
<form x-bind="submit: partyCreate"> <form class=form-inline x-bind="submit: partyCreate">
{#if _view.partyError} {#if _view.partyError}
<div class='alert alert-danger'>{_view.partyError}</div> <div class='alert alert-danger'>{_view.partyError}</div>
{/} {/}
<input type="text" class="input-medium search-query" value="{_newParty}"> <div class=control-group>
<input type="submit" class="btn" value="Add" /> <input type="text" class="input-medium" placeholder="Party Name" value="{_newParty}">
<input type="submit" class="btn" value="Create" />
</div>
</form> </form>
{/} {/}
{/} {/}
</app:myModal> </app:myModal>
<alerts:> <alerts:>