Merge

src/server/api.coffee

@@ -55,30 +55,30 @@ router.post '/users/:uid/tasks/:taskId/:direction', (req, res) ->
     res.send(result)
 
 router.get '/users/:uid/calendar.ics', (req, res) ->
-    #return next() #disable for now
-    {uid} = req.params
-    {apiToken} = req.query
+  #return next() #disable for now
+  {uid} = req.params
+  {apiToken} = req.query
 
-    model = req.getModel()
-    query = model.query('users').withIdAndToken(uid, apiToken)
-    query.fetch (err, result) ->
-      return res.send(500, err) if err
-      tasks = result.at(0).get('tasks')
-      #      tasks = result[0].tasks
-      tasksWithDates = _.filter tasks, (task) -> !!task.date
-      return res.send(500, "No events found") if _.isEmpty(tasksWithDates)
+  model = req.getModel()
+  query = model.query('users').withIdAndToken(uid, apiToken)
+  query.fetch (err, result) ->
+    return res.send(500, err) if err
+    tasks = result.at(0).get('tasks')
+    #      tasks = result[0].tasks
+    tasksWithDates = _.filter tasks, (task) -> !!task.date
+    return res.send(500, "No events found") if _.isEmpty(tasksWithDates)
 
-      ical = new icalendar.iCalendar()
-      ical.addProperty('NAME', 'HabitRPG')
-      _.each tasksWithDates, (task) ->
-        event = new icalendar.VEvent(task.id);
-        event.setSummary(task.text);
-        d = new Date(task.date)
-        d.date_only = true
-        event.setDate d
-        ical.addComponent event
-      res.type('text/calendar')
-      formattedIcal = ical.toString().replace(/DTSTART\:/g, 'DTSTART;VALUE=DATE:')
-      res.send(200, formattedIcal)
+    ical = new icalendar.iCalendar()
+    ical.addProperty('NAME', 'HabitRPG')
+    _.each tasksWithDates, (task) ->
+      event = new icalendar.VEvent(task.id);
+      event.setSummary(task.text);
+      d = new Date(task.date)
+      d.date_only = true
+      event.setDate d
+      ical.addComponent event
+    res.type('text/calendar')
+    formattedIcal = ical.toString().replace(/DTSTART\:/g, 'DTSTART;VALUE=DATE:')
+    res.send(200, formattedIcal)
 
 module.exports = router

src/server/index.coffee

@@ -9,8 +9,12 @@ app = require '../app'
 serverError = require './serverError'
 MongoStore = require('connect-mongo')(express)
 priv = require './private'
+<<<<<<< HEAD
 habitrpgStore = require './store'
 middleware = require './middleware'
+=======
+habitrpgStore = require('./store')
+>>>>>>> b1f7c3cdfa9363b26b59f6e651ccf0d680313773
 
 ## RACER CONFIGURATION ##
 

src/server/middleware.coffee

@@ -8,10 +8,10 @@ module.exports.splash = (req, res, next) ->
     next()
 
 module.exports.view = (req, res, next) ->
-  model = req.getModel()
-  _view = model.get('_view') || {}
-  ## Set _mobileDevice to true or false so view can exclude portions from mobile device
-  _view.mobileDevice = /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent')
-  _view.nodeEnv = process.env.NODE_ENV
-  model.set '_view', _view
-  next()
+    model = req.getModel()
+    _view = model.get('_view') || {}
+    ## Set _mobileDevice to true or false so view can exclude portions from mobile device
+    _view.mobileDevice = /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent')
+    _view.nodeEnv = process.env.NODE_ENV
+    model.set '_view', _view
+    next()