Blockchain: Removes Join Now from head menu; Fixes text style in intro block

birdofpreyru · birdofpreyru · commit 23ddf1c180d1 · 2017-09-15T14:54:53.000+02:00
diff --git a/.exchange-rates.cache b/.exchange-rates.cache
@@ -1 +1 @@
-{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1505430000,"base":"USD","rates":{"AED":3.673014,"AFN":68.630079,"ALL":111.957598,"AMD":477.735313,"ANG":1.777664,"AOA":165.9215,"ARS":16.991,"AUD":1.250112,"AWG":1.795251,"AZN":1.7,"BAM":1.641215,"BBD":2,"BDT":80.583547,"BGN":1.639955,"BHD":0.37724,"BIF":1741.080974,"BMD":1,"BND":1.349501,"BOB":6.955968,"BRL":3.119595,"BSD":1,"BTC":0.000301901034,"BTN":64.047228,"BWP":10.14439,"BYN":1.941982,"BZD":2.01313,"CAD":1.216203,"CDF":1562.881563,"CHF":0.961569,"CLF":0.02319,"CLP":624.2,"CNH":6.543403,"CNY":6.552396,"COP":2899.653333,"CRC":576.621761,"CUC":1,"CUP":25.5,"CVE":92.875,"CZK":21.87455,"DJF":178.76,"DKK":6.242562,"DOP":47.244322,"DZD":111.2945,"EGP":17.645,"ERN":15.337793,"ETB":23.418183,"EUR":0.839009,"FJD":2.025157,"FKP":0.746204,"GBP":0.746204,"GEL":2.459125,"GGP":0.746204,"GHS":4.416734,"GIP":0.746204,"GMD":46.125,"GNF":8992.5,"GTQ":7.283821,"GYD":207.546477,"HKD":7.813011,"HNL":23.389688,"HRK":6.2791,"HTG":62.947328,"HUF":258.805,"IDR":13239.951073,"ILS":3.521225,"IMP":0.746204,"INR":64.1637,"IQD":1164.934957,"IRR":33310,"ISK":105.21,"JEP":0.746204,"JMD":129.903937,"JOD":0.709503,"JPY":109.94437037,"KES":102.959908,"KGS":68.673222,"KHR":4083.333333,"KMF":413.765225,"KPW":900,"KRW":1134.17,"KWD":0.301589,"KYD":0.832258,"KZT":338.941816,"LAK":8303.566667,"LBP":1504.524887,"LKR":152.657899,"LRD":117.074294,"LSL":13.142562,"LYD":1.354936,"MAD":9.364378,"MDL":17.599529,"MGA":2988.444875,"MKD":51.67375,"MMK":1352.674087,"MNT":2449.441941,"MOP":8.03614,"MRO":364.460827,"MUR":33.35,"MVR":15.409873,"MWK":724.675734,"MXN":17.662526,"MYR":4.2065,"MZN":61.732957,"NAD":13.142562,"NGN":361.029651,"NIO":30.28567,"NOK":7.874942,"NPR":102.408065,"NZD":1.383579,"OMR":0.385035,"PAB":1,"PEN":3.238498,"PGK":3.190543,"PHP":51.18,"PKR":105.284982,"PLN":3.590381,"PYG":5678.502124,"QAR":3.705007,"RON":3.86032,"RSD":99.85,"RUB":57.5596,"RWF":830.109566,"SAR":3.7507,"SBD":7.735487,"SCR":13.392938,"SDG":6.668096,"SEK":7.989599,"SGD":1.346466,"SHP":0.746204,"SLL":7541.125831,"SOS":576.617179,"SRD":7.438,"SSP":125.7373,"STD":20527.540843,"SVC":8.737628,"SYP":514.97499,"SZL":13.149654,"THB":33.08,"TJS":8.785895,"TMT":3.504979,"TND":2.439914,"TOP":2.219187,"TRY":3.434374,"TTD":6.737899,"TWD":30.098712,"TZS":2242.7,"UAH":26.131535,"UGX":3590.25,"USD":1,"UYU":29.00675,"UZS":8081.45,"VEF":9.985022,"VND":22719.200123,"VUV":104.382651,"WST":2.483371,"XAF":550.353977,"XAG":0.05608526,"XAU":0.00074986,"XCD":2.70255,"XDR":0.704516,"XOF":550.353977,"XPD":0.00107869,"XPF":100.120433,"XPT":0.00101293,"YER":250.306642,"ZAR":13.131781,"ZMW":9.382882,"ZWL":322.355011}}
+{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1505476800,"base":"USD","rates":{"AED":3.672973,"AFN":68.53875,"ALL":111.73,"AMD":478.45,"ANG":1.779153,"AOA":165.9215,"ARS":16.991,"AUD":1.247669,"AWG":1.795251,"AZN":1.7,"BAM":1.635738,"BBD":2,"BDT":80.748286,"BGN":1.636866,"BHD":0.377182,"BIF":1744.7,"BMD":1,"BND":1.344435,"BOB":6.961525,"BRL":3.119496,"BSD":1,"BTC":0.000332933814,"BTN":64.115874,"BWP":10.18401,"BYN":1.938447,"BZD":2.014757,"CAD":1.214515,"CDF":1562.881563,"CHF":0.960965,"CLF":0.02319,"CLP":624.585,"CNH":6.548744,"CNY":6.544708,"COP":2897.85,"CRC":576.58,"CUC":1,"CUP":25.5,"CVE":92.875,"CZK":21.82455,"DJF":178.76,"DKK":6.226904,"DOP":47.249072,"DZD":111.064167,"EGP":17.649,"ERN":15.342579,"ETB":23.436764,"EUR":0.836853,"FJD":2.011699,"FKP":0.737039,"GBP":0.737039,"GEL":2.462425,"GGP":0.737039,"GHS":4.432711,"GIP":0.737039,"GMD":46.125,"GNF":8958.4,"GTQ":7.290084,"GYD":207.965254,"HKD":7.81631,"HNL":23.386311,"HRK":6.257973,"HTG":63.022754,"HUF":258.53643,"IDR":13245.494062,"ILS":3.521825,"IMP":0.737039,"INR":64.095,"IQD":1167.5,"IRR":33310,"ISK":105.869261,"JEP":0.737039,"JMD":130.718525,"JOD":0.709001,"JPY":111.24616667,"KES":102.89,"KGS":68.643776,"KHR":4053.25,"KMF":413.765225,"KPW":900,"KRW":1130.8775,"KWD":0.301312,"KYD":0.832879,"KZT":339.45,"LAK":8284.8,"LBP":1507.45,"LKR":152.844139,"LRD":117.074294,"LSL":13.189412,"LYD":1.361315,"MAD":9.346,"MDL":17.619678,"MGA":2964.6,"MKD":51.51098,"MMK":1356.4,"MNT":2453.879163,"MOP":8.046782,"MRO":364.805,"MUR":33.435,"MVR":15.409873,"MWK":725.54,"MXN":17.69335,"MYR":4.189799,"MZN":61.31,"NAD":13.19125,"NGN":359.787233,"NIO":30.350347,"NOK":7.818863,"NPR":102.528085,"NZD":1.373359,"OMR":0.384928,"PAB":1,"PEN":3.23699,"PGK":3.19319,"PHP":51.3075,"PKR":105.338422,"PLN":3.576407,"PYG":5651.15,"QAR":3.705007,"RON":3.848964,"RSD":99.74475,"RUB":57.6456,"RWF":831.045,"SAR":3.750774,"SBD":7.734844,"SCR":13.58249,"SDG":6.673154,"SEK":7.952538,"SGD":1.344,"SHP":0.737039,"SLL":7538.529905,"SOS":578.390064,"SRD":7.438,"SSP":125.881,"STD":20535.146277,"SVC":8.74534,"SYP":514.99999,"SZL":13.18534,"THB":33.09125,"TJS":8.792897,"TMT":3.504979,"TND":2.445204,"TOP":2.217942,"TRY":3.440186,"TTD":6.743577,"TWD":30.062,"TZS":2243.1,"UAH":26.190843,"UGX":3593.3,"USD":1,"UYU":28.993638,"UZS":8087.8,"VEF":9.985022,"VND":22753.894861,"VUV":103.676756,"WST":2.509453,"XAF":548.939628,"XAG":0.05661072,"XAU":0.00075623,"XCD":2.70255,"XDR":0.704516,"XOF":548.939628,"XPD":0.00107946,"XPF":99.863135,"XPT":0.00102682,"YER":250.306642,"ZAR":13.17867,"ZMW":9.3882,"ZWL":322.355011}}
diff --git a/__tests__/shared/components/tc-communities/__snapshots__/Header.jsx.snap b/__tests__/shared/components/tc-communities/__snapshots__/Header.jsx.snap
@@ -17,6 +17,7 @@ exports[`Snapshot match 1`] = `
     ]
   }
   groupId=""
+  hideJoinNow={false}
   hideSearch={false}
   isMobileOpen={false}
   loginUrl="/some/login/url"
@@ -78,6 +79,7 @@ exports[`Snapshot match 2`] = `
   }
   cssUrl="some/css/url"
   groupId=""
+  hideJoinNow={false}
   hideSearch={false}
   isMobileOpen={true}
   loginUrl="/some/login/url"
diff --git a/src/shared/components/tc-communities/Header/index.jsx b/src/shared/components/tc-communities/Header/index.jsx
@@ -30,6 +30,7 @@ function Header(props) {
     closeMenu,
     communitySelector,
     groupId,
+    hideJoinNow,
     openMenu,
     openedMenu,
     logos,
@@ -117,19 +118,21 @@ function Header(props) {
     </div>
   ) : (
     <div className={theme.authorize}>
-      <button
-        onClick={() => {
-          let url = encodeURIComponent(
-            `${window.location.href}?join=${groupId}`,
-          );
-          url = encodeURIComponent(
-            `${config.URL.AUTH}/member?retUrl=${url}`,
-          );
-          url = encodeURIComponent(url);
-          window.location = `${config.URL.AUTH}/member/registration?retUrl=${url}`;
-        }}
-        className={theme.btnRegister}
-      >Join Now</button>
+      { hideJoinNow ? null : (
+        <button
+          onClick={() => {
+            let url = encodeURIComponent(
+              `${window.location.href}?join=${groupId}`,
+            );
+            url = encodeURIComponent(
+              `${config.URL.AUTH}/member?retUrl=${url}`,
+            );
+            url = encodeURIComponent(url);
+            window.location = `${config.URL.AUTH}/member/registration?retUrl=${url}`;
+          }}
+          className={theme.btnRegister}
+        >Join Now</button>
+      )}
       <button
         onClick={() => {
           const url = encodeURIComponent(
@@ -229,6 +232,7 @@ Header.defaultProps = {
   activeTrigger: null,
   baseUrl: '',
   groupId: '',
+  hideJoinNow: false,
   menuItems: [],
   openedMenu: null,
   logos: [],
@@ -257,6 +261,7 @@ Header.propTypes = {
     }),
   ])),
   additionalLogos: PT.arrayOf(PT.string),
+  hideJoinNow: PT.bool,
   hideSearch: PT.bool,
   chevronOverAvatar: PT.bool,
   openedMenu: PT.shape({}),
diff --git a/src/shared/components/tc-communities/communities/blockchain/Home/style.scss b/src/shared/components/tc-communities/communities/blockchain/Home/style.scss
@@ -63,7 +63,7 @@
 
 .introContainer {
   background: $tc-gray-neutral-light;
-  color: #394146;
+  color: #787d81;
   padding-bottom: 48px;
   margin-bottom: 24px;
 
@@ -73,15 +73,14 @@
   }
 
   h1 {
-    @include roboto;
-
-    font-size: 36px;
+    color: #394146;
+    font: 600 36px 'Open Sans';
     margin-bottom: 12px;
   }
 
   p {
-    color: #394146;
-    font: 15px/22px 'roboto';
+    color: #787d81;
+    font: 15px/22px 'Open Sans';
     padding: 6px 0;
   }
 }
diff --git a/src/shared/containers/tc-communities/Header.jsx b/src/shared/containers/tc-communities/Header.jsx
@@ -23,6 +23,7 @@ function mapStateToProps(state, ownProps) {
     communityId: meta.communityId,
     communitySelector: meta.communitySelector,
     groupId: meta.groupId,
+    hideJoinNow: ownProps.hideJoinNow,
     hideSearch: meta.hideSearch,
     isMobileOpen: meta.isMobileOpen,
     logos: meta.logos,
diff --git a/src/shared/routes/Communities/Blockchain/Routes.jsx b/src/shared/routes/Communities/Blockchain/Routes.jsx
@@ -26,7 +26,10 @@ export default function Routes({ base, member, meta }) {
     <Route
       component={({ match }) => (
         <div>
-          <Header pageId={match.params.pageId || 'home'} />
+          <Header
+            hideJoinNow
+            pageId={match.params.pageId || 'home'}
+          />
           <Switch>
             <Route
               component={() => (

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1505430000,"base":"USD","rates":{"AED":3.673014,"AFN":68.630079,"ALL":111.957598,"AMD":477.735313,"ANG":1.777664,"AOA":165.9215,"ARS":16.991,"AUD":1.250112,"AWG":1.795251,"AZN":1.7,"BAM":1.641215,"BBD":2,"BDT":80.583547,"BGN":1.639955,"BHD":0.37724,"BIF":1741.080974,"BMD":1,"BND":1.349501,"BOB":6.955968,"BRL":3.119595,"BSD":1,"BTC":0.000301901034,"BTN":64.047228,"BWP":10.14439,"BYN":1.941982,"BZD":2.01313,"CAD":1.216203,"CDF":1562.881563,"CHF":0.961569,"CLF":0.02319,"CLP":624.2,"CNH":6.543403,"CNY":6.552396,"COP":2899.653333,"CRC":576.621761,"CUC":1,"CUP":25.5,"CVE":92.875,"CZK":21.87455,"DJF":178.76,"DKK":6.242562,"DOP":47.244322,"DZD":111.2945,"EGP":17.645,"ERN":15.337793,"ETB":23.418183,"EUR":0.839009,"FJD":2.025157,"FKP":0.746204,"GBP":0.746204,"GEL":2.459125,"GGP":0.746204,"GHS":4.416734,"GIP":0.746204,"GMD":46.125,"GNF":8992.5,"GTQ":7.283821,"GYD":207.546477,"HKD":7.813011,"HNL":23.389688,"HRK":6.2791,"HTG":62.947328,"HUF":258.805,"IDR":13239.951073,"ILS":3.521225,"IMP":0.746204,"INR":64.1637,"IQD":1164.934957,"IRR":33310,"ISK":105.21,"JEP":0.746204,"JMD":129.903937,"JOD":0.709503,"JPY":109.94437037,"KES":102.959908,"KGS":68.673222,"KHR":4083.333333,"KMF":413.765225,"KPW":900,"KRW":1134.17,"KWD":0.301589,"KYD":0.832258,"KZT":338.941816,"LAK":8303.566667,"LBP":1504.524887,"LKR":152.657899,"LRD":117.074294,"LSL":13.142562,"LYD":1.354936,"MAD":9.364378,"MDL":17.599529,"MGA":2988.444875,"MKD":51.67375,"MMK":1352.674087,"MNT":2449.441941,"MOP":8.03614,"MRO":364.460827,"MUR":33.35,"MVR":15.409873,"MWK":724.675734,"MXN":17.662526,"MYR":4.2065,"MZN":61.732957,"NAD":13.142562,"NGN":361.029651,"NIO":30.28567,"NOK":7.874942,"NPR":102.408065,"NZD":1.383579,"OMR":0.385035,"PAB":1,"PEN":3.238498,"PGK":3.190543,"PHP":51.18,"PKR":105.284982,"PLN":3.590381,"PYG":5678.502124,"QAR":3.705007,"RON":3.86032,"RSD":99.85,"RUB":57.5596,"RWF":830.109566,"SAR":3.7507,"SBD":7.735487,"SCR":13.392938,"SDG":6.668096,"SEK":7.989599,"SGD":1.346466,"SHP":0.746204,"SLL":7541.125831,"SOS":576.617179,"SRD":7.438,"SSP":125.7373,"STD":20527.540843,"SVC":8.737628,"SYP":514.97499,"SZL":13.149654,"THB":33.08,"TJS":8.785895,"TMT":3.504979,"TND":2.439914,"TOP":2.219187,"TRY":3.434374,"TTD":6.737899,"TWD":30.098712,"TZS":2242.7,"UAH":26.131535,"UGX":3590.25,"USD":1,"UYU":29.00675,"UZS":8081.45,"VEF":9.985022,"VND":22719.200123,"VUV":104.382651,"WST":2.483371,"XAF":550.353977,"XAG":0.05608526,"XAU":0.00074986,"XCD":2.70255,"XDR":0.704516,"XOF":550.353977,"XPD":0.00107869,"XPF":100.120433,"XPT":0.00101293,"YER":250.306642,"ZAR":13.131781,"ZMW":9.382882,"ZWL":322.355011}}
	`1`	+{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1505476800,"base":"USD","rates":{"AED":3.672973,"AFN":68.53875,"ALL":111.73,"AMD":478.45,"ANG":1.779153,"AOA":165.9215,"ARS":16.991,"AUD":1.247669,"AWG":1.795251,"AZN":1.7,"BAM":1.635738,"BBD":2,"BDT":80.748286,"BGN":1.636866,"BHD":0.377182,"BIF":1744.7,"BMD":1,"BND":1.344435,"BOB":6.961525,"BRL":3.119496,"BSD":1,"BTC":0.000332933814,"BTN":64.115874,"BWP":10.18401,"BYN":1.938447,"BZD":2.014757,"CAD":1.214515,"CDF":1562.881563,"CHF":0.960965,"CLF":0.02319,"CLP":624.585,"CNH":6.548744,"CNY":6.544708,"COP":2897.85,"CRC":576.58,"CUC":1,"CUP":25.5,"CVE":92.875,"CZK":21.82455,"DJF":178.76,"DKK":6.226904,"DOP":47.249072,"DZD":111.064167,"EGP":17.649,"ERN":15.342579,"ETB":23.436764,"EUR":0.836853,"FJD":2.011699,"FKP":0.737039,"GBP":0.737039,"GEL":2.462425,"GGP":0.737039,"GHS":4.432711,"GIP":0.737039,"GMD":46.125,"GNF":8958.4,"GTQ":7.290084,"GYD":207.965254,"HKD":7.81631,"HNL":23.386311,"HRK":6.257973,"HTG":63.022754,"HUF":258.53643,"IDR":13245.494062,"ILS":3.521825,"IMP":0.737039,"INR":64.095,"IQD":1167.5,"IRR":33310,"ISK":105.869261,"JEP":0.737039,"JMD":130.718525,"JOD":0.709001,"JPY":111.24616667,"KES":102.89,"KGS":68.643776,"KHR":4053.25,"KMF":413.765225,"KPW":900,"KRW":1130.8775,"KWD":0.301312,"KYD":0.832879,"KZT":339.45,"LAK":8284.8,"LBP":1507.45,"LKR":152.844139,"LRD":117.074294,"LSL":13.189412,"LYD":1.361315,"MAD":9.346,"MDL":17.619678,"MGA":2964.6,"MKD":51.51098,"MMK":1356.4,"MNT":2453.879163,"MOP":8.046782,"MRO":364.805,"MUR":33.435,"MVR":15.409873,"MWK":725.54,"MXN":17.69335,"MYR":4.189799,"MZN":61.31,"NAD":13.19125,"NGN":359.787233,"NIO":30.350347,"NOK":7.818863,"NPR":102.528085,"NZD":1.373359,"OMR":0.384928,"PAB":1,"PEN":3.23699,"PGK":3.19319,"PHP":51.3075,"PKR":105.338422,"PLN":3.576407,"PYG":5651.15,"QAR":3.705007,"RON":3.848964,"RSD":99.74475,"RUB":57.6456,"RWF":831.045,"SAR":3.750774,"SBD":7.734844,"SCR":13.58249,"SDG":6.673154,"SEK":7.952538,"SGD":1.344,"SHP":0.737039,"SLL":7538.529905,"SOS":578.390064,"SRD":7.438,"SSP":125.881,"STD":20535.146277,"SVC":8.74534,"SYP":514.99999,"SZL":13.18534,"THB":33.09125,"TJS":8.792897,"TMT":3.504979,"TND":2.445204,"TOP":2.217942,"TRY":3.440186,"TTD":6.743577,"TWD":30.062,"TZS":2243.1,"UAH":26.190843,"UGX":3593.3,"USD":1,"UYU":28.993638,"UZS":8087.8,"VEF":9.985022,"VND":22753.894861,"VUV":103.676756,"WST":2.509453,"XAF":548.939628,"XAG":0.05661072,"XAU":0.00075623,"XCD":2.70255,"XDR":0.704516,"XOF":548.939628,"XPD":0.00107946,"XPF":99.863135,"XPT":0.00102682,"YER":250.306642,"ZAR":13.17867,"ZMW":9.3882,"ZWL":322.355011}}
Original file line number	Diff line number	Diff line change
@@ -17,6 +17,7 @@ exports[`Snapshot match 1`] = `
`17`	`17`	`]`
`18`	`18`	`}`
`19`	`19`	`groupId=""`
	`20`	`+ hideJoinNow={false}`
`20`	`21`	`hideSearch={false}`
`21`	`22`	`isMobileOpen={false}`
`22`	`23`	`loginUrl="/some/login/url"`
@@ -78,6 +79,7 @@ exports[`Snapshot match 2`] = `
`78`	`79`	`}`
`79`	`80`	`cssUrl="some/css/url"`
`80`	`81`	`groupId=""`
	`82`	`+ hideJoinNow={false}`
`81`	`83`	`hideSearch={false}`
`82`	`84`	`isMobileOpen={true}`
`83`	`85`	`loginUrl="/some/login/url"`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`
`64`	`64`	`.introContainer {`
`65`	`65`	`background: $tc-gray-neutral-light;`
`66`		`- color: #394146;`
	`66`	`+ color: #787d81;`
`67`	`67`	`padding-bottom: 48px;`
`68`	`68`	`margin-bottom: 24px;`
`69`	`69`
`@@ -73,15 +73,14 @@`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`h1 {`
`76`		`- @include roboto;`
`77`		`-`
`78`		`- font-size: 36px;`
	`76`	`+ color: #394146;`
	`77`	`+ font: 600 36px 'Open Sans';`
`79`	`78`	`margin-bottom: 12px;`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`p {`
`83`		`- color: #394146;`
`84`		`- font: 15px/22px 'roboto';`
	`82`	`+ color: #787d81;`
	`83`	`+ font: 15px/22px 'Open Sans';`
`85`	`84`	`padding: 6px 0;`
`86`	`85`	`}`
`87`	`86`	`}`