From 441724e10faaa31e229878c94bf7ab36014056c3 Mon Sep 17 00:00:00 2001 From: Eric Ferraiuolo Date: Sun, 21 Apr 2013 16:42:39 -0400 Subject: [PATCH] Update requires for reorganization --- app.js | 4 ++-- lib/invitations.js | 2 +- routes/combo.js | 2 +- routes/invitations.js | 2 +- routes/rsvp.js | 2 +- scripts/gen-labels.js | 2 +- server.js | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app.js b/app.js index 8818a4e5..5ba216f5 100644 --- a/app.js +++ b/app.js @@ -1,8 +1,8 @@ var express = require('express'), exphbs = require('express3-handlebars'), - config = require('../config'), - helpers = require('./helpers'), + config = require('./config'), + helpers = require('./lib/helpers'), middleware = require('./middleware'), routes = require('./routes'), diff --git a/lib/invitations.js b/lib/invitations.js index 40e715f1..f30705f1 100644 --- a/lib/invitations.js +++ b/lib/invitations.js @@ -2,7 +2,7 @@ var async = require('async'), crypto = require('crypto'), pg = require('pg'), - config = require('../../config'), + config = require('../config'), INVITATIONS = 'SELECT * FROM invitations ORDER BY id', INVITATION_BY_ID = 'SELECT * FROM invitations WHERE id=$1 LIMIT 1', diff --git a/routes/combo.js b/routes/combo.js index 07e46f9c..f058c5f1 100644 --- a/routes/combo.js +++ b/routes/combo.js @@ -1,5 +1,5 @@ var combo = require('combohandler'), - config = require('../../config'); + config = require('../config'); function send (req, res) { res.send(res.body); diff --git a/routes/invitations.js b/routes/invitations.js index 1378483a..9a4e0567 100644 --- a/routes/invitations.js +++ b/routes/invitations.js @@ -1,4 +1,4 @@ -var invs = require('../services/invitations'); +var invs = require('../lib/invitations'); exports.read = function (req, res, next) { invs.loadInvitation(req.invitationId, function (err, invitation) { diff --git a/routes/rsvp.js b/routes/rsvp.js index fc4a090e..41f33c60 100644 --- a/routes/rsvp.js +++ b/routes/rsvp.js @@ -1,6 +1,6 @@ var STATUS_CODES = require('http').STATUS_CODES, - invs = require('../services/invitations'); + invs = require('../lib/invitations'); exports.login = [invIdFromUrl, loadInvitation, setSessionInvId]; exports.edit = [invIdFromSession, loadInvitation, renderInvitation]; diff --git a/scripts/gen-labels.js b/scripts/gen-labels.js index 07e2f55e..9b9af804 100755 --- a/scripts/gen-labels.js +++ b/scripts/gen-labels.js @@ -3,7 +3,7 @@ var csv = require('csv'), path = require('path'), - invs = require('../lib/services/invitations'), + invs = require('../lib/invitations'), output = process.argv[2]; if (output) { diff --git a/server.js b/server.js index b17e671a..82d45148 100644 --- a/server.js +++ b/server.js @@ -1,5 +1,5 @@ var http = require('http'), - app = require('./lib/app'), + app = require('./app'), port = app.get('port'); http.createServer(app).listen(port, function () {