handle remote error and petition ui

greenpeace · Nov 26, 2019 · 2253d0e · 2253d0e
1 parent a4a2701
commit 2253d0e
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 13 deletions.
diff --git a/classes/class-p4ct-ajax-handler.php b/classes/class-p4ct-ajax-handler.php
@@ -422,8 +422,12 @@ private function get_carousel_posts( $tags, $type, $preferences ) {
 									'filename'    => null,
 								);
 								$result = wp_remote_get( $url, $args );
-								$obj = json_decode( $result['body'], true );
-								$single_update['signatures'] = $obj['rows'][0]['columns'][4]['value'];
+								if( is_wp_error( $result ) ) {
+									$single_update['signatures'] = 0;
+								} else {
+									$obj = json_decode( $result['body'], true );
+									$single_update['signatures'] = $obj['rows'][0]['columns'][4]['value'];
+								}								
 							}
 
 							if ( $single_update['engaging_target'] && $single_update['signatures'] ) {

diff --git a/frontend/js/components/en-petition-form.js b/frontend/js/components/en-petition-form.js
@@ -129,7 +129,7 @@ export default function() {
   if ( 1 == gpeaOptions.showFacebook ) {
     const ctaFacebook = document.createElement('button');
     ctaFacebook.classList.add('button', 'fb', 'js-sign-facebook');
-    ctaFacebook.innerHTML = 'Facebook';    
+    ctaFacebook.innerHTML = gpeaOptions.facebook_label;    
 
     // cta.parentNode.insertBefore(ctaFacebook, cta);
     let formContainer = form.querySelector('.form-container');

diff --git a/frontend/scss/_template-petition.scss b/frontend/scss/_template-petition.scss
@@ -66,7 +66,9 @@
       background-size: auto 70%;
       background-position: 4px center;
       @include lessThan('sm') {
-        width: 50%;
+        min-width: 50%;
+        width: auto;
+        padding-left: 45px;
       }      
     }
   }
@@ -78,7 +80,7 @@
   .outer_block_container {
     @include ct-container;
     padding-top: 0;
-    padding-bottom: 0;
+    padding-bottom: 0;    
 
     > :last-child:not(.enform-side-style) {
       margin-bottom: 145px;
@@ -129,6 +131,9 @@
 
 .page-template-petition,
 .page-template-petition-thankyou {
+  .outer_block_container {
+    overflow: visible;
+  }
   footer {
     padding-top: 0;
 
@@ -137,7 +142,7 @@
     }
     .footer-lower {
       margin-top: 20px;
-      padding-bottom: 220px;
+      padding-bottom: 120px;
       @include greaterThan('sm') {
         padding-bottom: 20px;
       }
@@ -296,6 +301,47 @@
       .en__field--emailAddress {
         display: block;
       }
-    }  
+      div.thankyou {
+        background-color: #fff;
+        .form-group {
+          display: block;
+        }
+        .form-group.social-media {
+          display: none;
+        }
+        header {
+          display: inline-block;
+        }
+        p {
+          display: block;
+        }
+        .formblock-flex {
+          height: auto;
+          display: block;
+        }
+        a.btn.btn-primary.btn-block {
+          width: 100%;
+        }
+      }
+    }
+    div.thankyou {
+      .form-group {
+        display: none;
+      }
+      header, p {
+        display: none;
+      }
+      .formblock-flex {
+        display: flex;
+        height: auto;
+        max-height: none;
+        margin-bottom: 0;
+        align-items: center;
+        justify-content: center;
+      }
+      a.btn.btn-primary.btn-block {
+        width: auto;
+      }
+    }
   }
 }
diff --git a/frontend/scss/organisms/_section-petition.scss b/frontend/scss/organisms/_section-petition.scss
@@ -549,7 +549,7 @@
     }
 
     .enform.is-open {
-      transform: translateY(-50vh);
+      transform: translateY(-45vh);
       height: 92vh;
 
       .title-and-description,

diff --git a/languages/gpea_theme-ko_KR.mo b/languages/gpea_theme-ko_KR.mo
diff --git a/languages/gpea_theme-ko_KR.po b/languages/gpea_theme-ko_KR.po
@@ -513,3 +513,6 @@ msgstr "전체 보기"
 
 msgid "Any topic"
 msgstr "전체 보기"
+
+msgid "Facebook"
+msgstr "페이스북으로 로그인"
diff --git a/languages/gpea_theme-zh_HK.mo b/languages/gpea_theme-zh_HK.mo
diff --git a/languages/gpea_theme-zh_HK.po b/languages/gpea_theme-zh_HK.po
@@ -518,3 +518,6 @@ msgstr "所有主題"
 
 msgid "Any topic"
 msgstr "所有議題"
+
+msgid "Facebook"
+msgstr "Facebook"
diff --git a/languages/gpea_theme-zh_TW.mo b/languages/gpea_theme-zh_TW.mo
diff --git a/languages/gpea_theme-zh_TW.po b/languages/gpea_theme-zh_TW.po
@@ -513,3 +513,6 @@ msgstr "所有議題"
 
 msgid "Any topic"
 msgstr "所有主題"
+
+msgid "Facebook"
+msgstr "Facebook"
diff --git a/page-templates/petition.php b/page-templates/petition.php
@@ -88,6 +88,7 @@
 // extra cta in thanks box
 $context['extra_cta_link']             = $page_meta_data['p4-gpea_cta_thanks_link'][0] ?? '';
 $context['extra_cta_label']            = $page_meta_data['p4-gpea_cta_thanks_label'][0] ?? '';
+$context['facebook_label']             = __( 'Facebook', 'gpea_theme' );
 
 
 if ( $context['engaging_page_id'] && ! $context['signatures'] ) {
@@ -109,8 +110,12 @@
 		'filename'    => null,
 	);
 	$result = wp_remote_get( $url, $args );
-	$obj = json_decode( $result['body'], true );
-	$context['signatures'] = $obj['rows'][0]['columns'][4]['value'];
+	if( is_wp_error( $result ) ) {
+		$context['signatures'] = 0;
+	} else {
+		$obj = json_decode( $result['body'], true );
+		$context['signatures'] = $obj['rows'][0]['columns'][4]['value'];
+	}	
 }
 
 if ( $context['petition_target'] && $context['signatures'] ) {

diff --git a/static/css/style.css b/static/css/style.css
diff --git a/static/css/style.css.map b/static/css/style.css.map
diff --git a/static/js/script.js b/static/js/script.js
diff --git a/templates/petition.twig b/templates/petition.twig
@@ -27,6 +27,7 @@
 	<script>
 		gpeaOptions.petition_thanks_link = '{{ extra_cta_link }}';
 		gpeaOptions.petition_thanks_label = '{{ extra_cta_label }}';
+		gpeaOptions.facebook_label = '{{ facebook_label }}';
 	</script>
 	{% endif %}
 {% endblock %}