Merge branch 'develop' into feature-new-nav-master

Author: luizrrodrigues

.circleci/config.yml

@@ -176,21 +176,24 @@ workflows:
               only: 
                 - develop
                 - hot-fix
+                - survey_tc
+                - fix-groups-updates
+                - sort_registrations_submissions
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:
-                - hot-fix
+                - develop
+                - feature-contentful
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
                 - develop
-                - feature-new-nav-master
       # Production builds are exectuted only on tagged commits to the
       # master branch.
       - "build-prod":

config/default.js

@@ -1,8 +1,6 @@
 /* All availalbe configuration options should be documented in the default
  * config file, even when they are overriden in every custom configuration. */
 
-const { deferConfig } = require('config/defer');
-
 module.exports = {
   /* Configuration of Topcoder APIs. */
   API: {
@@ -152,6 +150,7 @@ module.exports = {
     COMMUNITY_API: 'http://localhost:8000',
     COMMUNITY_APP_GITHUB_ISSUES: 'https://github.com/topcoder-platform/community-app/issues',
     EMAIL_VERIFY_URL: 'http://www.topcoder-dev.com/settings/account/changeEmail',
+    THRIVE_POLL_FEED: 'https://www.topcoder.com/feed',
   },
 
   /* Information about Topcoder user groups can be cached in various places.
@@ -213,21 +212,9 @@ module.exports = {
 
     OPEN_EXCHANGE_RATES_KEY: '',
 
-    /* Review type ID for AV Scans. */
-    AV_SCAN_SCORER_REVIEW_TYPE_ID: '',
-
-    JWT_AUTH: {
-      SECRET: '',
-      VALID_ISSUERS: deferConfig(function d() {
-        return this.VALID_ISSUERS ? this.VALID_ISSUERS.replace(/\\"/g, '')
-          : '["https://api.topcoder-dev.com", "https://api.topcoder.com", "https://topcoder-dev.auth0.com/"]';
-      }),
-    },
-
     /* These credentials allow Community App server to communicate with
      * protected TC API endpoints (on behalf of the app itself). */
     TC_M2M: {
-      AUTH0_URL: '',
       CLIENT_ID: '',
       CLIENT_SECRET: '',
       AUDIENCE: '',
@@ -413,7 +400,7 @@ module.exports = {
       href: 'https://www.topcoder-dev.com/logout',
     },
   ],
-  // Config for TC EDU
+  // Config for TC EDU - THRIVE
   TC_EDU_BASE_PATH: '/thrive',
   TC_EDU_TRACKS_PATH: '/tracks',
   TC_EDU_ARTICLES_PATH: '/articles',

config/development.js

@@ -4,8 +4,4 @@ module.exports = {
   URL: {
     USER_SETTINGS: '', /* No dev server is available for saved searches */
   },
-
-  SECRET: {
-    AV_SCAN_SCORER_REVIEW_TYPE_ID: '68c5a381-c8ab-48af-92a7-7a869a4ee6c3',
-  },
 };

config/production.js

@@ -233,8 +233,4 @@ module.exports = {
     title: 'Switch to BUSINESS',
     href: 'https://connect.topcoder.com',
   },
-
-  SECRET: {
-    AV_SCAN_SCORER_REVIEW_TYPE_ID: '55bbb17d-aac2-45a6-89c3-a8d102863d05',
-  },
 };

docs/contentful/animations.md

@@ -0,0 +1,12 @@
+# Animations On Scroll
+Animationg Contentful components on scroll is implemetented currently for following components:
+- Viewport
+- Image
+- ContentBlock
+
+Definig a scroll animation is easy via the Web UI. Search for the "Animation On Scroll" field and either select existing animation or create new one.
+![](./pics/anim1.png)
+
+## Animation Model
+To define a default animation only `Name` and `Animate On Scroll` fields are required. There is help hint bellow each fields what is does and how to use it. For further detailed examples see: https://michalsnik.github.io/aos/. All available properties are supported from Contentful animatable components as well.
+![](./pics/anim2.png)

docs/contentful/index.md

@@ -33,5 +33,6 @@ Instructions are also provided below for developments that want to modify/create
     - [Custom inline components in Markdown fields](./custom-inline-components-in-markdown-fields.md)
     - [Miscellaneous CSS Solutions](./miscellaneous-CSS-solutions.md)
     - [Duplicate tool](https://github.com/topcoder-platform/contentful-duplicate-tool/blob/master/docs/contentful-duplicate.md)
+    - [Animate Components On Scroll](./animations.md)
 
 To request additional content types or adjustments to existing content models, please send  you request to [email protected].