Merge branch 'release/1.0.2'

Author: w00fz

CHANGELOG.md

@@ -1,3 +1,16 @@
+# v1.0.2
+## 02/18/2017
+
+1. [](#new)
+    * It is now possible to change the committer name. You can choose between Git User, GitSync Committer Name, Grav User Name, Grav User Fullname (#14).
+2. [](#improved)
+    * Added more documentation and description about the support of 2FA and Access Tokens (#16, #19, thanks @OleVik)
+    * Added 4th Generic Git choice in the wizard for self-hosted and custom git services (Gogs/Gitea) (#7 - #22 - thanks @erlepereira)
+1. [](#bugfix)
+    * Fixed issue preventing the custom Git Binary Path from getting used (#15)
+    * Fixed issue with Webhook auto-generated URL where it would display double slashes in case of root domain (#15)
+    * Fixed issue with the modal not properly restoring the tutorial steps of the active selected service
+    
 # v1.0.1
 ## 01/29/2017
 

app/wizard/index.js

@@ -6,7 +6,7 @@ import $ from 'jquery';
 
 const WIZARD = $('[data-remodal-id="wizard"]');
 const RESET_LOCAL = $('[data-remodal-id="reset-local"]');
-const SERVICES = { 'github': 'github.com', 'bitbucket': 'bitbucket.org', 'gitlab': 'gitlab.com' };
+const SERVICES = { 'github': 'github.com', 'bitbucket': 'bitbucket.org', 'gitlab': 'gitlab.com', 'allothers': 'allothers.repo' };
 const TEMPLATES = {
     REPO_URL: 'https://{placeholder}/getgrav/grav.git'
 };
@@ -173,6 +173,10 @@ $(document).on('keyup', '[data-gitsync-uribase] [name="gitsync[webhook]"]', (eve
 
 $(document).on('change', '[name="gitsync[repository]"]', (event) => {
     const target = $(event.target);
+    if (!target.is(':checked')) {
+        return;
+    }
+
     SERVICE = target.val();
 
     Object.keys(SERVICES).forEach((service) => {
@@ -186,6 +190,18 @@ $(document).on('change', '[name="gitsync[repository]"]', (event) => {
 
 });
 
+$(document).on('click', '[data-access-tokens-details]', (event) => {
+    const button = $(event.currentTarget);
+    const panel = button.closest('.access-tokens').find('.access-tokens-details');
+    
+    panel.slideToggle(250, () => {
+        const isVisible = panel.is(':visible');
+        const icon = button.find('.fa');
+
+        icon.removeClass('fa-chevron-down fa-chevron-up').addClass(`fa-chevron-${isVisible ? 'up' : 'down'}`);
+    });
+});
+
 $(document).ready(() => {
     STEPS = WIZARD.find('[class^="step-"]').length - 1;
     WIZARD.wrapInner('<form></form>');

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Git Sync
-version: 1.0.1
+version: 1.0.2
 description: Allows to synchronize portions of Grav with Git Repositories (GitHub, BitBucket, GitLab)
 icon: git
 author:
@@ -51,8 +51,9 @@ form:
       placeholder: Username, not email
     password:
       type: enc-password
-      label: Git Password
-      placeholder: Your Git Password
+      label: Git Password or Token
+      placeholder: Your Git Password or Token
+      description: Enter your password or token to encrypt and securely store it, then save the settings. It will not show up here for security reasons.
     webhook:
       type: text
       label: Repository Web Hook
@@ -77,6 +78,15 @@ form:
       default: master
       label: Remote Branch
       placeholder: master
+    git.author:
+      type: select
+      default: gituser
+      label: Commits Author
+      options:
+        gituser: Use Git User Name
+        gitsync: Use GitSync Committer Name
+        gravuser: Use Grav User Name
+        gravfull: Use Grav User Full Name
     git.name:
       type: text
       default: GitSync

classes/GitSync.php

@@ -161,9 +161,30 @@ public function add()
 
     public function commit($message = '(Grav GitSync) Automatic Commit')
     {
-        $author = $this->user . ' <' . $this->getConfig('git', null)['email'] . '>';
+        $authorType = $this->getConfig('git', null)['author'];
+        if (defined('GRAV_CLI') && in_array($authorType, ['gravuser', 'gravfull'])) {
+            $authorType = 'gituser';
+        }
+
+        switch ($authorType) {
+            case 'gitsync':
+                $user = $this->getConfig('git', null)['name'];
+                break;
+            case 'gravuser':
+                $user = $this->grav['session']->user->username;
+                break;
+            case 'gravfull':
+                $user = $this->grav['session']->user->fullname;
+                break;
+            case 'gituser':
+            default:
+                $user = $this->user;
+                break;
+        }
+
+        $author = $user . ' <' . $this->getConfig('git', null)['email'] . '>';
         $author = '--author="' . $author . '"';
-        $message .= ' from ' . $this->user;
+        $message .= ' from ' . $user;
         $this->add();
         return $this->execute("commit " . $author . " -m " . escapeshellarg($message));
     }
@@ -278,7 +299,7 @@ public function execute($command)
 
     public function getGitConfig($type, $value)
     {
-        return !$value && isset($this->config['git']) ? $this->config['git'][$type] : $value;
+        return isset($this->config['git']) && isset($this->config['git'][$type]) ? $this->config['git'][$type] : $value;
     }
 
     public function getRemote($type, $value)

css-compiled/git-sync.css

@@ -156,6 +156,8 @@ public function onTwigSiteVariables()
             $this->grav['assets']->addCss('plugin://git-sync/css-compiled/git-sync.css');
             $this->grav['assets']->addJs('plugin://git-sync/js/app.js', ['loading' => 'defer']);
         }
+        
+        return true;
     }
 
     public function onPageInitialized()

git-sync.php

@@ -7,6 +7,26 @@
             color: #366188;
         }
     }
+    
+    .access-tokens {
+        h3 {
+            margin-top: 1rem;
+        }
+        
+        a {
+            vertical-align: inherit !important;
+        }
+    }
+
+    .access-tokens-details {
+        > p {
+            margin-top: 0;
+        }
+
+        > div > ul {
+            margin-bottom: 0;
+        }
+    }
 
     .center {
         text-align: center;
@@ -52,6 +72,23 @@
             flex: 1;
         }
     }
+
+    .step-1 {
+      div.column:nth-child(1) {
+          flex-grow: 1.5;
+
+          > label:nth-child(4) {
+              width: 110%;
+          }
+      }
+      
+      div.column:nth-child(2) {
+          margin-left: 25px;
+      }    
+      div.column:nth-child(2) > label:nth-child(1) > input:nth-child(1), div.column:nth-child(2) > label:nth-child(2) > input:nth-child(1) {
+          width: 85%;
+        }
+      }
 }
 
 #admin-main [data-grav-field="git-wizard"] {

images/repos/gitlogo.svg

@@ -7,6 +7,6 @@
 {% block input_attributes %}
     type="password"
     class="input"
-    placeholder="{{ passwordStored ? (isEncrypted ? 'Your password is stored and won\'t show up here for security reasons. Type again to change and save' : 'Your password is stored but not encrypted. Type it in again and save.') : field.placeholder }}"
+    placeholder="{{ passwordStored ? (isEncrypted ? 'Your password is securely stored.' : 'Your password is stored but not encrypted.') : field.placeholder }}"
     {{ parent() }}
 {% endblock %}