From f931ca29805be64ed4b8835a4523da00dfcbb0ad Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Thu, 18 Feb 2021 20:09:45 -0500 Subject: finished?! --- .../suggestedPeople/SuggestedPeopleScreen.tsx | 77 ++++++++++++++++------ 1 file changed, 56 insertions(+), 21 deletions(-) (limited to 'src/screens') diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx index d61ba2fe..1199993b 100644 --- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx +++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx @@ -12,14 +12,20 @@ import { import {Image} from 'react-native-animatable'; import Animated from 'react-native-reanimated'; import {useDispatch, useSelector, useStore} from 'react-redux'; -import {TabsGradient} from '../../components'; +import {TabsGradient, TaggsBar} from '../../components'; import {MutualFriends} from '../../components/suggestedPeople'; import {SP_PAGE_SIZE} from '../../constants'; import SuggestedPeopleOnboardingStackScreen from '../../routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen'; import {getSuggestedPeople} from '../../services/SuggestedPeopleService'; +import {resetScreenType} from '../../store/actions'; import {RootState} from '../../store/rootReducer'; -import {ScreenType, SuggestedPeopleDataType} from '../../types'; -import {normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils'; +import { + ProfilePreviewType, + ScreenType, + SuggestedPeopleDataType, +} from '../../types'; +import {fetchUserX, normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils'; +import {userXInStore} from './../../utils/'; /** * Bare bones for suggested people consisting of: @@ -35,22 +41,54 @@ const SuggestedPeopleScreen: React.FC = () => { const {suggested_people_linked} = useSelector( (state: RootState) => state.user.profile, ) ?? {suggested_people_linked: -1}; - const [users, setUsers] = useState([]); + const [people, setPeople] = useState([]); const [page, setPage] = useState(0); const [refreshing, setRefreshing] = useState(false); + // DEBUG + useEffect(() => { + console.log( + 'people updated', + people.map((ppl) => ppl.user.username), + ); + }, [people]); + // loads data and append it to users based on current page useEffect(() => { + console.log('current page', page); + loadMore(false); + }, [page]); + + const loadMore = (resetData: boolean) => { const loadNextPage = async () => await getSuggestedPeople(SP_PAGE_SIZE, page * SP_PAGE_SIZE); loadNextPage().then((newUsers) => { - setUsers(users.concat(newUsers)); + if (resetData) { + setPeople([]); + setPage(0); + } + loadUserDataToStore(newUsers.map((ppl) => ppl.user)); + setPeople(people.concat(newUsers)); }); - }, [page]); + }; + const loadUserDataToStore = async (users: ProfilePreviewType[]) => { + const loadUserData = async (user: ProfilePreviewType) => { + if (!userXInStore(state, screenType, user.id)) { + await fetchUserX( + dispatch, + {userId: user.id, username: user.username}, + screenType, + ); + } + }; + await Promise.all(users.map((user) => loadUserData(user))); + console.log('done loading'); + }; const resetPage = () => { const reset = async () => { - await setPage(0); + await dispatch(resetScreenType(screenType)); + loadMore(true); }; setRefreshing(true); reset().then(() => { @@ -83,10 +121,8 @@ const SuggestedPeopleScreen: React.FC = () => { return ( <> { {data.user.first_name} {data.user.username} - {/* TODO: uncomment me */} + {/* TODO: Finish me ?! */} {/* { */} - {/* {loadedStatus[data.user.username] && ( - - )} */} + @@ -130,7 +164,7 @@ const SuggestedPeopleScreen: React.FC = () => { <> } keyExtractor={(item, index) => index.toString()} showsVerticalScrollIndicator={false} @@ -151,6 +185,7 @@ const styles = StyleSheet.create({ width: SCREEN_WIDTH * 0.9, height: SCREEN_HEIGHT, paddingVertical: '15%', + paddingBottom: '20%', justifyContent: 'space-between', alignSelf: 'center', marginHorizontal: '5%', @@ -225,7 +260,7 @@ const styles = StyleSheet.create({ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'flex-start', - marginBottom: '10%', + marginBottom: '5%', }, body: {}, }); -- cgit v1.2.3-70-g09d2