Fix panel routes

Closes #42

autogit.php

@@ -3,7 +3,7 @@
 /**
  * Kirby Auto Git Plugin
  *
- * @version   0.6.0
+ * @version   0.6.1
  * @author    Pedro Borges <[email protected]>
  * @copyright Pedro Borges <[email protected]>
  * @link      https://github.com/pedroborges/kirby-autogit
@@ -21,9 +21,7 @@ function autogit() {
     }
 
     // Load routes
-    if (c::get('autogit.webhook.secret', false)) {
-        require_once(__DIR__.DS.'lib'.DS.'routes.php');
-    }
+    require_once(__DIR__.DS.'lib'.DS.'routes.php');
 
     // Only load hooks, routes and widgets when
     // the content directory is a Git repo

changelog.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.6.1] - 2018-03-01
+### Fixed
+- Bug where panel routes where not being registered.
+
 ## [0.6.0] - 2018-02-13
 ### Added
 - `autogit` option: disables the plugin.

lib/routes.php

@@ -17,7 +17,7 @@ function autogitRoute($action, $source = null) {
 }
 
 // Add widget route
-if (class_exists('Panel')) {
+if (function_exists('panel')) {
     panel()->routes([
         [
             'pattern' => 'autogit/(:any)',
@@ -36,19 +36,23 @@ function autogitRoute($action, $source = null) {
 }
 
 // Add webhook route
-kirby()->routes([
-    [
-        'pattern' => c::get('autogit.webhook.url', 'autogit').'/(:any)',
-        'method'  => 'GET|POST',
-        'action'  => function($action) {
-            $secretMatches = r::get('secret') === c::get('autogit.webhook.secret');
-            $validActions  = ['pull', 'push'];
-
-            if (! autogit()->hasRemote() or ! $secretMatches or ! in_array($action, $validActions)) {
-                return go(site()->errorPage());
-            }
+if (c::get('autogit.webhook.secret', false)) {
+    kirby()->routes([
+        [
+            'pattern' => c::get('autogit.webhook.url', 'autogit').'/(:any)',
+            'method'  => 'GET|POST',
+            'action'  => function($action) {
+                $secretMatches = r::get('secret') === c::get('autogit.webhook.secret');
+                $validActions  = ['pull', 'push'];
+
+                if (! autogit()->hasRemote() or
+                    ! $secretMatches or
+                    ! in_array($action, $validActions)) {
+                    return go(site()->errorPage());
+                }
 
-            return autogitRoute($action, 'webhook');
-        }
-    ]
-]);
+                return autogitRoute($action, 'webhook');
+            }
+        ]
+    ]);
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "autogit",
   "author": "Pedro Borges <[email protected]>",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Kirby Auto Git",
   "type": "kirby-plugin",
   "license": "MIT"

widgets/autogit/template.php

@@ -49,11 +49,11 @@
 
 <div class="autogit-widget">
   <?php if (autogit()->hasRemote()) : ?>
-    <button href="/panel/autogit/push" data-action="push" class="btn btn-rounded btn-positive autogit-action">
+    <button data-action="push" class="btn btn-rounded btn-positive autogit-action">
       <i class="icon icon-left fa fa-cloud-upload"></i>
       Publish changes
     </button>
-    <button href="/panel/autogit/pull" data-action="pull" class="btn btn-rounded btn-positive autogit-action">
+    <button data-action="pull" class="btn btn-rounded btn-positive autogit-action">
       <i class="icon icon-left fa fa-cloud-download"></i>
       Get latest changes
     </button>
@@ -67,7 +67,7 @@
 </div>
 
 <script>
-  var panelURL = '<?php echo panel()->urls->index ?>'
+  var panelURL = '<?= panel()->urls->index ?>'
   var $widget = $('#autogit-widget')
   var $loadingIcon = $('<i class="icon icon-left fa fa-spinner" />')
   var $successIcon = $('<i class="icon icon-left fa fa-check" />')