fixed bug where actions were executed mutliple times

jedireza · jedireza · commit e69b14b7453d · 2014-11-13T13:46:11.000-08:00
diff --git a/chat/server.js b/chat/server.js
@@ -3,8 +3,8 @@
  * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
  */
 require('node-jsx').install({ extension: '.jsx' });
-var http = require('http');
 var express = require('express');
+var favicon = require('serve-favicon');
 var expressState = require('express-state');
 var bodyParser = require('body-parser');
 var debug = require('debug')('Example');
@@ -16,7 +16,8 @@ var HeadComponent = React.createFactory(require('./components/Head.jsx'));
 var server = express();
 expressState.extend(server);
 server.set('state namespace', 'App');
-server.use(express.static(__dirname + '/build'));
+server.use(favicon(__dirname + '/../favicon.ico'));
+server.use('/public', express.static(__dirname + '/build'));
 server.use(bodyParser.json());
 
 // Get access to the fetchr plugin instance
@@ -55,9 +56,9 @@ server.use(function (req, res, next) {
         res.write(head);
         res.write('<body>');
         res.write('<div id="app">' + html + '</div>');
-        res.write('</body>')
+        res.write('</body>');
         res.write('<script>' + res.locals.state + '</script>');
-        res.write('<script src="/js/client.js" defer></script>');
+        res.write('<script src="/public/js/client.js" defer></script>');
         res.write('</html>');
         res.end();
     });
diff --git a/favicon.ico b/favicon.ico
diff --git a/package.json b/package.json
@@ -15,7 +15,8 @@
     "fluxible-plugin-fetchr": "^0.1.0",
     "fluxible-plugin-routr": "^0.2.0",
     "node-jsx": "^0.12.0",
-    "react": "^0.12.0"
+    "react": "^0.12.0",
+    "serve-favicon": "^2.1.6"
   },
   "devDependencies": {
     "jsx-loader": "^0.12.0",
diff --git a/routing/server.js b/routing/server.js
@@ -4,8 +4,8 @@
  */
 'use strict';
 require('node-jsx').install({ extension: '.jsx' });
-var http = require('http');
 var express = require('express');
+var favicon = require('serve-favicon');
 var expressState = require('express-state');
 var navigateAction = require('flux-router-component').navigateAction;
 var debug = require('debug')('Example');
@@ -16,8 +16,8 @@ var HeadComponent = React.createFactory(require('./components/Head.jsx'));
 var server = express();
 expressState.extend(server);
 server.set('state namespace', 'App');
-
-server.use(express.static(__dirname + '/build'));
+server.use(favicon(__dirname + '/../favicon.ico'));
+server.use('/public', express.static(__dirname + '/build'));
 
 server.use(function (req, res, next) {
     var context = app.createContext();
@@ -49,9 +49,9 @@ server.use(function (req, res, next) {
         res.write(head);
         res.write('<body>');
         res.write('<div id="app">' + html + '</div>');
-        res.write('</body>')
+        res.write('</body>');
         res.write('<script>' + res.locals.state + '</script>');
-        res.write('<script src="/js/client.js" defer></script>');
+        res.write('<script src="/public/js/client.js" defer></script>');
         res.write('</html>');
         res.end();
     });
