reverting to repository "recaptcha change in staticman"

_config.yml

@@ -16,7 +16,7 @@ description              : "Blog by Pat Eskinasy."
 url                      : https://pateskinasy.github.io # the base hostname & protocol for your site e.g. "https://mmistakes.github.io"
 baseurl                  : # the subpath of your site, e.g. "/blog"
 repository               : pateskinasy/pateskinasy.github.io # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes"
-teaser                   : /assets/images/interface.jpg # path of fallback teaser image, e.g. "/assets/images/500x300.png"
+teaser                   : /assets/images/interface.jpeg # path of fallback teaser image, e.g. "/assets/images/500x300.png"
 remote_theme             : "mmistakes/minimal-mistakes"
 # breadcrumbs            : false # true, false (default)
 words_per_minute         : 200
@@ -48,8 +48,8 @@ staticman:
       options:
         format           : # "iso8601" (default), "timestamp-seconds", "timestamp-milliseconds"
 reCaptcha:
-  #siteKey                : "6LfPykwUAAAAABh2PsHzcHLRKGvfMUIiHOf-kRYH"
-  #secret                 : "yTL4Wi/1qmLhLbPEzBNBVvQ7LYHwG//607P9IDhY/T7UWwwuA+oN5BSihpFcbkY4ADbuqZgXL0HtWwX1HnZiTmh/as28BTbkQ/qdLGdukpciHuzoftXEK7s7fCGtkkF9vF0d0dTYznlV7NwM7FZrc8HeDsZ0K2YdUPANwwnLQzY="
+  siteKey                : "6LfPykwUAAAAABh2PsHzcHLRKGvfMUIiHOf-kRYH"
+  secret                 : "yTL4Wi/1qmLhLbPEzBNBVvQ7LYHwG//607P9IDhY/T7UWwwuA+oN5BSihpFcbkY4ADbuqZgXL0HtWwX1HnZiTmh/as28BTbkQ/qdLGdukpciHuzoftXEK7s7fCGtkkF9vF0d0dTYznlV7NwM7FZrc8HeDsZ0K2YdUPANwwnLQzY="
 atom_feed:
   path                   : # blank (default) uses feed.xml
 search                   : true # true, false (default)
@@ -129,7 +129,6 @@ include:
   - .htaccess
   - _pages
   - _posts
-  - _data
 exclude:
   - "*.sublime-project"
   - "*.sublime-workspace"

_includes/comment.html

@@ -4,7 +4,11 @@
   </div>
   <div class="comment__content-wrapper">
     <h3 class="comment__author" itemprop="author" itemscope itemtype="http://schema.org/Person">
-          <span itemprop="name">{{ include.name }}</span>
+      {% unless include.url == blank %}
+        <span itemprop="name"><a rel="external nofollow" itemprop="url" href="{{ include.url }}">{{ include.name }}</a></span>
+      {% else %}
+        <span itemprop="name">{{ include.name }}</span>
+      {% endunless %}
     </h3>
     <p class="comment__date">
       {% if include.date %}

_includes/comments.html

@@ -33,12 +33,14 @@ <h4 class="page__comments-title">{{ comments_label }}</h4>
             {% if site.data.comments[page.slug] %}
               <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_title | default: "Comments" }}</h4>
               {% assign comments = site.data.comments[page.slug] | sort %}
+
               {% for comment in comments %}
                 {% assign email = comment[1].email %}
                 {% assign name = comment[1].name %}
+                {% assign url = comment[1].url %}
                 {% assign date = comment[1].date %}
                 {% assign message = comment[1].message %}
-                {% include comment.html index=forloop.index email=email name=name date=date message=message %}
+                {% include comment.html index=forloop.index email=email name=name url=url date=date message=message %}
               {% endfor %}
             {% endif %}
           </div>
@@ -53,6 +55,7 @@ <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_labe
                 <i class="fas fa-spinner fa-spin fa-3x fa-fw"></i>
                 <span class="sr-only">{{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}</span>
               </div>
+
               <div class="form-group">
                 <label for="comment-form-message">{{ site.data.ui-text[site.locale].comment_form_comment_label | default: "Comment" }} <small class="required">*</small></label>
                 <textarea type="text" rows="3" id="comment-form-message" name="fields[message]" tabindex="1"></textarea>
@@ -102,9 +105,10 @@ <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_titl
               {% for comment in comments %}
                 {% assign email = comment[1].email %}
                 {% assign name = comment[1].name %}
+                {% assign url = comment[1].url %}
                 {% assign date = comment[1].date %}
                 {% assign message = comment[1].message %}
-                {% include comment.html index=forloop.index email=email name=name date=date message=message %} <!-- url=url -->
+                {% include comment.html index=forloop.index email=email name=name url=url date=date message=message %}
               {% endfor %}
             {% endif %}
           </div>
@@ -114,7 +118,7 @@ <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_titl
           <div class="page__comments-form">
             <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_label | default: "Leave a Comment" }}</h4>
             <p class="small">{{ site.data.ui-text[site.locale].comment_form_info | default: "Your email address will not be published. Required fields are marked" }} <span class="required">*</span></p>
-            <form id="new_comment" class="page__comments-form js-form form" method="post" action="https://api.staticman.net/v1/entry/{{ site.repository }}/{{ site.staticman.branch }}">
+            <form id="new_comment" class="page__comments-form js-form form" method="post" action="https://api.staticman.net/v2/entry/{{ site.repository }}/{{ site.staticman.branch }}">
               <div class="form__spinner">
                 <i class="fas fa-spinner fa-spin fa-3x fa-fw"></i>
                 <span class="sr-only">{{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}</span>

staticman.yml

@@ -10,7 +10,7 @@ comments:
   #
   # Names of the fields the form is allowed to submit. If a field that is
   # not here is part of the request, an error will be thrown.
-  allowedFields: ["name", "email", "message"]
+  allowedFields: ["name", "email", "message"] #"url"]
 
   # (*) REQUIRED WHEN USING NOTIFICATIONS
   #
@@ -49,7 +49,7 @@ comments:
   # Whether entries need to be approved before they are published to the main
   # branch. If set to `true`, a pull request will be created for your approval.
   # Otherwise, entries will be published to the main branch automatically.
-  moderation: false
+  moderation: true
 
   # Akismet spam detection.
   # akismet:
@@ -83,7 +83,7 @@ comments:
   # (*) REQUIRED
   #
   # Destination path (directory) for the data files. Accepts placeholders.
-  path: "/_data/comments/{options.slug}"
+  path: "docs/_data/comments/{options.slug}" # "/_data/comments/{options.slug}" (default)
 
   # Names of required files. If any of these isn't in the request or is empty,
   # an error will be thrown.
@@ -97,8 +97,8 @@ comments:
   # reCaptcha
   # Register your domain at https://www.google.com/recaptcha/ and choose reCAPTCHA V2
   reCaptcha:
-    enabled: false
-    #siteKey: "6LfPykwUAAAAABh2PsHzcHLRKGvfMUIiHOf-kRYH"
+    enabled: true
+    siteKey: "6LfPykwUAAAAABh2PsHzcHLRKGvfMUIiHOf-kRYH"
     # Encrypt reCaptcha secret key using Staticman /encrypt endpoint
     # For more information, https://staticman.net/docs/encryption
-    #secret: "yTL4Wi/1qmLhLbPEzBNBVvQ7LYHwG//607P9IDhY/T7UWwwuA+oN5BSihpFcbkY4ADbuqZgXL0HtWwX1HnZiTmh/as28BTbkQ/qdLGdukpciHuzoftXEK7s7fCGtkkF9vF0d0dTYznlV7NwM7FZrc8HeDsZ0K2YdUPANwwnLQzY="
+    secret: "yTL4Wi/1qmLhLbPEzBNBVvQ7LYHwG//607P9IDhY/T7UWwwuA+oN5BSihpFcbkY4ADbuqZgXL0HtWwX1HnZiTmh/as28BTbkQ/qdLGdukpciHuzoftXEK7s7fCGtkkF9vF0d0dTYznlV7NwM7FZrc8HeDsZ0K2YdUPANwwnLQzY="