From fe5ff5ec516302811b7323cadf8e3dd0939beea4 Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Thu, 18 Mar 2021 02:45:46 -0700 Subject: services + --- src/services/UserFriendsService.ts | 67 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) (limited to 'src/services') diff --git a/src/services/UserFriendsService.ts b/src/services/UserFriendsService.ts index dbec1974..86339868 100644 --- a/src/services/UserFriendsService.ts +++ b/src/services/UserFriendsService.ts @@ -1,8 +1,13 @@ //Abstracted common friends api calls out here +import AsyncStorage from '@react-native-community/async-storage'; import {Alert} from 'react-native'; -import {FriendshipStatusType} from '../types'; -import {FRIENDS_ENDPOINT} from '../constants'; +import {ContactType, FriendshipStatusType} from '../types'; +import { + FRIENDS_ENDPOINT, + INVITE_FRIEND_ENDPOINT, + USERS_FROM_CONTACTS_ENDPOINT, +} from '../constants'; import {ERROR_SOMETHING_WENT_WRONG_REFRESH} from '../constants/strings'; export const loadFriends = async (userId: string, token: string) => { @@ -181,3 +186,61 @@ export const deleteFriendshipService = async ( return false; } }; + +export const usersFromContactsService = async ( + contacts: Array, +) => { + console.log('Contacts: ', contacts); + try { + const token = await AsyncStorage.getItem('token'); + const response = await fetch(USERS_FROM_CONTACTS_ENDPOINT, { + method: 'POST', + headers: { + Authorization: 'Token ' + token, + }, + body: JSON.stringify({ + contacts: contacts, + }), + }); + const status = response.status; + if (Math.floor(status / 100) === 2) { + const users_data = await response.json(); + return users_data; + } else { + console.log( + 'Something went wrong! 😭', + 'Not able to retrieve tagg users list', + ); + } + } catch (error) { + console.log(error); + Alert.alert(ERROR_SOMETHING_WENT_WRONG_REFRESH); + return false; + } +}; + +export const inviteFriendService = async ( + phoneNumber: string, + inviteeFirstName: string, + inviteeLastName: string, + inviterFullName: string, +) => { + const token = await AsyncStorage.getItem('token'); + const response = await fetch(INVITE_FRIEND_ENDPOINT, { + method: 'POST', + headers: { + Authorization: 'Token ' + token, + }, + body: JSON.stringify({ + phone_number: phoneNumber, + invitee_first_name: inviteeFirstName, + invitee_last_name: inviteeLastName, + inviter_full_name: inviterFullName, + }), + }); + if (response.status === 201) { + const response_body = await response.json(); + return response_body; + } + return false; +}; -- cgit v1.2.3-70-g09d2 From f81a4e1a05ca3fa66c2798b047d4bfd6995f462d Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Thu, 18 Mar 2021 13:44:19 -0700 Subject: Support modified endpoints + refactoring --- src/components/friends/InviteFriendTile.tsx | 2 -- src/components/profile/Friends.tsx | 23 ++++++++------------- src/screens/profile/InviteFriendsScreen.tsx | 32 +++++++++-------------------- src/services/UserFriendsService.ts | 10 +++++---- src/utils/common.ts | 21 ++++++++++++++++++- 5 files changed, 44 insertions(+), 44 deletions(-) (limited to 'src/services') diff --git a/src/components/friends/InviteFriendTile.tsx b/src/components/friends/InviteFriendTile.tsx index c49792f9..f56d3514 100644 --- a/src/components/friends/InviteFriendTile.tsx +++ b/src/components/friends/InviteFriendTile.tsx @@ -19,13 +19,11 @@ interface InviteFriendTileProps { const InviteFriendTile: React.FC = ({item}) => { const [invited, setInvited] = useState(false); const [formatedPhoneNumber, setFormattedPhoneNumber] = useState(''); - const {profile} = useSelector((state: RootState) => state.user); const handleInviteFriend = async () => { const response = await inviteFriendService( item.phoneNumber, item.firstName, item.lastName, - profile.name, ); if (response) { setInvited(response); diff --git a/src/components/profile/Friends.tsx b/src/components/profile/Friends.tsx index 36e0ef8a..7d57177c 100644 --- a/src/components/profile/Friends.tsx +++ b/src/components/profile/Friends.tsx @@ -9,7 +9,12 @@ import {usersFromContactsService} from '../../services'; import {NO_USER} from '../../store/initialStates'; import {RootState} from '../../store/rootReducer'; import {ProfilePreviewType, ScreenType} from '../../types'; -import {normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils'; +import { + extractContacts, + normalize, + SCREEN_HEIGHT, + SCREEN_WIDTH, +} from '../../utils'; import {handleAddFriend, handleUnfriend} from '../../utils/friends'; import {ProfilePreview} from '../profile'; import FindFriendsBlueIcon from '../../assets/icons/findFriends/find-friends-blue-icon.svg'; @@ -31,24 +36,12 @@ const Friends: React.FC = ({result, screenType, userId}) => { ProfilePreviewType[] >([]); - const extractPhoneNumbers = async () => { - let phoneNumbers: Array = []; - await getAll().then((contacts) => { - contacts.map((contact) => { - contact.phoneNumbers.map(async (phoneNumber) => { - phoneNumbers.push(await phoneNumber.number); - }); - }); - }); - return phoneNumbers; - }; - useEffect(() => { const handleFindFriends = () => { - extractPhoneNumbers().then(async (phoneNumbers) => { + extractContacts().then(async (contacts) => { const permission = await checkPermission(); if (permission === 'authorized') { - let response = await usersFromContactsService(phoneNumbers); + let response = await usersFromContactsService(contacts); await setUsersFromContacts(response.existing_tagg_users); usersFromContacts.map((user) => console.log('user: ', user.username)); } else if (permission === 'undefined') { diff --git a/src/screens/profile/InviteFriendsScreen.tsx b/src/screens/profile/InviteFriendsScreen.tsx index 1a5de1ce..53215d8a 100644 --- a/src/screens/profile/InviteFriendsScreen.tsx +++ b/src/screens/profile/InviteFriendsScreen.tsx @@ -15,6 +15,7 @@ import { import {useDispatch, useStore} from 'react-redux'; import {ContactType, ProfilePreviewType, ScreenType} from '../../types'; import { + extractContacts, handleAddFriend, HeaderHeight, normalize, @@ -53,24 +54,6 @@ const InviteFriendsScreen: React.FC = ({ }); const [query, setQuery] = useState(''); - const extractContacts = async () => { - let retrievedContacts: Array = []; - await getAll().then((contacts) => { - contacts.map((contact) => { - let obj: ContactType = { - first_name: contact.givenName, - last_name: contact.familyName, - }; - contact.phoneNumbers.map(async (phoneNumber) => { - obj.phone_number = phoneNumber.number; - retrievedContacts.push(obj); - console.log('contact: ', obj); - }); - }); - }); - return retrievedContacts; - }; - useEffect(() => { const handleFindFriends = () => { extractContacts().then(async (retrievedContacts) => { @@ -190,7 +173,13 @@ const InviteFriendsScreen: React.FC = ({ - + Sharing is caring, invite friends, and create moments together! @@ -224,9 +213,7 @@ const InviteFriendsScreen: React.FC = ({ - - Add Friends - + Add Friends @@ -257,6 +244,7 @@ const styles = StyleSheet.create({ fontSize: normalize(12), fontWeight: '600', lineHeight: normalize(14.32), + marginBottom: '5%', }, container: { alignSelf: 'center', diff --git a/src/services/UserFriendsService.ts b/src/services/UserFriendsService.ts index 86339868..c6679bef 100644 --- a/src/services/UserFriendsService.ts +++ b/src/services/UserFriendsService.ts @@ -8,7 +8,10 @@ import { INVITE_FRIEND_ENDPOINT, USERS_FROM_CONTACTS_ENDPOINT, } from '../constants'; -import {ERROR_SOMETHING_WENT_WRONG_REFRESH} from '../constants/strings'; +import { + ERROR_SOMETHING_WENT_WRONG, + ERROR_SOMETHING_WENT_WRONG_REFRESH, +} from '../constants/strings'; export const loadFriends = async (userId: string, token: string) => { try { @@ -223,7 +226,6 @@ export const inviteFriendService = async ( phoneNumber: string, inviteeFirstName: string, inviteeLastName: string, - inviterFullName: string, ) => { const token = await AsyncStorage.getItem('token'); const response = await fetch(INVITE_FRIEND_ENDPOINT, { @@ -232,15 +234,15 @@ export const inviteFriendService = async ( Authorization: 'Token ' + token, }, body: JSON.stringify({ - phone_number: phoneNumber, + invitee_phone_number: phoneNumber, invitee_first_name: inviteeFirstName, invitee_last_name: inviteeLastName, - inviter_full_name: inviterFullName, }), }); if (response.status === 201) { const response_body = await response.json(); return response_body; } + Alert.alert(ERROR_SOMETHING_WENT_WRONG); return false; }; diff --git a/src/utils/common.ts b/src/utils/common.ts index c1049c42..5f0e26ba 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -1,8 +1,9 @@ -import {NotificationType} from './../types/types'; +import {ContactType, NotificationType} from './../types/types'; import moment from 'moment'; import {Linking} from 'react-native'; import {BROWSABLE_SOCIAL_URLS, TOGGLE_BUTTON_TYPE} from '../constants'; import AsyncStorage from '@react-native-community/async-storage'; +import {getAll} from 'react-native-contacts'; export const getToggleButtonText: ( buttonType: string, @@ -115,3 +116,21 @@ export const shuffle = (array: any[]) => { return array; }; + +export const extractContacts = async () => { + let retrievedContacts: Array = []; + await getAll().then((contacts) => { + contacts.map((contact) => { + let obj: ContactType = { + first_name: contact.givenName, + last_name: contact.familyName, + }; + contact.phoneNumbers.map(async (phoneNumber) => { + obj.phone_number = phoneNumber.number; + retrievedContacts.push(obj); + console.log('contact: ', obj); + }); + }); + }); + return retrievedContacts; +}; -- cgit v1.2.3-70-g09d2 From ccd7d12fa20591b19ac8c8df0c9146740667f90f Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Thu, 18 Mar 2021 19:35:38 -0400 Subject: scroll view fix, search for case insensitive --- src/components/friends/InviteFriendTile.tsx | 4 ++ src/screens/profile/InviteFriendsScreen.tsx | 62 +++++++++++++---------------- src/services/UserFriendsService.ts | 6 +-- 3 files changed, 34 insertions(+), 38 deletions(-) (limited to 'src/services') diff --git a/src/components/friends/InviteFriendTile.tsx b/src/components/friends/InviteFriendTile.tsx index 9613b1ac..3fbf2e73 100644 --- a/src/components/friends/InviteFriendTile.tsx +++ b/src/components/friends/InviteFriendTile.tsx @@ -1,5 +1,6 @@ import React, {useEffect, useState} from 'react'; import { + Alert, StyleSheet, Text, TouchableOpacity, @@ -7,6 +8,7 @@ import { View, } from 'react-native'; import {TAGG_LIGHT_BLUE} from '../../constants'; +import {ERROR_SOMETHING_WENT_WRONG} from '../../constants/strings'; import {inviteFriendService} from '../../services'; import {normalize} from '../../utils'; @@ -25,6 +27,8 @@ const InviteFriendTile: React.FC = ({item}) => { ); if (response) { setInvited(response); + } else { + Alert.alert(ERROR_SOMETHING_WENT_WRONG); } }; diff --git a/src/screens/profile/InviteFriendsScreen.tsx b/src/screens/profile/InviteFriendsScreen.tsx index a57b72b6..06e98b90 100644 --- a/src/screens/profile/InviteFriendsScreen.tsx +++ b/src/screens/profile/InviteFriendsScreen.tsx @@ -11,6 +11,7 @@ import { Linking, StatusBar, TouchableWithoutFeedback, + ScrollView, } from 'react-native'; import {useDispatch, useStore} from 'react-redux'; import {ProfilePreviewType, ScreenType} from '../../types'; @@ -21,6 +22,7 @@ import { normalize, SCREEN_HEIGHT, SCREEN_WIDTH, + StatusBarHeight, } from '../../utils'; import {checkPermission} from 'react-native-contacts'; import {usersFromContactsService} from '../../services/UserFriendsService'; @@ -79,24 +81,20 @@ const InviteFriendsScreen: React.FC = ({ * Main handler for changes in query. */ useEffect(() => { + console.log('query is now ', query); const search = async () => { if (query.length > 0) { const searchResultsUsers = usersFromContacts.filter( - (item: ProfilePreviewType) => { - if ( - item.first_name.includes(query) || - item.last_name.includes(query) || - item.username.includes(query) - ) { - return item; - } - }, + (item: ProfilePreviewType) => + item.first_name.toLowerCase().includes(query) || + item.last_name.toLowerCase().includes(query) || + item.username.toLowerCase().includes(query), + ); + const searchResultsNonUsers = nonUsersFromContacts.filter( + (item) => + item.firstName.toLowerCase().includes(query) || + item.lastName.toLowerCase().includes(query), ); - const searchResultsNonUsers = nonUsersFromContacts.filter((item) => { - if (item.firstName.includes(query) || item.lastName.includes(query)) { - return item; - } - }); const sanitizedResult = { usersFromContacts: searchResultsUsers, nonUsersFromContacts: searchResultsNonUsers, @@ -138,7 +136,6 @@ const InviteFriendsScreen: React.FC = ({ const filteredUsers = users.filter( (user) => user.username !== item.username, ); - console.log('filteredUsers: ', filteredUsers); setResults({ ...results, usersFromContacts: filteredUsers, @@ -155,24 +152,14 @@ const InviteFriendsScreen: React.FC = ({ ); - const NonUsersFromContacts = () => ( - <> - item.phoneNumber} - renderItem={({item}) => } - /> - - ); - return ( - + - + Sharing is caring, invite friends, and create moments together! @@ -193,7 +180,7 @@ const InviteFriendsScreen: React.FC = ({ autoCapitalize="none" autoCorrect={false} onChangeText={(text) => { - setQuery(text); + setQuery(text.toLowerCase()); }} onBlur={() => { Keyboard.dismiss(); @@ -212,9 +199,16 @@ const InviteFriendsScreen: React.FC = ({ Invite your friends! - + item.phoneNumber} + renderItem={({item}) => } + /> - + @@ -225,8 +219,8 @@ const InviteFriendsScreen: React.FC = ({ const styles = StyleSheet.create({ mainContainer: {backgroundColor: 'white', height: SCREEN_HEIGHT}, body: { - paddingTop: HeaderHeight * 1.3, - height: SCREEN_HEIGHT * 0.8, + paddingTop: 10, + height: SCREEN_HEIGHT, backgroundColor: '#fff', }, headerContainer: { diff --git a/src/services/UserFriendsService.ts b/src/services/UserFriendsService.ts index c6679bef..cea20fbe 100644 --- a/src/services/UserFriendsService.ts +++ b/src/services/UserFriendsService.ts @@ -239,10 +239,8 @@ export const inviteFriendService = async ( invitee_last_name: inviteeLastName, }), }); - if (response.status === 201) { - const response_body = await response.json(); - return response_body; + if (response.status === 201 || response.status === 200) { + return await response.json(); } - Alert.alert(ERROR_SOMETHING_WENT_WRONG); return false; }; -- cgit v1.2.3-70-g09d2