Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/server-side/ServerManager.js

Author: codeBelt

Diff for: README.md

@@ -1,4 +1,4 @@
-# `hapi-react-hot-loader`
+# `hapi-react-hot-loader-example`
 Example application demonstrating react-hot-loader-3 with webpack-2, react and friends, and hapi.
 
 ## get started

Diff for: src/server-side/ServerManager.js

@@ -1,4 +1,4 @@
-import * as hapi from 'hapi';
+import * as Hapi from 'hapi';
 
 const PORT = process.env.PORT || 3000;
 const HOST = process.env.HOST || 'localhost';
@@ -8,7 +8,7 @@ class ServerManager {
 
     static log = () => console.log(`\n\nServer running in ${NODE_ENV} mode at: http://${HOST}:${PORT}\n`);
 
-    _server = new hapi.Server({ debug: { request: ['error'] } });
+    _server = new Hapi.Server({debug: {request: ['error']}});
 
     isProduction = (NODE_ENV === 'production');
 

Diff for: src/services/ServerService.js

@@ -0,0 +1,19 @@
+class ServerService {
+
+    static createLocationObject(request) {
+        const protocal = request.headers['x-forwarded-proto'] || request.connection.info.protocol;
+
+        return {
+            ...request.url,
+            host: request.info.host,
+            hostname: request.info.host.split(':')[0],
+            href: `${protocal}://${request.info.host}${request.url.path}`,
+            origin: `${protocal}://${request.info.host}`,
+            pathname: request.url.path.split('?')[0],
+            protocal: `${protocal}:`,
+        };
+    }
+
+}
+
+export default ServerService;