sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 15:38:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(sharing): add phantomjs buildpack to heroku (for pageres), proper use of nested nconf keys

Browse source
This commit is contained in:
Tyler Renelle 2014-11-12 09:02:12 -07:00
parent 15f318ccc2
commit 8f633e81db
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.buildpacks Normal file
View file

@ -0,0 +1,2 @@
https://github.com/heroku/heroku-buildpack-nodejs.git
https://github.com/stomita/heroku-buildpack-phantomjs.git

4
public/js/controllers/footerCtrl.js
View file

@ -38,8 +38,8 @@
// Scripts only for desktop // Scripts only for desktop
if (!window.env.IS_MOBILE) { if (!window.env.IS_MOBILE) {
// Add This - FIXME why isn't this working when here? instead it's now in <head> // Add This
//$.getScript("//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5016f6cc44ad68a4"); //$.getScript("//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5016f6cc44ad68a4"); //FIXME why isn't this working when here? instead it's now in <head>
var addthisServices = 'facebook,twitter,googleplus,tumblr,'+window.env.BASE_URL.replace('https://','').replace('http://',''); var addthisServices = 'facebook,twitter,googleplus,tumblr,'+window.env.BASE_URL.replace('https://','').replace('http://','');
window.addthis_config = { window.addthis_config = {
services_custom:{ services_custom:{

2
src/controllers/dataexport.js
View file

@ -11,7 +11,7 @@ var User = require('../models/user').model;
// Avatar screenshot/static-page includes // Avatar screenshot/static-page includes
var Pageres = require('pageres'); //https://github.com/sindresorhus/pageres var Pageres = require('pageres'); //https://github.com/sindresorhus/pageres
var AWS = require('aws-sdk'); var AWS = require('aws-sdk');
AWS.config.update({accessKeyId: nconf.get("S3").accessKeyId, secretAccessKey: nconf.get("S3").secretAccessKey}); AWS.config.update({accessKeyId: nconf.get("S3:accessKeyId"), secretAccessKey: nconf.get("S3:secretAccessKey")});
var s3Stream = require('s3-upload-stream')(new AWS.S3()); //https://github.com/nathanpeck/s3-upload-stream var s3Stream = require('s3-upload-stream')(new AWS.S3()); //https://github.com/nathanpeck/s3-upload-stream
var bucket = 'habitrpg-dev'; var bucket = 'habitrpg-dev';
var request = require('request'); var request = require('request');