Merge pull request #75 from evanawebb/73-remove-appending-service-as-…

…text-in-first-category #73 Remove appending services As Text In First Category
SCODEMeetup · Mar 31, 2020 · ceef1d2 · ceef1d2
2 parents a7ddc4c + 8838b3e
commit ceef1d2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/renderer/components/appBar/appBarClass.jsx b/src/renderer/components/appBar/appBarClass.jsx
@@ -50,7 +50,7 @@ export default class CustomAppBar extends React.Component {
           getServiceChildren(openCategory);
           openDrawer();
         }}>
-        CHOOSE {CATEGORY_LABELS[openCategory].toUpperCase()} SERVICES
+        CHOOSE {CATEGORY_LABELS[openCategory].topBar}
         {selectedServices[openCategory] && Object.keys(selectedServices[openCategory]).length > 0
           ? ` (${Object.keys(selectedServices[openCategory]).length})`
           : null}

diff --git a/src/renderer/redux/modules/services/constants.js b/src/renderer/redux/modules/services/constants.js
@@ -4,11 +4,11 @@ export const API_URL = API_BASE + API_PREFIX;
 
 // This is all categories in our current dataset
 export const CATEGORY_LABELS = {
-  566: 'Housing and Utility Assistance',
-  565: 'Health Care',
+  566: {name: 'Housing and Utility Assistance', topBar: 'HOUSING AND UTILITY ASSISTANCE SERVICES'},
+  565: {name: 'Health Care Services', topBar: 'HEATH CARE SERVICES'},
   // 561: 'Where to Donate',
   // 832: 'Advocacy, Planning and Professional Development',
-  563: 'Emergency Food, Clothing, Furniture and Disaster Services',
+  563: {name: 'Emergency Food, Clothing, Furniture and Disaster Services', topBar: 'EMERGENCY FOOD, CLOTHING, FURNITURE AND DISASTER SERVICES'}
   // 562: 'Arts, Education, Employment and Income Support',
   // 560: 'Adult Care and Youth Programs',
   // 568: 'Mental Health and Counseling Resources',

diff --git a/src/renderer/scenes/chooseCategory/chooseCategoryClass.jsx b/src/renderer/scenes/chooseCategory/chooseCategoryClass.jsx
@@ -36,7 +36,7 @@ export default class ChooseCategory extends React.Component {
               onClick={() => this.chooseCategory(id)}
               raised
               className="jumbo bg-primary text-white wrap-lines mb30">
-              {CATEGORY_LABELS[id]}
+              {CATEGORY_LABELS[id].name}
             </Button>
           ))}
         </div>

diff --git a/src/renderer/scenes/chooseSubCategory/chooseSubCategoryClass.jsx b/src/renderer/scenes/chooseSubCategory/chooseSubCategoryClass.jsx
@@ -99,7 +99,7 @@ export default class ChooseCategory extends React.Component {
     const id = this.props.openCategory;
 
     if (id && CATEGORY_LABELS[id]) {
-      return CATEGORY_LABELS[id];
+      return CATEGORY_LABELS[id].name;
     }
 
     return '';