From 8ce46790a8d12df6738d8ac17462ba57e2b0e6b9 Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Wed, 24 Mar 2021 16:09:45 -0700 Subject: Cornell Changes --- src/screens/badge/BadgeScreenHeader.tsx | 9 +++++---- src/screens/badge/BadgeSelection.tsx | 23 ++++++++++++---------- src/screens/search/SearchScreen.tsx | 8 ++++++-- src/screens/suggestedPeople/SPBody.tsx | 7 ++++--- .../SuggestedPeopleUploadPictureScreen.tsx | 10 ++++++---- 5 files changed, 34 insertions(+), 23 deletions(-) (limited to 'src/screens') diff --git a/src/screens/badge/BadgeScreenHeader.tsx b/src/screens/badge/BadgeScreenHeader.tsx index 300869e9..746e05d9 100644 --- a/src/screens/badge/BadgeScreenHeader.tsx +++ b/src/screens/badge/BadgeScreenHeader.tsx @@ -1,19 +1,20 @@ import React from 'react'; import {Image, StyleSheet, Text, View} from 'react-native'; -import {normalize} from '../../utils'; +import { Universities } from 'src/types'; +import {getUniversityBadge, normalize} from '../../utils'; interface BadgeScreenHeaderProps { - university: string; + university: Universities; } const BadgeScreenHeader: React.FC = ({university}) => { return ( - {university} Badges + {university} University Badges diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx index 35e91939..08cad020 100644 --- a/src/screens/badge/BadgeSelection.tsx +++ b/src/screens/badge/BadgeSelection.tsx @@ -15,7 +15,7 @@ import {BACKGROUND_GRADIENT_MAP} from '../../constants'; import {BADGE_DATA} from '../../constants/badges'; import {ERROR_BADGES_EXCEED_LIMIT} from '../../constants/strings'; import {suggestedPeopleBadgesFinished} from '../../store/actions'; -import {BackgroundGradientType} from '../../types'; +import {BackgroundGradientType, Universities} from '../../types'; import {SCREEN_HEIGHT, StatusBarHeight} from '../../utils'; import BadgeList from './BadgeList'; import BadgeScreenHeader from './BadgeScreenHeader'; @@ -34,9 +34,10 @@ type BadgeSelectionProps = { const BadgeSelection: React.FC = ({route}) => { const {editing} = route.params; - const {userId: loggedInUserId} = useSelector( - (state: RootState) => state.user.user, - ); + const { + user: {userId: loggedInUserId}, + profile: {university = Universities.brown}, + } = useSelector((state: RootState) => state.user); const [selectedBadges, setSelectedBadges] = useState([]); const dispatch = useDispatch(); const navigation = useNavigation(); @@ -114,18 +115,20 @@ const BadgeSelection: React.FC = ({route}) => { - + {/* filter not working, comment out for now */} {/* {}} top={Animated.useValue(0)} /> */} - + {university && ( + + )} diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx index ea660ed9..7e84b372 100644 --- a/src/screens/search/SearchScreen.tsx +++ b/src/screens/search/SearchScreen.tsx @@ -22,6 +22,7 @@ import { ProfilePreviewType, ScreenType, SearchCategoryType, + Universities, } from '../../types'; import { getRecentlySearchedCategories, @@ -38,6 +39,9 @@ import { const SearchScreen: React.FC = () => { const {recentSearches} = useSelector((state: RootState) => state.taggUsers); + const {profile: {university = Universities.cornell} = {}} = useSelector( + (state: RootState) => state.user, + ); const [query, setQuery] = useState(''); const [results, setResults] = useState | undefined>(undefined); const [recents, setRecents] = useState>( @@ -50,8 +54,8 @@ 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: Update for Cornell - category: 'Brown', + name: `${university} '${year}`, + category: university, })); const [keyboardVisible, setKeyboardVisible] = React.useState( 'keyboardVisible', diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx index 067eadb1..c4195fac 100644 --- a/src/screens/suggestedPeople/SPBody.tsx +++ b/src/screens/suggestedPeople/SPBody.tsx @@ -27,6 +27,7 @@ interface SPBodyProps { const SPBody: React.FC = ({ item: { user, + university, mutual_friends, social_links, suggested_people_url, @@ -50,7 +51,7 @@ const SPBody: React.FC = ({ useEffect(() => { const newBadges: {badge: UniversityBadge; img: any}[] = []; const findBadgeIcons = (badge: UniversityBadge) => { - BADGE_DATA['Cornell University']?.forEach((item) => { + BADGE_DATA[university]?.forEach((item) => { if (item.title === badge.category) { item.data.forEach((object) => { if (object.badgeName === badge.name) { @@ -120,7 +121,7 @@ const SPBody: React.FC = ({ return ( { - navigation.push('Profile', { + navigation.navigate('Profile', { userXId: loggedInUserId === user.id ? undefined : user.id, screenType, }); @@ -139,7 +140,7 @@ const SPBody: React.FC = ({ {firstItem && 'Suggested People'} {localBadges && ( - + )} diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx index 5275a186..378e69c5 100644 --- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx +++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx @@ -14,6 +14,7 @@ import ImagePicker from 'react-native-image-crop-picker'; import {SafeAreaView} from 'react-native-safe-area-context'; import {useDispatch, useSelector} from 'react-redux'; import {MainStackParams} from 'src/routes'; +import {Universities} from '../../types'; import FrontArrow from '../../assets/icons/front-arrow.svg'; import {TaggSquareButton, UniversityIcon} from '../../components'; import TaggLoadingIndicator from '../../components/common/TaggLoadingIndicator'; @@ -49,9 +50,10 @@ const SuggestedPeopleUploadPictureScreen: React.FC state.user.user, - ); + const { + user: {userId: loggedInUserId}, + profile: {university = Universities.brown}, + } = useSelector((state: RootState) => state.user); useEffect(() => { const loadData = async () => { @@ -166,7 +168,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC Edit Badges -- cgit v1.2.3-70-g09d2