sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 15:38:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

username/password registration now available

Browse source
This commit is contained in:
Tyler Renelle 2012-12-04 15:18:59 -08:00
parent 7f8ae420aa
commit 07a614259f
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -28,7 +28,7 @@
"www.habitrpg.com" "www.habitrpg.com"
], ],
"scripts": { "scripts": {
"start": "server.js" "start": "node server.js"
}, },
"engines": { "engines": {
"node": "0.8.x", "node": "0.8.x",

6
src/app/index.coffee
View file

@ -2,6 +2,7 @@ derby = require 'derby'
{get, view, ready} = derby.createApp module {get, view, ready} = derby.createApp module
derby.use require 'derby-ui-boot' derby.use require 'derby-ui-boot'
derby.use require('../../ui') derby.use require('../../ui')
derby.use require('derby-auth/components');
# Custom requires # Custom requires
moment = require('moment') moment = require('moment')
@ -39,9 +40,10 @@ get '/:uid?', (page, model, {uid}, next) ->
#FIXME remove this eventually, part of user schema #FIXME remove this eventually, part of user schema
user.setNull 'balance', 2 user.setNull 'balance', 2
# support legacy Everyauth schema (now using derby-auth, Passport) # support legacy Everyauth schema (now using derby-auth, Passport)
fb = user.get('auth.facebook') if fb = user.get('auth.facebook')
if fb
model.set('_loginName', if fb._raw then "#{fb.name.givenName} #{fb.name.familyName}" else fb.name) model.set('_loginName', if fb._raw then "#{fb.name.givenName} #{fb.name.familyName}" else fb.name)
else if username = user.get('auth.local.username')
model.set('_loginName', username)
# Setup Item Store # Setup Item Store
model.set '_items' model.set '_items'

15
views/app/index.html
View file

@ -13,7 +13,20 @@
<div id="head"> <div id="head">
<div class='pull-right'> <div class='pull-right'>
{#unless _loggedIn} {#unless _loggedIn}
<a href="/auth/facebook"><img src='/img/facebook-login-register.jpeg' alt="Login / Register With Facebook"/></a> <a class="btn btn-small btn-info" href="#login-modal" data-toggle="modal">Login / Register</a>
<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>
<h3>Or</h3>
<boot:tabs>
<boot:tab title="Login">
<derby-auth:login />
</boot:tab>
<boot:tab title="Register">
<derby-auth:register />
</boot:tab>
</boot:tabs>
</app:myModal>
{else} {else}
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-small">{_loginName}</button> <button class="btn btn-small">{_loginName}</button>