Merge branch 'tom-styling-fixes' into fix-past-challenges

Author: royshouvik

components/ChallengeCard/Tooltips/TrackAbbreviationTooltip/TrackAbbreviationTooltip.jsx

@@ -14,11 +14,11 @@ const DESCRIPTION = {
   APPLICATION_FRONT_END_DESIGN: 'Design UI and front end experiences for apps',
   ARCHITECTURE: 'Architect modules, components, or full applications',
   ASSEMBLY_COMPETITION: 'Develop code for a variety of use cases. Rigorous review and final fix process is included.',
-  BANNERS_OR_ICONS: 'Insert copy text here',
+  BANNERS_OR_ICONS: 'Design UI assets for use in web, mobile, print, and other digital formats',
   CODE: 'Develop code for apps, services, etc. Final fixes are not included',
-  CONCEPTUALIZATION: 'Insert copy text here',
-  DESIGN_FIRST_2_FINISH: 'Be the first to deliver the solution',
-  FIRST_2_FINISH: 'Be the first to deliver the solution',
+  CONCEPTUALIZATION: 'Discover and define user stories and requirements',
+  DESIGN_FIRST_2_FINISH: 'Be the first to deliver the design solution',
+  FIRST_2_FINISH: 'Be the first to deliver the development solution',
   MARATHON_MATCH: 'Write algorythms to solve complex problems, often for real world issues',
   PRINT_OR_PRESENTATION: 'Design print and presentation assets',
   SRM: 'Single Round Match - quickly write code to solve algorythm problems head to head against other competitors',

components/ChallengeFilters/ChallengeFilterWithSearch.js

@@ -37,9 +37,7 @@ class Filter extends BaseFilter {
     return (item) => {
       if (!parent(item)) return false;
       if (this.query) {
-        const platforms = item.platforms.join(' ');
-        const techs = item.technologies.join(' ');
-        const str = `${item.challengeName} ${platforms} ${techs}`.toLowerCase();
+        const str = `${item.name} ${item.platforms} ${item.technologies}`.toLowerCase();
         if (str.indexOf(this.query.toLowerCase()) < 0) return false;
       }
       return true;

components/ChallengeFilters/ChallengeFiltersExample.jsx

@@ -307,9 +307,11 @@ class ChallengeFiltersExample extends React.Component {
 
   onFilterByTopFilter(filter, isSidebarFilter) {
     const mergedFilter = Object.assign({}, this.state.filter, filter);
-    const updatedFilter = new SideBarFilter(mergedFilter);
+    let updatedFilter = new SideBarFilter(mergedFilter);
     if (!isSidebarFilter) {
       updatedFilter.mode = SideBarFilterModes.CUSTOM;
+    } else {
+      updatedFilter = this.state.filter.copySidebarFilterProps(updatedFilter);
     }
     this.setState({ filter: updatedFilter }, this.saveFiltersToHash.bind(this, updatedFilter));
   }

components/SideBarFilters/SideBarFilter.js

@@ -104,6 +104,13 @@ class SideBarFilter extends ChallengeFilter {
     return this;
   }
 
+  copySidebarFilterProps(filter) {
+    if (!filter._isSideBarFilter) return this;
+    this.name = _.clone(filter.name);
+    this.uuid = _.clone(filter.uuid);
+    return this;
+  }
+
   stringify() {
     return btoa(JSON.stringify([
       super.stringify(),

components/SideBarFilters/SideBarFilters.jsx

@@ -425,13 +425,14 @@ class SideBarFilters extends React.Component {
    */
   selectFilterWithName(filterName) {
     // find a filter with matching name
-    const currentFilter = _.find(this.state.filters, filter => filter.name === filterName);
-    if (currentFilter.mode === 'Open for review') {
+    const selectedFilter = _.find(this.state.filters, filter => filter.name === filterName);
+    if (selectedFilter.mode === 'Open for review') {
       // Jump to Development Review Opportunities page
       window.location.href = `${this.props.config.MAIN_URL}/review/development-review-opportunities/`;
       return;
     }
-    this.setState({ currentFilter }, () => this.props.onFilter(currentFilter));
+    const mergedFilter = this.props.filter.copySidebarFilterProps(selectedFilter);
+    this.setState({ currentFilter: mergedFilter }, () => this.props.onFilter(mergedFilter));
   }
 
   /**