Add support for multiple build hooks

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.1.2 - 2018-09-18
+### Added
+- Support for multiple hooks
+
+> {warning} You will need to resave the existing webhooks, they will be dropped on upgrade!
+
 ## 1.0.2 - 2018-09-07
 ### Added
 - "craftcms/cms" as a requirement for the Plugin Store. (thanks @angrybrad)

README.md

@@ -4,7 +4,7 @@
 
 Add Deploy hooks for Netlify
 
-![Screemshot](resources/img/screenshot.jpg)
+![Screenshot](resources/img/screenshot.png)
 
 ## Requirements
 
@@ -26,15 +26,14 @@ To install the plugin, follow these instructions.
 
 ## NetHooks Overview
 
-This will add a Deploy Button to your Utilities.
+This will add a Deploy Buttons to your Utilities.
 
 ## Configuring NetHooks
 
-Go to NetHooks under settings and provide a Netlify Build Webhook [[?]](https://www.netlify.com/docs/webhooks/#incoming-webhooks)
+Go to NetHooks under settings and provide one or more Netlify Build Webhooks [[?]](https://www.netlify.com/docs/webhooks/#incoming-webhooks)
 
 ## NetHooks Roadmap
 
-* Expand the set-up to include setting deploy hooks
 * Provide an overview of deploys
 * deploy status
 

composer.json

@@ -2,7 +2,7 @@
  "name": "jungleminds/nethooks",
  "description": "Add Deploy hooks for Netlify",
  "type": "craft-plugin",
- "version": "1.0.2",
+ "version": "1.1.2",
  "keywords": [
  "craft",
  "cms",

src/assetbundles/nethooksutility/dist/css/Nethooks.css

@@ -7,11 +7,11 @@
  * @copyright Copyright (c) 2018 Jungle Minds
  * @link https://jungleminds.com
  * @package Nethooks
- * @since 1.0.2
+ * @since 1.1.2
  */
 
-#content .deploy + .deploy { margin-top: 24px; }
-#content .deploy .deploy-header { display: -webkit-box; display: -ms-flexbox; display: flex; -webkit-box-align: center; -ms-flex-align: center; align-items: center; padding-bottom: 10px; border-bottom: 1px solid #e3e5e8; margin-bottom: 16px; }
-#content .deploy .deploy-header .readable { -webkit-box-flex: 1; -ms-flex-positive: 1; flex-grow: 1; margin: 0; }
-#content .deploy .deploy-header .buttons { margin: 0; }
-#content .deploy .deploy-header .buttons button:disabled { pointer-events: none; }
+#content .nethooks + .nethooks { margin-top: 24px; }
+#content .nethooks .nethooks-header { display: -webkit-box; display: -ms-flexbox; display: flex; -webkit-box-align: center; -ms-flex-align: center; align-items: center; padding-bottom: 10px; border-bottom: 1px solid #e3e5e8; margin-bottom: 16px; }
+#content .nethooks .nethooks-header .readable { -webkit-box-flex: 1; -ms-flex-positive: 1; flex-grow: 1; margin: 0; }
+#content .nethooks .hooks .hook { margin-bottom: 5px; }
+#content .nethooks .hooks .hook button:disabled { pointer-events: none; }

src/assetbundles/nethooksutility/dist/js/Nethooks.js

@@ -7,25 +7,26 @@
  * @copyright Copyright (c) 2018 Jungle Minds
  * @link https://jungleminds.com
  * @package Nethooks
- * @since 1.0.2
+ * @since 1.1.2
  */
 !function ($) {
- var deployButton = $('#nethooks-deploy-button');
- if (deployButton) {
- deployButton.on('click', function () {
- $(deployButton).addClass('add loading');
- $(deployButton).removeClass('submit');
- $(deployButton).prop('disabled', true);
+ var deployButtons = $('#content .nethooks .hooks .hook button');
+ if (deployButtons) {
+ deployButtons.on('click', function () {
+ var _this = this
+ $(_this).addClass('add loading');
+ $(_this).removeClass('submit');
+ $(_this).prop('disabled', true);
  $.ajax({
  type: "POST",
- url: $(deployButton).attr('data-build-hook'),
+ url: $(_this).attr('data-build-hook'),
  error: function () {
- $(deployButton).removeClass('add loading');
- $(deployButton).addClass('submit');
- $(deployButton).prop('disabled', false);
+ $(_this).removeClass('add loading');
+ $(_this).addClass('submit');
+ $(_this).prop('disabled', false);
  },
  success: function () {
- $(deployButton).removeClass('add loading');
+ $(_this).removeClass('add loading');
  }
  });
  });

src/config.php

@@ -24,6 +24,9 @@
 
 return [
 
- "buildHook" => 'https://api.netlify.com/build_hooks/...',
+ "buildHooks" => [[
+ 'name' => 'default',
+ 'url' => 'https://api.netlify.com/build_hooks/...'
+ ]],
 
 ];

src/models/Settings.php

@@ -27,7 +27,7 @@
  *
  * @author Jungle Minds
  * @package Nethooks
- * @since 1.0.2
+ * @since 1.1.2
  */
 class Settings extends Model
 {
@@ -37,9 +37,12 @@ class Settings extends Model
  /**
  * Some field model attribute
  *
- * @var string
+ * @var array
  */
- public $buildHook = 'https://api.netlify.com/build_hooks/...';
+ public $buildHooks = [[
+ 'name' => 'default',
+ 'url' => 'https://api.netlify.com/build_hooks/...'
+ ]];
 
  // Public Methods
  // =========================================================================
@@ -57,8 +60,10 @@ class Settings extends Model
  public function rules()
  {
  return [
- ['buildHook', 'string'],
- ['buildHook', 'default', 'value' => 'https://api.netlify.com/build_hooks/...'],
+ ['buildHooks', 'default', 'value' => [[
+ 'name' => 'default',
+ 'url' => 'https://api.netlify.com/build_hooks/...'
+ ]]],
  ];
  }
 }

src/templates/_components/utilities/Nethooks_content.twig

@@ -9,30 +9,34 @@
 * @copyright Copyright (c) 2018 Jungle Minds
 * @link https://jungleminds.com
 * @package Nethooks
-* @since 1.0.2
+* @since 1.1.2
 */
 #}
 {% set defaultBuildHook = 'https://api.netlify.com/build_hooks/...' %}
-<div class="deploy">
- <div class="deploy-header">
+{% set defaultActive = buildHooks[0]['url'] == defaultBuildHook and buildHooks | length > 1 %}
+
+<div class="nethooks">
+ <div class="nethooks-header">
  <div class="readable left">
  <h1>Nethooks</h1>
  </div>
- {% if buildHook|length > defaultBuildHook|length %}
- <div class="buttons right">
- <button
- id="nethooks-deploy-button"
- class="btn icon submit"
- data-build-hook="{{buildHook}}"
- >
- {{ "Deploy"|t }}
- </button>
- </div>
- {% endif %}
  </div>
- {% if buildHook|length <= defaultBuildHook|length %}
+ {% if defaultActive %}
  <div class="warning">
  <p>{{ "Please add a webhook to the plugin settings first"|t }}</p>
  </div>
+ {% else %}
+ <div class="hooks">
+ {% for i, buildHook in buildHooks %}
+ <div class="hook">
+ <button
+ class="btn icon submit"
+ data-build-hook="{{ buildHook['url'] }}"
+ >
+ {{ "Deploy"|t }} {{ buildHook['name'] }}
+ </button>
+ </div>
+ {% endfor %}
+ </div>
  {% endif %}
 </div>

src/templates/settings.twig

@@ -9,17 +9,42 @@
  * @copyright Copyright (c) 2018 Jungle Minds
  * @link https://jungleminds.com
  * @package Nethooks
- * @since 1.0.2
+ * @since 1.1.2
  */
 #}
 
 {% import "_includes/forms" as forms %}
 
-{{ forms.textField({
- label: 'Netlify Build Hook',
- instructions: 'add your <a href="https://www.netlify.com/docs/webhooks/#incoming-webhooks">Build Hook</a>',
- id: 'buildHook',
- name: 'buildHook',
- placeholder: 'https://api.netlify.com/build_hooks/...',
- value: settings['buildHook']})
-}}
+<div class="field">
+ <div class="heading">
+ <label for="buildHook">
+ Netlify Build Hook
+ </label>
+ <div class="instructions">
+ add your <a href="https://www.netlify.com/docs/webhooks/#incoming-webhooks">Build Hooks</a></br>
+ &nbsp;
+ </div>
+ <div class="input">
+ {{
+ forms.editableTable({
+ id: 'buildHooks',
+ name: 'buildHooks',
+ addRowLabel: 'Add a buildHook',
+ cols: {
+ name: {
+ heading: 'Name',
+ type: 'singleline'
+ },
+ url: {
+ heading: 'URL',
+ type: 'singleline'
+ }
+ },
+ rows: settings['buildHooks']
+ })
+ }}
+ </div>
+ </div>
+</div>
+
+

src/utilities/NethooksUtility.php

@@ -21,7 +21,7 @@
  *
  * @author Jungle Minds
  * @package Nethooks
- * @since 1.0.2
+ * @since 1.1.2
  */
 class NethooksUtility extends Utility
 {
@@ -70,7 +70,7 @@ public static function contentHtml(): string
  return Craft::$app->getView()->renderTemplate(
  'nethooks/_components/utilities/Nethooks_content',
  [
- 'buildHook' => Craft::$app->plugins->getPlugin('nethooks')->getSettings()->buildHook
+ 'buildHooks' => Craft::$app->plugins->getPlugin('nethooks')->getSettings()->buildHooks
  ]
  );
  }