Merge pull request #102 from fivejars/YGBWSLA-166

[YGBWSLA-166] Fix recaptcha error in custom login
fivejars · Sep 11, 2020 · e2995c9 · e2995c9
2 parents 4b7e126 + 6ba6eb4
commit e2995c9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/js/gated-content/dist/gated-content.umd.min.js b/js/gated-content/dist/gated-content.umd.min.js
diff --git a/js/gated-content/src/components/Pagination.vue b/js/gated-content/src/components/Pagination.vue
@@ -1,6 +1,6 @@
 <template>
   <nav class="text-center">
-    <span v-if="currentPage === 0 && itemsCount < pageLimit" class="d-none"></span>
+    <span v-if="hidePager" class="d-none"></span>
     <ul class="pagination justify-content-center m-4" v-else>
       <li class="page-item" :class="{ disabled: disablePrev }">
         <span class="page-link" v-if="disablePrev">Prev</span>
@@ -41,14 +41,6 @@ export default {
     links: {
       type: Object,
     },
-    itemsCount: {
-      type: Number,
-      default: 0,
-    },
-    pageLimit: {
-      type: Number,
-      default: 12,
-    },
   },
   computed: {
     disablePrev() {
@@ -57,6 +49,9 @@ export default {
     disableNext() {
       return typeof this.links.next === 'undefined';
     },
+    hidePager() {
+      return this.disablePrev && this.disableNext;
+    },
   },
   methods: {
     paginateObject(pageTo) {

diff --git a/js/gated-content/src/components/auth/CustomAuth.vue b/js/gated-content/src/components/auth/CustomAuth.vue
@@ -2,11 +2,12 @@
   <div class="container">
     <div v-if="message" class="alert alert-info">
       <span v-html="message"></span>
+      <a href="#" @click.prevent="resetForm">Back to Login form</a>
     </div>
     <div v-if="loading" class="spinner-center">
       <Spinner></Spinner>
     </div>
-    <form v-else class="plugin-custom">
+    <form v-show="!message && !loading" class="plugin-custom">
       <div v-if="error" class="alert alert-danger">
         <span>{{ error }}</span>
       </div>
@@ -60,6 +61,15 @@ export default {
     },
   },
   methods: {
+    resetForm() {
+      this.error = '';
+      this.message = '';
+      this.form.email = '';
+      this.loading = false;
+      if (this.config.enableRecaptcha && this.$refs.recaptcha) {
+        this.$refs.recaptcha.reset();
+      }
+    },
     async login() {
       this.loading = true;
       this.error = '';

diff --git a/js/gated-content/src/components/blog/BlogListing.vue b/js/gated-content/src/components/blog/BlogListing.vue
@@ -29,8 +29,6 @@
     <Pagination
       v-if="pagination"
       :links="links"
-      :itemsCount="listing.length"
-      :pageLimit="parseInt(config.pager_limit, 10)"
     ></Pagination>
   </div>
 </template>

diff --git a/js/gated-content/src/components/video/VideoListing.vue b/js/gated-content/src/components/video/VideoListing.vue
@@ -29,8 +29,6 @@
     <Pagination
       v-if="pagination"
       :links="links"
-      :itemsCount="listing.length"
-      :pageLimit="parseInt(config.pager_limit, 10)"
     ></Pagination>
   </div>
 </template>