Permalink
Browse files

small tweaks

  • Loading branch information...
1 parent 30e8694 commit 4592c340878a2954b1bd8ea0e46f191ea4cefcc2 Carter Rabasa committed Mar 31, 2012
Showing with 11 additions and 18 deletions.
  1. +0 −1 .gitignore
  2. +2 −2 package.json
  3. +5 −11 server.js
  4. +4 −4 views/index.jade
View
@@ -1,4 +1,3 @@
node_modules
-config.js
.DS_STORE
public/css/app.css
View
@@ -1,6 +1,6 @@
{
"name": "jsconf2012",
- "version": "0.1.0",
+ "version": "0.1.3",
"dependencies": {
"telenode": "0.0.3",
"express": "2.5.8",
@@ -16,4 +16,4 @@
"engines": {
"node": "0.6.x"
}
-}
+}
View
@@ -1,4 +1,4 @@
-// REQUIRED MODULES
+// Required Modules
var config = require('./config'),
telenode = require('telenode'),
@@ -7,7 +7,7 @@ var config = require('./config'),
express = require('express'),
stylus = require('stylus');
-// WEB APPLICATION CONFIGURATION
+// Configuration
var connection = new(cradle.Connection)(config.couchdb.url, config.couchdb.port, {
auth:{username: config.couchdb.username, password: config.couchdb.password}}),
@@ -29,13 +29,7 @@ app.configure(function(){
twilio.credentials({sid: config.twilio.sid, authToken: config.twilio.key});
-cowpokes.save('_design/users', {
- in: {
- map: function (doc) { if (doc.opt == 'in') emit(null, doc); }
- }
-});
-
-// UTILITY FUNCTIONS
+// Utility Functions
var updateBus = function(response, direction) {
var now = new Date();
@@ -74,7 +68,7 @@ var smsify = function(str) {
else { return str.substr(0,157)+'...'; }
};
-// CONFIGURE OUR ROUTES
+// Routes
app.get('/', function(request, response) {
response.render('index.jade');
@@ -240,7 +234,7 @@ app.get('/test', function(request, response) {
response.send('test');
});
-// SPIN-UP OUR WEBSERVER
+// Webserver
var port = process.env.PORT || 3000;
View
@@ -9,16 +9,16 @@ block content
ul
li
code #shuttle
- span Use this to check on the status of the Twilio Bus
+ span Check on the status of the Twilio Bus.
li
code #pour {your name}
- span join Whiskey Alerts
+ span Join Whiskey Alerts.
li
code #detox
- span leave Whiskey Alerts
+ span Leave Whiskey Alerts.
li
code #moo
- span Use this to send a Whiskey Alert. You only get <b>4</b> during JSConf.
+ span Send a Whiskey Alert. You only get <b>4</b> during JSConf.
h3 Got Questions? We Got Answers!
div(class="faceperson")
a(href="http://www.twitter.com/CarterRabasa",target="_blank")

0 comments on commit 4592c34

Please sign in to comment.