Skip to content
This repository has been archived by the owner on Apr 5, 2022. It is now read-only.

Revert to ReCAPTCHA 2 for Staticman #45

Merged
merged 8 commits into from
Aug 12, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exampleSite/config.toml
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@ disableLanguages = [""]
branch = ""

[params.staticman.recaptcha]
recaptcha = false
# Both keys must be present to enable recaptcha
siteKey = "" # Site Key
encryptedKey = ""

2 changes: 1 addition & 1 deletion layouts/partials/head.html
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<link rel="stylesheet" href="{{ . | relURL }}">
{{ end }}
{{ end }}
{{ if .Site.Params.staticman.recaptcha.recaptcha }}<script src="https://www.google.com/recaptcha/api.js?render={{ .Site.Params.staticman.recaptcha.sitekey }}"></script>{{ end }}
{{ if and .Site.Params.staticman.recaptcha.siteKey .Site.Params.staticman.recaptcha.encryptedKey }}<script src='https://www.google.com/recaptcha/api.js'></script>{{ end }}
{{ .Scratch.Set "Permalink" .Permalink }}
{{ .Scratch.Set "Title" .Title }}
{{ .Scratch.Set "Author" .Author }}
2 changes: 1 addition & 1 deletion layouts/post/comments.html
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<article class="post">
{{ template "_internal/disqus.html" . }}
</article>
{{ else if .Site.Params.staticman.staticman }}
{{ else if .Site.Params.staticman }}
<article class="post">
{{ .Render "staticman" }}
</article>
4 changes: 1 addition & 3 deletions layouts/post/content-single.html
Original file line number Diff line number Diff line change
@@ -11,7 +11,5 @@
{{ .Render "stats" }}
</footer>
</article>
<article class="post">
{{ .Render "comments" }}
</article>
{{ .Render "comments" }}
{{ .Render "pagination" }}
21 changes: 6 additions & 15 deletions layouts/post/staticman.html
Original file line number Diff line number Diff line change
@@ -8,24 +8,15 @@ <h2>Say something</h2>
<input name="fields[website]" type="text" placeholder="Your website">
<input required name="fields[email]" type="email" placeholder="Your email address (Required for Gravatar)">
<textarea required name="fields[body]" placeholder="Your message. Feel free to use Markdown (Google 'Markdown Cheat Sheet')." rows="10"></textarea>
{{ if .Site.Params.staticman.recaptcha.recaptcha }}
<input type="hidden" name="options[reCaptcha][siteKey]" value="{{ .Site.Params.staticman.recaptcha.sitekey }}">
<input type="hidden" name="options[reCaptcha][secret]" value="{{ .Site.Params.staticman.recaptcha.encryptedkey }}">
<input type="hidden" id="g-recaptcha-response" name="g-recaptcha-response">
{{ if and .Site.Params.staticman.recaptcha.siteKey .Site.Params.staticman.recaptcha.encryptedKey }}
{{ with .Site.Params.staticman.recaptcha }}
<input hidden name="options[reCaptcha][siteKey]" value="{{ .sitekey }}">
pacollins marked this conversation as resolved.
Show resolved Hide resolved
<input hidden name="options[reCaptcha][secret]" value="{{ .encryptedkey }}">
pacollins marked this conversation as resolved.
Show resolved Hide resolved
<div class="g-recaptcha" data-sitekey="{{ .sitekey }}"></div>
{{ end }}
{{ end }}
<input type="submit" value="Submit">
</form>
{{ if .Site.Params.staticman.recaptcha.recaptcha }}
<script>
grecaptcha.ready(function() {
grecaptcha.execute('{{ .Site.Params.staticman.recaptcha.sitekey }}', {action: 'homepage'})
.then(function(token) {
//console.log(token);
document.getElementByID('g-recaptcha-response').value=token;
});
});
</script>
{{ end }}

<h2>Comments</h2>

2 changes: 1 addition & 1 deletion static/css/main.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions static/css/main.scss
Original file line number Diff line number Diff line change
@@ -480,10 +480,10 @@ textarea {

/* ----------------------------------Add-Ons--------------------------------- */

/* Remove Recaptcha Badge */
/* Format reCaptcha */

div.grecaptcha-badge {
display: none !important;
.g-recaptcha {
margin: -0.25em 0 0.25em 0;
}

/* Fancybox */