From 30b52d392eaa03f294db6b7fdbde7ec6c89957a3 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Feb 2013 15:46:31 -0500
Subject: [PATCH] move routes, comment out gcal until we can get it working

---
 src/app/helpers.coffee         | 2 +-
 src/server/serverRoutes.coffee | 6 ++----
 views/app/index.html           | 5 +++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index dd50db04c5..c46141424b 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -27,6 +27,6 @@ module.exports.viewHelpers = (view) ->
 
   view.fn "encodeiCalLink", (uid, apiToken) ->
     loc = window?.location.origin or process.env.BASE_URL
-    encodeURIComponent "#{loc}/users/#{uid}/tasks.ics?apiToken=#{apiToken}"
+    encodeURIComponent "#{loc}/v1/users/#{uid}/calendar.ics?apiToken=#{apiToken}"
 
 
diff --git a/src/server/serverRoutes.coffee b/src/server/serverRoutes.coffee
index af6b386ff9..1dc27a4dad 100644
--- a/src/server/serverRoutes.coffee
+++ b/src/server/serverRoutes.coffee
@@ -14,8 +14,7 @@ module.exports = (expressApp, root, derby) ->
   expressApp.get '/terms', (req, res) ->
     staticPages.render 'terms', res
 
-  # localhost:3000/users/9/tasks.ics?apiToken=ae164366-f1ad-4a7d-83ef-b1d1085a96b6
-  expressApp.get '/users/:uid/tasks.ics', (req, res, next) ->
+  expressApp.get '/v1/users/:uid/calendar.ics', (req, res) ->
     {uid} = req.params
     {apiToken} = req.query
 
@@ -23,10 +22,9 @@ module.exports = (expressApp, root, derby) ->
 #    query = model.query('users').withIdAndToken(uid, apiToken)
 #    model.fetch query, (err, result) ->
     db.collection('users').find({_id:uid, apiToken:apiToken}).toArray (err, result) ->
-      return next(err) if err
+      return res.send(500, err) if err
 #      tasks = result.at(0).get('tasks')
       tasks = result[0].tasks
-      return next "No tasks found for user #{uid}" unless tasks?
       tasksWithDates = _.filter tasks, (task) -> !!task.date
 
       ical = new icalendar.iCalendar()
diff --git a/views/app/index.html b/views/app/index.html
index e57e0e35c2..2d18de7ae0 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -340,8 +340,9 @@ do a find for the string after "→"
             {#if _user.history.todos}
               <a x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
             {/}
-            &nbsp;<a href="/users/{{_user.id}}/tasks.ics?apiToken={{_user.apiToken}}"><img src='/img/calendar_ical.png' title="iCal" alt="iCal" rel=tooltip /></a>
-            &nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Googl Calendar" rel=tooltip /></a>
+            &nbsp;<a href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}"><img src='/img/calendar_ical.png' title="iCal" alt="iCal" rel=tooltip /></a>
+            <!-- comment out gcal until we can get it working -->
+            <!--&nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>-->
         </span>
         <div id="todos-chart" style="display:none;"></div>
         <ul class="nav nav-tabs">