From 79027072cb05ef58ce3eddfd939756e1da41681b Mon Sep 17 00:00:00 2001
From: Lukas Winkler <git@lw1.at>
Date: Wed, 10 Apr 2019 10:05:34 +0200
Subject: [PATCH] fix updater

---
 .gitignore                |  1 +
 client/src/App.vue        | 45 +++++++++++++++++++++++++++++++++++++++
 client/src/views/Main.vue |  2 +-
 client/tslint.json        |  2 +-
 public/supported.php      |  2 +-
 public/version.json       |  3 ---
 update.php                | 16 ++++++++++----
 7 files changed, 61 insertions(+), 10 deletions(-)
 delete mode 100644 public/version.json

diff --git a/.gitignore b/.gitignore
index 46fc299..0490fee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 vendor/
 tmp/
 config.ini
+public/version.json
diff --git a/client/src/App.vue b/client/src/App.vue
index 1e8c7bc..fb574f8 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -6,9 +6,54 @@
       <router-link to="/main">Main</router-link>
     </div>
     <router-view/>
+    <footer>
+      <div>
+        using Device Detector <a :href="'https://github.com/matomo-org/device-detector/tree/'+commitHash" target="_blank">{{shortHash}}</a>
+      </div>
+      <div>
+        last updated on {{lastUpdated.toLocaleString()}}
+      </div>
+    </footer>
   </div>
 </template>
 
+<script lang="ts">
+  import Vue from 'vue';
+
+  const versionJSON = 'http://local.devicedetector.net/version.json';
+
+  export default Vue.extend({
+    name: 'Main',
+    data() {
+      return {
+        commitHash: "",
+        lastUpdated: new Date()
+      };
+    },
+    computed:{
+      shortHash():string {
+        return this.commitHash.substring(0,7);
+      }
+    },
+    mounted(): void {
+      const req = new XMLHttpRequest();
+      req.onreadystatechange = (event: Event): void => {
+        if (req.readyState === XMLHttpRequest.DONE) {
+          if (req.status === 200) {
+            const data = JSON.parse(req.responseText);
+            console.log(data);
+            this.commitHash = data.commitHash;
+            this.lastUpdated = new Date(data.date);
+          }
+        }
+      };
+
+      req.open('GET', versionJSON , true);
+      req.send(null);
+    }
+  });
+</script>
+
 <style lang="scss">
 #app {
   font-family: 'Avenir', Helvetica, Arial, sans-serif;
diff --git a/client/src/views/Main.vue b/client/src/views/Main.vue
index eebf458..68939f7 100644
--- a/client/src/views/Main.vue
+++ b/client/src/views/Main.vue
@@ -12,7 +12,7 @@
 <script lang="ts">
     import Vue from 'vue';
 
-    const baseURL = 'http://localhost/devicedetector.net/api.php';
+    const baseURL = 'http://local.devicedetector.net/detect/';
 
     export default Vue.extend({
         name: 'Main',
diff --git a/client/tslint.json b/client/tslint.json
index 197a6b9..fe298ee 100644
--- a/client/tslint.json
+++ b/client/tslint.json
@@ -9,7 +9,7 @@
     ]
   },
   "rules": {
-    "quotemark": [true, "single"],
+    "quotemark": [true, "double"],
     "indent": [true, "spaces", 4],
     "interface-name": false,
     "ordered-imports": false,
diff --git a/public/supported.php b/public/supported.php
index a7dd100..e794a47 100644
--- a/public/supported.php
+++ b/public/supported.php
@@ -28,7 +28,7 @@ $cacheloader = new CacheLoader();
 
 $item = $cacheloader->cache->getItem("supported");
 
-if ($item->isHit() and false) {
+if ($item->isHit()) {
     $data = $item->get();
 } else {
 
diff --git a/public/version.json b/public/version.json
deleted file mode 100644
index 22e96b8..0000000
--- a/public/version.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "githash": "adssdasa"
-}
\ No newline at end of file
diff --git a/update.php b/update.php
index 7967d59..8162b4e 100644
--- a/update.php
+++ b/update.php
@@ -1,7 +1,10 @@
 <?php
 
 namespace DeviceDetectorNet;
-//system("composer update");
+
+require_once 'vendor/autoload.php';
+
+system("composer update");
 
 $lockstring = file_get_contents("composer.lock");
 $composerLock = json_decode($lockstring, true);
@@ -10,10 +13,15 @@ $key = array_search("piwik/device-detector", array_column($composerLock["package
 $ddPackage = $composerLock["packages"][$key];
 
 $commitHash = $ddPackage["source"]["reference"];
-$currentDate =
-    print_r($composerLock["packages"][$key]);
+$currentDate = (new \DateTime())->format('c');
 
+$version = [
+    "commitHash" => $commitHash,
+    "date" => $currentDate
+];
+
+file_put_contents("public/version.json", json_encode($version, JSON_PRETTY_PRINT));
 $cacheLoader = new CacheLoader();
 
 $cacheLoader->cache->clear();
-echo "Cache cleared";
\ No newline at end of file
+echo "Cache cleared\n";