From 7657657c2b8a28b96962ac4fa816bb1625a36e4b Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Mon, 8 Mar 2021 15:48:55 -0500 Subject: added support for badges --- src/screens/search/DiscoverUsers.tsx | 3 ++- src/screens/search/SearchScreen.tsx | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'src/screens') diff --git a/src/screens/search/DiscoverUsers.tsx b/src/screens/search/DiscoverUsers.tsx index e570edce..ce7507fc 100644 --- a/src/screens/search/DiscoverUsers.tsx +++ b/src/screens/search/DiscoverUsers.tsx @@ -18,12 +18,13 @@ interface DiscoverUsersProps { } const DiscoverUsers: React.FC = ({route}) => { + const {type: category_type} = route.params; const {id, name} = route.params.searchCategory; const [users, setUsers] = useState(); useEffect(() => { const loadData = async () => { - setUsers(await getDiscoverUsers(id)); + setUsers(await getDiscoverUsers(id, category_type)); }; loadData(); }, []); diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx index 223fc2b2..82a4c1ae 100644 --- a/src/screens/search/SearchScreen.tsx +++ b/src/screens/search/SearchScreen.tsx @@ -60,16 +60,18 @@ const SearchScreen: React.FC = () => { `${SEARCH_ENDPOINT}?query=${query}`, ); if (query.length > 2) { - const categories = searchResults?.categories; - const users = searchResults?.users; const sanitizedResult = [ + { + title: 'badges', + data: searchResults?.badges, + }, { title: 'categories', - data: categories, + data: searchResults?.categories, }, { title: 'users', - data: users, + data: searchResults?.users, }, ]; setResults(sanitizedResult); @@ -180,7 +182,7 @@ const styles = StyleSheet.create({ height: SCREEN_HEIGHT, }, contentContainer: { - height: SCREEN_HEIGHT * 0.9, + height: SCREEN_HEIGHT, paddingTop: '2%', paddingBottom: SCREEN_HEIGHT / 3, paddingHorizontal: '3%', -- cgit v1.2.3-70-g09d2