diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/assets/universities/cornell-clicked.png | bin | 0 -> 12362 bytes | |||
-rw-r--r-- | src/assets/universities/cornell-search.png | bin | 0 -> 12171 bytes | |||
-rw-r--r-- | src/components/profile/ProfileHeader.tsx | 2 | ||||
-rw-r--r-- | src/components/search/SearchResultCell.tsx | 2 | ||||
-rw-r--r-- | src/components/suggestedPeople/BadgesDropdown.tsx | 4 | ||||
-rw-r--r-- | src/components/suggestedPeople/UniversityIconClicked.tsx | 3 | ||||
-rw-r--r-- | src/constants/badges.ts | 2 | ||||
-rw-r--r-- | src/constants/constants.ts | 2 | ||||
-rw-r--r-- | src/screens/search/SearchScreen.tsx | 2 | ||||
-rw-r--r-- | src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx | 2 | ||||
-rw-r--r-- | src/services/ExploreService.ts | 2 | ||||
-rw-r--r-- | src/types/types.ts | 2 |
12 files changed, 13 insertions, 10 deletions
diff --git a/src/assets/universities/cornell-clicked.png b/src/assets/universities/cornell-clicked.png Binary files differnew file mode 100644 index 00000000..d6450b29 --- /dev/null +++ b/src/assets/universities/cornell-clicked.png diff --git a/src/assets/universities/cornell-search.png b/src/assets/universities/cornell-search.png Binary files differnew file mode 100644 index 00000000..ce41e7bc --- /dev/null +++ b/src/assets/universities/cornell-search.png diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx index 87eeb507..9d9a5cbd 100644 --- a/src/components/profile/ProfileHeader.tsx +++ b/src/components/profile/ProfileHeader.tsx @@ -60,7 +60,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({ <View style={styles.friendsAndUniversity}> <FriendsCount screenType={screenType} userXId={userXId} /> <UniversityIcon - university="brown" //TODO: Change + university="brown" //TODO: Update for Cornell university_class={university_class} /> </View> diff --git a/src/components/search/SearchResultCell.tsx b/src/components/search/SearchResultCell.tsx index 3379d789..4484bcd3 100644 --- a/src/components/search/SearchResultCell.tsx +++ b/src/components/search/SearchResultCell.tsx @@ -153,7 +153,7 @@ const SearchResultsCell: React.FC<SearchResults> = ({ <View style={[styles.imageContainer, styles.categoryBackground]}> <Image resizeMode="contain" - source={category === 'Brown' ? universityIcon() : searchIcon()} //TODO: Change + source={category === 'Brown' ? universityIcon() : searchIcon()} //TODO: Update for Cornell style={styles.categoryImage} /> </View> diff --git a/src/components/suggestedPeople/BadgesDropdown.tsx b/src/components/suggestedPeople/BadgesDropdown.tsx index 3cf9775b..3a7eeb0f 100644 --- a/src/components/suggestedPeople/BadgesDropdown.tsx +++ b/src/components/suggestedPeople/BadgesDropdown.tsx @@ -81,13 +81,13 @@ const BadgesDropdown: React.FC<BadgesDropdownProps> = ({ }}> {displayBadges ? ( <UniversityIconClicked - university="brown" //TODO: Change + university="brown" //TODO: Update for Cornell style={styles.universityIconContainer} imageStyle={{width: normalize(31), height: normalize(38)}} /> ) : ( <UniversityIcon - university="brown" //TODO: Change + university="brown" //TODO: Update for Cornell 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 bde4e17f..f23a8c16 100644 --- a/src/components/suggestedPeople/UniversityIconClicked.tsx +++ b/src/components/suggestedPeople/UniversityIconClicked.tsx @@ -20,6 +20,9 @@ const UniversityIconClicked: React.FC<UniversityIconClickedProps> = ({ }) => { var universityIcon; switch (university) { + case 'cornell': + universityIcon = require('../../assets/universities/cornell-clicked.png'); + break; case 'brown': universityIcon = require('../../assets/universities/brown-clicked.png'); break; diff --git a/src/constants/badges.ts b/src/constants/badges.ts index 0507ed52..49b96df0 100644 --- a/src/constants/badges.ts +++ b/src/constants/badges.ts @@ -110,7 +110,7 @@ export const _cornellBadgeImages = { wrestling: require('../assets/images/badges/cornell/wrestling.png'), zeta_beta_tau: require('../assets/images/badges/cornell/zeta_beta_tau.png'), zeta_psi: require('../assets/images/badges/cornell/zeta_psi.png'), - zeta_phi_beta: require('../assets/images/badges/brown/zeta_phi_beta.png'), + zeta_phi_beta: require('../assets/images/badges/cornell/zeta_phi_beta.png'), }; const _brownBadges = [ diff --git a/src/constants/constants.ts b/src/constants/constants.ts index 6b513f4e..5f91e03d 100644 --- a/src/constants/constants.ts +++ b/src/constants/constants.ts @@ -187,7 +187,7 @@ export const EXPLORE_SECTION_TITLES: ExploreSectionType[] = [ 'New to Tagg', 'People You May Know', 'Trending on Tagg', - "Brown '24", + "Brown '24", //TODO: Update for Cornell "Brown '23", "Brown '22", "Brown '21", diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx index 28e24299..ea660ed9 100644 --- a/src/screens/search/SearchScreen.tsx +++ b/src/screens/search/SearchScreen.tsx @@ -50,7 +50,7 @@ const SearchScreen: React.FC = () => { const top = Animated.useValue(-SCREEN_HEIGHT); const defaultButtons: SearchCategoryType[] = [21, 22, 23, 24].map((year) => ({ id: -1, - name: `Brown '${year}`, //TODO: Change + name: `Brown '${year}`, //TODO: Update for Cornell category: 'Brown', })); const [keyboardVisible, setKeyboardVisible] = React.useState( diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx index 16a64573..5275a186 100644 --- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx +++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx @@ -166,7 +166,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS <View style={styles.editBadgesMainContainer}> <View style={styles.editBadgesSubContainer}> <UniversityIcon - university="brown" //TODO: Change + university="brown" //TODO: Update for Cornell imageStyle={{width: normalize(16), height: normalize(20)}} /> <Text style={styles.editBadgesText}>Edit Badges</Text> diff --git a/src/services/ExploreService.ts b/src/services/ExploreService.ts index 07af91ad..df52b4e3 100644 --- a/src/services/ExploreService.ts +++ b/src/services/ExploreService.ts @@ -56,7 +56,7 @@ export const getAllExploreSections = async () => { 'New to Tagg': data.categories.new_to_tagg, 'People You May Know': data.categories.people_you_may_know, 'Trending on Tagg': data.categories.trending_on_tagg, - "Brown '21": data.categories.brown_21, + "Brown '21": data.categories.brown_21, //TODO: Update for Cornell "Brown '22": data.categories.brown_22, "Brown '23": data.categories.brown_23, "Brown '24": data.categories.brown_24, diff --git a/src/types/types.ts b/src/types/types.ts index dc2817bd..cb6b5209 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -129,7 +129,7 @@ export type ExploreSectionType = | 'People You May Know' | 'New to Tagg' | 'Trending on Tagg' - | "Brown '21" + | "Brown '21" //TODO: Update for Cornell | "Brown '22" | "Brown '23" | "Brown '24"; |