Merge pull request #72 from OpenBCI/development

Development
openbci-archive · Jan 14, 2019 · f6035df · f6035df
2 parents 3d87ee7 + 9efa0d9
commit f6035df
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/app/index.html b/app/index.html
@@ -4,7 +4,7 @@
         body {
             background-color: #284470;
         }
-        h1 {
+        h1, p {
             text-align: center;
             margin: auto;
             width: 50%;
@@ -22,6 +22,7 @@
 <body>
     <div style="width:100%; height:100%">
         <h1 id="connection">OpenBCI Electron Hub</h1>
+        <p>Version: <span id="versionText">Unknown</span></p>
         <div>
             <button id="quitButton" class="quitBtn">Quit OpenBCI Hub</button>
         </div>

diff --git a/app/package.json b/app/package.json
@@ -2,7 +2,7 @@
   "name": "openbci-electron-hub",
   "productName": "OpenBCIHub",
   "description": "OpenBCIHub",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "author": "AJ Keller <[email protected]>",
   "copyright": "© 2018, OpenBCI inc.",
   "homepage": "http://openbci.com",

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,9 @@
+# v2.0.4
+
+### New Features
+
+- Added version number to the HUB's display
+
 # v2.0.3
 
 ### Bug Fixes

diff --git a/src/index.js b/src/index.js
@@ -1,4 +1,5 @@
 import { ipcRenderer } from 'electron';
+import { remote } from 'electron'
 
 // document.addEventListener('DOMContentLoaded', () => {
 //   let n = new Notification('You did it!', {
@@ -15,3 +16,5 @@ import { ipcRenderer } from 'electron';
 document.getElementById("quitButton").addEventListener("click", function(){
   ipcRenderer.send('quit');
 });
+
+document.getElementById("versionText").innerHTML = remote.app.getVersion();