Cornell Changes

6 files changed, 36 insertions, 22 deletions

diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx
index 9d9a5cbd..0b93de98 100644
--- a/src/components/profile/ProfileHeader.tsx
+++ b/src/components/profile/ProfileHeader.tsx
@@ -4,7 +4,7 @@ import {useSelector} from 'react-redux';
 import UniversityIcon from './UniversityIcon';
 import {PROFILE_CUTOUT_TOP_Y} from '../../constants';
 import {RootState} from '../../store/rootreducer';
-import {ScreenType} from '../../types';
+import {ScreenType, Universities} from '../../types';
 import {normalize} from '../../utils';
 import Avatar from './Avatar';
 import FriendsCount from './FriendsCount';
@@ -24,7 +24,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
   handleBlockUnblock,
 }) => {
   const {
-    profile: {name = '', university_class = 2021} = {},
+    profile: {name = '', university_class = 2021, university = Universities.cornell} = {},
     user: {username: userXName = ''},
   } = userXId
     ? useSelector((state: RootState) => state.userX[screenType][userXId])
@@ -60,8 +60,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
           <View style={styles.friendsAndUniversity}>
             <FriendsCount screenType={screenType} userXId={userXId} />
             <UniversityIcon
-              university="brown" //TODO: Update for Cornell
-              university_class={university_class}
+              {...{university, university_class}}
             />
           </View>
         </View>
diff --git a/src/components/profile/UniversityIcon.tsx b/src/components/profile/UniversityIcon.tsx
index d738e745..1642b8f0 100644
--- a/src/components/profile/UniversityIcon.tsx
+++ b/src/components/profile/UniversityIcon.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import {ImageStyle, StyleProp, StyleSheet, ViewProps} from 'react-native';
 import {Image, Text, View} from 'react-native-animatable';
 import {getUniversityClass, normalize} from '../../utils';
-
+import {Universities} from '../../types';
 export interface UniversityIconProps extends ViewProps {
-  university: string;
+  university: Universities;
   university_class?: number;
   imageStyle?: StyleProp<ImageStyle>;
 }
@@ -20,10 +20,10 @@ const UniversityIcon: React.FC<UniversityIconProps> = ({
 }) => {
   var universityIcon;
   switch (university) {
-    case 'cornell':
+    case 'Cornell':
       universityIcon = require('../../assets/universities/cornell.png');
       break;
-    case 'brown':
+    case 'Brown':
       universityIcon = require('../../assets/universities/brown.png');
       break;
     default:
diff --git a/src/components/search/SearchBar.tsx b/src/components/search/SearchBar.tsx
index 62bda77e..5008ff53 100644
--- a/src/components/search/SearchBar.tsx
+++ b/src/components/search/SearchBar.tsx
@@ -14,6 +14,9 @@ import Animated, {interpolate} from 'react-native-reanimated';
 import Icon from 'react-native-vector-icons/Feather';
 import {normalize} from 'react-native-elements';
 import {SCREEN_HEIGHT, getSearchSuggestions} from '../../utils';
+import {useSelector} from 'react-redux';
+import {RootState} from '../../store/rootReducer';
+import {Universities} from '../../types';
 
 const AnimatedIcon = Animated.createAnimatedComponent(Icon);
 
@@ -37,9 +40,12 @@ const SearchBar: React.FC<SearchBarProps> = ({
     e.preventDefault();
     Keyboard.dismiss();
   };
+  const {profile: {university = Universities.cornell} = {}} = useSelector(
+    (state: RootState) => state.user,
+  );
   const DEFAULT_PLACEHOLDER: string = 'Search';
   // the list of suggestions to cycle through. TODO: get this from the backend
-  const SEARCH_SUGGESTIONS: string[] = getSearchSuggestions();
+  const SEARCH_SUGGESTIONS: string[] = getSearchSuggestions(university);
   /*
    * index & id of current placeholder, used in selecting next placeholder. -1
    * indicates DEFAULT_PLACEHOLDER. TODO: make it appear more random by tracking
diff --git a/src/components/search/SearchResultCell.tsx b/src/components/search/SearchResultCell.tsx
index 4484bcd3..6ebe19a6 100644
--- a/src/components/search/SearchResultCell.tsx
+++ b/src/components/search/SearchResultCell.tsx
@@ -2,7 +2,7 @@ import {useNavigation} from '@react-navigation/native';
 import React, {useEffect, useState} from 'react';
 import {Alert, Image, StyleSheet, Text, View} from 'react-native';
 import {TouchableOpacity} from 'react-native-gesture-handler';
-import {useDispatch, useStore} from 'react-redux';
+import {useDispatch, useSelector, useStore} from 'react-redux';
 import {ERROR_UNABLE_TO_VIEW_PROFILE} from '../../constants/strings';
 import {loadImageFromURL} from '../../services';
 import {RootState} from '../../store/rootReducer';
@@ -10,11 +10,13 @@ import {
   CategoryPreviewType,
   ProfilePreviewType,
   ScreenType,
+  Universities,
   UserType,
 } from '../../types';
 import {
   addCategoryToRecentlySearched,
   addUserToRecentlySearched,
+  getUniversityBadge,
   normalize,
   SCREEN_WIDTH,
 } from '../../utils';
@@ -43,6 +45,11 @@ const SearchResultsCell: React.FC<SearchResults> = ({
   loggedInUser,
 }) => {
   const [avatar, setAvatar] = useState<string | undefined>(undefined);
+
+  const {profile: {university = Universities.cornell} = {}} = useSelector(
+    (state: RootState) => state.user,
+  );
+
   useEffect(() => {
     (async () => {
       if (thumbnail_url !== undefined) {
@@ -143,17 +150,17 @@ const SearchResultsCell: React.FC<SearchResults> = ({
     return require('../../assets/images/search.png');
   };
 
-  const universityIcon = () => {
-    return require('../../assets/images/bwbadges.png');
-  };
-
   const categoryCell = () => {
     return (
       <TouchableOpacity style={styles.cellContainer} onPress={onPressCategory}>
         <View style={[styles.imageContainer, styles.categoryBackground]}>
           <Image
             resizeMode="contain"
-            source={category === 'Brown' ? universityIcon() : searchIcon()} //TODO: Update for Cornell
+            source={
+              category in Universities
+                ? getUniversityBadge(university, 'Search')
+                : searchIcon()
+            }
             style={styles.categoryImage}
           />
         </View>
diff --git a/src/components/suggestedPeople/BadgesDropdown.tsx b/src/components/suggestedPeople/BadgesDropdown.tsx
index 3a7eeb0f..f8e7bdaa 100644
--- a/src/components/suggestedPeople/BadgesDropdown.tsx
+++ b/src/components/suggestedPeople/BadgesDropdown.tsx
@@ -4,11 +4,12 @@ import {Image, StyleSheet} from 'react-native';
 import {TouchableOpacity} from 'react-native-gesture-handler';
 import LinearGradient from 'react-native-linear-gradient';
 import Animated, {Easing} from 'react-native-reanimated';
-import {UniversityBadge} from 'src/types';
+import {Universities, UniversityBadge} from '../../types';
 import {UniversityIcon} from '..';
 import {normalize, SCREEN_WIDTH} from '../../utils';
 import UniversityIconClicked from './UniversityIconClicked';
 interface BadgesDropdownProps {
+  university: Universities;
   localBadges: {
     badge: UniversityBadge;
     img: string;
@@ -17,6 +18,7 @@ interface BadgesDropdownProps {
 }
 
 const BadgesDropdown: React.FC<BadgesDropdownProps> = ({
+  university,
   localBadges,
   badges,
 }) => {
@@ -81,13 +83,13 @@ const BadgesDropdown: React.FC<BadgesDropdownProps> = ({
         }}>
         {displayBadges ? (
           <UniversityIconClicked
-            university="brown" //TODO: Update for Cornell
+            university={university}
             style={styles.universityIconContainer}
             imageStyle={{width: normalize(31), height: normalize(38)}}
           />
         ) : (
           <UniversityIcon
-            university="brown" //TODO: Update for Cornell
+            university={university}
             style={styles.universityIconContainer}
             imageStyle={{width: normalize(31), height: normalize(38)}}
           />
diff --git a/src/components/suggestedPeople/UniversityIconClicked.tsx b/src/components/suggestedPeople/UniversityIconClicked.tsx
index f23a8c16..7a0f3442 100644
--- a/src/components/suggestedPeople/UniversityIconClicked.tsx
+++ b/src/components/suggestedPeople/UniversityIconClicked.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import {ImageStyle, StyleProp, StyleSheet, ViewProps} from 'react-native';
 import {Image, Text, View} from 'react-native-animatable';
 import {getUniversityClass, normalize} from '../../utils';
-
+import {Universities} from '../../types';
 export interface UniversityIconClickedProps extends ViewProps {
-  university: string;
+  university: Universities;
   university_class?: number;
   imageStyle?: StyleProp<ImageStyle>;
 }
@@ -20,10 +20,10 @@ const UniversityIconClicked: React.FC<UniversityIconClickedProps> = ({
 }) => {
   var universityIcon;
   switch (university) {
-    case 'cornell':
+    case 'Cornell':
       universityIcon = require('../../assets/universities/cornell-clicked.png');
       break;
-    case 'brown':
+    case 'Brown':
       universityIcon = require('../../assets/universities/brown-clicked.png');
       break;
     default: