Merge pull request #458 from topcoder-platform/tony-faq-updates

tweaked join content and updated tests

Author: ajefts

__tests__/shared/components/Dashboard/MyChallenges/__snapshots__/ChallengeLinks.jsx.snap

@@ -47,9 +47,7 @@ exports[`Matches shallow shapshot 2`] = `
     <div
       className="src-shared-components-Dashboard-MyChallenges-ChallengeLinks-___style__icon___3IZGz src-shared-components-Dashboard-MyChallenges-ChallengeLinks-___style__registrants-icon___tm0l6"
     />
-    <p>
-      0
-    </p>
+    <p />
   </a>
   <a
     className="src-shared-components-Dashboard-MyChallenges-ChallengeLinks-___style__submissions___3TDly"

__tests__/shared/components/Dashboard/MyChallenges/__snapshots__/ChallengeTile.jsx.snap

@@ -633,9 +633,7 @@ exports[`Matches shallow shapshot 7`] = `
           <span>
             Role:
           </span>
-          <span>
-            
-          </span>
+          <span />
         </p>
       </div>
     </div>
@@ -671,9 +669,7 @@ exports[`Matches shallow shapshot 8`] = `
           <span>
             Role:
           </span>
-          <span>
-            
-          </span>
+          <span />
         </p>
       </header>
       <div

__tests__/shared/components/Dashboard/Program/__snapshots__/IosCard.jsx.snap

@@ -19,9 +19,7 @@ exports[`Matches shallow shapshot 1`] = `
       </a>
       <p
         className="src-shared-components-Dashboard-Program-___IosCard__subtrack-color___2axPS"
-      >
-        
-      </p>
+      />
     </div>
     <div
       className="src-shared-components-Dashboard-Program-___IosCard__challenge-links___2nxNN"
@@ -103,9 +101,7 @@ exports[`Matches shallow shapshot 2`] = `
       </a>
       <p
         className="src-shared-components-Dashboard-Program-___IosCard__subtrack-color___2axPS"
-      >
-        
-      </p>
+      />
     </div>
     <div
       className="src-shared-components-Dashboard-Program-___IosCard__challenge-links___2nxNN"
@@ -199,9 +195,7 @@ exports[`Matches shallow shapshot 3`] = `
       </a>
       <p
         className="src-shared-components-Dashboard-Program-___IosCard__subtrack-color___2axPS"
-      >
-        
-      </p>
+      />
     </div>
     <div
       className="src-shared-components-Dashboard-Program-___IosCard__challenge-links___2nxNN"

__tests__/shared/components/Dashboard/SRM/__snapshots__/SRMTile.jsx.snap

@@ -22,7 +22,7 @@ exports[`Matches shallow shapshot 1`] = `
         Starts in 
         <span>
           1d
-                1d
+                          1d
         </span>
       </p>
       <div
@@ -85,7 +85,7 @@ exports[`Matches shallow shapshot 2`] = `
         Starts in 
         <span>
           1d
-                1d
+                          1d
         </span>
       </p>
       <div

__tests__/shared/components/Dashboard/__snapshots__/SubtrackStats.jsx.snap

@@ -23,9 +23,7 @@ exports[`Matches shallow shapshot 1`] = `
             <p
               className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
               title=""
-            >
-              
-            </p>
+            />
             <p
               className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
               style={
@@ -56,9 +54,7 @@ exports[`Matches shallow shapshot 1`] = `
             <p
               className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
               title=""
-            >
-              
-            </p>
+            />
             <p
               className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
               style={
@@ -101,9 +97,7 @@ exports[`Matches shallow shapshot 1`] = `
                 <p
                   className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
                   title=""
-                >
-                  
-                </p>
+                />
                 <p
                   className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
                   style={
@@ -134,9 +128,7 @@ exports[`Matches shallow shapshot 1`] = `
                 <p
                   className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
                   title=""
-                >
-                  
-                </p>
+                />
                 <p
                   className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
                   style={

__tests__/shared/components/Leaderboard/__snapshots__/LeaderboardTable.jsx.snap

@@ -80,14 +80,10 @@ exports[`Matches shallow shapshot 1`] = `
       </td>
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
-      >
-        0
-      </td>
+      />
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
-      >
-        0
-      </td>
+      />
     </tr>
     <tr>
       <td
@@ -137,14 +133,10 @@ exports[`Matches shallow shapshot 1`] = `
       </td>
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
-      >
-        0
-      </td>
+      />
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
-      >
-        0
-      </td>
+      />
     </tr>
     <tr>
       <td
@@ -194,14 +186,10 @@ exports[`Matches shallow shapshot 1`] = `
       </td>
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
-      >
-        0
-      </td>
+      />
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
-      >
-        0
-      </td>
+      />
     </tr>
     <tr>
       <td
@@ -251,14 +239,10 @@ exports[`Matches shallow shapshot 1`] = `
       </td>
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
-      >
-        0
-      </td>
+      />
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
-      >
-        0
-      </td>
+      />
     </tr>
   </tbody>
 </table>

__tests__/shared/components/SubmissionManagement/__snapshots__/ScreeningDetails.jsx.snap

@@ -9,9 +9,7 @@ exports[`Snapshot match 1`] = `
   >
     <p
       className="src-shared-components-SubmissionManagement-ScreeningDetails-___styles__status-title___3HTbG"
-    >
-      
-    </p>
+    />
   </div>
   <p>
     Your submission has been received, and will be evaluated during Review phase.

__tests__/shared/components/SubmissionManagement/__snapshots__/ScreeningStatus.jsx.snap

@@ -105,9 +105,7 @@ exports[`Snapshot match 6`] = `
   >
     <span
       className="src-shared-components-SubmissionManagement-ScreeningStatus-___styles__status___1CCjJ"
-    >
-      
-    </span>
+    />
     <span
       className="src-shared-components-SubmissionManagement-ScreeningStatus-___styles__warning___6tSHD"
     >

__tests__/shared/components/__snapshots__/Select.jsx.snap

@@ -32,7 +32,6 @@ exports[`Matches shallow shapshot 1`] = `
   noResultsText="No results found"
   onBlurResetsInput={true}
   onCloseResetsInput={true}
-  openAfterFocus={false}
   optionComponent={[Function]}
   pageSize={5}
   placeholder="Select..."

__tests__/shared/components/challenge-listing/Filters/__snapshots__/DateRangePicker.jsx.snap

@@ -18,7 +18,6 @@ exports[`Matches shallow shapshot 1`] = `
   hideKeyboardShortcutsPanel={false}
   horizontalMargin={0}
   initialVisibleMonth={null}
-  inputIconPosition="before"
   isDayBlocked={[Function]}
   isDayHighlighted={[Function]}
   isOutsideRange={[Function]}
@@ -34,7 +33,6 @@ exports[`Matches shallow shapshot 1`] = `
   onFocusChange={[Function]}
   onNextMonthClick={[Function]}
   onPrevMonthClick={[Function]}
-  openDirection="down"
   orientation="horizontal"
   phrases={
     Object {
@@ -51,7 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
       "jumpToNextMonth": "Move forward to switch to the next month",
       "jumpToPrevMonth": "Move backward to switch to the previous month",
       "keyboardNavigationInstructions": "Press the down arrow key to interact with the calendar and
-  select a date. Press the question mark key to get the keyboard shortcuts for changing dates.",
+      select a date. Press the question mark key to get the keyboard shortcuts for changing dates.",
       "keyboardShortcuts": "Keyboard Shortcuts",
       "leftArrowRightArrow": "Right and left arrow keys",
       "moveFocusByOneDay": "Move backward (left) and forward (right) by one day",
@@ -79,7 +77,6 @@ exports[`Matches shallow shapshot 1`] = `
   startDate={null}
   startDateId="startDate"
   startDatePlaceholderText="Start Date"
-  weekDayFormat="dd"
   withFullScreenPortal={false}
   withPortal={false}
 />

src/shared/components/tc-communities/JoinCommunity/ConfirmModal/index.jsx

@@ -27,9 +27,9 @@ export default function ConfirmModal({
     <Modal onCancel={resetJoinButton}>
       <div styleName="confirmMsg">
         { userId ? null : (
-          <p>To join you must login / register into Topcoder platform!</p>
+          <p>You must be a Topcoder member before you can join the {communityName} community.</p>
         )}
-        Are you sure you want to join {communityName}?
+        To join, login if you are already a member. If not, register first to join the {communityName} community.
       </div>
       <div styleName="buttons">
         { userId ? (
@@ -53,7 +53,7 @@ export default function ConfirmModal({
                 window.location = `${config.URL.AUTH}/member?retUrl=${url}`;
               }}
               styleName="btnConfirmLong"
-            >Log In & Join</button>
+            >Login</button>
             <button
               onClick={() => {
                 const url = `${
@@ -62,7 +62,7 @@ export default function ConfirmModal({
                 window.location = `${config.URL.AUTH}/member/registration?retUrl=${url}`;
               }}
               styleName="btnConfirmLong"
-            >Register & Join</button>
+            >Register</button>
             <button
               onClick={resetJoinButton}
               styleName="btnCancelLong"

src/shared/components/tc-communities/communities/blockchain/Home/index.jsx

@@ -37,10 +37,10 @@ export default function Home(props) {
         imageSrc="/themes/blockchain/community-hero.jpg"
       />
 
-      <CommunityStats />
-
       <JoinCommunity />
 
+      <CommunityStats />
+
       <Section
         theme={{
           container: style.linksContainer,
@@ -104,12 +104,13 @@ export default function Home(props) {
 
       <NewsSection news={props.news} />
 
+/**
       <NewsletterSignup
         title="Sign up for Topcoder Product Development Updates"
         text="Don’t miss out opportunities to work on the Topcoder Platform!"
         imageSrc="/themes/wipro/subscribe-bg.jpg"
       />
-
+*/
     </main>
   );
 }