Upstream null version; build version tags not being saved properly #575 (#578)

* Check for null version from upstream #575

* Fix for pre-release version numbering

* Move popup to right

* Split get/generate build ID #575

app/Http/Composers/VersionComposer.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Composers;
+
+use App\Services\VersionService;
+use Illuminate\View\View;
+
+class VersionComposer
+{
+    protected $versionSvc;
+
+    public function __construct(VersionService $versionSvc)
+    {
+        $this->versionSvc = $versionSvc;
+    }
+
+    public function compose(View $view)
+    {
+        $view->with('version', $this->versionSvc->getCurrentVersion(false));
+        $view->with('version_full', $this->versionSvc->getCurrentVersion(true));
+    }
+}