Merge pull request #54 from thisandagain/bugfix/gh38

Clean-up and minor bug fix

package.json

@@ -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",

server/defaults.json

@@ -1,4 +1,4 @@
 {    
-    "title": "Scratch - Imagine, Program, Share",
+    "title": "Imagine, Program, Share",
     "description": "Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations."
 }

server/template.html

@@ -15,7 +15,7 @@
         <!-- Open Graph -->
         <meta property="og:type" content="website" />
         <meta property="og:url" content="https://scratch.mit.edu/" />
-        <meta property="og:title" content="Scratch - Imagine, Program, Share" />
+        <meta property="og:title" content="Scratch - {{title}}" />
         <meta property="og:description" content="Make games, stories and interactive art with Scratch. (scratch.mit.edu)" />    
 
         <!-- Favicon & CSS normalize -->

src/components/navigation/navigation.jsx

@@ -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');

src/lib/log.js

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

src/log.js

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

src/mixins/api.jsx

@@ -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) {

src/session.json

@@ -1,17 +0,0 @@
-{
-    "token": "62d43b28d86a14423e01bdb2995dbbb2",
-    "user": {
-        "id": 1709047,
-        "username": "thisandagain",
-        "thumbnailUrl": "//cdn2.scratch.mit.edu/get_image/user/1709047_32x32.png?v=1427980331.0"
-    },
-    "permissions": {
-        "admin": true,
-        "social": true,
-        "educator": false
-    },
-    "flags": {
-        "has_outstanding_email_confirmation": false,
-        "show_welcome": false
-    }
-}

webpack.config.js

@@ -1,7 +1,8 @@
 var path = require('path');
 var webpack = require('webpack');
+
+var environment = require('./src/environment.js');
 var routes = require('./server/routes.json');
-var buildEnv = require('./src/environment.js');
 
 // Prepare all entry points
 var entry = {
@@ -53,7 +54,7 @@ module.exports = {
     },
     plugins: [
         new webpack.DefinePlugin({
-            'process.env': buildEnv
+            'process.env': environment
         }),
         new webpack.optimize.UglifyJsPlugin({
             compress: {