diff options
Diffstat (limited to 'src')
23 files changed, 14 insertions, 18 deletions
diff --git a/src/assets/images/badges/brown_entrepreneurship.png b/src/assets/images/badges/brown_ep.png Binary files differindex c4f381b2..c4f381b2 100644 --- a/src/assets/images/badges/brown_entrepreneurship.png +++ b/src/assets/images/badges/brown_ep.png diff --git a/src/assets/images/badges/impulse_and_mezcla.png b/src/assets/images/badges/impulse.png Binary files differindex 68a73028..68a73028 100644 --- a/src/assets/images/badges/impulse_and_mezcla.png +++ b/src/assets/images/badges/impulse.png diff --git a/src/assets/images/badges/old/alpha_chi_omega.png b/src/assets/images/badges/old/alpha_chi_omega.png Binary files differdeleted file mode 100644 index 473894cc..00000000 --- a/src/assets/images/badges/old/alpha_chi_omega.png +++ /dev/null diff --git a/src/assets/images/badges/old/alpha_phi_alpha.png b/src/assets/images/badges/old/alpha_phi_alpha.png Binary files differdeleted file mode 100644 index 275e0eb3..00000000 --- a/src/assets/images/badges/old/alpha_phi_alpha.png +++ /dev/null diff --git a/src/assets/images/badges/old/baseball.png b/src/assets/images/badges/old/baseball.png Binary files differdeleted file mode 100644 index 7b470dbe..00000000 --- a/src/assets/images/badges/old/baseball.png +++ /dev/null diff --git a/src/assets/images/badges/old/basketball.png b/src/assets/images/badges/old/basketball.png Binary files differdeleted file mode 100644 index 45d1139b..00000000 --- a/src/assets/images/badges/old/basketball.png +++ /dev/null diff --git a/src/assets/images/badges/old/beta_omega_chi.png b/src/assets/images/badges/old/beta_omega_chi.png Binary files differdeleted file mode 100644 index f2a85996..00000000 --- a/src/assets/images/badges/old/beta_omega_chi.png +++ /dev/null diff --git a/src/assets/images/badges/old/brown_badge.png b/src/assets/images/badges/old/brown_badge.png Binary files differdeleted file mode 100644 index bcffb6e3..00000000 --- a/src/assets/images/badges/old/brown_badge.png +++ /dev/null diff --git a/src/assets/images/badges/old/delta_gamma.png b/src/assets/images/badges/old/delta_gamma.png Binary files differdeleted file mode 100644 index 84182eca..00000000 --- a/src/assets/images/badges/old/delta_gamma.png +++ /dev/null diff --git a/src/assets/images/badges/old/delta_phi.png b/src/assets/images/badges/old/delta_phi.png Binary files differdeleted file mode 100644 index 074317d1..00000000 --- a/src/assets/images/badges/old/delta_phi.png +++ /dev/null diff --git a/src/assets/images/badges/old/field_hockey.png b/src/assets/images/badges/old/field_hockey.png Binary files differdeleted file mode 100644 index 766f0f60..00000000 --- a/src/assets/images/badges/old/field_hockey.png +++ /dev/null diff --git a/src/assets/images/badges/old/football.png b/src/assets/images/badges/old/football.png Binary files differdeleted file mode 100644 index 2e8214b7..00000000 --- a/src/assets/images/badges/old/football.png +++ /dev/null diff --git a/src/assets/images/badges/old/gymnastics.png b/src/assets/images/badges/old/gymnastics.png Binary files differdeleted file mode 100644 index 5d500f26..00000000 --- a/src/assets/images/badges/old/gymnastics.png +++ /dev/null diff --git a/src/assets/images/badges/old/hockey.png b/src/assets/images/badges/old/hockey.png Binary files differdeleted file mode 100644 index 7e269665..00000000 --- a/src/assets/images/badges/old/hockey.png +++ /dev/null diff --git a/src/assets/images/badges/old/kappa_alpha_psi.png b/src/assets/images/badges/old/kappa_alpha_psi.png Binary files differdeleted file mode 100644 index 1b7d7aff..00000000 --- a/src/assets/images/badges/old/kappa_alpha_psi.png +++ /dev/null diff --git a/src/assets/images/badges/old/kappa_delta.png b/src/assets/images/badges/old/kappa_delta.png Binary files differdeleted file mode 100644 index 642ddb5b..00000000 --- a/src/assets/images/badges/old/kappa_delta.png +++ /dev/null diff --git a/src/assets/images/badges/old/lax.png b/src/assets/images/badges/old/lax.png Binary files differdeleted file mode 100644 index 3810589b..00000000 --- a/src/assets/images/badges/old/lax.png +++ /dev/null diff --git a/src/assets/images/badges/old/sigma.png b/src/assets/images/badges/old/sigma.png Binary files differdeleted file mode 100644 index 7e6c9d22..00000000 --- a/src/assets/images/badges/old/sigma.png +++ /dev/null diff --git a/src/assets/images/badges/old/theta_alpha.png b/src/assets/images/badges/old/theta_alpha.png Binary files differdeleted file mode 100644 index 607720f5..00000000 --- a/src/assets/images/badges/old/theta_alpha.png +++ /dev/null diff --git a/src/assets/images/badges/old/track.png b/src/assets/images/badges/old/track.png Binary files differdeleted file mode 100644 index a531f641..00000000 --- a/src/assets/images/badges/old/track.png +++ /dev/null diff --git a/src/assets/images/badges/old/volleyball.png b/src/assets/images/badges/old/volleyball.png Binary files differdeleted file mode 100644 index a9bb9c88..00000000 --- a/src/assets/images/badges/old/volleyball.png +++ /dev/null diff --git a/src/constants/badges.ts b/src/constants/badges.ts index 0604464d..6dc7ccf2 100644 --- a/src/constants/badges.ts +++ b/src/constants/badges.ts @@ -10,7 +10,7 @@ export const _badgeImages = { brown_class_board: require('../assets/images/badges/brown_class_board.png'), brown_cs: require('../assets/images/badges/brown_cs.png'), brown_democrats: require('../assets/images/badges/brown_democrats.png'), - brown_entrepreneurship: require('../assets/images/badges/brown_entrepreneurship.png'), + brown_ep: require('../assets/images/badges/brown_ep.png'), brown_womens_collective: require('../assets/images/badges/brown_womens_collective.png'), bsu: require('../assets/images/badges/bsu.png'), buxton_international: require('../assets/images/badges/buxton_international.png'), @@ -21,7 +21,7 @@ export const _badgeImages = { football: require('../assets/images/badges/football.png'), gymnastics: require('../assets/images/badges/gymnastics.png'), hockey: require('../assets/images/badges/hockey.png'), - impulse_and_mezcla: require('../assets/images/badges/impulse_and_mezcla.png'), + impulse: require('../assets/images/badges/impulse.png'), kappa_delta: require('../assets/images/badges/kappa_delta.png'), lacrosse: require('../assets/images/badges/lacrosse.png'), latin_at_brown: require('../assets/images/badges/latin_at_brown.png'), @@ -58,7 +58,7 @@ export const BADGE_DATA = [ badgeImage: _badgeImages.volleyball, }, { - badgeName: 'Brown Lacross', + badgeName: 'Brown Lacrosse', badgeImage: _badgeImages.lacrosse, }, { @@ -113,7 +113,7 @@ export const BADGE_DATA = [ badgeImage: _badgeImages.latin_at_brown, }, { - badgeName: 'Buxton/international', + badgeName: 'Buxton/International', badgeImage: _badgeImages.buxton_international, }, { @@ -185,12 +185,8 @@ export const BADGE_DATA = [ badgeImage: _badgeImages.fashion_at_brown, }, { - badgeName: 'Brown Democrats', - badgeImage: _badgeImages.brown_democrats, - }, - { - badgeName: 'Impulse + Mezcla', - badgeImage: _badgeImages.impulse_and_mezcla, + badgeName: 'Impulse', + badgeImage: _badgeImages.impulse, }, ], }, @@ -198,8 +194,8 @@ export const BADGE_DATA = [ title: 'Network', data: [ { - badgeName: 'Brown Entrepreneurship', - badgeImage: _badgeImages.brown_entrepreneurship, + badgeName: 'Brown EP', + badgeImage: _badgeImages.brown_ep, }, { badgeName: 'Black in Business', diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx index bba137c0..06d3efb3 100644 --- a/src/screens/suggestedPeople/SPBody.tsx +++ b/src/screens/suggestedPeople/SPBody.tsx @@ -3,10 +3,11 @@ import React, {Fragment, useEffect, useMemo, useState} from 'react'; import {StyleSheet, Text, View} from 'react-native'; import {Image} from 'react-native-animatable'; import {TouchableOpacity} from 'react-native-gesture-handler'; +import Animated from 'react-native-reanimated'; import RequestedButton from '../../assets/ionicons/requested-button.svg'; import {TaggsBar} from '../../components'; import {BadgesDropdown, MutualFriends} from '../../components/suggestedPeople'; -import {DATA} from '../../screens/badge/BadgeSelection'; +import {BADGE_DATA} from '../../constants/badges'; import { ProfilePreviewType, ScreenType, @@ -14,7 +15,6 @@ import { UniversityBadge, } from '../../types'; import {isIPhoneX, normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils'; -import Animated from 'react-native-reanimated'; interface SPBodyProps { item: SuggestedPeopleDataType; @@ -47,19 +47,19 @@ const SPBody: React.FC<SPBodyProps> = ({ }[] >([]); const navigation = useNavigation(); - let array = []; useEffect(() => { + const newBadges: {badge: UniversityBadge; img: any}[] = []; const findBadgeIcons = (badge: UniversityBadge) => { - DATA?.forEach((item) => { + BADGE_DATA?.forEach((item) => { if (item.title === badge.category) { item.data.forEach((object) => { if (object.badgeName === badge.name) { - array.push({badge, img: object.badgeImage}); + newBadges.push({badge, img: object.badgeImage}); } }); } }); - setLocalBadges(array); + setLocalBadges(newBadges); }; badges ? badges.forEach((badge) => findBadgeIcons(badge)) |
