Merge pull request #66 from Hydrock/feature/base-tag

bugthesystem · web-flow · commit 0a2bc88d428e · 2023-04-27T11:48:58.000+02:00
diff --git a/README.md b/README.md
@@ -53,7 +53,8 @@ Default options:
 
 ```js
 title: 'hapi.js Status',
-path: '/status',
+path: '/status', // Path to Status Page
+base: '/', // href attribute of the base html tag 
 websocket: null, // The Socket.io instance to be used, if none provided a new one will be created!
 spans: [{
   interval: 1,     // Every second
diff --git a/__tests__/helpers/default-config.spec.js b/__tests__/helpers/default-config.spec.js
@@ -11,6 +11,11 @@ describe('helpers', () => {
         expect('/status').toEqual(defaultConfig.path);
       });
 
+      it('then base === /', () => {
+        expect('/').toEqual(defaultConfig.base);
+      });
+
+
       it('then spans === array', () => {
         const spans = [
           { interval: 1, retention: 60, responses: [] },
diff --git a/src/helpers/default-config.js b/src/helpers/default-config.js
@@ -1,6 +1,7 @@
 module.exports = {
   title: 'hapi.js Status',
   path: '/status',
+  base: '/',
   spans: [
     {
       interval: 1,
diff --git a/src/middleware-wrapper.js b/src/middleware-wrapper.js
@@ -20,6 +20,7 @@ const middlewareWrapper = (server, options) => {
       const renderedHtml = fs.readFileSync(path.join(__dirname, '/public/index.html'))
         .toString()
         .replace(/{{title}}/g, opts.title)
+        .replace(/{{base}}/g, opts.base)
         .replace(/{{script}}/g, fs.readFileSync(path.join(__dirname, '/public/javascripts/app.js')))
         .replace(/{{style}}/g, fs.readFileSync(path.join(__dirname, '/public/stylesheets/style.css')));
 
diff --git a/src/public/index.html b/src/public/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <base href="{{base}}">
   <title>{{title}}</title>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.6.0/Chart.bundle.min.js"></script>
   <script src="https://cdn.socket.io/4.5.0/socket.io.min.js"></script>
diff --git a/src/public/javascripts/app.js b/src/public/javascripts/app.js
@@ -7,7 +7,12 @@ Chart.defaults.global.elements.line.backgroundColor = "rgba(0,0,0,0)";
 Chart.defaults.global.elements.line.borderColor = "rgba(0,0,0,0.9)";
 Chart.defaults.global.elements.line.borderWidth = 2;
 
-var socket = io(location.protocol + '//' + location.hostname + ':' + location.port);
+const baseTag = document.querySelector('base');
+const basePath = baseTag ? baseTag.getAttribute('href') : '/';
+
+var socket = io(location.protocol + '//' + location.hostname + ':' + location.port, {
+  path: `${basePath}/socket.io`
+});
 var defaultSpan = 0;
 var spans = [];
 var statusCodesColors = ['#75D701', '#47b8e0', '#ffc952', '#E53A40'];
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`module.exports = {`
`2`	`2`	`title: 'hapi.js Status',`
`3`	`3`	`path: '/status',`
	`4`	`+ base: '/',`
`4`	`5`	`spans: [`
`5`	`6`	`{`
`6`	`7`	`interval: 1,`