Merge branch 'develop' into member-selector

Author: birdofpreyru

.exchange-rates.cache

@@ -1 +1 @@
-{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1508716800,"base":"USD","rates":{"AED":3.672993,"AFN":68.380133,"ALL":113.282273,"AMD":482.161304,"ANG":1.788357,"AOA":165.9225,"ARS":17.524074,"AUD":1.281074,"AWG":1.789995,"AZN":1.6985,"BAM":1.659594,"BBD":2,"BDT":82.706207,"BGN":1.660054,"BHD":0.377046,"BIF":1755.430443,"BMD":1,"BND":1.361805,"BOB":6.922952,"BRL":3.192395,"BSD":1,"BTC":0.00016678716,"BTN":65.011891,"BWP":10.382103,"BYN":1.959351,"BZD":2.013743,"CAD":1.26375,"CDF":1566.940781,"CHF":0.985896,"CLF":0.02333,"CLP":627.931164,"CNH":6.6373,"CNY":6.6392,"COP":2933.5,"CRC":570.481142,"CUC":1,"CUP":25.5,"CVE":93.8,"CZK":21.838,"DJF":178.77,"DKK":6.332615,"DOP":47.884791,"DZD":114.256308,"EGP":17.682,"ERN":15.336062,"ETB":27.194188,"EUR":0.850721,"FJD":2.037082,"FKP":0.75815,"GBP":0.75815,"GEL":2.482879,"GGP":0.75815,"GHS":4.399647,"GIP":0.75815,"GMD":47.4,"GNF":9026.3,"GTQ":7.366307,"GYD":208.427435,"HKD":7.80205,"HNL":23.595881,"HRK":6.370692,"HTG":63.947324,"HUF":261.9475,"IDR":13511.580047,"ILS":3.49515,"IMP":0.75815,"INR":65.1141,"IQD":1172.340296,"IRR":34243.946723,"ISK":105.71,"JEP":0.75815,"JMD":127.645593,"JOD":0.709001,"JPY":114.05875,"KES":103.458374,"KGS":68.54748,"KHR":4058.613333,"KMF":417.844177,"KPW":900,"KRW":1134.72,"KWD":0.302339,"KYD":0.834883,"KZT":336.595303,"LAK":8312.95,"LBP":1520.547463,"LKR":153.990818,"LRD":118.723205,"LSL":13.68264,"LYD":1.371949,"MAD":9.43187,"MDL":17.368089,"MGA":3084.880606,"MKD":52.25576,"MMK":1367.33506,"MNT":2451.865814,"MOP":8.052459,"MRO":355.821838,"MUR":34.00192,"MVR":15.409873,"MWK":728.366938,"MXN":19.0082,"MYR":4.225,"MZN":61.028857,"NAD":13.64834,"NGN":360.146861,"NIO":30.758276,"NOK":7.998,"NPR":104.078659,"NZD":1.440968,"OMR":0.3847,"PAB":1,"PEN":3.238138,"PGK":3.216388,"PHP":51.612907,"PKR":105.371372,"PLN":3.600552,"PYG":5688.527124,"QAR":3.78397,"RON":3.90212,"RSD":101.128935,"RUB":57.5795,"RWF":848.67327,"SAR":3.7502,"SBD":7.792911,"SCR":13.646132,"SDG":6.686393,"SEK":8.17895,"SGD":1.363283,"SHP":0.75815,"SLL":7643.328121,"SOS":585.274004,"SRD":7.448,"SSP":130.4107,"STD":20823.05009,"SVC":8.766224,"SYP":514.98999,"SZL":13.699742,"THB":33.2085,"TJS":8.811479,"TMT":3.50998,"TND":2.477309,"TOP":2.236132,"TRY":3.68829,"TTD":6.742681,"TWD":30.235661,"TZS":2248.337374,"UAH":26.598841,"UGX":3651.233069,"USD":1,"UYU":29.589897,"UZS":8064.8,"VEF":9.990025,"VND":22720.586641,"VUV":105.223334,"WST":2.533773,"XAF":558.036461,"XAG":0.05889637,"XAU":0.00078425,"XCD":2.70255,"XDR":0.708683,"XOF":558.036461,"XPD":0.00102725,"XPF":101.518031,"XPT":0.00108934,"YER":250.331642,"ZAR":13.69311,"ZMW":9.753126,"ZWL":322.355011}}
+{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1508716800,"base":"USD","rates":{"AED":3.672993,"AFN":68.380133,"ALL":113.282273,"AMD":482.161304,"ANG":1.788357,"AOA":165.9225,"ARS":17.524074,"AUD":1.281074,"AWG":1.789995,"AZN":1.6985,"BAM":1.659594,"BBD":2,"BDT":82.706207,"BGN":1.660054,"BHD":0.377046,"BIF":1755.430443,"BMD":1,"BND":1.361805,"BOB":6.922952,"BRL":3.192395,"BSD":1,"BTC":0.00016678716,"BTN":65.011891,"BWP":10.382103,"BYN":1.959351,"BZD":2.013743,"CAD":1.26375,"CDF":1566.940781,"CHF":0.985896,"CLF":0.02333,"CLP":627.931164,"CNH":6.6373,"CNY":6.6392,"COP":2933.5,"CRC":570.481142,"CUC":1,"CUP":25.5,"CVE":93.8,"CZK":21.838,"DJF":178.77,"DKK":6.332615,"DOP":47.884791,"DZD":114.256308,"EGP":17.682,"ERN":15.336062,"ETB":27.194188,"EUR":0.850721,"FJD":2.037082,"FKP":0.75815,"GBP":0.75815,"GEL":2.482879,"GGP":0.75815,"GHS":4.399647,"GIP":0.75815,"GMD":47.4,"GNF":9026.3,"GTQ":7.366307,"GYD":208.427435,"HKD":7.80205,"HNL":23.595881,"HRK":6.370692,"HTG":63.947324,"HUF":261.9475,"IDR":13511.580047,"ILS":3.49515,"IMP":0.75815,"INR":65.1141,"IQD":1172.340296,"IRR":34243.946723,"ISK":105.71,"JEP":0.75815,"JMD":127.645593,"JOD":0.709001,"JPY":114.05875,"KES":103.458374,"KGS":68.54748,"KHR":4058.613333,"KMF":417.844177,"KPW":900,"KRW":1134.72,"KWD":0.302339,"KYD":0.834883,"KZT":336.595303,"LAK":8312.95,"LBP":1520.547463,"LKR":153.990818,"LRD":118.723205,"LSL":13.68264,"LYD":1.371949,"MAD":9.43187,"MDL":17.368089,"MGA":3084.880606,"MKD":52.25576,"MMK":1367.33506,"MNT":2451.865814,"MOP":8.052459,"MRO":355.821838,"MUR":34.00192,"MVR":15.409873,"MWK":728.366938,"MXN":19.0082,"MYR":4.225,"MZN":61.028857,"NAD":13.64834,"NGN":360.146861,"NIO":30.758276,"NOK":7.998,"NPR":104.078659,"NZD":1.440968,"OMR":0.3847,"PAB":1,"PEN":3.238138,"PGK":3.216388,"PHP":51.612907,"PKR":105.371372,"PLN":3.600552,"PYG":5688.527124,"QAR":3.78397,"RON":3.90212,"RSD":101.128935,"RUB":57.5795,"RWF":848.67327,"SAR":3.7502,"SBD":7.792911,"SCR":13.646132,"SDG":6.686393,"SEK":8.17895,"SGD":1.363283,"SHP":0.75815,"SLL":7643.328121,"SOS":585.274004,"SRD":7.448,"SSP":130.4107,"STD":20823.05009,"SVC":8.766224,"SYP":514.98999,"SZL":13.699742,"THB":33.2085,"TJS":8.811479,"TMT":3.50998,"TND":2.477309,"TOP":2.236132,"TRY":3.68829,"TTD":6.742681,"TWD":30.235661,"TZS":2248.337374,"UAH":26.598841,"UGX":3651.233069,"USD":1,"UYU":29.589897,"UZS":8064.8,"VEF":9.990025,"VND":22720.586641,"VUV":105.223334,"WST":2.533773,"XAF":558.036461,"XAG":0.05889637,"XAU":0.00078425,"XCD":2.70255,"XDR":0.708683,"XOF":558.036461,"XPD":0.00102725,"XPF":101.518031,"XPT":0.00108934,"YER":250.331642,"ZAR":13.69311,"ZMW":9.753126,"ZWL":322.355011}}

README.md

@@ -58,7 +58,6 @@ exports[`Matches shallow shapshot 1`] = `
       },
     ]
   }
-  communityName={null}
   expand={[Function]}
   expanded={true}
   keepPlaceholders={false}
@@ -199,7 +198,6 @@ exports[`Matches shallow shapshot 2`] = `
       },
     ]
   }
-  communityName={null}
   expand={[Function]}
   expanded={false}
   keepPlaceholders={false}
@@ -227,7 +225,6 @@ exports[`Matches shallow shapshot 3`] = `
     }
   }
   challenges={Array []}
-  communityName={null}
   expand={[Function]}
   expanded={false}
   keepPlaceholders={false}

__tests__/shared/components/challenge-listing/Listing/__snapshots__/Bucket.jsx.snap

@@ -7,6 +7,7 @@ exports[`Snapshot match 1`] = `
   composeContextTheme="softly"
   link={null}
   mapThemrProps={[Function]}
+  subTitle=""
   theme={
     Object {
       "container": "src-shared-components-tc-communities-CommunityStats-___style__container___3IKHh",

__tests__/shared/components/tc-communities/__snapshots__/CommunityStats.jsx.snap

@@ -7,6 +7,7 @@ exports[`Matches shallow shapshot 1`] = `
   composeContextTheme="softly"
   link={null}
   mapThemrProps={[Function]}
+  subTitle=""
   theme={Object {}}
   themePriority="adhoc-context-default"
   title="Latest News"

__tests__/shared/components/tc-communities/__snapshots__/NewsSection.jsx.snap

@@ -19,13 +19,14 @@ exports[`Match shadow snapshot 1`] = `
     title="Community 2"
   />
   <Connect(CommunityStatsContainer) />
-  <Connect(JoinCommunity) />
+  <Connect(JoinCommunityContainer) />
   <ThemedSection
     anchor={null}
     composeAdhocTheme="deeply"
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-community-2-Home-___style__linksContainer___CzMMR",
@@ -75,6 +76,7 @@ exports[`Match shadow snapshot 1`] = `
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-community-2-Home-___style__resourcesContainer___1Y23p",

__tests__/shared/components/tc-communities/communities/community-2/__snapshots__/Home.jsx.snap

@@ -25,6 +25,7 @@ exports[`Match shadow snapshot 1`] = `
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-community-2-Learn-___style__learnBasicsContainer___1ZPny",
@@ -95,6 +96,7 @@ exports[`Match shadow snapshot 1`] = `
       }
     }
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-community-2-Learn-___style__coursesContainer___3SRv4",
@@ -158,6 +160,7 @@ exports[`Match shadow snapshot 1`] = `
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-community-2-Learn-___style__resourcesContainer___dzJCp",

__tests__/shared/components/tc-communities/communities/community-2/__snapshots__/Learn.jsx.snap

@@ -25,6 +25,7 @@ exports[`Snapshot match 1`] = `
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-demo-expert-Learn-___style__learnBasicsContainer___aCUEb",
@@ -250,6 +251,7 @@ exports[`Snapshot match 1`] = `
       }
     }
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-demo-expert-Learn-___style__coursesContainer___1l39O",
@@ -313,6 +315,7 @@ exports[`Snapshot match 1`] = `
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-demo-expert-Learn-___style__resourcesContainer___299NM",

__tests__/shared/components/tc-communities/communities/demo-expert/__snapshots__/Learn.jsx.snap

@@ -39,13 +39,14 @@ exports[`Match shadow snapshot 1`] = `
       }
     }
   />
-  <Connect(JoinCommunity) />
+  <Connect(JoinCommunityContainer) />
   <ThemedSection
     anchor="why-topcoder-taskforce"
     composeAdhocTheme="deeply"
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-taskforce-Home-___style__linksContainer___25Lds",
@@ -99,6 +100,7 @@ exports[`Match shadow snapshot 1`] = `
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-taskforce-Home-___style__WhatCanYouGetDone___1to7k",
@@ -125,6 +127,7 @@ exports[`Match shadow snapshot 1`] = `
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-taskforce-Home-___style__resourcesContainer___tnDQ3",

__tests__/shared/components/tc-communities/communities/taskforce/__snapshots__/Home.jsx.snap

@@ -25,6 +25,7 @@ exports[`Snapshot match 1`] = `
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-tc-prod-dev-Learn-___style__learnBasicsContainer___1iYDC",
@@ -234,6 +235,7 @@ exports[`Snapshot match 1`] = `
       }
     }
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-tc-prod-dev-Learn-___style__coursesContainer____PCRk",
@@ -297,6 +299,7 @@ exports[`Snapshot match 1`] = `
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={
       Object {
         "container": "src-shared-components-tc-communities-communities-tc-prod-dev-Learn-___style__resourcesContainer___1uPkY",

__tests__/shared/components/tc-communities/communities/tc-prod-dev/__snapshots__/Learn.jsx.snap

@@ -25,6 +25,7 @@ exports[`Snapshot match 1`] = `
     composeContextTheme="softly"
     link={null}
     mapThemrProps={[Function]}
+    subTitle=""
     theme={Object {}}
     themePriority="adhoc-context-default"
     title={null}

__tests__/shared/components/tc-communities/communities/wipro/__snapshots__/Learn.jsx.snap

@@ -1,5 +1,6 @@
 import { mount } from 'enzyme';
 import React from 'react';
+import { Provider } from 'react-redux';
 import configureStore from 'redux-mock-store';
 import tActions from 'actions/tc-communities';
 import JoinCommunity from 'components/tc-communities/JoinCommunity';
@@ -25,6 +26,7 @@ describe('full render connnected component and dispatch actions', () => {
         data: {
           challengeGroupId: '1',
           communityName: 'name',
+          communityId: '1',
         },
       },
       hideJoinButton: true,
@@ -44,6 +46,9 @@ describe('full render connnected component and dispatch actions', () => {
     groups: {
       groups: {},
     },
+    terms: {
+      terms: [],
+    },
   };
 
   const mockStore = configureStore();
@@ -56,7 +61,7 @@ describe('full render connnected component and dispatch actions', () => {
       json: () => ({ result: { status: 200, metadata: {}, content: [] } }),
     });
     store = mockStore(initialState);
-    instance = mount(<ConnectedJoinCommunity store={store} />);
+    instance = mount(<Provider store={store}><ConnectedJoinCommunity /></Provider>);
     joinCommunity = instance.find(JoinCommunity);
     store.clearActions();
   });
@@ -74,7 +79,7 @@ describe('full render connnected component and dispatch actions', () => {
       },
     };
     store = mockStore(newStore);
-    instance = mount(<ConnectedJoinCommunity store={store} />);
+    instance = mount(<Provider store={store}><ConnectedJoinCommunity /></Provider>);
   });
 
   test('hideJoinButton', () => {

__tests__/shared/containers/tc-communities/JoinCommunity.jsx

@@ -3,6 +3,6 @@
 
 {
   "LOG_ENTRIES_TOKEN": "LOG_ENTRIES_TOKEN",
-  "MOCK_CHALLENGE_TERMS_SERVICE": "MOCK_CHALLENGE_TERMS_SERVICE"
+  "MOCK_TERMS_SERVICE": "MOCK_TERMS_SERVICE"
 
 }

config/custom-environment-variables.json

@@ -29,11 +29,11 @@
    * the setup. To override it use LOG_ENTRIES_TOKEN environment variable. */
   "LOG_ENTRIES_TOKEN": "816f5574-0d4a-49f9-ab3b-00d791f7c1f7",
 
-  /* When set to true, challenge terms service is short-cut so that each time
-   * a user goes to challenge details page, it tells that none of challenge
+  /* When set to true, terms service is short-cut so that each time
+   * a user goes to challenge details page or community page, it tells that none of
    * terms is agrees, and takes care that user is taken through the terms
    * agreement flow. */
-  "MOCK_CHALLENGE_TERMS_SERVICE": false,
+  "MOCK_TERMS_SERVICE": false,
 
   /* Configuration related to https://openexchangerates.org. This is the
    * service which provides currency exchange rates. */

config/default.json

@@ -25,5 +25,5 @@
   "leaderboardApiUrl": "https://api.topcoder.com/v4/looks/458/run/json/",
   "newsFeed": "http://www.topcoder.com/feed",
   "description": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore.",
-  "image":"1.jpg"
+  "image": "1.jpg"
 }