Skip to content
This repository has been archived by the owner on Mar 12, 2019. It is now read-only.

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
zyll committed Jun 19, 2014
1 parent e458afe commit da6875b
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 1,125 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "bower_components"
}
13 changes: 11 additions & 2 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ module.exports = (grunt) ->
]
jshint:
front: ['assets/**/*.js']
back: ['package.json', 'koalab.js', 'app/**/*.js']
back: [
'package.json'
'koalab.js'
'app/**/*.js'
]
coffeelint:
files: ['Gruntfile.coffee', 'assets/**/*.coffee']
plato:
Expand All @@ -37,7 +41,10 @@ module.exports = (grunt) ->
]
back:
files:
'reports/back': ['koalab.js', 'app/**/*.js']
'reports/back': [
'koalab.js'
'app/**/*.js'
]
coffee:
options:
sourceMap: true
Expand Down Expand Up @@ -102,6 +109,8 @@ module.exports = (grunt) ->
'public/zepto.min.js': ['bower_components/zepto/zepto.js']
stylus:
compile:
options:
"resolve url": true
files:
'public/koalab.css': 'assets/css/*.styl'
cssmin:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ cp config/server.json.example config/server.json
$EDITOR config/server.json
npm install -g grunt-cli
npm install .
./node_modules/bower/bin/bower install
grunt
node koalab.js
firefox http://localhost:8080/
Expand Down
2 changes: 1 addition & 1 deletion app/views/board.jade
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ block content
script(src="/backbone.shortcuts.js")
script(src="/templates.js")
script(src="/app.js")
script
script.
document.addEventListener("DOMContentLoaded", function() {
var board = new App.Board(!{board});
board.postits.reset(!{postits});
Expand Down
8 changes: 4 additions & 4 deletions assets/css/font-awesome.styl
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
*/

@font-face
font-family: 'FontAwesome'
font-style: normal
font-weight: normal
src: local('FontAwesome'), url('/fonts/FontAwesome.woff') format('woff')
font-family FontAwesome
font-style normal
font-weight normal
src url(fonts/FontAwesome.woff)

icon(char)
&:before
Expand Down
87 changes: 51 additions & 36 deletions koalab.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
var fs = require('fs'),
crypto = require('crypto'),
express = require('express'),
pass = require('passport'),
BrowserID = require('passport-browserid').Strategy,
mongoose = require('mongoose');
var fs = require('fs'),
crypto = require('crypto'),
express = require('express'),
bodyParser = require('body-parser'),
cookieParser = require('cookie-parser'),
cookieSession = require('cookie-session'),
methodOverride = require('method-override'),
pass = require('passport'),
BrowserID = require('passport-browserid').Strategy,
mongoose = require('mongoose');

var config,
authorized = [];
Expand Down Expand Up @@ -78,42 +82,53 @@ pass.use('browserid', new BrowserID({

useSecret(function(secret) {
var app = express();
app.configure(function() {
app.set('view engine', 'jade');
app.set('views', __dirname + '/app/views');
app.set('view engine', 'jade');
app.set('views', __dirname + '/app/views');

app.use(express.bodyParser());
app.use(express.cookieParser());
app.use(express.cookieSession({ secret: secret }));
app.use(pass.initialize());
app.use(pass.session());
app.use(express.methodOverride());
app.use(app.router);
app
.use(express.static(__dirname + '/public'))
.use(bodyParser())
.use(cookieParser())
.use(cookieSession({secret: secret}))
.use(pass.initialize())
.use(pass.session())
.use(methodOverride());

var uri = process.env.MONGOLAB_URI ||
process.env.MONGOHQ_URL ||
config.mongodb.host + "/" + config.mongodb.database;
var db = mongoose.createConnection(uri);
db.on('error', function(err) {
abort("Can't connect to mongodb: ", err);
});

var port = process.env.PORT || config.port;
db.once('open', function () {
require('./app/controller')(app, db, pass, config.demo);
app.listen(port, function() {
console.log('Express server listening on port ' + port);
// development error handler
// will print stacktrace
if (app.get('env') === 'development') {
app.use(function(err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
message: err.message,
error: err
});
});
}

// production error handler
// no stacktraces leaked to user
app.use(function(err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
message: err.message,
error: {}
});
});
});

app.configure('development', function() {
app.use(express.static(__dirname + '/public'));
app.use(express.logger('dev'));
app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
var uri = process.env.MONGOLAB_URI ||
process.env.MONGOHQ_URL ||
config.mongodb.host + "/" + config.mongodb.database;
var db = mongoose.createConnection(uri);
db.on('error', function(err) {
abort("Can't connect to mongodb: ", err);
});

app.configure('production', function() {
app.use(express.errorHandler());
var port = process.env.PORT || config.port;
db.once('open', function () {
require('./app/controller')(app, db, pass, config.demo);
app.listen(port, function() {
console.log('Express server listening on port ' + port);
});
});
});
Loading

0 comments on commit da6875b

Please sign in to comment.