aboutsummaryrefslogtreecommitdiffstats
path: root/src/app.coffee
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2014-08-08 07:11:56 -0700
committerAdam Soltys <[email protected]>2014-08-08 07:11:56 -0700
commit561ab2d01e059da44c0e5b34f5527fe946a1448c (patch)
tree6165fcae53610081d5f7f3ba8a5b4e56a57d14fb /src/app.coffee
parente1464288b2f53fd4c200d64df9a085dbb0ca80b7 (diff)
downloadcoinos-server-561ab2d01e059da44c0e5b34f5527fe946a1448c.tar.gz
coinos-server-561ab2d01e059da44c0e5b34f5527fe946a1448c.zip
Use connect-assets for js and css
Diffstat (limited to 'src/app.coffee')
-rw-r--r--src/app.coffee11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/app.coffee b/src/app.coffee
index 9fff6ab0..b5736414 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -2,7 +2,6 @@ express = require('express')
bodyParser = require('body-parser')
cookieParser = require('cookie-parser')
path = require('path')
-engines = require('consolidate')
passport = require('./passport')
calculator = require("./routes/calculator")
@@ -21,7 +20,6 @@ app.engine('html', require('hogan-express'))
app.set('view engine', 'html')
app.set('views', __dirname + '/views')
app.use(express.static(__dirname + '/public'))
-app.use(require('connect-assets')(src: 'public'))
app.use(bodyParser.urlencoded({ extended: true}))
app.use(bodyParser.json())
app.use(bodyParser.json({ type: 'application/vnd.api+json' }))
@@ -31,10 +29,8 @@ app.use(passport.initialize())
app.use(passport.session())
authorize = (req, res, next) ->
-
if req.params.user is req.user?.username or
- req.user?.username is 'admin' or
- req.user?.username is 'ben'
+ req.user?.username is 'admin'
return next()
res.redirect('/login')
@@ -50,7 +46,6 @@ app.get('/logout', sessions.destroy)
app.get('/:user/exists', users.exists)
app.get('/:user.json', users.json)
-app.get('/users', users.index)
app.get('/users/new', users.new)
app.post('/users', users.create)
@@ -62,10 +57,12 @@ app.post('/:user/transactions', transactions.create)
app.get('/:user/report', authorize, transactions.index)
app.get('/:user', users.show)
+app.use(require('connect-assets')(src: 'public', servePath: '/'))
+
app.use((err, req, res, next) ->
res.status(500)
res.send('An error occurred');
- console.log(err)
+ console.error(err.stack)
res.end()
)