Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrite: push login modal to the front page, don't allow anonymous

Browse Source 
usage.
This commit is contained in:
Tyler Renelle
2013-09-02 01:08:28 -04:00
parent 3bd6771687
commit ef9e1f3444
11 changed files with 120 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/controllers/authCtrl.js
+16 -3
View File
@@ -4,10 +4,11 @@
The authentication controller (login & facebook)
*/
habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'Facebook', 'LocalAuth', 'User', '$http', '$location', 'API_URL',
function($scope, $rootScope, Facebook, LocalAuth, User, $http, $location, API_URL) {
habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$location', 'API_URL',
function($scope, $rootScope, User, $http, $location, API_URL) {
var runAuth;
var showedFacebookMessage;
$scope.useUUID = false;
$scope.toggleUUID = function() {
if (showedFacebookMessage === false) {
@@ -16,16 +17,19 @@ habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'Facebook', 'LocalAuth'
}
$scope.useUUID = !$scope.useUUID;
};
$scope.logout = function() {
localStorage.clear();
location.reload();
window.location.href = '/logout';
};
runAuth = function(id, token) {
User.authenticate(id, token, function(err) {
window.location.href = '/';
//$rootScope.modals.login = false;
});
};
$scope.register = function() {
/*TODO highlight invalid inputs
we have this as a workaround for https://github.com/HabitRPG/habitrpg-mobile/issues/64
@@ -45,6 +49,7 @@ habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'Facebook', 'LocalAuth'
}
});
};
$scope.auth = function() {
var data;
data = {
@@ -68,4 +73,12 @@ habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'Facebook', 'LocalAuth'
});
}
};
$scope.playButtonClick = function(){
if (User.authenticated()) {
window.location.href = '/';
} else {
$('#login-modal').modal('show');
}
}
}]);
assets/js/services/authServices.js
+1
View File
@@ -2,6 +2,7 @@
/**
* Services that persists and retrieves user from localStorage.
* FIXME is this file ever used?
*/
var facebook = {}
assets/js/services/userServices.js
+4 -4
View File
@@ -5,8 +5,8 @@
*/
angular.module('userServices', []).
factory('User', ['$http', '$location', 'Notification', 'API_URL', 'STORAGE_USER_ID', 'STORAGE_SETTINGS_ID',
function($http, $location, Notification, API_URL, STORAGE_USER_ID, STORAGE_SETTINGS_ID) {
factory('User', ['$http', '$location', 'API_URL', 'STORAGE_USER_ID', 'STORAGE_SETTINGS_ID',
function($http, $location, API_URL, STORAGE_USER_ID, STORAGE_SETTINGS_ID) {
var authenticated = false,
defaultSettings = {
auth: { apiId: '', apiToken: ''},
@@ -92,7 +92,7 @@ angular.module('userServices', []).
queue.push(sent.shift())
});
settings.fetching = false;
Notification.push({type:'text', text:"We're offline"})
//Notification.push({type:'text', text:"We're offline"})
});
@@ -174,7 +174,7 @@ angular.module('userServices', []).
//If user does not have ApiID that forward him to settings.
if (!settings.auth.apiId || !settings.auth.apiToken) {
$location.path("/login");
//$location.path("/login");
} else {
userServices.authenticate(settings.auth.apiId, settings.auth.apiToken)
}
assets/js/static.js
+6
View File
@@ -0,0 +1,6 @@
"use strict";
window.habitrpg = angular.module('habitrpg', ['userServices'])
.constant("API_URL", "")
.constant("STORAGE_USER_ID", 'habitrpg-user')
.constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings')
src/controllers/user.js
+1 -1
View File
@@ -31,7 +31,6 @@ var NO_USER_FOUND = {err: "No user found."};
beforeEach auth interceptor
*/
api.auth = function(req, res, next) {
var token, uid;
uid = req.headers['x-api-user'];
@@ -53,6 +52,7 @@ api.auth = function(req, res, next) {
}
res.locals.wasModified = +user._v !== +req.query._v;
res.locals.user = user;
req.session.userId = user._id;
return next();
});
};
src/middleware.js
+2 -3
View File
@@ -5,8 +5,8 @@ module.exports = function(req, res, next) {
// show them the splash page if they're not logged in
var isStatic = req.url.split('/')[1] == 'static';
// if (!isStatic && !req.headers['x-api-user'] && !req.headers['x-api-key'] && req.headers.accept != 'application/json')
// return res.redirect('/static/front')
if (req.url == '/' && !req.headers['x-api-user'] && !req.headers['x-api-key'] && !(req.session && req.session.userId))
return res.redirect('/static/front')
res.locals.habitrpg = res.locals.habitrpg || {}
_.defaults(res.locals.habitrpg, {
@@ -20,7 +20,6 @@ module.exports = function(req, res, next) {
res.header("Access-Control-Allow-Methods", "OPTIONS,GET,POST,PUT,HEAD,DELETE");
res.header("Access-Control-Allow-Headers", "Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key");
//wtf is this for?
if (req.method === 'OPTIONS') {
return res.send(200);
}
src/routes/pages.js
+5
View File
@@ -19,6 +19,11 @@ router.get('/partials/options', function(req, res) {
res.render('options');
});
router.get('/logout', function(req, res) {
delete req.session.userId;
res.redirect('/');
})
// -------- Marketing --------
router.get('/splash.html', function(req, res) {
src/server.js
+2 -1
View File
@@ -34,6 +34,8 @@ app.use(express.logger("dev"));
app.use(express.bodyParser());
app.use(require('connect-assets')());
app.use(express.methodOverride());
app.use(express.cookieParser(nconf.get('SESSION_SECRET')));
app.use(express.session());
app.use(require('./middleware'));
app.use(app.router);
app.use(express['static'](path.join(__dirname, "/../public")));
@@ -71,7 +73,6 @@ module.exports = server;
# .use(express.methodOverride())
# # Uncomment and supply secret to add Derby session handling
# # Derby session middleware creates req.session and socket.io sessions
# .use(express.cookieParser())
# .use(store.sessionMiddleware
# secret: process.env.SESSION_SECRET || 'YOUR SECRET HERE'
# cookie: { maxAge: TWO_WEEKS } # defaults to 2 weeks? aka, can delete this line?
views/shared/modals/login.jade
+4 -1
View File
@@ -1,4 +1,7 @@
div(modal='modals.login')
// This file was moved to /views/static/front.jade, as we're requiring login / registration from front page now
keep this file around until we're sure of that decision
//-div(modal='modals.login')
.modal-header
h3 Login / Register
.modal-body
views/static/front.jade
+58 -11
View File
@@ -4,15 +4,62 @@ block title
title HabitRPG | Gamify Your Life
block content
#wrap
//-include ./header
.jumbotron.masthead
div(ng-app='habitrpg')
#wrap(ng-controller='AuthCtrl')
//-include ./header
.jumbotron.masthead
.container
h1
img(src='/bower_components/habitrpg-shared/img/logo/habitrpg_pixel.png', alt='HabitRPG')
p
| A habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.
a.btn.btn-primary.btn-small(ng-click='playButtonClick()') Play
.container
h1
img(src='/bower_components/habitrpg-shared/img/logo/habitrpg_pixel.png', alt='HabitRPG')
p
| A habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.
a.btn.btn-primary.btn-small(href='/?play=1') Play
.container
p(style='height:600;')
iframe(src='//player.vimeo.com/video/57639356', width='100%', height='539', frameborder='0', webkitallowfullscreen='', mozallowfullscreen='', allowfullscreen='')
p(style='height:600;')
iframe(src='//player.vimeo.com/video/57639356', width='100%', height='539', frameborder='0', webkitallowfullscreen='', mozallowfullscreen='', allowfullscreen='')
.modal.fade#login-modal
.modal-dialog
.modal-content
.modal-header
button.close(type='button', data-dismiss='modal', aria-hidden='true') ×
h4.modal-title Login / Register
.modal-body
//a(href='/auth/facebook')
img(src='/img/facebook-login-register.jpeg', alt='Login / Register With Facebook')
//h3 Or
ul.nav.nav-tabs
li.active
a(data-toggle='tab',data-target='#login-tab') Login
li
a(data-toggle='tab',data-target='#register-tab') Register
.tab-content
.tab-pane.active
form(ng-submit='auth()')
.control-group
input(type='text', ng-model='loginUsername', placeholder='{{useUUID ? "UUID" : "Username"}}')
.control-group
input(type='{{useUUID ? "text" : "password"}}', ng-model='loginPassword', placeholder='{{useUUID ? "API Token" : "Password"}}')
.control-group
label.checkbox
input(type='checkbox', ng-click='useUUID = !useUUID')
| Use UUID / API Token (For Facebook Users)
.control-group
input.btn.btn-primary(type='submit', value='Login')
.tab-pane
form(ng-submit='register()', name='registrationForm')
.control-group
input(type='text', ng-model='registerVals.username', placeholder='Username', required)
.control-group
input(type='email', ng-model='registerVals.email', placeholder='Email', required)
.control-group
input(type='password', ng-model='registerVals.password', placeholder='Password', required)
.control-group
input(type='password', ng-model='registerVals.confirmPassword', placeholder='Password Confirm', required)
.control-group
input.btn.btn-primary(type='submit', value='Register')
.modal-footer
button.btn.btn-default(type='button', data-dismiss='modal') Close
views/static/layout.jade
+21 -6
View File
@@ -7,16 +7,31 @@ html
meta(charset='utf-8')
meta(name='viewport', content='width=device-width, initial-scale=1.0')
// CDN
link(href='//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap.min.css', rel='stylesheet')
link(href='//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css', rel='stylesheet')
link(href='/css/docs.css', rel='stylesheet')
// CSS
link(rel='stylesheet', href='/bower_components/bootstrap/docs/assets/css/bootstrap.css')
link(rel='stylesheet', href='/bower_components/bootstrap/docs/assets/css/bootstrap-responsive.css')
link(href='/bower_components/bootstrap/docs/assets/css/docs.css', rel='stylesheet')
link(href='/css/static-pages.css', rel='stylesheet')
link(href='/css/footer.css', rel='stylesheet')
script(src='//cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js')
script(src='//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/js/bootstrap.min.js')
// FIXME we gotta get rid of all these requirements in userServices. we don't need habitrpg-shared, lodash, moment, etc here
// and habitrpg-shared alone is ~700kb
// JS
script(type='text/javascript', src='/bower_components/jquery/jquery.min.js')
script(type='text/javascript', src='/bower_components/lodash/dist/lodash.min.js')
script(type='text/javascript', src='/bower_components/habitrpg-shared/dist/habitrpg-shared.js')
script(type='text/javascript', src='/bower_components/moment/min/moment.min.js')
script(type='text/javascript', src='/bower_components/angular/angular.min.js')
script(type='text/javascript', src='/bower_components/bootstrap/docs/assets/js/bootstrap.min.js')
script(type='text/javascript').
$.getScript("//s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire");
!= js('static')
!= js('services/userServices')
!= js('controllers/authCtrl')
body
block content