scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-22 23:27:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolve merge conflict

Browse source
This commit is contained in:
Andrew Sliwinski 2015-10-13 09:40:40 -04:00
parent 79a8d771d6
commit f3d6a273fb
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package.json
View file

@ -22,7 +22,7 @@
},
"homepage": "https://github.com/llk/scratch-www#readme",
"dependencies": {
"bunyan": "1.5.0",
"bunyan": "1.5.1",
"compression": "1.5.2",
"express": "4.13.3",
"express-http-proxy": "0.6.0",
@ -40,7 +40,8 @@
"file-loader": "0.8.4",
"json-loader": "0.5.2",
"jsx-loader": "0.13.2",
"node-sass": "3.3.2",
"minilog": "2.0.8",
"node-sass": "3.3.3",
"react": "0.13.3",
"react-modal": "0.3.0",
"react-onclickoutside": "0.3.1",

2
src/components/navigation/navigation.jsx
View file

@ -2,7 +2,7 @@ var React = require('react');
var classNames = require('classnames');
var xhr = require('xhr');
var log = require('../../log.js');
var log = require('../../lib/log.js');
var Api = require('../../mixins/api.jsx');
var Session = require('../../mixins/session.jsx');

4
src/lib/log.js Normal file
View file

@ -0,0 +1,4 @@
var minilog = require('minilog');
minilog.enable();
module.exports = minilog('www');

4
src/log.js
View file

@ -1,4 +0,0 @@
var bunyan = require('bunyan');
var Logger = bunyan.createLogger({name: 'scratch-www'});
module.exports = Logger;

2
src/mixins/api.jsx
View file

@ -1,7 +1,7 @@
var cookie = require('cookie');
var defaults = require('lodash.defaults');
var xhr = require('xhr');
var log = require('../log.js');
var log = require('../lib/log.js');
var Api = {
getCsrf: function (callback) {