aboutsummaryrefslogtreecommitdiff
path: root/src/screens
diff options
context:
space:
mode:
Diffstat (limited to 'src/screens')
-rw-r--r--src/screens/badge/BadgeSelection.tsx2
-rw-r--r--src/screens/onboarding/InvitationCodeVerification.tsx14
-rw-r--r--src/screens/onboarding/Login.tsx1
-rw-r--r--src/screens/onboarding/OnboardingStepThree.tsx4
-rw-r--r--src/screens/profile/ProfileScreen.tsx10
-rw-r--r--src/screens/suggestedPeople/SPBody.tsx2
-rw-r--r--src/screens/suggestedPeople/SuggestedPeopleScreen.tsx170
-rw-r--r--src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx6
-rw-r--r--src/screens/suggestedPeopleOnboarding/SuggestedPeopleWelcomeScreen.tsx13
9 files changed, 49 insertions, 173 deletions
diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx
index cbd7dd88..335d4333 100644
--- a/src/screens/badge/BadgeSelection.tsx
+++ b/src/screens/badge/BadgeSelection.tsx
@@ -74,9 +74,11 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
const success = await addBadgesService(selectedBadges);
if (success) {
dispatch(suggestedPeopleBadgesFinished());
+ navigation.navigate('SuggestedPeople');
}
} else {
dispatch(suggestedPeopleBadgesFinished());
+ navigation.navigate('SuggestedPeople');
}
}
}}>
diff --git a/src/screens/onboarding/InvitationCodeVerification.tsx b/src/screens/onboarding/InvitationCodeVerification.tsx
index 41d17f29..7cd4b3bf 100644
--- a/src/screens/onboarding/InvitationCodeVerification.tsx
+++ b/src/screens/onboarding/InvitationCodeVerification.tsx
@@ -1,3 +1,4 @@
+import AsyncStorage from '@react-native-community/async-storage';
import {RouteProp} from '@react-navigation/native';
import {StackNavigationProp} from '@react-navigation/stack';
import React from 'react';
@@ -9,6 +10,7 @@ import {
useBlurOnFulfill,
useClearByFocusCell,
} from 'react-native-confirmation-code-field';
+import {useDispatch} from 'react-redux';
import {
ArrowButton,
Background,
@@ -25,7 +27,7 @@ import {
} from '../../constants/strings';
import {OnboardingStackParams} from '../../routes';
import {BackgroundGradientType} from '../../types';
-import {SCREEN_WIDTH} from '../../utils';
+import {SCREEN_WIDTH, userLogin} from '../../utils';
type InvitationCodeVerificationRouteProp = RouteProp<
OnboardingStackParams,
@@ -56,6 +58,7 @@ const InvitationCodeVerification: React.FC<InvitationCodeVerificationProps> = ({
value,
setValue,
});
+ const dispatch = useDispatch();
const handleInvitationCodeVerification = async () => {
if (value.length === 6) {
@@ -71,10 +74,11 @@ const InvitationCodeVerification: React.FC<InvitationCodeVerificationProps> = ({
);
if (verifyInviteCodeResponse.status === 200) {
- navigation.navigate('Login');
- setTimeout(() => {
- Alert.alert(SUCCESS_INVITATION_CODE);
- }, 500);
+ const userId = route.params.userId;
+ const username = route.params.username;
+ await AsyncStorage.setItem('userId', userId);
+ await AsyncStorage.setItem('username', username);
+ userLogin(dispatch, {userId, username});
} else {
Alert.alert(ERROR_INVALID_INVITATION_CODE);
}
diff --git a/src/screens/onboarding/Login.tsx b/src/screens/onboarding/Login.tsx
index cfa39dbd..6d9d3a97 100644
--- a/src/screens/onboarding/Login.tsx
+++ b/src/screens/onboarding/Login.tsx
@@ -170,6 +170,7 @@ const Login: React.FC<LoginProps> = ({navigation}: LoginProps) => {
} else if (statusCode === 200 && !data.isOnboarded) {
navigation.navigate('InvitationCodeVerification', {
userId: data.UserID,
+ username: username,
});
setTimeout(() => {
Alert.alert(ERROR_NOT_ONBOARDED);
diff --git a/src/screens/onboarding/OnboardingStepThree.tsx b/src/screens/onboarding/OnboardingStepThree.tsx
index 64a2a2f7..f22d720f 100644
--- a/src/screens/onboarding/OnboardingStepThree.tsx
+++ b/src/screens/onboarding/OnboardingStepThree.tsx
@@ -57,7 +57,7 @@ const OnboardingStepThree: React.FC<OnboardingStepThreeProps> = ({
route,
navigation,
}) => {
- const {userId} = route.params;
+ const {userId, username} = route.params;
let emptyDate: string | undefined;
const [form, setForm] = React.useState({
smallPic: '',
@@ -224,12 +224,12 @@ const OnboardingStepThree: React.FC<OnboardingStepThreeProps> = ({
},
body: request,
});
- console.log(route.params.userId);
let statusCode = response.status;
let data = await response.json();
if (statusCode === 200) {
navigation.navigate('InvitationCodeVerification', {
userId: route.params.userId,
+ username: username,
});
} else if (statusCode === 400) {
Alert.alert(
diff --git a/src/screens/profile/ProfileScreen.tsx b/src/screens/profile/ProfileScreen.tsx
index 5edc6277..313e2f2c 100644
--- a/src/screens/profile/ProfileScreen.tsx
+++ b/src/screens/profile/ProfileScreen.tsx
@@ -38,11 +38,11 @@ const ProfileScreen: React.FC<ProfileOnboardingProps> = ({route}) => {
* This is done to reset the users stored in our store for the Search screen.
* Read more about useFocusEffect here : https://reactnavigation.org/docs/function-after-focusing-screen/
*/
- useFocusEffect(() => {
- if (!userXId) {
- dispatch(resetScreenType(screenType));
- }
- });
+ // useFocusEffect(() => {
+ // if (!userXId) {
+ // dispatch(resetScreenType(screenType));
+ // }
+ // });
return (
<>
diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx
index 06d3efb3..8e0801c2 100644
--- a/src/screens/suggestedPeople/SPBody.tsx
+++ b/src/screens/suggestedPeople/SPBody.tsx
@@ -121,7 +121,7 @@ const SPBody: React.FC<SPBodyProps> = ({
<TouchableOpacity
onPress={() => {
navigation.push('Profile', {
- userXId: user.id,
+ userXId: loggedInUserId === user.id ? undefined : user.id,
screenType,
});
}}
diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
index 4094b0a3..76889657 100644
--- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
+++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
@@ -1,37 +1,31 @@
import {useFocusEffect, useNavigation} from '@react-navigation/native';
-import React, {useCallback, useEffect, useState, useRef} from 'react';
-import {
- FlatList,
- RefreshControl,
- StatusBar,
- StyleSheet,
- ViewToken,
-} from 'react-native';
-
+import React, {useCallback, useEffect, useRef, useState} from 'react';
+import {FlatList, RefreshControl, StatusBar, ViewToken} from 'react-native';
import {useDispatch, useSelector, useStore} from 'react-redux';
-import {TabsGradient, TaggLoadingIndicator, Background} from '../../components';
+import {Background, TabsGradient, TaggLoadingIndicator} from '../../components';
import {SP_PAGE_SIZE} from '../../constants';
+import {MainStack} from '../../routes';
+import MainStackScreen from '../../routes/main/MainStackScreen';
import SuggestedPeopleOnboardingStackScreen from '../../routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen';
import {getSuggestedPeople} from '../../services/SuggestedPeopleService';
import {cancelFriendRequest, resetScreenType} from '../../store/actions';
import {RootState} from '../../store/rootReducer';
import {
+ BackgroundGradientType,
FriendshipStatusType,
ProfilePreviewType,
ScreenType,
SuggestedPeopleDataType,
- BackgroundGradientType,
} from '../../types';
import {
fetchUserX,
getUserAsProfilePreviewType,
handleAddFriend,
- normalize,
- SCREEN_HEIGHT,
- SCREEN_WIDTH,
} from '../../utils';
+import {SuggestedPeopleWelcomeScreen} from '../suggestedPeopleOnboarding';
import {userXInStore} from './../../utils/';
import SPBody from './SPBody';
+
/**
* Bare bones for suggested people consisting of:
* * Image, title, name, username, add friend button [w/o functionality]
@@ -209,9 +203,13 @@ const SuggestedPeopleScreen: React.FC = () => {
[],
);
- return suggested_people_linked === 0 ? (
- <SuggestedPeopleOnboardingStackScreen />
- ) : loading ? (
+ useFocusEffect(() => {
+ if (suggested_people_linked === 0) {
+ navigation.navigate('SPWelcomeScreen');
+ }
+ });
+
+ return loading ? (
<>
<TaggLoadingIndicator fullscreen />
<Background gradientType={BackgroundGradientType.Dark} />
@@ -245,142 +243,4 @@ const SuggestedPeopleScreen: React.FC = () => {
);
};
-const styles = StyleSheet.create({
- mainContainer: {
- flexDirection: 'column',
- width: SCREEN_WIDTH,
- height: SCREEN_HEIGHT,
- paddingVertical: '15%',
- paddingBottom: '20%',
- justifyContent: 'space-between',
- alignSelf: 'center',
- },
- marginManager: {marginHorizontal: '5%'},
- image: {
- position: 'absolute',
- width: SCREEN_WIDTH,
- height: SCREEN_HEIGHT,
- zIndex: 0,
- },
- title: {
- zIndex: 1,
- paddingTop: '3%',
- alignSelf: 'center',
- fontSize: normalize(22),
- lineHeight: normalize(26),
- fontWeight: '800',
- letterSpacing: normalize(3),
- color: '#FFFEFE',
- textShadowColor: 'rgba(0, 0, 0, 0.4)',
- textShadowOffset: {width: normalize(2), height: normalize(2)},
- textShadowRadius: normalize(2),
- },
- firstName: {
- color: '#fff',
- fontWeight: '800',
- fontSize: normalize(24),
- lineHeight: normalize(29),
- textShadowColor: 'rgba(0, 0, 0, 0.3)',
- textShadowOffset: {width: normalize(2), height: normalize(2)},
- textShadowRadius: normalize(2),
- letterSpacing: normalize(2.5),
- alignSelf: 'baseline',
- },
- username: {
- color: '#fff',
- fontWeight: '600',
- fontSize: normalize(15),
- lineHeight: normalize(18),
- textShadowColor: 'rgba(0, 0, 0, 0.3)',
- textShadowOffset: {width: normalize(2), height: normalize(2)},
- textShadowRadius: normalize(2),
- letterSpacing: normalize(2),
- },
- nameInfoContainer: {},
- addButton: {
- justifyContent: 'center',
- alignItems: 'center',
- width: SCREEN_WIDTH * 0.3,
- height: SCREEN_WIDTH * 0.085,
- padding: 0,
- borderWidth: 2,
- borderColor: '#fff',
- borderRadius: 1,
- marginLeft: '1%',
- marginTop: '4%',
- shadowColor: 'rgb(0, 0, 0)',
- shadowRadius: 2,
- shadowOffset: {width: 2, height: 2},
- shadowOpacity: 0.5,
- },
- addButtonTitle: {
- color: 'white',
- padding: 0,
- fontSize: normalize(15),
- lineHeight: normalize(18),
- fontWeight: 'bold',
- textAlign: 'center',
- letterSpacing: normalize(1),
- },
- addUserContainer: {
- flexDirection: 'row',
- justifyContent: 'space-between',
- alignItems: 'flex-start',
- marginBottom: '5%',
- },
- requestedButton: {
- justifyContent: 'center',
- alignItems: 'center',
- width: SCREEN_WIDTH * 0.3,
- height: SCREEN_WIDTH * 0.085,
- padding: 0,
- borderWidth: 2,
- borderColor: 'transparent',
- borderRadius: 1,
- marginLeft: '1%',
- marginTop: '4%',
- shadowColor: 'rgb(0, 0, 0)',
- shadowRadius: 2,
- shadowOffset: {width: 2, height: 2},
- shadowOpacity: 0.5,
- },
- requestedButtonTitle: {
- backgroundColor: 'transparent',
- fontSize: normalize(15),
- lineHeight: normalize(18),
- fontWeight: 'bold',
- textAlign: 'center',
- letterSpacing: normalize(1),
- },
- body: {},
-
- button: {
- justifyContent: 'center',
- alignItems: 'center',
- width: SCREEN_WIDTH * 0.4,
- aspectRatio: 154 / 33,
- borderWidth: 2,
- borderColor: '#fff',
- borderRadius: 3,
- marginRight: '2%',
- marginLeft: '1%',
- },
- transparentBG: {
- backgroundColor: 'transparent',
- },
- lightBlueBG: {
- backgroundColor: '#fff',
- },
- label: {
- fontSize: normalize(15),
- fontWeight: '700',
- letterSpacing: 1,
- },
- blueLabel: {
- color: '#fff',
- },
- whiteLabel: {
- color: 'white',
- },
-});
export default SuggestedPeopleScreen;
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
index 87e22d9e..0a4e5718 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
@@ -98,7 +98,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS
if (success) {
dispatch(uploadedSuggestedPeoplePhoto(image));
if (!editing) {
- navigation.push('BadgeSelection', {editing: false});
+ navigation.navigate('BadgeSelection', {editing: false});
}
} else {
Alert.alert(ERROR_UPLOAD);
@@ -106,12 +106,12 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS
setLoading(false);
// Navigated back to Profile if user is editing their Suggested People Picture
if (editing) {
+ navigation.goBack();
setTimeout(() => {
Alert.alert(success ? SUCCESS_PIC_UPLOAD : ERROR_UPLOAD_SP_PHOTO);
}, 500);
}
}
- navigation.goBack();
};
return (
@@ -161,7 +161,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS
{editing && (
<TouchableOpacity
onPress={() => {
- navigation.push('BadgeSelection', {editing: true});
+ navigation.navigate('BadgeSelection', {editing: true});
}}>
<View style={styles.editBadgesMainContainer}>
<View style={styles.editBadgesSubContainer}>
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleWelcomeScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleWelcomeScreen.tsx
index 10f3b3a5..2f12d909 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleWelcomeScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleWelcomeScreen.tsx
@@ -1,6 +1,6 @@
import {BlurView} from '@react-native-community/blur';
import {useNavigation} from '@react-navigation/native';
-import React from 'react';
+import React, {Fragment, useEffect} from 'react';
import {Image, StatusBar, StyleSheet, TouchableOpacity} from 'react-native';
import {Text} from 'react-native-animatable';
import {SafeAreaView} from 'react-native-safe-area-context';
@@ -9,6 +9,13 @@ import {isIPhoneX, normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
const SuggestedPeopleWelcomeScreen: React.FC = () => {
const navigation = useNavigation();
+
+ useEffect(() => {
+ navigation.setOptions({
+ headerBackImage: () => <Fragment />,
+ });
+ }, []);
+
return (
<>
<StatusBar barStyle={'light-content'} />
@@ -35,7 +42,9 @@ const SuggestedPeopleWelcomeScreen: React.FC = () => {
</BlurView>
<TouchableOpacity
style={styles.nextButton}
- onPress={() => navigation.push('UploadPicture')}>
+ onPress={() =>
+ navigation.navigate('UpdateSPPicture', {editing: false})
+ }>
<UpArrow color={'white'} />
</TouchableOpacity>
</>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-12-07 17:33:08 +0000