Skip to content

Commit

Permalink
deployment fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jordanbrauner committed Jan 18, 2016
1 parent d9e215f commit b37ce61
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 32 deletions.
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions Procfile
@@ -0,0 +1 @@
web: node app.js
6 changes: 3 additions & 3 deletions app.js
Expand Up @@ -5,7 +5,7 @@ var mongoose = require('mongoose');
var hbs = require("hbs");

// CONFIGURE
mongoose.connect('mongodb://localhost/project4test');
mongoose.connect("mongodb://" + (process.env.MONGODB_URL || "localhost/project4test"));
var db = mongoose.connection;
db.on('error', console.error.bind(console, 'connection error: '));
db.once('open', function() {
Expand All @@ -23,6 +23,6 @@ app.get("/", function(req, res) {
app.use("/cards", require("./controllers/cardsController"));

// RUN APP
app.listen(4000, function() {
console.log("App listening on port " + this.address().port);
app.listen(process.env.PORT || 4000, function() {
console.log("App listening on port 4000");
});
2 changes: 1 addition & 1 deletion db/seeds.js
Expand Up @@ -3,7 +3,7 @@ var Card = require("../models/card");
var cardData = require("./card_data.json");
var mongoose = require("mongoose");

mongoose.connect('mongodb://localhost/project4test');
mongoose.connect("mongodb://" + (process.env.MONGODB_URL || "localhost/project4test"));
var db = mongoose.connection;

db.on("error", function(err) {
Expand Down
23 changes: 0 additions & 23 deletions npm-debug.log

This file was deleted.

8 changes: 4 additions & 4 deletions package.json
@@ -1,17 +1,17 @@
{
"name": "project-4",
"name": "moonlight-mansion",
"version": "1.0.0",
"description": "A bord game inspired by the weird fiction of H.P. Lovecraft and Clark Ashton Smith.",
"description": "deploy-test",
"main": "app.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "Jordan Brauner",
"license": "ISC",
"dependencies": {
"bower": "^1.7.2",
"express": "^4.13.3",
"hbs": "^4.0.0",
"mongoose": "^4.3.4"
"mongodb": "^2.1.4",
"mongoose": "^4.3.6"
}
}
3 changes: 2 additions & 1 deletion public/js/models/card.js
Expand Up @@ -28,7 +28,8 @@ cards = {
};

Card.fetch = function() {
var url = "http://localhost:4000/cards";
var url = "/cards";

var request = $.getJSON(url).then(function(response) {
for (var i = 0; i < response.length; i++) {
if (response[i].cardType == "event") {
Expand Down

0 comments on commit b37ce61

Please sign in to comment.