Merge branch 'develop' into issue_1474

Author: codeMinter

Dockerfile

@@ -26,6 +26,11 @@ ARG CONTENTFUL_TOPGEAR_PREVIEW_API_KEY
 
 ARG FILESTACK_API_KEY
 ARG FILESTACK_SUBMISSION_CONTAINER
+
+# Credentials for Mailchimp service
+ARG MAILCHIMP_API_KEY
+ARG MAILCHIMP_BASE_URL
+
 ARG NODE_CONFIG_ENV
 ARG OPEN_EXCHANGE_RATES_KEY
 ARG SEGMENT_IO_API_KEY
@@ -49,6 +54,11 @@ ENV CONTENTFUL_TOPGEAR_PREVIEW_API_KEY=$CONTENTFUL_TOPGEAR_PREVIEW_API_KEY
 
 ENV FILESTACK_API_KEY=$FILESTACK_API_KEY
 ENV FILESTACK_SUBMISSION_CONTAINER=$FILESTACK_SUBMISSION_CONTAINER
+
+# Credentials for Mailchimp service
+ENV MAILCHIMP_API_KEY=$MAILCHIMP_API_KEY
+ENV MAILCHIMP_BASE_URL=$MAILCHIMP_BASE_URL
+
 ENV NODE_CONFIG_ENV=$NODE_CONFIG_ENV
 ENV OPEN_EXCHANGE_RATES_KEY=$OPEN_EXCHANGE_RATES_KEY
 ENV SEGMENT_IO_API_KEY=$SEGMENT_IO_API_KEY

build.sh

@@ -48,6 +48,8 @@ docker build -t $TAG \
   --build-arg CONTENTFUL_TOPGEAR_SPACE_ID=$CONTENTFUL_TOPGEAR_SPACE_ID \
   --build-arg FILESTACK_API_KEY=$FILESTACK_API_KEY \
   --build-arg FILESTACK_SUBMISSION_CONTAINER=$FILESTACK_SUBMISSION_CONTAINER \
+  --build-arg MAILCHIMP_API_KEY=$MAILCHIMP_API_KEY \
+  --build-arg MAILCHIMP_BASE_URL=$MAILCHIMP_BASE_URL \
   --build-arg NODE_CONFIG_ENV=$NODE_CONFIG_ENV \
   --build-arg OPEN_EXCHANGE_RATES_KEY=$OPEN_EXCHANGE_RATES_KEY \
   --build-arg SEGMENT_IO_API_KEY=$SEGMENT_IO_API_KEY \

config/custom-environment-variables.js

@@ -46,6 +46,13 @@ module.exports = {
       },
     },
 
+    MAILCHIMP: {
+      default: {
+        API_KEY: 'MAILCHIMP_API_KEY',
+        MAILCHIMP_BASE_URL: 'MAILCHIMP_BASE_URL',
+      },
+    },
+
     OPEN_EXCHANGE_RATES_KEY: 'OPEN_EXCHANGE_RATES_KEY',
   },
 };

config/default.js

@@ -172,6 +172,13 @@ module.exports = {
       },
     },
 
+    MAILCHIMP: {
+      default: {
+        API_KEY: '',
+        MAILCHIMP_BASE_URL: '',
+      },
+    },
+
     OPEN_EXCHANGE_RATES_KEY: '',
   },
 };

docs/contentful/custom-inline-components-in-markdown-fields.md

@@ -44,33 +44,31 @@ the same way).
   member of the community. It automatically shows necessary confirmation modals.
 
 - #### NewsletterSignup
-  **Sample Use:** `<NewsletterSignup listId="LIST_ID" apiKey="API_KEY" mailchimpBaseUrl="BASE_URL"/>`
+  **Sample Use:** `<NewsletterSignup listId="LIST_ID" />`
 
   Renders
   email input field, along with subscription button, that subscribes given email
   for a newsletter list. The component handles verification of emails, and modal
   UI windows shown on success and failure of subscription.
 
-  | Param | Default | Description |
-  | --- | --- | --- |
-  | apiKey | | MailChimp API key. |
-  | label | Subscribe for Newsletter | Optional. Custom label to show on the button. |
-  | listId | | ID of MailChimp list to subscribe. |
-  | mailchimpBaseUrl | | Base URL of MailChimp API, associated with the API key and list ID. |
+  | Param     | Default                  | Description                                                                      |
+  | ---       | ---                      | ---                                                                              |
+  | label     | Subscribe for Newsletter | Optional. Custom label to show on the button.                                    |
+  | listId    |                          | ID of MailChimp list to subscribe.                                               |
+  | interests | empty string             | Optional. commas separated string of group ids to which user should be subscribed |
 
 - #### NewsletterSignupForMembers
-  **Sample use:** `<NewsletterSignupForMembers listId="LIST_ID" apiKey="API_KEY" mailchimpBaseUrl="BASE_URL"/>`
+  **Sample use:** `<NewsletterSignupForMembers listId="LIST_ID" />`
 
   Renders a newsletter signup button that takes user email from his profile
   information. If the user is not-authenticated, it gets him to the login or
   registration page, and subscribes him on return. Accepts the following props:
 
-  | Param | Default | Description |
-  | --- | --- | --- |
-  | apiKey | | MailChimp API key. |
-  | label | Subscribe for Newsletter | Optional. Custom label to show on the button. |
-  | listId | | ID of MailChimp list to subscribe. |
-  | mailchimpBaseUrl | | Base URL of MailChimp API, associated with the API key and list ID. |
+  | Param     | Default                  | Description                                                                       |
+  | ---       | ---                      | ---                                                                               |
+  | label     | Subscribe for Newsletter | Optional. Custom label to show on the button.                                     |
+  | listId    |                          | ID of MailChimp list to subscribe.                                                |
+  | interests | empty string             | Optional. commas separated string of group ids to which user should be subscribed |
 
 
 - #### VideoModalButton