Merge branch 'team1' of github.com:adunkman/stalkqr

Conflicts:
	README.md
	app.coffee
	package.json
	public/css/app.styl
	views/layout.jade

Author: Andrew Dunkman

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/adunkman/stalkqr.png?branch=master)](http://travis-ci.org/adunkman/stalkqr)
 
-An open source project by the NodeKC group. 
+An open source project by the NodeKC group.
 
 http://nodekc.org
 
@@ -14,7 +14,7 @@ This project will generate URL's that can be used by others to add your social c
 
 ###Set up your environment variables
 
-#### UNIX    
+#### UNIX
     export KEY=value
 
 #### Windows
@@ -24,7 +24,7 @@ This project will generate URL's that can be used by others to add your social c
     heroku config:add KEY=value
 
 ##Twitter API Key
-  
+
     TWITTER_CONSUMER_KEY
     TWITTER_CONSUMER_SECRET
 
@@ -41,5 +41,5 @@ https://github.com/account/applications Once again, it's important to set the ca
 
     CALLBACK_BASE_URL
 
-You will need to set up your base callback url. This is the root url to where the site is hosted. Examples include: http://localhost:3000 or http://hazy-mist-1110.herokuapp.com 
+You will need to set up your base callback url. This is the root url to where the site is hosted. Examples include: http://localhost:3000 or http://hazy-mist-1110.herokuapp.com
 

app.coffee

@@ -6,7 +6,7 @@ app = express.createServer()
 port = process.env.PORT || 3000
 sessionSecret = process.env.SESSION_SECRET || 'stalkqr'
 
-controllers = 
+controllers =
   authentication: require './controllers/authentication'
   site: require './controllers/site'
   code: require './controllers/code'
@@ -22,19 +22,22 @@ app.configure ->
   app.set 'view engine', 'jade'
 
 app.configure 'development', ->
-  app.use stylus.middleware 
-    src: path.join __dirname, 'public' 
-  
+  app.use stylus.middleware
+    src: path.join __dirname, 'public'
+
 app.configure 'production', ->
-  app.use stylus.middleware 
-    src: path.join __dirname, 'public' 
+  app.use stylus.middleware
+    src: path.join __dirname, 'public'
     compress: true
 
 controllers.authentication.use app
 controllers.site.use app
 controllers.code.use app
 controllers.event.use app
 
+app.get '/generate', bitly.generate, (req, res) ->
+  res.render 'layout', res.data
+
 app.listen port
 
 console.log 'server listening on port ' + port

package.json

@@ -16,7 +16,7 @@
     "should": "~v0.5.1",
     "mocha": "v0.13.0"
   },
-  
+
   "scripts": {
     "test": "make test"
   }

public/css/app.styl

@@ -1,11 +1,14 @@
 body
   font-family 'Helveteca Neue', arial, sans-serif
-a 
+  color white
+
+a
   color #8cc84b
   text-decoration none
   &:hover
     text-decoration underline
-h1 
+
+h1
   font-size 3em
   font-family verdana
   margin-top 2em

views/layout.jade

@@ -4,4 +4,4 @@ html(lang="en")
     title stalkqr
     link(rel='stylesheet', href='/css/app.css')
 
-  body!= body
+  body!= body