refactored code

Author: nursoltan-s

src/shared/components/challenge-listing/ChallengeCard/MatchScore/index.jsx

@@ -10,9 +10,6 @@ export default function MatchScore({ score }) {
         {score}% match
       </DevelopmentTrackEventTag>
     </div>
-    // <span styleName="match-score">
-    //   {score}% match
-    // </span>
   );
 }
 

src/shared/components/challenge-listing/ChallengeCard/MatchScore/style.scss

@@ -2,5 +2,6 @@
 
 .matchScoreTag {
   margin-right: 4px;
+  margin-bottom: 4px;
   display: inline-block;
 }

src/shared/components/challenge-listing/NoChallengeCard/index.jsx

@@ -1,7 +1,3 @@
-/**
- * Component for rendering a Review Opportunity and associated Challenge
- * information.  Will be contained within a Bucket.
- */
 import React from 'react';
 
 import './style.scss';
@@ -21,10 +17,4 @@ function NoChallengeCard() {
   );
 }
 
-NoChallengeCard.defaultProps = {
-};
-
-NoChallengeCard.propTypes = {
-};
-
 export default NoChallengeCard;

src/shared/components/challenge-listing/NoChallengeCard/style.scss

@@ -21,4 +21,6 @@
   text-align: center;
   padding-bottom: 26px;
   padding-top: 10px;
+  line-height: 22px;
+  color: $tc-gray-60;
 }

src/shared/components/challenge-listing/Tags.jsx

@@ -34,6 +34,14 @@ export default function Tags({
     </div>
   );
 
+  const tagRedirectLink = (item) => {
+    if (challengesUrl && item.indexOf('+') !== 0) {
+      return `${challengesUrl}?filter[tags][0]=${
+        encodeURIComponent(item)}`;
+    }
+    return null;
+  };
+
   const renderVerifiedTag = item => (
     <div styleName="recommended-challenge-tooltip">
       <Tooltip
@@ -45,8 +53,7 @@ export default function Tags({
           onClick={() => onClick(item.trim())}
           key={item}
           role="button"
-          to={(challengesUrl && item.indexOf('+') !== 0) ? `${challengesUrl}?filter[tags][0]=${
-            encodeURIComponent(item)}` : null}
+          to={tagRedirectLink(item)}
         >
           <VerifiedIcon styleName="verified-tag" />
           <span styleName={cn({ 'verified-tag-text': recommended })}>{item}</span>
@@ -69,8 +76,7 @@ export default function Tags({
                   onClick={() => onClick(item.trim())}
                   key={item}
                   role="button"
-                  to={(challengesUrl && item.indexOf('+') !== 0) ? `${challengesUrl}?filter[tags][0]=${
-                    encodeURIComponent(item)}` : null}
+                  to={tagRedirectLink(item)}
                 >
                   <span>{item}</span>
                 </Tag>
@@ -113,8 +119,7 @@ export default function Tags({
                     onClick={() => onClick(item.trim())}
                     key={item}
                     role="button"
-                    to={(challengesUrl && item.indexOf('+') !== 0) ? `${challengesUrl}?filter[tags][0]=${
-                      encodeURIComponent(item)}` : null}
+                    to={tagRedirectLink(item)}
                   >
                     <span>{item}</span>
                   </Tag>
@@ -130,8 +135,7 @@ export default function Tags({
             onClick={() => onClick(item.trim())}
             key={item}
             role="button"
-            to={(challengesUrl && item.indexOf('+') !== 0) ? `${challengesUrl}?filter[tags][0]=${
-              encodeURIComponent(item)}` : null}
+            to={tagRedirectLink(item)}
           >
             <span>{item}</span>
           </Tag>

src/shared/components/challenge-listing/index.jsx

@@ -166,10 +166,6 @@ export default function ChallengeListing(props) {
 
   return (
     <div styleName="ChallengeFiltersExample" id="challengeFilterContainer">
-      {/* <ChallengeSearchBar
-        setFilterState={props.setFilterState}
-      /> */}
-
       <div styleName="tc-content-wrapper">
         <div styleName={desktop ? 'sidebar-container-desktop' : 'sidebar-container-mobile'}>
           <Sidebar

src/shared/utils/challenge-listing/sort.js

@@ -101,7 +101,7 @@ export default {
     name: 'Review start date',
   },
   [SORTS.BEST_MATCH]: {
-    func: (a, b) => calculateScore(b.matchScore) - calculateScore(a.matchScore),
+    func: (a, b) => calculateScore(b.jaccard_index) - calculateScore(a.jaccard_index),
     name: 'Best Match',
   },
 };