captcha finetuning and fixes

Author: tobihagemann

assets/js/cardpayments.js

@@ -128,14 +128,14 @@ class OneTimePayment {
     this._status.errorMessage = error.message;
     this._status.inProgress = false;
     this._status.captcha = null;
+    // TODO: reset captcha
   }
 
   onPaymentSucceeded() {
     console.info('Stripe payment succeeded!');
     this._status.success = true;
     this._status.errorMessage = '';
     this._status.inProgress = false;
-    this._status.captcha = null;
   }
 
 }

assets/js/hubdemo.js

@@ -36,6 +36,7 @@ class HubDemo {
     this._feedbackData.success = false;
     this._feedbackData.inProgress = false;
     this._feedbackData.errorMessage = error;
+    // TODO: reset captcha
   }
 
   onRequestSucceeded(data) {

assets/js/hubmanaged.js

@@ -119,6 +119,7 @@ class HubManaged {
     this._feedbackData.success = false;
     this._feedbackData.inProgress = false;
     this._feedbackData.errorMessage = error;
+    // TODO: reset captcha
   }
 
   onRequestSucceeded() {

assets/js/hubsubscription.js

@@ -115,6 +115,7 @@ class HubSubscription {
   onCreateSessionFailed(error) {
     this._subscriptionData.inProgress = false;
     this._subscriptionData.errorMessage = error;
+    // TODO: reset captcha
   }
 
   loadCustomBilling(continueHandler) {

assets/js/supportercert.js

@@ -36,6 +36,7 @@ class SupporterCertificate {
     this._feedbackData.success = false;
     this._feedbackData.inProgress = false;
     this._feedbackData.errorMessage = error;
+    // TODO: reset captcha
   }
 
   onRequestSucceeded() {

i18n/de.yaml

@@ -996,6 +996,6 @@
 - id: altcha_verified
   translation: "Verifiziert!"
 - id: altcha_verifying
-  translation: "Wird überprüft..."
+  translation: "Verifizierung läuft…"
 - id: altcha_waitAlert
-  translation: "Verifizierung...bitte warten."
+  translation: "Verifizierung läuft… bitte warten."

i18n/en.yaml

@@ -988,14 +988,14 @@
 
 # Altcha
 - id: altcha_label
-  translation: "I\\'m not a bot"
+  translation: "I'm not a bot"
 - id: altcha_error
   translation: "Verification failed. Try again later."
 - id: altcha_expired
   translation: "Verification expired. Try again."
 - id: altcha_verified
   translation: "Verified!"
 - id: altcha_verifying
-  translation: "Verifying..."
+  translation: "Verifying…"
 - id: altcha_waitAlert
-  translation: "Verifying... please wait."
+  translation: "Verifying… please wait."

layouts/hub-billing/single.html

@@ -1,6 +1,6 @@
 {{ define "main" }}
   <div class="container pt-12 pb-24">
-    <form x-data="{subscriptionData: {state: 'MISSING_PARAMS', captcha: null, hubId: null, returnUrl: null, session: null, customBilling: null, monthlyPrice: null, errorMessage: '', inProgress: false, restartModal: {open: false, nextPayment: null}, changeSeatsModal: {open: false, confirmation: false, immediatePayment: null}, token: null, details: null, quantity: 5, email: ''}, acceptTerms: false, hubSubscription: null, captchaState: null}" x-init="hubSubscription = new HubSubscription($refs.form, subscriptionData, new URLSearchParams(location.search))" x-ref="form">
+    <form x-data="{subscriptionData: {state: 'MISSING_PARAMS', captcha: null, hubId: null, returnUrl: null, session: null, customBilling: null, monthlyPrice: null, errorMessage: '', inProgress: false, restartModal: {open: false, nextPayment: null}, changeSeatsModal: {open: false, confirmation: false, immediatePayment: null}, token: null, details: null, quantity: 5, email: ''}, acceptTerms: false, hubSubscription: null, captchaState: null}" x-init="hubSubscription = new HubSubscription($refs.form, subscriptionData, new URLSearchParams(location.search))" x-ref="form" @submit.prevent="hubSubscription.createSession()">
       <template x-if="subscriptionData.state == 'MISSING_PARAMS'">
         <div class="text-center max-w-xl mx-auto">
           <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4">
@@ -35,7 +35,7 @@ <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4">
             <i class="fas fa-sign-in fa-fw"></i>
             {{ i18n "hub_billing_createsession_description" . }}
           </p>
-          <button x-show="subscriptionData.captcha" :disabled="subscriptionData.inProgress || captchaState == 'verifying'" @click.prevent="hubSubscription.createSession()" type="submit" class="btn btn-primary w-full md:w-64">
+          <button x-show="subscriptionData.captcha" :disabled="subscriptionData.inProgress || captchaState == 'verifying'" type="submit" class="btn btn-primary w-full md:w-64">
             <i :class="{'fa-paper-plane': !subscriptionData.inProgress, 'fa-spinner fa-spin': subscriptionData.inProgress}" class="fas fa-fw" aria-hidden="true"></i>
             {{ i18n "hub_billing_createsession_submit" . }}
           </button>
@@ -201,7 +201,7 @@ <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4" id="restart-m
                     </div>
                   </div>
                   <div class="border-t border-primary p-4 md:flex md:flex-row-reverse md:items-center">
-                    <button :disabled="subscriptionData.inProgress" @click.prevent="hubSubscription.restart()" type="submit" class="btn btn-primary shrink-0 w-full mb-4 md:w-auto md:ml-3 md:mb-0">
+                    <button :disabled="subscriptionData.inProgress" @click.prevent="hubSubscription.restart()" type="button" class="btn btn-primary shrink-0 w-full mb-4 md:w-auto md:ml-3 md:mb-0">
                       <i :class="{'fa-check': !subscriptionData.inProgress, 'fa-spinner fa-spin': subscriptionData.inProgress}" class="fas fa-fw" aria-hidden="true"></i>
                       {{ i18n "hub_billing_manage_modal_confirm" . }}
                     </button>
@@ -267,11 +267,11 @@ <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4" id="change-se
                     </div>
                   </div>
                   <div class="border-t border-primary p-4 md:flex md:flex-row-reverse md:items-center">
-                    <button x-show="!subscriptionData.changeSeatsModal.confirmation" :disabled="subscriptionData.quantity == subscriptionData.details.quantity" @click.prevent="hubSubscription.askForChangeSeatsConfirmation()" type="submit" class="btn btn-primary shrink-0 w-full mb-4 md:w-auto md:ml-3 md:mb-0">
+                    <button x-show="!subscriptionData.changeSeatsModal.confirmation" :disabled="subscriptionData.quantity == subscriptionData.details.quantity" @click.prevent="hubSubscription.askForChangeSeatsConfirmation()" type="button" class="btn btn-primary shrink-0 w-full mb-4 md:w-auto md:ml-3 md:mb-0">
                       <i class="fas fa-chevron-right fa-fw" aria-hidden="true"></i>
                       {{ i18n "hub_billing_manage_modal_continue" . }}
                     </button>
-                    <button x-show="subscriptionData.changeSeatsModal.confirmation" :disabled="subscriptionData.inProgress" @click.prevent="hubSubscription.changeQuantity()" type="submit" class="btn btn-primary shrink-0 w-full mb-4 md:w-auto md:ml-3 md:mb-0">
+                    <button x-show="subscriptionData.changeSeatsModal.confirmation" :disabled="subscriptionData.inProgress" @click.prevent="hubSubscription.changeQuantity()" type="button" class="btn btn-primary shrink-0 w-full mb-4 md:w-auto md:ml-3 md:mb-0">
                       <i :class="{'fa-check': !subscriptionData.inProgress, 'fa-spinner fa-spin': subscriptionData.inProgress}" class="fas fa-fw" aria-hidden="true"></i>
                       {{ i18n "hub_billing_manage_modal_confirm" . }}
                     </button>
@@ -369,7 +369,7 @@ <h2 class="inline-flex px-4 py-1 rounded-full text-sm font-medium tracking-wide
                   </p>
                   <p x-show="subscriptionData.customBilling?.managed" class="font-p mb-4">{{ partial "checkbox.html" (dict "context" . "alpineVariable" "acceptTerms" "label" (i18n "accept_hub_managed_terms_and_privacy" | safeHTML)) }}</p>
                   <p x-show="!subscriptionData.customBilling?.managed" class="font-p mb-4">{{ partial "checkbox.html" (dict "context" . "alpineVariable" "acceptTerms" "label" (i18n "accept_terms_and_privacy" | safeHTML)) }}</p>
-                  <button :disabled="subscriptionData.inProgress || !acceptTerms" @click.prevent="hubSubscription.checkout('{{ .Site.Language.Lang }}')" type="submit" class="btn btn-primary w-full lg:w-1/2">
+                  <button :disabled="subscriptionData.inProgress || !acceptTerms" @click.prevent="hubSubscription.checkout('{{ .Site.Language.Lang }}')" type="button" class="btn btn-primary w-full lg:w-1/2">
                     <i :class="{'fa-shopping-cart': !subscriptionData.inProgress, 'fa-check': !subscriptionData.inProgress, 'fa-spinner fa-spin': subscriptionData.inProgress}" class="fas fa-fw" aria-hidden="true"></i>
                     {{ i18n "hub_billing_checkout_standard_submit" . }}
                   </button>

layouts/hub-demo/single.html

@@ -5,7 +5,7 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
       <p class="lead">{{ i18n "hub_demo_description" }}</p>
     </header>
 
-    <form x-ref="form">
+    <form x-ref="form" @submit.prevent="hubDemo.request()">
       <section class="relative white-box">
         <div x-show="!feedbackData.success" class="px-4 py-5 md:p-6 md:grid md:grid-cols-3 md:gap-6">
           <header class="md:col-span-1">
@@ -58,7 +58,7 @@ <h3 class="font-h3">
         <p class="font-p mb-4">
           {{ i18n "hub_demo_instruction" }}
         </p>
-        <button x-show="submitData.captcha" :disabled="feedbackData.inProgress || captchaState == 'verifying'" @click.prevent="hubDemo.request()" type="submit" class="btn btn-primary w-full md:w-64" x-cloak>
+        <button x-show="submitData.captcha" :disabled="feedbackData.inProgress || captchaState == 'verifying'" type="submit" class="btn btn-primary w-full md:w-64" x-cloak>
           <i :class="{'fa-paper-plane': !feedbackData.inProgress, 'fa-spinner fa-spin': feedbackData.inProgress}" class="fas fa-fw" aria-hidden="true"></i> {{ i18n "hub_demo_submit" }}
         </button>
         {{ partial "captcha.html" (dict "alpineVariable" "submitData.captcha" "captchaState" "captchaState") }}

layouts/partials/supporter-cert-contributor.html

@@ -15,7 +15,7 @@
     <div class="text-center mt-8">
       <p class="font-p mb-4">{{ i18n "supporter_cert_contributor_instruction" . | safeHTML }}</p>
       <p class="font-p mb-4">{{ partial "checkbox.html" (dict "context" . "alpineVariable" "acceptTerms" "label" (i18n "accept_terms_and_privacy" | safeHTML)) }}</p>
-      <button :disabled="feedbackData.inProgress || !acceptTerms || captchaState == 'verifying'" class="btn btn-primary w-full md:w-64 plausible-event-name=supporter-cert-contributor-form" data-umami-event="supporter-cert-contributor-submit" x-cloak>
+      <button :disabled="feedbackData.inProgress || !acceptTerms || captchaState == 'verifying'" type="submit" class="btn btn-primary w-full md:w-64 plausible-event-name=supporter-cert-contributor-form" data-umami-event="supporter-cert-contributor-form" x-cloak>
         <i :class="{'fa-paper-plane': !feedbackData.inProgress, 'fa-spinner fa-spin': feedbackData.inProgress}" class="fas fa-fw" aria-hidden="true"></i> {{ i18n "supporter_cert_common_submit" }}
       </button>
       {{ partial "captcha.html" (dict "alpineVariable" "submitData.captcha" "captchaState" "captchaState") }}