replaced localhost for target dev server and showing version in-app

yangwao · Aug 13, 2017 · e33b2a9 · e33b2a9
1 parent a1a5d6a
commit e33b2a9
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 12 deletions.
diff --git a/server/lib/mongo.js b/server/lib/mongo.js
@@ -23,10 +23,10 @@ let getDbStats = function (db, cb) {
 l.info('Mongodb @', config.mongodb.host)
 MongoClient.connect(mongoUrl, function (err, database) {
   if (err) {
-    l.error('Could not connect to mongodb')
+    l.error('Could not connect to Mongodb')
   }
   db = database
-  l.info('Connected successfully to mongodb')
+  l.info('Connected successfully to Mongodb')
   getDbStats(db, function () {
   })
 })

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/skCube-client/package.json b/skCube-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "skCube-client",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "author": "Matej Nemcek <[email protected]>",
   "description": "gathering gsr data to server",
   "license": "MIT license",

diff --git a/skCube-client/src/renderer/components/LandingPage.vue b/skCube-client/src/renderer/components/LandingPage.vue
@@ -45,6 +45,9 @@
           <p>
             last server packet status: {{ serverReply.status }} @ {{ serverReply.timestamp }} seen: {{ serverReply.seen }} packetId: {{ serverReply._id }}
           </p>
+          <p>
+            targetServer {{ targetServer }} version {{ this.appVersion }}
+          </p>
         </div>
       </div>
 
@@ -53,13 +56,16 @@
 </template>
 
 <script>
+import {version} from '../../../package.json'
 export default {
   data() {
     return {
       today: Date.now(),
       last30days: 1000*60*60*24*30,
-      targetViewer: 'http://localhost:9001/v1/createdAt/',
-      targetServer: 'http://localhost:9001/v1/raw',
+      // targetViewer: 'http://localhost:9001/v1/createdAt/',
+      // targetServer: 'http://localhost:9001/v1/raw',
+      targetViewer: 'http://collector.hypersignal.xyz:9001/v1/createdAt/',
+      targetServer: 'http://collector.hypersignal.xyz:9001/v1/raw',
       gsrPath: {
         sentDir: 'sent/',
         dir: '',
@@ -68,17 +74,18 @@ export default {
       },
       gsrFilename: '',
       packetInfo: {
-        meta: '',
-        sourceCallsign: '',
-        destinationCallsign: ''
+        meta: 'null',
+        sourceCallsign: 'OM9SAT',
+        destinationCallsign: '00000'
       },
       counter: 0,
       gsrPacket: '',
       serverReply: {
         status: '-',
         seen: '-',
         timestamp: '-'
-      }
+      },
+      appVersion: require('electron').remote.app.getVersion()
     }
   },
   name: 'landing-page',