Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:majormajors/kittenmash

  • Loading branch information...
commit c06299a9f77914b7b4de424896a3c9b0e08c41d9 2 parents 8526746 + 197f208
Alex "Merlin" Glowaski alexglow authored
5 app.js
View
@@ -12,6 +12,8 @@ var express = require('express')
var app = module.exports = express.createServer();
+var port = 3000;
+
// Configuration
app.configure(function(){
@@ -29,6 +31,7 @@ app.configure('development', function(){
});
app.configure('production', function(){
+ port = process.env.PORT;
mongoose.connect(process.env.MONGOLAB_URI);
app.use(express.errorHandler());
});
@@ -38,6 +41,6 @@ app.configure('production', function(){
app.get('/', routes.index);
app.resource('scores', controllers.scores);
-app.listen(3000, function(){
+app.listen(port, function(){
console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);
});
4 package.json
View
@@ -9,4 +9,8 @@
, "express-mongoose": ">= 0.0.5"
, "express-resource": ">= 0.2.4"
}
+ , "engines": {
+ "node": "0.6.x",
+ "npm": "1.1.x"
+ }
}
BIN  public/images/600x600/cute-kitten-631-4.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  public/images/600x600/cute-kitten3.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  public/images/600x600/kitten.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.