Last fix for update functionality

app/Http/Controllers/APIController.php

@@ -162,7 +162,7 @@ public function runComposer()
         return response()->json(['Composer run successful!', 200]);
     }
 
-    public function finalize()
+    public function finalize($version)
     {
         // Now we should be ready to rumble again -> update the env file
         $editor = new EnvEdit();

app/Http/routes.php

@@ -57,7 +57,7 @@
     Route::get ('/api/moveUpdate', 'APIController@moveUpdate');
     Route::get ('/api/migrateDatabase', 'APIController@migrateDatabase');
     Route::get ('/api/runComposer', 'APIController@runComposer');
-    Route::get ('/api/finalize', 'APIController@finalize');
+    Route::get ('/api/finalize/{version}', 'APIController@finalize');
 });
 
 

changelog.md

@@ -1,3 +1,12 @@
+# v0.1.4
+
+* Minor patch for the last dependency issues
+
+# v0.1.3
+
+* Fixed dependency issues with the new UpdateController
+* Added capability of automated updates
+
 # v.0.1.2
 
 * Fixed an error that in "closed editing mode" (Guests are not able to edit),

resources/assets/less/classes.less

@@ -38,6 +38,26 @@
     right:20px;
 }
 
+.bg-primary {
+    background-color:@color-primary;
+}
+
+.bg-warning {
+    background-color:@color-warning;
+}
+
+.bg-error {
+    background-color:@color-error;
+}
+
+.bg-success {
+    background-color:@color-success;
+}
+
+.bg-muted {
+    background-color:@color-muted;
+}
+
 /*
 ************************
 **** Button classes ****

resources/views/admin/updates.blade.php

@@ -19,9 +19,6 @@
                 {{ trans('ui.backend.updates.patch', ['current' => env('APP_VERSION', 'v0.0.0'), 'new' => $newVersion, 'published' => $published]) }}
             </div>
         @endif
-        <div>
-            {!! $changelog or '' !!}
-        </div>
         <p>
             <a id="commenceUpdate">{{ trans('ui.backend.updates.commence') }}</a>
         </p>
@@ -31,6 +28,9 @@
             <ul id="updateProgress">
             </ul>
         </div>
+        <div>
+            {!! $changelog or '' !!}
+        </div>
     @else
         <div class="alert muted">
             {{ trans('ui.backend.updates.none', ['current' => env('APP_VERSION', 'v0.0.0')]) }}
@@ -107,7 +107,7 @@
             // This will be passed to the setup.php as an action to execute
             'action': 'finalize',
             // In this variable the retrieved input will be put.
-            'argv': ''
+            'argv': "{{ $newVersion }}"
         },
     ];
 
@@ -148,13 +148,13 @@ function Updater(steps)
             // Call the controller and execute action
             $.get("{{ url('/admin/api/')}}/" + step.action + "/" + step.argv, function() {})
             .done($.proxy(function(data) {
-                $('#next').text(data[0]).addClass('success');
+                $('#next').text(data[0]).addClass('bg-success');
                 $('#next').attr('id', '');
                 this.goodtogo = true;
                 this.next();
             }, this))
             .fail($.proxy(function(data) {
-                $('#next').text(data[0]).addClass('error');
+                $('#next').text(data[0]).addClass('bg-error');
             }, this));
         } else {
             // No action required -> commence the next step