Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Vallelunga committed Apr 9, 2014
1 parent 896fb9f commit bc64dce
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"general": {
"production": false,
"production": true,
"company": "BubbleCoup",
"logo": "bubblecoup",
"delimeter": {
Expand Down Expand Up @@ -42,7 +42,7 @@
"password": "bubblecoup"
},
"stripe": {
"production": "sk_live_EzlWg4LFouolfg7RGNj0dHaI",
"production": "sk_test_YPp6Iew2IQkSOOP1CXRIg741",
"development": "sk_test_YPp6Iew2IQkSOOP1CXRIg741"
},
"icons": {
Expand Down
6 changes: 3 additions & 3 deletions public/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ var fs = require("fs");
var js = piler.createJSManager({ urlRoot: "/js/" });
var css = piler.createCSSManager({ urlRoot: "/css/" });

exports.init = function(app) {
exports.init = function(app, srv) {
//Bind to App
js.bind(app);
css.bind(app);
js.bind(app, srv);
css.bind(app, srv);

//Auto Discover JS
$.each(fs.readdirSync(__dirname + "/js/"), function(index, directory) {
Expand Down
2 changes: 1 addition & 1 deletion routes/globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module.exports = function(req, res, next) {
res.locals.location = req.location;
res.locals.random = "?rand=" + config.random;
res.locals.type = "website";
res.locals.search = req.param("q") || "";
res.locals.search = "";
res.locals.logos = {
"logo": res.locals.host + "/img/logo.png",
"graph": res.locals.host + "/favicon/196.png",
Expand Down
5 changes: 3 additions & 2 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var express = require("express");
var device = require("express-device");
var slashes = require("connect-slashes");
var app = express();
var srv = require('http').createServer(app);
var ejs = require("ejs");
var RedisStore = require("connect-redis")(express);

Expand All @@ -28,7 +29,7 @@ app.configure(function() {
app.set("x-powered-by", false);

//Piler Assests
require("./public").init(app);
require("./public").init(app, srv);
app.use(require("./public").express);

//Direct Assests
Expand Down Expand Up @@ -84,4 +85,4 @@ require("./routes")(app);

/* Start Router */
app.use(app.router);
app.listen(80);
srv.listen(80);

0 comments on commit bc64dce

Please sign in to comment.