From ad70d44fd106c475ff3ecd680ebb41946e4dc363 Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Wed, 17 Mar 2021 15:59:53 -0700 Subject: Tma 701 - New screens added, refactoring pending --- src/assets/images/blocked-white@3x.png | Bin 0 -> 1020 bytes src/assets/images/edit-profile@3x.png | Bin 0 -> 770 bytes src/assets/images/privacypolicy@3x.png | Bin 0 -> 519 bytes src/assets/images/settings/blocked-white.png | Bin 0 -> 367 bytes src/assets/images/settings/blocked-white@2x.png | Bin 0 -> 685 bytes src/assets/images/settings/edit-profile.png | Bin 0 -> 341 bytes src/assets/images/settings/edit-profile@2x.png | Bin 0 -> 582 bytes src/assets/images/settings/privacypolicy.png | Bin 0 -> 283 bytes src/assets/images/settings/privacypolicy@2x.png | Bin 0 -> 371 bytes src/assets/images/settings/settings-white.png | Bin 0 -> 400 bytes src/assets/images/settings/settings-white@2x.png | Bin 0 -> 871 bytes src/assets/images/settings/settings-white@3x.png | Bin 0 -> 1393 bytes src/assets/images/settings/settings.png | Bin 0 -> 508 bytes src/assets/images/settings/settings@2x.png | Bin 0 -> 967 bytes src/assets/images/settings/termsofuse.png | Bin 0 -> 373 bytes src/assets/images/settings/termsofuse@2x.png | Bin 0 -> 600 bytes src/assets/images/settings/white-arrow.png | Bin 0 -> 240 bytes src/assets/images/settings/white-arrow@2x.png | Bin 0 -> 355 bytes src/assets/images/settings/white-arrow@3x.png | Bin 0 -> 415 bytes src/assets/images/settings@3x.png | Bin 0 -> 1433 bytes src/assets/images/termsofuse@3x.png | Bin 0 -> 939 bytes src/components/profile/ProfileMoreInfoDrawer.tsx | 22 +-- src/routes/main/MainStackNavigator.tsx | 3 + src/routes/main/MainStackScreen.tsx | 24 +++ src/screens/profile/AccountType.tsx | 87 +++++++++++ src/screens/profile/PrivacyScreen.tsx | 159 ++++++++++++++++++++ src/screens/profile/SettingsScreen.tsx | 184 +++++++++++++++++++++++ src/screens/profile/index.ts | 3 + src/store/actions/user.ts | 2 + 29 files changed, 475 insertions(+), 9 deletions(-) create mode 100644 src/assets/images/blocked-white@3x.png create mode 100644 src/assets/images/edit-profile@3x.png create mode 100644 src/assets/images/privacypolicy@3x.png create mode 100644 src/assets/images/settings/blocked-white.png create mode 100644 src/assets/images/settings/blocked-white@2x.png create mode 100644 src/assets/images/settings/edit-profile.png create mode 100644 src/assets/images/settings/edit-profile@2x.png create mode 100644 src/assets/images/settings/privacypolicy.png create mode 100644 src/assets/images/settings/privacypolicy@2x.png create mode 100644 src/assets/images/settings/settings-white.png create mode 100644 src/assets/images/settings/settings-white@2x.png create mode 100644 src/assets/images/settings/settings-white@3x.png create mode 100644 src/assets/images/settings/settings.png create mode 100644 src/assets/images/settings/settings@2x.png create mode 100644 src/assets/images/settings/termsofuse.png create mode 100644 src/assets/images/settings/termsofuse@2x.png create mode 100644 src/assets/images/settings/white-arrow.png create mode 100644 src/assets/images/settings/white-arrow@2x.png create mode 100644 src/assets/images/settings/white-arrow@3x.png create mode 100644 src/assets/images/settings@3x.png create mode 100644 src/assets/images/termsofuse@3x.png create mode 100644 src/screens/profile/AccountType.tsx create mode 100644 src/screens/profile/PrivacyScreen.tsx create mode 100644 src/screens/profile/SettingsScreen.tsx (limited to 'src') diff --git a/src/assets/images/blocked-white@3x.png b/src/assets/images/blocked-white@3x.png new file mode 100644 index 00000000..06eeb651 Binary files /dev/null and b/src/assets/images/blocked-white@3x.png differ diff --git a/src/assets/images/edit-profile@3x.png b/src/assets/images/edit-profile@3x.png new file mode 100644 index 00000000..8ba76b18 Binary files /dev/null and b/src/assets/images/edit-profile@3x.png differ diff --git a/src/assets/images/privacypolicy@3x.png b/src/assets/images/privacypolicy@3x.png new file mode 100644 index 00000000..aa3402b2 Binary files /dev/null and b/src/assets/images/privacypolicy@3x.png differ diff --git a/src/assets/images/settings/blocked-white.png b/src/assets/images/settings/blocked-white.png new file mode 100644 index 00000000..ec3750af Binary files /dev/null and b/src/assets/images/settings/blocked-white.png differ diff --git a/src/assets/images/settings/blocked-white@2x.png b/src/assets/images/settings/blocked-white@2x.png new file mode 100644 index 00000000..1f39ba06 Binary files /dev/null and b/src/assets/images/settings/blocked-white@2x.png differ diff --git a/src/assets/images/settings/edit-profile.png b/src/assets/images/settings/edit-profile.png new file mode 100644 index 00000000..c096a32a Binary files /dev/null and b/src/assets/images/settings/edit-profile.png differ diff --git a/src/assets/images/settings/edit-profile@2x.png b/src/assets/images/settings/edit-profile@2x.png new file mode 100644 index 00000000..4753e0a3 Binary files /dev/null and b/src/assets/images/settings/edit-profile@2x.png differ diff --git a/src/assets/images/settings/privacypolicy.png b/src/assets/images/settings/privacypolicy.png new file mode 100644 index 00000000..47792a3d Binary files /dev/null and b/src/assets/images/settings/privacypolicy.png differ diff --git a/src/assets/images/settings/privacypolicy@2x.png b/src/assets/images/settings/privacypolicy@2x.png new file mode 100644 index 00000000..31a1aeb2 Binary files /dev/null and b/src/assets/images/settings/privacypolicy@2x.png differ diff --git a/src/assets/images/settings/settings-white.png b/src/assets/images/settings/settings-white.png new file mode 100644 index 00000000..f571e4b0 Binary files /dev/null and b/src/assets/images/settings/settings-white.png differ diff --git a/src/assets/images/settings/settings-white@2x.png b/src/assets/images/settings/settings-white@2x.png new file mode 100644 index 00000000..6d59c672 Binary files /dev/null and b/src/assets/images/settings/settings-white@2x.png differ diff --git a/src/assets/images/settings/settings-white@3x.png b/src/assets/images/settings/settings-white@3x.png new file mode 100644 index 00000000..0019b29c Binary files /dev/null and b/src/assets/images/settings/settings-white@3x.png differ diff --git a/src/assets/images/settings/settings.png b/src/assets/images/settings/settings.png new file mode 100644 index 00000000..7445b8bf Binary files /dev/null and b/src/assets/images/settings/settings.png differ diff --git a/src/assets/images/settings/settings@2x.png b/src/assets/images/settings/settings@2x.png new file mode 100644 index 00000000..8a152c70 Binary files /dev/null and b/src/assets/images/settings/settings@2x.png differ diff --git a/src/assets/images/settings/termsofuse.png b/src/assets/images/settings/termsofuse.png new file mode 100644 index 00000000..82e90148 Binary files /dev/null and b/src/assets/images/settings/termsofuse.png differ diff --git a/src/assets/images/settings/termsofuse@2x.png b/src/assets/images/settings/termsofuse@2x.png new file mode 100644 index 00000000..5e0fe642 Binary files /dev/null and b/src/assets/images/settings/termsofuse@2x.png differ diff --git a/src/assets/images/settings/white-arrow.png b/src/assets/images/settings/white-arrow.png new file mode 100644 index 00000000..7c60d262 Binary files /dev/null and b/src/assets/images/settings/white-arrow.png differ diff --git a/src/assets/images/settings/white-arrow@2x.png b/src/assets/images/settings/white-arrow@2x.png new file mode 100644 index 00000000..13cce59a Binary files /dev/null and b/src/assets/images/settings/white-arrow@2x.png differ diff --git a/src/assets/images/settings/white-arrow@3x.png b/src/assets/images/settings/white-arrow@3x.png new file mode 100644 index 00000000..48ed872a Binary files /dev/null and b/src/assets/images/settings/white-arrow@3x.png differ diff --git a/src/assets/images/settings@3x.png b/src/assets/images/settings@3x.png new file mode 100644 index 00000000..4844d30f Binary files /dev/null and b/src/assets/images/settings@3x.png differ diff --git a/src/assets/images/termsofuse@3x.png b/src/assets/images/termsofuse@3x.png new file mode 100644 index 00000000..7d253196 Binary files /dev/null and b/src/assets/images/termsofuse@3x.png differ diff --git a/src/components/profile/ProfileMoreInfoDrawer.tsx b/src/components/profile/ProfileMoreInfoDrawer.tsx index a77a2e84..d62063a7 100644 --- a/src/components/profile/ProfileMoreInfoDrawer.tsx +++ b/src/components/profile/ProfileMoreInfoDrawer.tsx @@ -3,7 +3,6 @@ import React from 'react'; import {Alert, Image, StyleSheet, TouchableOpacity} from 'react-native'; import {useSelector} from 'react-redux'; import MoreIcon from '../../assets/icons/more_horiz-24px.svg'; -import PersonOutline from '../../assets/ionicons/person-outline.svg'; import {TAGG_DARK_BLUE, TAGG_LIGHT_BLUE} from '../../constants'; import {ERROR_ATTEMPT_EDIT_SP} from '../../constants/strings'; import {RootState} from '../../store/rootreducer'; @@ -29,7 +28,7 @@ const ProfileMoreInfoDrawer: React.FC = (props) => { const isOwnProfile = !userXId || userXName === username; const goToEditProfile = () => { - navigation.push('EditProfile', { + navigation.navigate('EditProfile', { userId: userId, username: username, }); @@ -41,9 +40,7 @@ const ProfileMoreInfoDrawer: React.FC = (props) => { Alert.alert(ERROR_ATTEMPT_EDIT_SP); } else { // Sending undefined for updatedSelectedBadges to mark that there was no update yet - navigation.push('UpdateSPPicture', { - editing: true, - }); + navigation.navigate('SettingsScreen'); setIsOpen(false); } }; @@ -81,14 +78,21 @@ const ProfileMoreInfoDrawer: React.FC = (props) => { textColor={'black'} buttons={[ [ - 'Edit Suggested', - goToUpdateSPProfile, + 'Settings', + goToSettingsPage, , + ], + [ + 'Edit Profile', + goToEditProfile, + , ], - ['Edit Profile', goToEditProfile, ], ]} /> )} diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx index 26d9943b..4563ec95 100644 --- a/src/routes/main/MainStackNavigator.tsx +++ b/src/routes/main/MainStackNavigator.tsx @@ -28,6 +28,9 @@ export type MainStackParams = { userXId: string | undefined; screenType: ScreenType; }; + SettingsScreen: {}; + PrivacyScreen: {}; + AccountTypeScreen: {}; SocialMediaTaggs: { socialMediaType: string; userXId: string | undefined; diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx index 8cefd3cc..d855f0df 100644 --- a/src/routes/main/MainStackScreen.tsx +++ b/src/routes/main/MainStackScreen.tsx @@ -6,6 +6,7 @@ import {StyleSheet, Text} from 'react-native'; import {normalize} from 'react-native-elements'; import BackIcon from '../../assets/icons/back-arrow.svg'; import { + AccountType, AnimatedTutorial, BadgeSelection, CaptionScreen, @@ -20,12 +21,14 @@ import { MomentUploadPromptScreen, NotificationsScreen, ProfileScreen, + PrivacyScreen, RequestContactsAccess, SearchScreen, SocialMediaTaggs, SuggestedPeopleScreen, SuggestedPeopleUploadPictureScreen, SuggestedPeopleWelcomeScreen, + SettingsScreen, } from '../../screens'; import MutualBadgeHolders from '../../screens/suggestedPeople/MutualBadgeHolders'; import {ScreenType} from '../../types'; @@ -150,6 +153,27 @@ const MainStackScreen: React.FC = ({route}) => { ...headerBarOptions('white', 'Discover Users'), }} /> + + + { + const [isPrivateAccount, setIsPrivateAccount] = useState(false); + const switchAccountType = () => + setIsPrivateAccount((previousState) => !previousState); + + useEffect(() => { + // Fetching from Redux and Set the result + // setIsPrivateAccount(true); + }, []); + + const getAccountText = () => { + return isPrivateAccount ? 'Private Account' : 'Public Account'; + }; + + return ( + <> + + + + + + {getAccountText()} + + + + + + Enabling a public account will: + + + {'\n'}Everyone can view my posts{'\n'} + {'\n'}Everyone can send me friend requests{'\n'} + {'\n'}Everyone can tagg me{'\n'} + {'\n'}Everyone can send me direct messages + + + + + + + ); +}; + +const styles = StyleSheet.create({ + container: { + flex: 1, + }, + title: { + fontSize: normalize(18), + fontWeight: '600', + lineHeight: normalize(17.9), + color: 'white', + }, + + detailTitleStyle: { + fontSize: normalize(19), + fontWeight: '700', + lineHeight: normalize(22.67), + color: 'white', + }, + detailContentStyle: { + fontSize: normalize(14), + fontWeight: '600', + lineHeight: normalize(16.71), + color: 'white', + }, +}); + +export default AccountType; diff --git a/src/screens/profile/PrivacyScreen.tsx b/src/screens/profile/PrivacyScreen.tsx new file mode 100644 index 00000000..e92769fc --- /dev/null +++ b/src/screens/profile/PrivacyScreen.tsx @@ -0,0 +1,159 @@ +import React from 'react'; +import { + Alert, + Image, + SectionList, + StatusBar, + StyleSheet, + Text, + TouchableOpacity, + View, +} from 'react-native'; +import {SafeAreaView} from 'react-native-safe-area-context'; +import {normalize} from '../../utils/layouts'; +import {Background} from '../../components'; +import {BackgroundGradientType} from '../../types'; +import {logout} from '../../store/actions'; +import {useDispatch, useSelector} from 'react-redux'; +import {useNavigation} from '@react-navigation/core'; +import {RootState} from 'src/store/rootReducer'; +import {ERROR_ATTEMPT_EDIT_SP} from '../../constants/strings'; + +const DATA = [ + { + title: '', + data: [ + { + title: 'Account Type', + preimage: require('../../assets/images/tagg-logo.png'), + postimage: require('../../assets/images/settings/white-arrow.png'), + }, + { + title: 'Blocked Accounts', + preimage: require('../../assets/images/settings/blocked-white.png'), + postimage: require('../../assets/images/settings/white-arrow.png'), + }, + ], + }, +]; + +const PrivacyScreen: React.FC = () => { + const dispatch = useDispatch(); + const navigation = useNavigation(); + const {suggested_people_linked} = useSelector( + (state: RootState) => state.user.profile, + ); + const goToUpdateSPProfile = () => { + if (suggested_people_linked === 0) { + Alert.alert(ERROR_ATTEMPT_EDIT_SP); + } else { + // Sending undefined for updatedSelectedBadges to mark that there was no update yet + navigation.navigate('UpdateSPPicture', { + editing: true, + }); + } + }; + + const getActions = (type: string) => { + switch (type) { + case 'Account Type': + navigateTo('AccountTypeScreen', {}); + break + case 'Blocked Accounts': + navigateTo('Blocked Accounts', {}); + break + default: + break; + } + }; + + const navigateTo = (screen: string, options: object) => { + navigation.navigate(screen, options); + }; + + const Item = ({ + title, + preimage, + postimage, + }: { + title: string; + preimage: number; + postimage: number; + }) => ( + getActions(title)} style={styles.item}> + + + {title} + + + {title === 'Account Type' && ( + + {'Private'} + + )} + + + + ); + + return ( + <> + + + + + item.title + index} + renderItem={({item: {title, preimage, postimage}}) => { + return ; + }} + renderSectionHeader={({section: {title}}) => { + if (title.length === 0) { + return null; + } + return ( + + {title} + + ); + }} + /> + + + + + ); +}; + +const styles = StyleSheet.create({ + container: { + flex: 1, + }, + item: { + marginTop: 36, + flexDirection: 'row', + justifyContent: 'flex-start', + alignItems: 'center', + }, + header: { + fontSize: normalize(18), + fontWeight: '600', + lineHeight: normalize(21.48), + color: '#E9E9E9', + }, + title: { + fontSize: normalize(15), + fontWeight: '600', + lineHeight: normalize(17.9), + color: 'white', + }, + logoutStyle: { + fontSize: normalize(20), + fontWeight: '600', + lineHeight: normalize(23.87), + color: 'white', + }, +}); + +export default PrivacyScreen; diff --git a/src/screens/profile/SettingsScreen.tsx b/src/screens/profile/SettingsScreen.tsx new file mode 100644 index 00000000..79633572 --- /dev/null +++ b/src/screens/profile/SettingsScreen.tsx @@ -0,0 +1,184 @@ +import React from 'react'; +import { + Alert, + Image, + SectionList, + StatusBar, + StyleSheet, + Text, + TouchableOpacity, + View, +} from 'react-native'; +import {SafeAreaView} from 'react-native-safe-area-context'; +import {normalize} from '../../utils/layouts'; +import {Background} from '../../components'; +import {BackgroundGradientType} from '../../types'; +import {logout} from '../../store/actions'; +import {useDispatch, useSelector} from 'react-redux'; +import {useNavigation} from '@react-navigation/core'; +import {RootState} from 'src/store/rootReducer'; +import {ERROR_ATTEMPT_EDIT_SP} from '../../constants/strings'; + +const DATA = [ + { + title: 'ACCOUNT', + data: [ + { + title: 'Suggested People Profile', + preimage: require('../../assets/images/tagg-logo.png'), + postimage: require('../../assets/images/settings/white-arrow.png'), + }, + { + title: 'Privacy', + preimage: require('../../assets/images/settings/settings-white.png'), + postimage: require('../../assets/images/settings/white-arrow.png'), + }, + ], + }, + { + title: 'GENERAL', + data: [ + { + title: 'Terms of use', + preimage: require('../../assets/images/settings/termsofuse.png'), + postimage: require('../../assets/images/settings/white-arrow.png'), + }, + { + title: 'Privacy Policy', + preimage: require('../../assets/images/settings/privacypolicy.png'), + postimage: require('../../assets/images/settings/white-arrow.png'), + }, + ], + }, +]; + +const SettingsScreen: React.FC = () => { + const dispatch = useDispatch(); + const navigation = useNavigation(); + const {suggested_people_linked} = useSelector( + (state: RootState) => state.user.profile, + ); + const goToUpdateSPProfile = () => { + if (suggested_people_linked === 0) { + Alert.alert(ERROR_ATTEMPT_EDIT_SP); + } else { + // Sending undefined for updatedSelectedBadges to mark that there was no update yet + navigateTo('UpdateSPPicture', { + editing: true, + }); + } + }; + + const navigateTo = (screen: string, options: object) => { + navigation.navigate(screen, options); + }; + + const getActions = (type: string) => { + switch (type) { + case 'Suggested People Profile': + goToUpdateSPProfile(); + break; + case 'Privacy': + navigateTo('PrivacyScreen', {}); + break; + case 'Terms of use': + //TODO: + break; + case 'Privacy Policy': + //TODO: + break; + default: + break; + } + }; + + const Item = ({ + title, + preimage, + postimage, + }: { + title: string; + preimage: number; + postimage: number; + }) => ( + getActions(title)} style={styles.item}> + + + {title} + + + + ); + + return ( + <> + + + + + item.title + index} + renderItem={({item: {title, preimage, postimage}}) => { + return ; + }} + renderSectionHeader={({section: {title}}) => ( + + {title} + + )} + ListFooterComponent={() => ( + { + navigation.reset({ + index: 0, + routes: [{name: 'SuggestedPeople'}], + }); + dispatch(logout()); + }}> + Logout + + )} + /> + + + + + ); +}; + +const styles = StyleSheet.create({ + container: { + flex: 1, + }, + item: { + marginTop: 36, + flexDirection: 'row', + justifyContent: 'flex-start', + alignItems: 'center', + }, + header: { + fontSize: normalize(18), + fontWeight: '600', + lineHeight: normalize(21.48), + color: '#E9E9E9', + }, + title: { + fontSize: normalize(15), + fontWeight: '600', + lineHeight: normalize(17.9), + color: 'white', + }, + logoutStyle: { + fontSize: normalize(20), + fontWeight: '600', + lineHeight: normalize(23.87), + color: 'white', + }, +}); + +export default SettingsScreen; diff --git a/src/screens/profile/index.ts b/src/screens/profile/index.ts index f74946a6..b7efdd3b 100644 --- a/src/screens/profile/index.ts +++ b/src/screens/profile/index.ts @@ -7,3 +7,6 @@ export {default as FriendsListScreen} from './FriendsListScreen'; export {default as EditProfile} from './EditProfile'; export {default as MomentUploadPromptScreen} from './MomentUploadPromptScreen'; export {default as InviteFriendsScreen} from './InviteFriendsScreen'; +export {default as SettingsScreen} from './SettingsScreen'; +export {default as PrivacyScreen} from './PrivacyScreen'; +export {default as AccountType} from './AccountType'; diff --git a/src/store/actions/user.ts b/src/store/actions/user.ts index 46f96d9a..cb5e3dc1 100644 --- a/src/store/actions/user.ts +++ b/src/store/actions/user.ts @@ -1,3 +1,4 @@ +import AsyncStorage from '@react-native-community/async-storage'; import {Action, ThunkAction} from '@reduxjs/toolkit'; import { getProfilePic, @@ -157,6 +158,7 @@ export const logout = (): ThunkAction< Action > => async (dispatch) => { try { + AsyncStorage.clear(); dispatch({type: userLoggedIn.type, payload: {userId: '', username: ''}}); } catch (error) { console.log(error); -- cgit v1.2.3-70-g09d2 From ff3f0acadf810cd1b5bf276b9ee926f2c480b7be Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Wed, 17 Mar 2021 16:09:08 -0700 Subject: TMA 700, Lock image added --- src/assets/images/settings/lock-white.png | Bin 0 -> 416 bytes src/assets/images/settings/lock-white@2x.png | Bin 0 -> 723 bytes src/assets/images/settings/lock-white@3x.png | Bin 0 -> 1000 bytes src/screens/profile/PrivacyScreen.tsx | 28 +++++++++------------------ src/screens/profile/SettingsScreen.tsx | 8 ++++++-- 5 files changed, 15 insertions(+), 21 deletions(-) create mode 100644 src/assets/images/settings/lock-white.png create mode 100644 src/assets/images/settings/lock-white@2x.png create mode 100644 src/assets/images/settings/lock-white@3x.png (limited to 'src') diff --git a/src/assets/images/settings/lock-white.png b/src/assets/images/settings/lock-white.png new file mode 100644 index 00000000..04a0a55d Binary files /dev/null and b/src/assets/images/settings/lock-white.png differ diff --git a/src/assets/images/settings/lock-white@2x.png b/src/assets/images/settings/lock-white@2x.png new file mode 100644 index 00000000..b1927922 Binary files /dev/null and b/src/assets/images/settings/lock-white@2x.png differ diff --git a/src/assets/images/settings/lock-white@3x.png b/src/assets/images/settings/lock-white@3x.png new file mode 100644 index 00000000..da9ac212 Binary files /dev/null and b/src/assets/images/settings/lock-white@3x.png differ diff --git a/src/screens/profile/PrivacyScreen.tsx b/src/screens/profile/PrivacyScreen.tsx index e92769fc..eea0230a 100644 --- a/src/screens/profile/PrivacyScreen.tsx +++ b/src/screens/profile/PrivacyScreen.tsx @@ -10,7 +10,7 @@ import { View, } from 'react-native'; import {SafeAreaView} from 'react-native-safe-area-context'; -import {normalize} from '../../utils/layouts'; +import {normalize, SCREEN_WIDTH} from '../../utils/layouts'; import {Background} from '../../components'; import {BackgroundGradientType} from '../../types'; import {logout} from '../../store/actions'; @@ -25,7 +25,7 @@ const DATA = [ data: [ { title: 'Account Type', - preimage: require('../../assets/images/tagg-logo.png'), + preimage: require('../../assets/images/settings/lock-white.png'), postimage: require('../../assets/images/settings/white-arrow.png'), }, { @@ -38,30 +38,16 @@ const DATA = [ ]; const PrivacyScreen: React.FC = () => { - const dispatch = useDispatch(); const navigation = useNavigation(); - const {suggested_people_linked} = useSelector( - (state: RootState) => state.user.profile, - ); - const goToUpdateSPProfile = () => { - if (suggested_people_linked === 0) { - Alert.alert(ERROR_ATTEMPT_EDIT_SP); - } else { - // Sending undefined for updatedSelectedBadges to mark that there was no update yet - navigation.navigate('UpdateSPPicture', { - editing: true, - }); - } - }; const getActions = (type: string) => { switch (type) { case 'Account Type': navigateTo('AccountTypeScreen', {}); - break + break; case 'Blocked Accounts': navigateTo('Blocked Accounts', {}); - break + break; default: break; } @@ -81,7 +67,11 @@ const PrivacyScreen: React.FC = () => { postimage: number; }) => ( getActions(title)} style={styles.item}> - + {title} diff --git a/src/screens/profile/SettingsScreen.tsx b/src/screens/profile/SettingsScreen.tsx index 79633572..f9d437d0 100644 --- a/src/screens/profile/SettingsScreen.tsx +++ b/src/screens/profile/SettingsScreen.tsx @@ -10,7 +10,7 @@ import { View, } from 'react-native'; import {SafeAreaView} from 'react-native-safe-area-context'; -import {normalize} from '../../utils/layouts'; +import {normalize, SCREEN_WIDTH} from '../../utils/layouts'; import {Background} from '../../components'; import {BackgroundGradientType} from '../../types'; import {logout} from '../../store/actions'; @@ -102,7 +102,11 @@ const SettingsScreen: React.FC = () => { postimage: number; }) => ( getActions(title)} style={styles.item}> - + {title} -- cgit v1.2.3-70-g09d2 From 7a521127177838bcae0cd85b2e5bd912c46406b9 Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Thu, 25 Mar 2021 13:51:14 -0700 Subject: Added API for updating account toggle --- src/constants/strings.ts | 1 + src/screens/profile/AccountType.tsx | 31 +++++++++++++++-------- src/screens/profile/PrivacyScreen.tsx | 17 +++++++------ src/services/UserProfileService.ts | 47 ++++++++++++++++++++++++++++++++++- 4 files changed, 77 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/constants/strings.ts b/src/constants/strings.ts index 019d0bea..4f792dcc 100644 --- a/src/constants/strings.ts +++ b/src/constants/strings.ts @@ -31,6 +31,7 @@ export const ERROR_NEXT_PAGE = 'There was a problem while loading the next page export const ERROR_NOT_ONBOARDED = 'You are now on waitlist, please enter your invitation code if you have one'; export const ERROR_PHONE_IN_USE = 'Phone already in use, please try another one'; export const ERROR_PROFILE_CREATION_SHORT = 'Profile creation failed 😓'; +export const ERROR_PROFILE_UPDATE_SHORT = 'Profile update failed. 😔'; export const ERROR_PWD_ACCOUNT = (str: string) => `Please make sure that the email / username entered is registered with us. You may contact our customer support at ${str}`; export const ERROR_REGISTRATION = (str: string) => `Registration failed 😔, ${str}`; export const ERROR_SELECT_BIRTHDAY = 'Please select your birthday'; diff --git a/src/screens/profile/AccountType.tsx b/src/screens/profile/AccountType.tsx index dedf4420..e1e19389 100644 --- a/src/screens/profile/AccountType.tsx +++ b/src/screens/profile/AccountType.tsx @@ -1,22 +1,33 @@ -import React, {useEffect, useState} from 'react'; +import React, {useState} from 'react'; import {StatusBar, StyleSheet, Switch, Text, View} from 'react-native'; import {SafeAreaView} from 'react-native-safe-area-context'; +import {useDispatch, useSelector} from 'react-redux'; import {Background} from '../../components'; +import {updateProfileVisibility} from '../../services'; +import {NO_PROFILE} from '../../store/initialStates'; +import {RootState} from '../../store/rootReducer'; import {BackgroundGradientType} from '../../types'; +import {getTokenOrLogout} from '../../utils'; import {normalize} from '../../utils/layouts'; const AccountType: React.FC = () => { const [isPrivateAccount, setIsPrivateAccount] = useState(false); - const switchAccountType = () => - setIsPrivateAccount((previousState) => !previousState); + const { + user: {userId, username}, + profile: {is_private} = NO_PROFILE, + } = useSelector((state: RootState) => state.user); - useEffect(() => { - // Fetching from Redux and Set the result - // setIsPrivateAccount(true); - }, []); + const dispatch = useDispatch(); + + const updateAccountVisibility = async () => { + const isPrivate = !isPrivateAccount; + setIsPrivateAccount(isPrivate); + const token = await getTokenOrLogout(dispatch); + updateProfileVisibility(token, {userId, username}, isPrivate, dispatch); + }; const getAccountText = () => { - return isPrivateAccount ? 'Private Account' : 'Public Account'; + return is_private ? 'Private Account' : 'Public Account'; }; return ( @@ -37,8 +48,8 @@ const AccountType: React.FC = () => { borderWidth: 2, borderColor: 'white', }} - value={isPrivateAccount} - onValueChange={switchAccountType}> + value={is_private} + onValueChange={updateAccountVisibility}> diff --git a/src/screens/profile/PrivacyScreen.tsx b/src/screens/profile/PrivacyScreen.tsx index eea0230a..37f042af 100644 --- a/src/screens/profile/PrivacyScreen.tsx +++ b/src/screens/profile/PrivacyScreen.tsx @@ -1,6 +1,6 @@ +import {useNavigation} from '@react-navigation/core'; import React from 'react'; import { - Alert, Image, SectionList, StatusBar, @@ -10,14 +10,12 @@ import { View, } from 'react-native'; import {SafeAreaView} from 'react-native-safe-area-context'; -import {normalize, SCREEN_WIDTH} from '../../utils/layouts'; +import {useSelector} from 'react-redux'; +import {RootState} from 'src/store/rootReducer'; import {Background} from '../../components'; +import {NO_PROFILE} from '../../store/initialStates'; import {BackgroundGradientType} from '../../types'; -import {logout} from '../../store/actions'; -import {useDispatch, useSelector} from 'react-redux'; -import {useNavigation} from '@react-navigation/core'; -import {RootState} from 'src/store/rootReducer'; -import {ERROR_ATTEMPT_EDIT_SP} from '../../constants/strings'; +import {normalize, SCREEN_WIDTH} from '../../utils/layouts'; const DATA = [ { @@ -39,6 +37,9 @@ const DATA = [ const PrivacyScreen: React.FC = () => { const navigation = useNavigation(); + const {profile: {is_private} = NO_PROFILE} = useSelector( + (state: RootState) => state.user, + ); const getActions = (type: string) => { switch (type) { @@ -78,7 +79,7 @@ const PrivacyScreen: React.FC = () => { {title === 'Account Type' && ( - {'Private'} + {is_private ? 'Private' : 'Public'} )} diff --git a/src/services/UserProfileService.ts b/src/services/UserProfileService.ts index 085787c3..c1901be1 100644 --- a/src/services/UserProfileService.ts +++ b/src/services/UserProfileService.ts @@ -1,6 +1,8 @@ import AsyncStorage from '@react-native-community/async-storage'; import moment from 'moment'; +import {useEffect} from 'react'; import {Alert} from 'react-native'; +import {loadUserData} from '../store/actions'; import { EDIT_PROFILE_ENDPOINT, GET_FB_POSTS_ENDPOINT, @@ -20,6 +22,7 @@ import { ERROR_DOUBLE_CHECK_CONNECTION, ERROR_DUP_OLD_PWD, ERROR_INVALID_PWD_CODE, + ERROR_PROFILE_UPDATE_SHORT, ERROR_PWD_ACCOUNT, ERROR_SOMETHING_WENT_WRONG, ERROR_SOMETHING_WENT_WRONG_REFRESH, @@ -27,7 +30,12 @@ import { SUCCESS_PWD_RESET, SUCCESS_VERIFICATION_CODE_SENT, } from '../constants/strings'; -import {ProfileInfoType, ProfileType, SocialAccountType} from '../types'; +import { + ProfileInfoType, + ProfileType, + SocialAccountType, + UserType, +} from '../types'; export const loadProfileInfo = async (token: string, userId: string) => { try { @@ -75,6 +83,43 @@ export const getProfilePic = async ( } }; +export const updateProfileVisibility = async ( + token: string, + user: UserType, + isPrivateAccount: Boolean, + dispatch: Function, +) => { + try { + const url = EDIT_PROFILE_ENDPOINT + `${user.userId}/`; + const request = new FormData(); + request.append('is_private', isPrivateAccount); + let response = await fetch(url, { + method: 'PATCH', + headers: { + 'Content-Type': 'application/json', + Authorization: 'Token ' + token, + }, + body: request, + }); + const {status} = response; + let data = await response.json(); + if (status === 200) { + dispatch(loadUserData(user)); + } else if (status >= 400) { + Alert.alert( + ERROR_PROFILE_UPDATE_SHORT, + data.error || 'Something went wrong! 😭', + ); + } + } catch (error) { + Alert.alert(ERROR_PROFILE_UPDATE_SHORT, ERROR_DOUBLE_CHECK_CONNECTION); + return { + name: 'Profile update error', + description: error, + }; + } +}; + const integratedSocialPostsEndpoints: {[social: string]: string} = { Facebook: GET_FB_POSTS_ENDPOINT, Instagram: GET_IG_POSTS_ENDPOINT, -- cgit v1.2.3-70-g09d2 From 57a06ec668a24118dd2bbfef149be71d79acf94c Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Thu, 25 Mar 2021 16:14:29 -0700 Subject: Refactoring changes --- src/constants/constants.ts | 52 +++++++++++ src/screens/profile/AccountType.tsx | 70 ++++++++++----- src/screens/profile/PrivacyScreen.tsx | 124 +++----------------------- src/screens/profile/SettingsCell.tsx | 113 +++++++++++++++++++++++ src/screens/profile/SettingsScreen.tsx | 158 +++++---------------------------- src/services/UserProfileService.ts | 7 +- 6 files changed, 253 insertions(+), 271 deletions(-) create mode 100644 src/screens/profile/SettingsCell.tsx (limited to 'src') diff --git a/src/constants/constants.ts b/src/constants/constants.ts index d24e352e..91029b3a 100644 --- a/src/constants/constants.ts +++ b/src/constants/constants.ts @@ -186,3 +186,55 @@ export const SP_WIDTH = 375; export const SP_HEIGHT = 812; export const SP_PAGE_SIZE = 5; + +export const SETTINGS_DATA = { + SettingsAndPrivacy: [ + { + title: 'ACCOUNT', + data: [ + { + title: 'Suggested People Profile', + preimage: require('../assets/images/tagg-logo.png'), + postimage: require('../assets/images/settings/white-arrow.png'), + }, + { + title: 'Privacy', + preimage: require('../assets/images/settings/settings-white.png'), + postimage: require('../assets/images/settings/white-arrow.png'), + }, + ], + }, + { + title: 'GENERAL', + data: [ + { + title: 'Terms of use', + preimage: require('../assets/images/settings/termsofuse.png'), + postimage: require('../assets/images/settings/white-arrow.png'), + }, + { + title: 'Privacy Policy', + preimage: require('../assets/images/settings/privacypolicy.png'), + postimage: require('../assets/images/settings/white-arrow.png'), + }, + ], + }, + ], + PrivacyScreen: [ + { + title: '', + data: [ + { + title: 'Account Type', + preimage: require('../assets/images/settings/lock-white.png'), + postimage: require('../assets/images/settings/white-arrow.png'), + }, + { + title: 'Blocked Accounts', + preimage: require('../assets/images/settings/blocked-white.png'), + postimage: require('../assets/images/settings/white-arrow.png'), + }, + ], + }, + ], +}; diff --git a/src/screens/profile/AccountType.tsx b/src/screens/profile/AccountType.tsx index e1e19389..8c700cef 100644 --- a/src/screens/profile/AccountType.tsx +++ b/src/screens/profile/AccountType.tsx @@ -1,5 +1,12 @@ import React, {useState} from 'react'; -import {StatusBar, StyleSheet, Switch, Text, View} from 'react-native'; +import { + ActivityIndicator, + StatusBar, + StyleSheet, + Switch, + Text, + View, +} from 'react-native'; import {SafeAreaView} from 'react-native-safe-area-context'; import {useDispatch, useSelector} from 'react-redux'; import {Background} from '../../components'; @@ -12,6 +19,7 @@ import {normalize} from '../../utils/layouts'; const AccountType: React.FC = () => { const [isPrivateAccount, setIsPrivateAccount] = useState(false); + const [isLoading, setIsLoading] = useState(false); const { user: {userId, username}, profile: {is_private} = NO_PROFILE, @@ -20,10 +28,17 @@ const AccountType: React.FC = () => { const dispatch = useDispatch(); const updateAccountVisibility = async () => { + setIsLoading(true); const isPrivate = !isPrivateAccount; setIsPrivateAccount(isPrivate); const token = await getTokenOrLogout(dispatch); - updateProfileVisibility(token, {userId, username}, isPrivate, dispatch); + await updateProfileVisibility( + token, + {userId, username}, + isPrivate, + dispatch, + ); + setIsLoading(false); }; const getAccountText = () => { @@ -35,24 +50,29 @@ const AccountType: React.FC = () => { - - + + {getAccountText()} - + + + {!isLoading && ( + + )} + - + Enabling a public account will: @@ -71,16 +91,20 @@ const AccountType: React.FC = () => { }; const styles = StyleSheet.create({ - container: { - flex: 1, - }, + container: {marginHorizontal: '8%', marginTop: '20%'}, title: { fontSize: normalize(18), fontWeight: '600', lineHeight: normalize(17.9), color: 'white', }, - + switchContainerStyle: { + flexDirection: 'row', + alignItems: 'center', + position: 'absolute', + right: 0, + }, + detailContainerStyle: {marginTop: '40%'}, detailTitleStyle: { fontSize: normalize(19), fontWeight: '700', @@ -93,6 +117,10 @@ const styles = StyleSheet.create({ lineHeight: normalize(16.71), color: 'white', }, + switchStyles: { + borderWidth: 2, + borderColor: 'white', + }, }); export default AccountType; diff --git a/src/screens/profile/PrivacyScreen.tsx b/src/screens/profile/PrivacyScreen.tsx index 37f042af..d91c7841 100644 --- a/src/screens/profile/PrivacyScreen.tsx +++ b/src/screens/profile/PrivacyScreen.tsx @@ -1,114 +1,40 @@ import {useNavigation} from '@react-navigation/core'; import React from 'react'; import { - Image, SectionList, StatusBar, StyleSheet, - Text, - TouchableOpacity, View, + SafeAreaView, } from 'react-native'; -import {SafeAreaView} from 'react-native-safe-area-context'; import {useSelector} from 'react-redux'; import {RootState} from 'src/store/rootReducer'; import {Background} from '../../components'; import {NO_PROFILE} from '../../store/initialStates'; import {BackgroundGradientType} from '../../types'; -import {normalize, SCREEN_WIDTH} from '../../utils/layouts'; - -const DATA = [ - { - title: '', - data: [ - { - title: 'Account Type', - preimage: require('../../assets/images/settings/lock-white.png'), - postimage: require('../../assets/images/settings/white-arrow.png'), - }, - { - title: 'Blocked Accounts', - preimage: require('../../assets/images/settings/blocked-white.png'), - postimage: require('../../assets/images/settings/white-arrow.png'), - }, - ], - }, -]; +import {normalize} from '../../utils/layouts'; +import SettingsCell from './SettingsCell'; +import {SETTINGS_DATA} from '../../constants/constants'; const PrivacyScreen: React.FC = () => { - const navigation = useNavigation(); const {profile: {is_private} = NO_PROFILE} = useSelector( (state: RootState) => state.user, ); - const getActions = (type: string) => { - switch (type) { - case 'Account Type': - navigateTo('AccountTypeScreen', {}); - break; - case 'Blocked Accounts': - navigateTo('Blocked Accounts', {}); - break; - default: - break; - } - }; - - const navigateTo = (screen: string, options: object) => { - navigation.navigate(screen, options); - }; - - const Item = ({ - title, - preimage, - postimage, - }: { - title: string; - preimage: number; - postimage: number; - }) => ( - getActions(title)} style={styles.item}> - - - {title} - - - {title === 'Account Type' && ( - - {is_private ? 'Private' : 'Public'} - - )} - - - - ); - return ( <> - + item.title + index} - renderItem={({item: {title, preimage, postimage}}) => { - return ; - }} - renderSectionHeader={({section: {title}}) => { - if (title.length === 0) { - return null; - } - return ( - - {title} - - ); - }} + renderItem={({item: {title, preimage, postimage}}) => ( + + )} /> @@ -118,33 +44,7 @@ const PrivacyScreen: React.FC = () => { }; const styles = StyleSheet.create({ - container: { - flex: 1, - }, - item: { - marginTop: 36, - flexDirection: 'row', - justifyContent: 'flex-start', - alignItems: 'center', - }, - header: { - fontSize: normalize(18), - fontWeight: '600', - lineHeight: normalize(21.48), - color: '#E9E9E9', - }, - title: { - fontSize: normalize(15), - fontWeight: '600', - lineHeight: normalize(17.9), - color: 'white', - }, - logoutStyle: { - fontSize: normalize(20), - fontWeight: '600', - lineHeight: normalize(23.87), - color: 'white', - }, + container: {marginHorizontal: '8%', marginTop: '8%'}, }); export default PrivacyScreen; diff --git a/src/screens/profile/SettingsCell.tsx b/src/screens/profile/SettingsCell.tsx new file mode 100644 index 00000000..29dcc691 --- /dev/null +++ b/src/screens/profile/SettingsCell.tsx @@ -0,0 +1,113 @@ +import {useNavigation} from '@react-navigation/core'; +import React from 'react'; +import { + Alert, + Image, + StyleSheet, + Text, + TouchableOpacity, + View, +} from 'react-native'; +import {ERROR_ATTEMPT_EDIT_SP} from '../../constants/strings'; +import {normalize, SCREEN_WIDTH} from '../../utils/layouts'; + +type SettingsCellProps = { + title: string; + preimage: number; + postimage: number; + isPrivate?: boolean; + suggested_people_linked?: number; +}; + +const SettingsCell: React.FC = ({ + title, + preimage, + postimage, + isPrivate, + suggested_people_linked, +}) => { + const navigation = useNavigation(); + const goToUpdateSPProfile = () => { + if (suggested_people_linked === 0) { + Alert.alert(ERROR_ATTEMPT_EDIT_SP); + } else { + // Sending undefined for updatedSelectedBadges to mark that there was no update yet + navigateTo('UpdateSPPicture', { + editing: true, + }); + } + }; + const getActions = (type: string) => { + switch (type) { + case 'Account Type': + navigateTo('AccountTypeScreen', {}); + break; + case 'Blocked Accounts': + navigateTo('Blocked Accounts', {}); + break; + case 'Suggested People Profile': + goToUpdateSPProfile(); + break; + case 'Privacy': + navigateTo('PrivacyScreen', {}); + break; + case 'Terms of use': + //TODO: + break; + case 'Privacy Policy': + //TODO: + break; + default: + break; + } + }; + + const navigateTo = (screen: string, options: object) => { + navigation.navigate(screen, options); + }; + return ( + getActions(title)} + style={styles.itemStyles}> + + + {title} + + + {title === 'Account Type' && ( + + {isPrivate ? 'Private' : 'Public'} + + )} + + + + ); +}; + +const styles = StyleSheet.create({ + container: {marginHorizontal: '8%'}, + itemStyles: { + marginTop: 36, + flexDirection: 'row', + justifyContent: 'flex-start', + alignItems: 'center', + }, + subItemStyles: {position: 'absolute', right: 0}, + preImageStyles: {width: SCREEN_WIDTH * 0.05, height: SCREEN_WIDTH * 0.05}, + postImageStyles: {width: 15, height: 15}, + titleContainerStyles: {marginLeft: '12%'}, + titleStyles: { + fontSize: normalize(15), + fontWeight: '600', + lineHeight: normalize(17.9), + color: 'white', + }, + subtitleStyles: {color: '#C4C4C4', marginRight: 13}, +}); + +export default SettingsCell; diff --git a/src/screens/profile/SettingsScreen.tsx b/src/screens/profile/SettingsScreen.tsx index f9d437d0..cb049a96 100644 --- a/src/screens/profile/SettingsScreen.tsx +++ b/src/screens/profile/SettingsScreen.tsx @@ -1,150 +1,50 @@ import React from 'react'; import { - Alert, - Image, SectionList, StatusBar, StyleSheet, Text, TouchableOpacity, + SafeAreaView, View, } from 'react-native'; -import {SafeAreaView} from 'react-native-safe-area-context'; -import {normalize, SCREEN_WIDTH} from '../../utils/layouts'; +import {useSelector} from 'react-redux'; +import {RootState} from 'src/store/rootReducer'; import {Background} from '../../components'; import {BackgroundGradientType} from '../../types'; -import {logout} from '../../store/actions'; -import {useDispatch, useSelector} from 'react-redux'; -import {useNavigation} from '@react-navigation/core'; -import {RootState} from 'src/store/rootReducer'; -import {ERROR_ATTEMPT_EDIT_SP} from '../../constants/strings'; - -const DATA = [ - { - title: 'ACCOUNT', - data: [ - { - title: 'Suggested People Profile', - preimage: require('../../assets/images/tagg-logo.png'), - postimage: require('../../assets/images/settings/white-arrow.png'), - }, - { - title: 'Privacy', - preimage: require('../../assets/images/settings/settings-white.png'), - postimage: require('../../assets/images/settings/white-arrow.png'), - }, - ], - }, - { - title: 'GENERAL', - data: [ - { - title: 'Terms of use', - preimage: require('../../assets/images/settings/termsofuse.png'), - postimage: require('../../assets/images/settings/white-arrow.png'), - }, - { - title: 'Privacy Policy', - preimage: require('../../assets/images/settings/privacypolicy.png'), - postimage: require('../../assets/images/settings/white-arrow.png'), - }, - ], - }, -]; +import {normalize} from '../../utils/layouts'; +import SettingsCell from './SettingsCell'; +import {SETTINGS_DATA} from '../../constants/constants'; const SettingsScreen: React.FC = () => { - const dispatch = useDispatch(); - const navigation = useNavigation(); const {suggested_people_linked} = useSelector( (state: RootState) => state.user.profile, ); - const goToUpdateSPProfile = () => { - if (suggested_people_linked === 0) { - Alert.alert(ERROR_ATTEMPT_EDIT_SP); - } else { - // Sending undefined for updatedSelectedBadges to mark that there was no update yet - navigateTo('UpdateSPPicture', { - editing: true, - }); - } - }; - - const navigateTo = (screen: string, options: object) => { - navigation.navigate(screen, options); - }; - - const getActions = (type: string) => { - switch (type) { - case 'Suggested People Profile': - goToUpdateSPProfile(); - break; - case 'Privacy': - navigateTo('PrivacyScreen', {}); - break; - case 'Terms of use': - //TODO: - break; - case 'Privacy Policy': - //TODO: - break; - default: - break; - } - }; - - const Item = ({ - title, - preimage, - postimage, - }: { - title: string; - preimage: number; - postimage: number; - }) => ( - getActions(title)} style={styles.item}> - - - {title} - - - - ); return ( <> - + item.title + index} - renderItem={({item: {title, preimage, postimage}}) => { - return ; - }} + renderItem={({item: {title, preimage, postimage}}) => ( + + )} renderSectionHeader={({section: {title}}) => ( - - {title} + + {title} )} ListFooterComponent={() => ( { - navigation.reset({ - index: 0, - routes: [{name: 'SuggestedPeople'}], - }); - dispatch(logout()); - }}> - Logout + style={styles.logoutContainerStyles} + onPress={() => {}}> + Logout )} /> @@ -156,28 +56,16 @@ const SettingsScreen: React.FC = () => { }; const styles = StyleSheet.create({ - container: { - flex: 1, - }, - item: { - marginTop: 36, - flexDirection: 'row', - justifyContent: 'flex-start', - alignItems: 'center', - }, - header: { + container: {marginHorizontal: '8%', marginTop: '8%'}, + headerContainerStyles: {marginTop: '14%'}, + headerTextStyles: { fontSize: normalize(18), fontWeight: '600', lineHeight: normalize(21.48), color: '#E9E9E9', }, - title: { - fontSize: normalize(15), - fontWeight: '600', - lineHeight: normalize(17.9), - color: 'white', - }, - logoutStyle: { + logoutContainerStyles: {marginTop: '20%', marginLeft: '12%'}, + logoutTextStyles: { fontSize: normalize(20), fontWeight: '600', lineHeight: normalize(23.87), diff --git a/src/services/UserProfileService.ts b/src/services/UserProfileService.ts index c1901be1..1ce1d0b5 100644 --- a/src/services/UserProfileService.ts +++ b/src/services/UserProfileService.ts @@ -92,11 +92,11 @@ export const updateProfileVisibility = async ( try { const url = EDIT_PROFILE_ENDPOINT + `${user.userId}/`; const request = new FormData(); - request.append('is_private', isPrivateAccount); + request.append('is_private', isPrivateAccount ? 'True' : 'False'); let response = await fetch(url, { method: 'PATCH', headers: { - 'Content-Type': 'application/json', + 'Content-Type': 'multipart/form-data', Authorization: 'Token ' + token, }, body: request, @@ -104,7 +104,7 @@ export const updateProfileVisibility = async ( const {status} = response; let data = await response.json(); if (status === 200) { - dispatch(loadUserData(user)); + await dispatch(loadUserData(user)); } else if (status >= 400) { Alert.alert( ERROR_PROFILE_UPDATE_SHORT, @@ -112,6 +112,7 @@ export const updateProfileVisibility = async ( ); } } catch (error) { + debugger; Alert.alert(ERROR_PROFILE_UPDATE_SHORT, ERROR_DOUBLE_CHECK_CONNECTION); return { name: 'Profile update error', -- cgit v1.2.3-70-g09d2 From 3802fbd5d7f7c9ca70060f53af993356d946483d Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Mon, 29 Mar 2021 12:45:36 -0700 Subject: TOU and PP updates --- src/components/profile/ProfileMoreInfoDrawer.tsx | 2 +- src/constants/api.ts | 4 +++ src/constants/constants.ts | 12 +++---- src/screens/profile/SettingsCell.tsx | 41 +++++++++++++++++++++--- 4 files changed, 48 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/components/profile/ProfileMoreInfoDrawer.tsx b/src/components/profile/ProfileMoreInfoDrawer.tsx index d62063a7..f70f90d0 100644 --- a/src/components/profile/ProfileMoreInfoDrawer.tsx +++ b/src/components/profile/ProfileMoreInfoDrawer.tsx @@ -35,7 +35,7 @@ const ProfileMoreInfoDrawer: React.FC = (props) => { setIsOpen(false); }; - const goToUpdateSPProfile = () => { + const goToSettingsPage = () => { if (profile.suggested_people_linked === 0) { Alert.alert(ERROR_ATTEMPT_EDIT_SP); } else { diff --git a/src/constants/api.ts b/src/constants/api.ts index 6afdf384..22890c33 100644 --- a/src/constants/api.ts +++ b/src/constants/api.ts @@ -64,3 +64,7 @@ export const DEEPLINK: string = 'https://tinyurl.com/y3o4aec5'; export const LINK_IG_OAUTH: string = `https://www.instagram.com/oauth/authorize/?client_id=205466150510738&redirect_uri=${DEEPLINK}&scope=user_profile,user_media&response_type=code`; export const LINK_FB_OAUTH: string = `https://www.facebook.com/v8.0/dialog/oauth?client_id=1308555659343609&redirect_uri=${DEEPLINK}&scope=user_posts,public_profile&response_type=code`; export const LINK_TWITTER_OAUTH: string = API_URL + 'link-twitter-request/'; + +// Profile Links +export const COMMUNITY_GUIDELINES: string = 'https://www.tagg.id/community-guidelines'; +export const PRIVACY_POLICY: string = 'https://www.tagg.id/privacy-policy'; diff --git a/src/constants/constants.ts b/src/constants/constants.ts index 91029b3a..f533563d 100644 --- a/src/constants/constants.ts +++ b/src/constants/constants.ts @@ -208,7 +208,7 @@ export const SETTINGS_DATA = { title: 'GENERAL', data: [ { - title: 'Terms of use', + title: 'Community Guidelines', preimage: require('../assets/images/settings/termsofuse.png'), postimage: require('../assets/images/settings/white-arrow.png'), }, @@ -229,11 +229,11 @@ export const SETTINGS_DATA = { preimage: require('../assets/images/settings/lock-white.png'), postimage: require('../assets/images/settings/white-arrow.png'), }, - { - title: 'Blocked Accounts', - preimage: require('../assets/images/settings/blocked-white.png'), - postimage: require('../assets/images/settings/white-arrow.png'), - }, + // { + // title: 'Blocked Accounts', + // preimage: require('../assets/images/settings/blocked-white.png'), + // postimage: require('../assets/images/settings/white-arrow.png'), + // }, ], }, ], diff --git a/src/screens/profile/SettingsCell.tsx b/src/screens/profile/SettingsCell.tsx index 29dcc691..f5360242 100644 --- a/src/screens/profile/SettingsCell.tsx +++ b/src/screens/profile/SettingsCell.tsx @@ -3,11 +3,15 @@ import React from 'react'; import { Alert, Image, + Linking, StyleSheet, Text, TouchableOpacity, View, } from 'react-native'; +import InAppBrowser from 'react-native-inappbrowser-reborn'; +import {TAGG_PURPLE} from '../../constants'; +import {COMMUNITY_GUIDELINES, PRIVACY_POLICY} from '../../constants/api'; import {ERROR_ATTEMPT_EDIT_SP} from '../../constants/strings'; import {normalize, SCREEN_WIDTH} from '../../utils/layouts'; @@ -43,7 +47,7 @@ const SettingsCell: React.FC = ({ navigateTo('AccountTypeScreen', {}); break; case 'Blocked Accounts': - navigateTo('Blocked Accounts', {}); + //TODO: break; case 'Suggested People Profile': goToUpdateSPProfile(); @@ -51,17 +55,42 @@ const SettingsCell: React.FC = ({ case 'Privacy': navigateTo('PrivacyScreen', {}); break; - case 'Terms of use': - //TODO: + case 'Community Guidelines': + openTaggLink(COMMUNITY_GUIDELINES); break; case 'Privacy Policy': - //TODO: + openTaggLink(PRIVACY_POLICY); break; default: break; } }; + const openTaggLink = async (url: string) => { + try { + if (await InAppBrowser.isAvailable()) { + await InAppBrowser.open(url, { + dismissButtonStyle: 'cancel', + preferredBarTintColor: TAGG_PURPLE, + preferredControlTintColor: 'white', + animated: true, + modalPresentationStyle: 'fullScreen', + modalTransitionStyle: 'coverVertical', + modalEnabled: true, + enableBarCollapsing: false, + animations: { + startEnter: 'slide_in_right', + startExit: 'slide_out_left', + endEnter: 'slide_in_left', + endExit: 'slide_out_right', + }, + }); + } else Linking.openURL(url); + } catch (error) { + Alert.alert(error.message); + } + }; + const navigateTo = (screen: string, options: object) => { navigation.navigate(screen, options); }; @@ -108,6 +137,10 @@ const styles = StyleSheet.create({ color: 'white', }, subtitleStyles: {color: '#C4C4C4', marginRight: 13}, + tc: { + marginVertical: '5%', + top: '8%', + }, }); export default SettingsCell; -- cgit v1.2.3-70-g09d2 From bc1f377dfe4033f2fad28b7852dc09a72e0bd43e Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Mon, 29 Mar 2021 13:07:51 -0700 Subject: Logout remaining --- src/screens/profile/AccountType.tsx | 38 ++++++++++++++++------------------ src/screens/profile/PrivacyScreen.tsx | 5 ++--- src/screens/profile/SettingsScreen.tsx | 9 ++++---- 3 files changed, 25 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/screens/profile/AccountType.tsx b/src/screens/profile/AccountType.tsx index 8c700cef..60ed0668 100644 --- a/src/screens/profile/AccountType.tsx +++ b/src/screens/profile/AccountType.tsx @@ -51,25 +51,23 @@ const AccountType: React.FC = () => { - + {getAccountText()} - - + {!isLoading && ( + - {!isLoading && ( - - )} - + )} @@ -93,6 +91,7 @@ const AccountType: React.FC = () => { const styles = StyleSheet.create({ container: {marginHorizontal: '8%', marginTop: '20%'}, title: { + alignSelf: 'center', fontSize: normalize(18), fontWeight: '600', lineHeight: normalize(17.9), @@ -100,9 +99,8 @@ const styles = StyleSheet.create({ }, switchContainerStyle: { flexDirection: 'row', - alignItems: 'center', - position: 'absolute', - right: 0, + alignContent: 'center', + justifyContent: 'space-between', }, detailContainerStyle: {marginTop: '40%'}, detailTitleStyle: { diff --git a/src/screens/profile/PrivacyScreen.tsx b/src/screens/profile/PrivacyScreen.tsx index d91c7841..17872e24 100644 --- a/src/screens/profile/PrivacyScreen.tsx +++ b/src/screens/profile/PrivacyScreen.tsx @@ -1,4 +1,3 @@ -import {useNavigation} from '@react-navigation/core'; import React from 'react'; import { SectionList, @@ -12,7 +11,7 @@ import {RootState} from 'src/store/rootReducer'; import {Background} from '../../components'; import {NO_PROFILE} from '../../store/initialStates'; import {BackgroundGradientType} from '../../types'; -import {normalize} from '../../utils/layouts'; +import {SCREEN_HEIGHT} from '../../utils/layouts'; import SettingsCell from './SettingsCell'; import {SETTINGS_DATA} from '../../constants/constants'; @@ -44,7 +43,7 @@ const PrivacyScreen: React.FC = () => { }; const styles = StyleSheet.create({ - container: {marginHorizontal: '8%', marginTop: '8%'}, + container: {height: SCREEN_HEIGHT, marginHorizontal: '8%', marginTop: '8%'}, }); export default PrivacyScreen; diff --git a/src/screens/profile/SettingsScreen.tsx b/src/screens/profile/SettingsScreen.tsx index cb049a96..88962f71 100644 --- a/src/screens/profile/SettingsScreen.tsx +++ b/src/screens/profile/SettingsScreen.tsx @@ -1,20 +1,20 @@ import React from 'react'; import { + SafeAreaView, SectionList, StatusBar, StyleSheet, Text, TouchableOpacity, - SafeAreaView, View, } from 'react-native'; import {useSelector} from 'react-redux'; import {RootState} from 'src/store/rootReducer'; import {Background} from '../../components'; +import {SETTINGS_DATA} from '../../constants/constants'; import {BackgroundGradientType} from '../../types'; -import {normalize} from '../../utils/layouts'; +import {normalize, SCREEN_HEIGHT} from '../../utils/layouts'; import SettingsCell from './SettingsCell'; -import {SETTINGS_DATA} from '../../constants/constants'; const SettingsScreen: React.FC = () => { const {suggested_people_linked} = useSelector( @@ -28,6 +28,7 @@ const SettingsScreen: React.FC = () => { item.title + index} renderItem={({item: {title, preimage, postimage}}) => ( @@ -56,7 +57,7 @@ const SettingsScreen: React.FC = () => { }; const styles = StyleSheet.create({ - container: {marginHorizontal: '8%', marginTop: '8%'}, + container: {height: SCREEN_HEIGHT, marginHorizontal: '8%', marginTop: '8%'}, headerContainerStyles: {marginTop: '14%'}, headerTextStyles: { fontSize: normalize(18), -- cgit v1.2.3-70-g09d2 From e8d862e5e6dd8a6a517a93c65e30795813af936d Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Mon, 29 Mar 2021 13:39:22 -0700 Subject: Logout changes --- src/screens/profile/SettingsScreen.tsx | 14 ++++++++++++-- src/store/actions/user.ts | 2 +- src/utils/users.ts | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/screens/profile/SettingsScreen.tsx b/src/screens/profile/SettingsScreen.tsx index 88962f71..05e051b5 100644 --- a/src/screens/profile/SettingsScreen.tsx +++ b/src/screens/profile/SettingsScreen.tsx @@ -8,15 +8,19 @@ import { TouchableOpacity, View, } from 'react-native'; -import {useSelector} from 'react-redux'; +import {useDispatch, useSelector} from 'react-redux'; +import {logout} from '../../store/actions'; import {RootState} from 'src/store/rootReducer'; import {Background} from '../../components'; import {SETTINGS_DATA} from '../../constants/constants'; import {BackgroundGradientType} from '../../types'; import {normalize, SCREEN_HEIGHT} from '../../utils/layouts'; import SettingsCell from './SettingsCell'; +import {useNavigation} from '@react-navigation/core'; const SettingsScreen: React.FC = () => { + const dispatch = useDispatch(); + const navigation = useNavigation(); const {suggested_people_linked} = useSelector( (state: RootState) => state.user.profile, ); @@ -44,7 +48,13 @@ const SettingsScreen: React.FC = () => { ListFooterComponent={() => ( {}}> + onPress={() => { + dispatch(logout()); + navigation.reset({ + index: 0, + routes: [{name: 'SuggestedPeople'}], + }); + }}> Logout )} diff --git a/src/store/actions/user.ts b/src/store/actions/user.ts index cb5e3dc1..374154da 100644 --- a/src/store/actions/user.ts +++ b/src/store/actions/user.ts @@ -158,7 +158,7 @@ export const logout = (): ThunkAction< Action > => async (dispatch) => { try { - AsyncStorage.clear(); + await AsyncStorage.clear(); dispatch({type: userLoggedIn.type, payload: {userId: '', username: ''}}); } catch (error) { console.log(error); diff --git a/src/utils/users.ts b/src/utils/users.ts index f9d6d6b7..22c1c1f0 100644 --- a/src/utils/users.ts +++ b/src/utils/users.ts @@ -133,7 +133,7 @@ export const loadAllSocialsForUser = async (userId: string, token?: string) => { export const getTokenOrLogout = async (dispatch: Function): Promise => { const token = await AsyncStorage.getItem('token'); if (!token) { - dispatch({type: userLoggedIn.type, payload: {userId: '', username: ''}}); + dispatch(logout()); return ''; } return token; -- cgit v1.2.3-70-g09d2