Revert then refix because shit got broken
This commit is contained in:
parent
cc8e0c623c
commit
770d04540c
@ -1,6 +1,6 @@
|
||||
import React, { useState } from 'react';
|
||||
import { StyleSheet } from 'react-native';
|
||||
import { ThemedText, ThemedView } from '@/components/theme/Theme';
|
||||
import { ThemedView } from '@/components/theme/Theme';
|
||||
import UserInfo from '@/components/home/UserInfo';
|
||||
import RelationshipView from '@/components/home/RelationshipView';
|
||||
|
||||
@ -17,7 +17,6 @@ const IndexScreen = () => {
|
||||
</ThemedView>
|
||||
</ThemedView>
|
||||
);
|
||||
|
||||
};
|
||||
export default IndexScreen;
|
||||
|
||||
|
@ -7,14 +7,9 @@ import {
|
||||
|
||||
const RootLayout = () => {
|
||||
const [isSignedIn, setIsSignedIn] = useState(false);
|
||||
console.log('RootLayout rendering, isSignedIn:', isSignedIn);
|
||||
if (!isSignedIn) {
|
||||
console.log('Rendering SignInScreen');
|
||||
return (
|
||||
<SignInScreen onSignIn={() => setIsSignedIn(true)} />
|
||||
);
|
||||
}
|
||||
console.log('PushNotificationManager & Stack');
|
||||
if (!isSignedIn)
|
||||
return <SignInScreen onSignIn={() => setIsSignedIn(true)} />
|
||||
|
||||
return (
|
||||
<PushNotificationManager>
|
||||
<Stack>
|
||||
|
@ -37,7 +37,7 @@ const SignInScreen = ({onSignIn}: {onSignIn: () => void}) => {
|
||||
|
||||
const initialDataResponse = await getInitialDataByAppleId(credential.user);
|
||||
|
||||
console.log("InitialData response: ", initialDataResponse);
|
||||
console.log(initialDataResponse);
|
||||
if (initialDataResponse.status === 404 || !initialDataResponse.ok) {
|
||||
if (!credential.user || !credential.email ||
|
||||
!credential.fullName?.givenName || !credential.fullName?.familyName ||
|
||||
|
@ -137,7 +137,6 @@ export const saveInitialData = async (initialData: InitialData) => {
|
||||
await SecureStore.setItemAsync(
|
||||
'partner', JSON.stringify(initialData.relationshipData.partner)
|
||||
);
|
||||
if (initialData.countdown)
|
||||
await SecureStore.setItemAsync('countdown', JSON.stringify(initialData.countdown));
|
||||
}
|
||||
} catch (error) {
|
||||
|
@ -4,7 +4,6 @@ import * as Device from 'expo-device';
|
||||
import * as Notifications from 'expo-notifications';
|
||||
import Constants from 'expo-constants';
|
||||
import type { NotificationMessage } from '@/constants/Types';
|
||||
import { ThemedText } from '@/components/theme/Theme';
|
||||
|
||||
Notifications.setNotificationHandler({
|
||||
handleNotification: async () => ({
|
||||
@ -115,12 +114,7 @@ export const PushNotificationManager = ({children}: {children: React.ReactNode})
|
||||
Notifications.removeNotificationSubscription(responseListener.current);
|
||||
};
|
||||
}, []);
|
||||
//return ( <> {children} </> );
|
||||
return (
|
||||
<ErrorBoundary>
|
||||
{children}
|
||||
</ErrorBoundary>
|
||||
);
|
||||
return ( <ErrorBoundary>{children}</ErrorBoundary> );
|
||||
};
|
||||
|
||||
class ErrorBoundary extends React.Component<{children: React.ReactNode}, {hasError: boolean}> {
|
||||
|
@ -11,17 +11,15 @@ export const getInitialDataByAppleId = async (appleId: string) => {
|
||||
'x-api-key': process.env.EXPO_PUBLIC_API_KEY ?? '',
|
||||
},
|
||||
});
|
||||
console.log("InitialData API response: ", response);
|
||||
return response;
|
||||
} catch (error: unknown) {
|
||||
console.error('Error getting Initial Data by Apple ID:', error);
|
||||
console.error('Error getting user by Apple ID:', error);
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
export const createUser = async (
|
||||
appleId: string, email: string, fullName: string, pushToken: string
|
||||
) => {
|
||||
export const createUser =
|
||||
async (appleId: string, email: string, fullName: string, pushToken: string) => {
|
||||
try {
|
||||
const apiUrl = `${process.env.EXPO_PUBLIC_API_URL}/api/users/createUser`;
|
||||
const response = await fetch(apiUrl, {
|
||||
@ -102,8 +100,7 @@ export const updateProfilePicture = async (userId: number, pfpUrl: string) => {
|
||||
|
||||
export const checkRelationshipStatus = async (userId: number) => {
|
||||
try {
|
||||
const apiUrl =
|
||||
`${process.env.EXPO_PUBLIC_API_URL}/api/relationships/checkRelationship`;
|
||||
const apiUrl = `${process.env.EXPO_PUBLIC_API_URL}/api/users/checkRelationship`;
|
||||
const response = await fetch((apiUrl + `?userId=${userId}`), {
|
||||
headers: {
|
||||
'x-api-key': process.env.EXPO_PUBLIC_API_KEY ?? '',
|
||||
|
Loading…
Reference in New Issue
Block a user