moving files around - serve the chat from heroku instead of github pages

MadeByThePinsHub · Jan 17, 2017 · c5611b0 · c5611b0
1 parent b0c6f81
commit c5611b0
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 21 deletions.
diff --git a/chat.html b/chat.html
@@ -7,8 +7,8 @@
 <body>
 
 <div id="intergramChat"></div>
-<script src="static/chat.js"></script>
-<audio id="messageSound" src="ping.mp3" preload="auto"></audio>
+<script src="js/chat.js"></script>
+<audio id="messageSound" src="media/ping.mp3" preload="auto"></audio>
 
 </body>
 </html>
diff --git a/demo.html b/demo.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Intergram Demo Page</title>
+
+    <meta charset="utf-8" />
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+    <style type="text/css">
+      body {
+        background-color: #f0f0f2;
+        margin: 0;
+        padding: 0;
+        font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+      }
+
+      .main {
+        width: 600px;
+        margin: 5em auto;
+        padding: 50px;
+        background-color: #fff;
+        border-radius: 1em;
+      }
+    </style>
+
+  </head>
+  <body>
+
+    <div class="main">
+      <h1>Intergram Demo Page</h1>
+      <p>Free live chat widget linked to your telegram messenger. </p>
+
+      <p><a href="https://github.com/idoco/intergram">More information...</a></p>
+    </div>
+
+    <script> window.intergramId = 312940879; window.intergramFrameSrc = '/chat.html' </script>
+    <script src="/js/widget.js"></script>
+
+  </body>
+</html>
diff --git a/index.html b/index.html
diff --git a/ping.mp3 → media/ping.mp3 b/ping.mp3 → media/ping.mp3
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "start": "node server.js",
     "postinstall": "npm run build",
     "dev": "node devServer.js",
-    "build": "shx mkdir -p dist && shx cp *.html dist && shx cp ping.mp3 dist && shx cp -r ./css dist && webpack -p",
+    "build": "shx mkdir -p dist && shx cp *.html dist && shx cp -r ./media dist && shx cp -r ./css dist && webpack -p",
     "test": "npm run -s lint",
     "lint": "eslint src",
     "deploy": "gh-pages -d dist"

diff --git a/server.js b/server.js
@@ -6,7 +6,7 @@ const http = require('http').Server(app);
 const io = require('socket.io')(http);
 const request = require('request');
 
-app.use(express.static('dist'));
+app.use(express.static('dist', {index: 'demo.html'}));
 app.use(compression());
 app.use(bodyParser.json());
 

diff --git a/src/widget/ChatFrame.js b/src/widget/ChatFrame.js
@@ -8,9 +8,9 @@ export default class ChatFrame extends Component {
     }
 
     render() {
+        const frameSrc = window.intergramFrameSrc || 'https://intergram.herokuapp.com/chat.html';
         return (
-            // Using a static link to GitHub pages - this might be confusing during development!
-            <iframe src={'https://idoco.github.io/intergram/chat.html?id=' + window.intergramId }
+            <iframe src={frameSrc + '?id=' + window.intergramId}
                     width='300' height='350' frameborder='0'>
             </iframe>
         );

diff --git a/webpack.config.js b/webpack.config.js
@@ -12,7 +12,7 @@ module.exports = {
         ],
     },
     output: {
-        path: path.join(__dirname, 'dist', 'static'),
+        path: path.join(__dirname, 'dist', 'js'),
         filename: '[name].js',
         publicPath: '/static/'
     },