Merge pull request #1070 from apinf/hotfix/api-umbrella-methods-sync

Hotfix/Contact form fix

Author: Ville Jyrkkä

client/views/home/body/homeBody.js

@@ -1,5 +1,22 @@
+import { contactEmailValid } from '/lib/helperFunctions/validateSettings';
+
+Template.homeBody.onCreated(function () {
+
+  // Subscribe to settings publication
+  this.subscribe('settings');
+});
+
 Template.homeBody.rendered = function () {
   $(".contact-us-link").click(function () {
     document.getElementById("contact-us").scrollIntoView();
   });
 };
+
+Template.homeBody.helpers({
+  contactDetailsValid () {
+
+    const settings = Settings.findOne();
+
+    return contactEmailValid(settings);
+  }
+})

client/views/home/body/home_body.html

@@ -134,18 +134,20 @@ <h2 class="section-heading">{{_ "section3_Heading"}}</h2>
       </div>
     </div>
   </div>
-  <div id="contact-us" class="container">
-    <div class="row">
-      <div class="col-lg-12 text-center">
-        <h2 class="feature-section-heading">{{_ "section_ContactUs"}}</h2>
-        <hr class="primary">
-        <h4 class="text-muted">{{_ "section_ContactUs_Text"}}</h4>
+  {{ # if contactDetailsValid }}
+    <div id="contact-us" class="container">
+      <div class="row">
+        <div class="col-lg-12 text-center">
+          <h2 class="feature-section-heading">{{_ "section_ContactUs"}}</h2>
+          <hr class="primary">
+          <h4 class="text-muted">{{_ "section_ContactUs_Text"}}</h4>
+        </div>
       </div>
-    </div>
-    <div class="row">
-      <div class="col-lg-6 col-lg-push-3">
-        {{> contactForm}}
+      <div class="row">
+        <div class="col-lg-6 col-lg-push-3">
+          {{> contactForm}}
+        </div>
       </div>
     </div>
-  </div>
+  {{ / if }}
 </template>

client/views/home/body/home_body.less

@@ -107,4 +107,8 @@
   .features {
     margin-bottom: 3.5em;
   }
+
+  #contact-us {
+    margin-bottom: 4.37em;
+  }
 }

client/views/home/footer/home_footer.less

@@ -6,7 +6,6 @@
   /* Footer */
   footer {
     background-color: #333;
-    margin-top: 4.37em;
     padding-bottom: 1em;
     padding-top: 2em;
 

lib/helperFunctions/validateSettings.js

@@ -32,7 +32,6 @@ export function apiUmbrellaSettingsValid (settings) {
 // Validates mail configuration settings
 export function mailSettingsValid (settings) {
 
-
   if ((typeof settings !== 'undefined') && settings.mail) {
 
     if (settings.mail.username && settings.mail.password) {
@@ -43,3 +42,16 @@ export function mailSettingsValid (settings) {
 
   return false;
 }
+
+// Validate email address setting
+export function contactEmailValid (settings) {
+  // Check all properties in nested structure
+  if ((typeof settings !== 'undefined') && settings.contactForm) {
+    if (settings.contactForm.toEmail) {
+      // Finally return true
+      return true;
+    }
+  }
+
+  return false;
+}