Merge pull request #247 from Plant-for-the-Planet-org/dev

Dev

app/actions/EditMyTree.js

@@ -13,21 +13,17 @@ export function editTree(plantContribution, plantId) {
       plantContribution: plantId
     })
       .then(res => {
-        const { statusText, status } = res;
+        const { statusText } = res;
         const { contribution, treecounter } = res.data;
 
-        NotificationManager.success(statusText, status, 5000);
+        NotificationManager.success(statusText, 'Success', 5000);
         dispatch(mergeEntities(normalize(treecounter, treecounterSchema)));
         dispatch(mergeEntities(normalize(contribution, contributionSchema)));
         updateRoute('app_myTrees', dispatch);
       })
       .catch(error => {
         debug(error.response);
-        NotificationManager.error(
-          error.response.data.message,
-          error.response.data.code,
-          5000
-        );
+        NotificationManager.error(error.response.data.message, 'Error', 5000);
       });
   };
 }

app/actions/pledgeAction.js

@@ -31,16 +31,12 @@ export function postPledge(data, params) {
     postRequest('eventPledge_post', data, params)
       .then(res => {
         console.log(dispatch, res);
-        const { statusText, status } = res;
+        const { statusText } = res;
 
-        NotificationManager.success('Success', status, 5000);
+        NotificationManager.success(statusText, 'Success', 5000);
       })
       .catch(error => {
-        NotificationManager.error(
-          error.response.data.message,
-          error.response.data.code,
-          5000
-        );
+        NotificationManager.error(error.response.data.message, 'Error', 5000);
       });
   };
 }

app/actions/registerTree.js

@@ -15,21 +15,17 @@ export function registerTree(plantContribution, treecounterId, mode) {
       mode: mode
     })
       .then(res => {
-        const { statusText, status } = res;
+        const { statusText } = res;
         const { contribution, treecounter } = res.data;
 
-        NotificationManager.success(statusText, status, 5000);
+        NotificationManager.success(statusText, 'Success', 5000);
         dispatch(mergeEntities(normalize(treecounter, treecounterSchema)));
         dispatch(mergeEntities(normalize(contribution, contributionSchema)));
         history.push(getLocalRoute('app_userHome'));
       })
       .catch(error => {
         debug(error.response);
-        NotificationManager.error(
-          error.response.data.message,
-          error.response.data.code,
-          5000
-        );
+        NotificationManager.error(error.response.data.message, 'Error', 5000);
       });
   };
 }

app/actions/targetAction.js

@@ -16,11 +16,7 @@ export function SubmitTarget(treecounterData) {
       })
       .catch(error => {
         debug(error);
-        NotificationManager.error(
-          error.response.data.message,
-          error.response.data.code,
-          5000
-        );
+        NotificationManager.error(error.response.data.message, 'Error', 5000);
       });
   };
 }

app/components/GiftTrees/index.js

@@ -467,6 +467,9 @@ export default class GiftTrees extends Component {
                   <PaymentSelector
                     paymentMethods={paymentMethods}
                     accounts={plantProject.paymentSetup.accounts}
+                    stripePublishableKey={
+                      plantProject.paymentSetup.stripePublishableKey
+                    }
                     amount={this.state.selectedAmount}
                     currency={this.state.selectedCurrency}
                     expandedOption={this.state.expandedOption}

app/components/PlantProjects/PlantProjectCarousel.js

@@ -31,12 +31,14 @@ class PlantProjectCarousel extends React.Component {
     return (
       <Slider {...settings}>
         {plantProjects.map(plantProject => (
-          <PlantProjectFull
-            key={`plantProject-${plantProject.id}`}
-            expanded={false}
-            tpoName={tpoName}
-            plantProject={plantProject}
-          />
+          <div className="plant_project_carousal__content">
+            <PlantProjectFull
+              key={`plantProject-${plantProject.id}`}
+              expanded={false}
+              tpoName={tpoName}
+              plantProject={plantProject}
+            />
+          </div>
         ))}
       </Slider>
     );

app/components/SelectPlantProject/index.js

@@ -165,7 +165,6 @@ export default class SelectPlantProject extends Component {
     const settings = {
       dots: true,
       infinite: false,
-      adaptiveHeight: true,
       prevArrow: (
         <CarouselNavigation
           styleName="tpo-footer-nav-img__left"
@@ -212,7 +211,7 @@ export default class SelectPlantProject extends Component {
             <Slider {...settings}>
               {featuredProjects.length !== 0
                 ? featuredProjects.map(project => (
-                    <div key={project.id}>
+                    <div key={project.id} className="plant_project_content">
                       <PlantProjectFull
                         callExpanded={() => this.callExpanded()}
                         expanded={false}

app/locales/en/commonlabels.js

@@ -3,5 +3,6 @@ export default {
   notification_error: 'Login Error',
   isRequired: ' is Required',
   enterValidEmail: 'Enter valid Email',
-  invalidLength: 'Invalid Length: should be less than '
+  invalidLength: 'Invalid Length: should be less than ',
+  invalidValueMsg: 'Please enter valid '
 };

app/server/formSchemas/target.js

@@ -11,7 +11,9 @@ export default {
       type: 'integer',
       title: 'label.target_year',
       pattern: '[0-9]{4}',
-      propertyOrder: 2
+      propertyOrder: 2,
+      minimum: 1000,
+      maximum: 9999
     },
     targetComment: {
       type: 'string',

app/server/parserLiformToTcomb.js

@@ -193,6 +193,7 @@ export default function parseJsonToTcomb(liformSchemaJson, config = {}) {
             attr: liformSchema.properties[propertyKey].attr
           };
         }
+        options.error = commonValidator;
       }
     }
     return schemaOptions;

app/server/validator.js

@@ -3,7 +3,6 @@ import i18n from '../locales/i18n.js';
 
 export const commonValidator = function(value, path, context) {
   let hasConfig = context && context.options.config;
-
   if (!value && hasConfig && hasConfig.required) {
     console.log('TEST_ERROR', value, path, context);
     return (
@@ -23,5 +22,11 @@ export const commonValidator = function(value, path, context) {
         );
       }
     }
+  } else {
+    return (
+      <div className="error-msg">
+        {i18n.t('label.invalidValueMsg') + i18n.t(context.options.label)}
+      </div>
+    );
   }
 };

app/utils/api.js

@@ -20,11 +20,7 @@ function checkStatus(response) {
 
 function onAPIError(error) {
   if (error.response) {
-    NotificationManager.error(
-      error.response.data.message,
-      error.response.data.code,
-      5000
-    );
+    NotificationManager.error(error.response.data.message, 'Error', 5000);
   }
   if (error.response && error.response.status === 401) {
     getStore().dispatch(logoutUser());

web/stylesheet/_register_trees.scss

@@ -16,6 +16,7 @@
     fieldset {
       flex: 1;
       display: flex;
+      flex-direction: column;
     }
   }
 }

web/stylesheet/donateTrees/_donate_trees.scss

@@ -155,6 +155,10 @@
       display: inline-block;
     }
   }
+  .plant_project_content {
+    max-height:500px;
+    overflow: auto;
+  }
 }
 
 .projects-list {

web/stylesheet/treeCounter/_tpo_footer.scss

@@ -7,6 +7,10 @@
 .tpo-footer__container {
   position: relative;
   width: 100%;
+  .plant_project_carousal__content {
+    height: 380px;
+    overflow: auto;
+  }
 }
 
 .tpo-footer-card-layout {
@@ -190,7 +194,6 @@
     .project-images-carousal__container {
       background-color: $placeholderColor;
       margin-bottom: 39px;
-      min-height: 300px;
       .image-carousal {
         width: 100%;
         border: 0;
@@ -220,7 +223,6 @@
     .youtube-video__container {
       margin-top: 76px;
       margin-bottom: 43px;
-      min-height: 350px;
     }
   }
 }