Merge pull request #70 from topcoder-platform/bugbash

Bugbash Fixes

Author: luizrrodrigues

.circleci/config.yml

@@ -77,7 +77,7 @@ workflows:
             branches:
               only:
                 - dev
-                - challenge-listing-part-2
+                - bugbash
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

README.md

@@ -56,5 +56,5 @@ Make sure you have [Heroky CLI](https://devcenter.heroku.com/articles/heroku-cli
 
 - `git push heroku master` - push changes to Heroku and trigger deploying
 
-- Now you have to configure frame app to use the URL provided by Heroku like `https://<APP-NAME>.herokuapp.com/topcoder-micro-frontends-earn-app.js` to load this microapp.
+- Now you have to configure frame app to use the URL provided by Heroku like `https://<APP-NAME>.herokuapp.com/earn-app/topcoder-micro-frontends-earn-app.js` to load this microapp.
 

config/default.js

@@ -1,12 +1,13 @@
 module.exports = {
-	GUIKIT: {
+  GUIKIT: {
     DEBOUNCE_ON_CHANGE_TIME: 150,
   },
   API: {
     V5: "https://api.topcoder-dev.com/v5",
     V3: "https://api.topcoder-dev.com/v3",
   },
   URL: {
+    BASE: "https://www.topcoder-dev.com",
     COMMUNITY_APP: "https://community-app.topcoder-dev.com",
-  }
-}
+  },
+};

config/development.js

@@ -7,6 +7,7 @@ module.exports = {
     V3: "https://api.topcoder-dev.com/v3",
   },
   URL: {
+    BASE: "https://www.topcoder-dev.com",
     COMMUNITY_APP: "https://community-app.topcoder-dev.com",
   },
 };

config/production.js

@@ -7,6 +7,7 @@ module.exports = {
     V3: "https://api.topcoder.com/v3",
   },
   URL: {
+    BASE: "https://www.topcoder.com",
     COMMUNITY_APP: "https://community-app.topcoder.com",
   },
 };

src/constants/index.js

@@ -42,7 +42,7 @@ export const FILTER_CHALLENGE_TRACK_ABBREVIATIONS = {
 };
 
 export const CHALLENGE_SORT_BY = {
-  "Best Match": "bestMatch",
+  // "Best Match": "bestMatch",
   "Most recent": "updated",
   "Prize amount": "overview.totalPrizes",
   Title: "name",

src/containers/Challenges/Listing/ChallengeItem/index.jsx

@@ -38,7 +38,7 @@ const ChallengeItem = ({ challenge, onClickTag, onClickTrack }) => {
         <div styleName="name-container">
           <h6 styleName="name">
             <a
-              href={`${process.env.URL.COMMUNITY_APP}/challenges/${challenge.id}`} // eslint-disable-line no-undef
+              href={`${process.env.URL.BASE}/challenges/${challenge.id}`} // eslint-disable-line no-undef
             >
               {challenge.name}
             </a>
@@ -65,12 +65,12 @@ const ChallengeItem = ({ challenge, onClickTag, onClickTrack }) => {
         </div>
         <div styleName="nums">
           <a
-            href={`${process.env.URL.COMMUNITY_APP}/challenges/${challenge.id}?tab=registrants`} // eslint-disable-line no-undef
+            href={`${process.env.URL.BASE}/challenges/${challenge.id}?tab=registrants`} // eslint-disable-line no-undef
           >
             <NumRegistrants numOfRegistrants={challenge.numOfRegistrants} />
           </a>
           <a
-            href={`${process.env.URL.COMMUNITY_APP}/challenges/${challenge.id}?tab=submissions`} // eslint-disable-line no-undef
+            href={`${process.env.URL.BASE}/challenges/${challenge.id}?tab=submissions`} // eslint-disable-line no-undef
           >
             <NumSubmissions numOfSubmissions={challenge.numOfSubmissions} />
           </a>

src/containers/Challenges/index.jsx

@@ -4,7 +4,7 @@ import { connect } from "react-redux";
 import Listing from "./Listing";
 import actions from "../../actions";
 import ChallengeError from "./Listing/errors/ChallengeError";
-import ChallengeRecommendedError from "./Listing/errors/ChallengeRecommendedError";
+// import ChallengeRecommendedError from "./Listing/errors/ChallengeRecommendedError";
 import * as constants from "../../constants";
 import IconListView from "../../assets/icons/list-view.svg";
 import IconCardView from "../../assets/icons/card-view.svg";
@@ -60,7 +60,7 @@ const Challenges = ({
       {challenges.length === 0 && initialized && <ChallengeError />}
       {challenges.length > 0 && (
         <>
-          {noRecommendedChallenges && <ChallengeRecommendedError />}
+          {/*noRecommendedChallenges && <ChallengeRecommendedError />*/}
           <Listing
             challenges={challenges}
             search={search}

src/containers/Filter/ChallengeFilter/index.jsx

@@ -32,7 +32,7 @@ const ChallengeFilter = ({
   updateFilter,
   openForRegistrationCount,
 }) => {
-  const BUCKET_OPEN_FOR_REGISTRATION = constants.FILTER_BUCKETS[1];
+  // const BUCKET_OPEN_FOR_REGISTRATION = constants.FILTER_BUCKETS[1];
   const tagOptions = utils.createDropdownTermOptions(challengeTags);
   const bucketOptions = utils.createRadioOptions(challengeBuckets, bucket);
 
@@ -260,8 +260,8 @@ const ChallengeFilter = ({
           </div>
         </div>
       )}
-
-      {bucket === BUCKET_OPEN_FOR_REGISTRATION && (
+      {/* DISABLED UNTIL IMPLEMENT RECOMMENDED CHALLENGES */}
+      {/* bucket === BUCKET_OPEN_FOR_REGISTRATION && (
         <div styleName="recommended-challenges">
           <span styleName="toggle">
             <Toggle
@@ -278,11 +278,10 @@ const ChallengeFilter = ({
           </span>
           <span>Recommended Challenges</span>
         </div>
-      )}
-
+      )*/}
       <div styleName="footer">
         <Button onClick={clearFilter}>CLEAR FILTER</Button>
-        <Button onClick={saveFilter}>SAVE FILTER</Button>
+        {/*<Button onClick={saveFilter}>SAVE FILTER</Button>*/}
       </div>
     </div>
   );

src/reducers/filter.js

@@ -22,7 +22,7 @@ const defaultState = {
     // ---
 
     bucket: constants.FILTER_BUCKETS[1],
-    recommended: true,
+    recommended: false,
   },
 };