Updated to Expo 51 SDK, changed app directory structure and some pack…

…age imports to match
ufosc · Jun 22, 2024 · e87f935 · e87f935
1 parent 486ecaa
commit e87f935
Show file tree

Hide file tree

Showing 36 changed files with 11,481 additions and 17,320 deletions.
diff --git a/client/src/components/auth/AuthButtons.tsx → client/app/components/auth/AuthButtons.tsx b/client/src/components/auth/AuthButtons.tsx → client/app/components/auth/AuthButtons.tsx
diff --git a/...omponents/auth/AuthenticationResponse.tsx → ...omponents/auth/AuthenticationResponse.tsx b/...omponents/auth/AuthenticationResponse.tsx → ...omponents/auth/AuthenticationResponse.tsx
@@ -1,5 +1,5 @@
-import { FirebaseError } from "firebase/app";
-import { User } from "firebase/auth";
+import { FirebaseError } from "@firebase/app";
+import { User } from "@firebase/auth";
 import React from "react";
 import { StyleSheet, Text, Dimensions, TouchableOpacity } from "react-native";
 

diff --git a/client/src/components/auth/LogInButton.tsx → client/app/components/auth/LogInButton.tsx b/client/src/components/auth/LogInButton.tsx → client/app/components/auth/LogInButton.tsx
diff --git a/client/src/components/auth/SignUpButton.tsx → client/app/components/auth/SignUpButton.tsx b/client/src/components/auth/SignUpButton.tsx → client/app/components/auth/SignUpButton.tsx
diff --git a/client/src/components/chat/ChatMessage.tsx → client/app/components/chat/ChatMessage.tsx b/client/src/components/chat/ChatMessage.tsx → client/app/components/chat/ChatMessage.tsx
diff --git a/.../src/components/chat/ChatScreenFooter.tsx → .../app/components/chat/ChatScreenFooter.tsx b/.../src/components/chat/ChatScreenFooter.tsx → .../app/components/chat/ChatScreenFooter.tsx
diff --git a/...nt/src/components/chat/MessageChannel.tsx → ...nt/app/components/chat/MessageChannel.tsx b/...nt/src/components/chat/MessageChannel.tsx → ...nt/app/components/chat/MessageChannel.tsx
diff --git a/client/src/components/chat/NearbyCount.tsx → client/app/components/chat/NearbyCount.tsx b/client/src/components/chat/NearbyCount.tsx → client/app/components/chat/NearbyCount.tsx
@@ -9,7 +9,7 @@ const NearbyCount: React.FC<CounterProps> = ({ count }) => {
       <View style={styles.iconAndCount}>
         <Image
           style={styles.iconImage}
-          source={require("../../../assets/nearby_icon.png")}
+          source={require("../../../assets/icons/misc/nearby_icon.png")}
         />
         <Text style={styles.countText}>{count}</Text>
       </View>

diff --git a/client/src/components/chat/NearbyHeader.tsx → client/app/components/chat/NearbyHeader.tsx b/client/src/components/chat/NearbyHeader.tsx → client/app/components/chat/NearbyHeader.tsx
diff --git a/...t/src/components/common/CustomButtons.tsx → ...t/app/components/common/CustomButtons.tsx b/...t/src/components/common/CustomButtons.tsx → ...t/app/components/common/CustomButtons.tsx
diff --git a/...nt/src/components/common/CustomInputs.tsx → ...nt/app/components/common/CustomInputs.tsx b/...nt/src/components/common/CustomInputs.tsx → ...nt/app/components/common/CustomInputs.tsx
diff --git a/...src/components/common/SafeAreaWrapper.tsx → ...app/components/common/SafeAreaWrapper.tsx b/...src/components/common/SafeAreaWrapper.tsx → ...app/components/common/SafeAreaWrapper.tsx
diff --git a/.../src/components/settings/SettingsItem.tsx → .../app/components/settings/SettingsItem.tsx b/.../src/components/settings/SettingsItem.tsx → .../app/components/settings/SettingsItem.tsx
diff --git a/client/src/configs/firebaseConfig.ts → client/app/configs/firebaseConfig.ts b/client/src/configs/firebaseConfig.ts → client/app/configs/firebaseConfig.ts
@@ -1,12 +1,12 @@
 import { API_KEY, AUTH_DOMAIN } from "@env"; // Don't worry about this env error!
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import { initializeApp, getApp, getApps } from "firebase/app";
+import { initializeApp, getApp, getApps } from "@firebase/app";
 import {
   initializeAuth,
   getReactNativePersistence,
   getAuth,
   Auth,
-} from "firebase/auth";
+} from "@firebase/auth";
 
 const firebaseConfig = {
   apiKey: API_KEY || "Mock-Key",

diff --git a/client/src/contexts/LocationContext.tsx → client/app/contexts/LocationContext.tsx b/client/src/contexts/LocationContext.tsx → client/app/contexts/LocationContext.tsx
diff --git a/client/src/contexts/SettingsContext.tsx → client/app/contexts/SettingsContext.tsx b/client/src/contexts/SettingsContext.tsx → client/app/contexts/SettingsContext.tsx
diff --git a/client/src/contexts/SocketContext.tsx → client/app/contexts/SocketContext.tsx b/client/src/contexts/SocketContext.tsx → client/app/contexts/SocketContext.tsx
diff --git a/client/src/contexts/UserContext.tsx → client/app/contexts/UserContext.tsx b/client/src/contexts/UserContext.tsx → client/app/contexts/UserContext.tsx
diff --git a/client/App.tsx → client/app/index.js b/client/App.tsx → client/app/index.js
@@ -1,13 +1,12 @@
-import { NavigationContainer } from "@react-navigation/native";
 import React from "react";
 import { Text } from "react-native";
 
 // Navigation
-import AppNavigator from "./src/navigation/AppNavigator";
-import AuthNavigator from "./src/navigation/AuthNavigator";
+import AppNavigator from "./navigation/AppNavigator";
+import AuthNavigator from "./navigation/AuthNavigator";
 // Services/Hooks/Styles
-import { AuthStore } from "./src/services/AuthStore";
-import { useGlobalFonts } from "./src/styles/fonts";
+import { AuthStore } from "./services/AuthStore";
+import { useGlobalFonts } from "./styles/fonts";
 
 const App = () => {
   const { initialized, isLoggedin } = AuthStore.useState();
@@ -18,9 +17,7 @@ const App = () => {
   if (!initialized) return <Text>Loading...</Text>;
 
   return (
-    <NavigationContainer>
-      {isLoggedin ? <AppNavigator /> : <AuthNavigator />}
-    </NavigationContainer>
+    isLoggedin ? <AppNavigator /> : <AuthNavigator />
   );
 };
 

diff --git a/client/src/navigation/AppNavigator.tsx → client/app/navigation/AppNavigator.tsx b/client/src/navigation/AppNavigator.tsx → client/app/navigation/AppNavigator.tsx
diff --git a/client/src/navigation/AuthNavigator.tsx → client/app/navigation/AuthNavigator.tsx b/client/src/navigation/AuthNavigator.tsx → client/app/navigation/AuthNavigator.tsx
diff --git a/client/src/screens/auth/LoginScreen.tsx → client/app/screens/auth/LoginScreen.tsx b/client/src/screens/auth/LoginScreen.tsx → client/app/screens/auth/LoginScreen.tsx
diff --git a/client/src/screens/auth/SignUpScreen.tsx → client/app/screens/auth/SignUpScreen.tsx b/client/src/screens/auth/SignUpScreen.tsx → client/app/screens/auth/SignUpScreen.tsx
diff --git a/client/src/screens/auth/WelcomeScreen.tsx → client/app/screens/auth/WelcomeScreen.tsx b/client/src/screens/auth/WelcomeScreen.tsx → client/app/screens/auth/WelcomeScreen.tsx
diff --git a/client/src/screens/chat/ChatScreen.tsx → client/app/screens/chat/ChatScreen.tsx b/client/src/screens/chat/ChatScreen.tsx → client/app/screens/chat/ChatScreen.tsx
diff --git a/...t/src/screens/settings/SettingsScreen.tsx → ...t/app/screens/settings/SettingsScreen.tsx b/...t/src/screens/settings/SettingsScreen.tsx → ...t/app/screens/settings/SettingsScreen.tsx
diff --git a/client/src/services/AuthStore.ts → client/app/services/AuthStore.ts b/client/src/services/AuthStore.ts → client/app/services/AuthStore.ts
@@ -4,7 +4,7 @@ import {
   onAuthStateChanged,
   signInWithEmailAndPassword,
   signOut,
-} from "firebase/auth";
+} from "@firebase/auth";
 import { Store } from "pullstate";
 
 import { auth } from "../configs/firebaseConfig";

diff --git a/client/src/services/SettingsStore.ts → client/app/services/SettingsStore.ts b/client/src/services/SettingsStore.ts → client/app/services/SettingsStore.ts
diff --git a/client/src/styles/fonts.ts → client/app/styles/fonts.ts b/client/src/styles/fonts.ts → client/app/styles/fonts.ts
diff --git a/client/src/types/Message.ts → client/app/types/Message.ts b/client/src/types/Message.ts → client/app/types/Message.ts
diff --git a/client/src/types/Props.ts → client/app/types/Props.ts b/client/src/types/Props.ts → client/app/types/Props.ts
diff --git a/client/src/types/User.ts → client/app/types/User.ts b/client/src/types/User.ts → client/app/types/User.ts
diff --git a/client/src/utils/scripts.ts → client/app/utils/scripts.ts b/client/src/utils/scripts.ts → client/app/utils/scripts.ts
diff --git a/client/babel.config.js b/client/babel.config.js
@@ -3,7 +3,6 @@ module.exports = function (api) {
   return {
     presets: ["babel-preset-expo"],
     plugins: [
-      "expo-router/babel",
       [
         "module:react-native-dotenv",
         {