Merge pull request #65 from CodeYourFuture/feature/term-of-use

change termsOfUseAndPrivacy to agreeToTOU

Author: Wolfjawan

src/Components/forms/Acknowledgement.js

@@ -3,7 +3,7 @@ import { FormGroup, Label, Input } from 'reactstrap'
 
 export default ({
   onChange,
-  termsOfUseAndPrivacy,
+  agreeToTOU,
   agreeToReceiveEmails,
   agreeToReceivePhoneCall,
   agreeToReceiveCYFNews
@@ -15,14 +15,14 @@ export default ({
       </div>
       <hr className="mt-0" />
       <FormGroup check>
-        <Label check htmlFor="termsOfUseAndPrivacy">
+        <Label check htmlFor="agreeToTOU">
           <Input
             className={`form-check-input`}
             type="checkbox"
-            name="termsOfUseAndPrivacy"
+            name="agreeToTOU"
             onChange={onChange}
-            id="termsOfUseAndPrivacy"
-            checked={termsOfUseAndPrivacy}
+            id="agreeToTOU"
+            checked={agreeToTOU}
           />
           I have read and accepted to the{' '}
           <a

src/Components/forms/helper.js

@@ -21,7 +21,7 @@ export const initialState = {
   formInComplete: false,
   userId: '',
   dashboardUrl: '',
-  termsOfUseAndPrivacy: false,
+  agreeToTOU: false,
   agreeToReceiveEmails: false,
   agreeToReceivePhoneCall: false,
   agreeToReceiveCYFNews: false,
@@ -33,7 +33,7 @@ export const initialState = {
     cityId: false,
     interestedInVolunteer: false,
     interestedInCYF: false,
-    termsOfUseAndPrivacy: false,
+    agreeToTOU: false,
     agreeToReceiveEmails: false,
     agreeToReceivePhoneCall: false,
     agreeToReceiveCYFNews: false

src/Components/forms/index.js

@@ -94,7 +94,7 @@ class Forms extends Component {
       techSkill,
       otherSkill,
       userId,
-      termsOfUseAndPrivacy,
+      agreeToTOU,
       agreeToReceiveEmails,
       agreeToReceivePhoneCall,
       agreeToReceiveCYFNews
@@ -107,7 +107,7 @@ class Forms extends Component {
       cityId,
       interestedInVolunteer,
       tel,
-      termsOfUseAndPrivacy,
+      agreeToTOU,
       agreeToReceiveEmails,
       interestedInCYF
     })
@@ -133,7 +133,7 @@ class Forms extends Component {
         techSkill: filterEmptyValue(techSkill),
         otherSkill: filterEmptyValue(otherSkill),
         userId,
-        termsOfUseAndPrivacy,
+        agreeToTOU,
         agreeToReceiveEmails,
         agreeToReceivePhoneCall,
         agreeToReceiveCYFNews
@@ -167,7 +167,7 @@ class Forms extends Component {
     const { err, volunteer } = this.props
     const {
       disabled,
-      termsOfUseAndPrivacy,
+      agreeToTOU,
       agreeToReceiveEmails,
       formInComplete,
       userId,
@@ -212,9 +212,7 @@ class Forms extends Component {
           <button
             className="btn volunteer-submit-btn"
             type="submit"
-            disabled={
-              disabled || !termsOfUseAndPrivacy || !agreeToReceiveEmails
-            }
+            disabled={disabled || !agreeToTOU || !agreeToReceiveEmails}
           >
             Submit
           </button>