gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mediaburst/hackathon-starter into mediaburst-master

Browse Source 
* 'master' of https://github.com/mediaburst/hackathon-starter:
  Update README.md
  Using the newest clockwork npm package
  Removed commentted out lines from clockwork.jade
  Tweak to the clockwork view
  Adding clockwork SMS to the API mix

Conflicts:
	controllers/api.js
	package.json
This commit is contained in:
Sahat Yalkabov
2014-02-27 19:27:11 -05:00
parent 0318c1fa79 bea521f3b3
commit 007d561d88
6 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@@ -11,6 +11,8 @@ var passport = require('passport');
var expressValidator = require('express-validator');
var connectAssets = require('connect-assets');
/**
* Load controllers.
*/
@@ -125,6 +127,8 @@ app.get('/api/steam', apiController.getSteam);
app.get('/api/scraping', apiController.getScraping);
app.get('/api/twilio', apiController.getTwilio);
app.post('/api/twilio', apiController.postTwilio);
app.get('/api/clockwork', apiController.getClockwork);
app.post('/api/clockwork', apiController.postClockwork);
app.get('/api/foursquare', passportConf.isAuthenticated, passportConf.isAuthorized, apiController.getFoursquare);
app.get('/api/tumblr', passportConf.isAuthenticated, passportConf.isAuthorized, apiController.getTumblr);
app.get('/api/facebook', passportConf.isAuthenticated, passportConf.isAuthorized, apiController.getFacebook);