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

Revert to ReCAPTCHA 2 for Staticman #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ce3d53
Revert to ReCAPTCHA 2 for Staticman
pacollins Aug 10, 2019
8484671
Merge branch 'master' into Revert-staticman-recaptcha
pacollins Aug 10, 2019
7ed1b06
Fixed missing braces to load reCAPTCHA site key
VincentTam Aug 11, 2019
320c0d8
Remove extra article tag
pacollins Aug 11, 2019
ac8c52a
Remove redundancy of recaptcha.recaptcha
pacollins Aug 11, 2019
5ccfc71
Revert socnet deletion
pacollins Aug 11, 2019
220e0f5
Merge branch 'Revert-staticman-recaptcha'
pacollins Aug 11, 2019
ff52ad0
Simplify code for calling Staticman
VincentTam Aug 11, 2019
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ disableLanguages = [""]
branch = ""

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

Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/post/comments.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions layouts/post/content-single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion static/css/main.min.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions static/css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down