Merge branch 'main' into cwz/ocf-30-navigation-bar

.eslintrc.js

@@ -12,4 +12,12 @@ module.exports = {
     '@typescript-eslint/no-explicit-any': 'warn',
     '@typescript-eslint/no-shadow': 'error',
   },
+  settings: {
+    'import/resolver': {
+      typescript: {
+        alwaysTryTypes: true,
+        project: './tsconfig.json',
+      },
+    },
+  },
 };

.gitignore

@@ -9,8 +9,8 @@ dist/
 web-build/
 
 # Platforms
-ios/*
-android/*
+ios/
+android/
 
 # Native
 *.orig.*
@@ -38,12 +38,3 @@ yarn-error.*
 
 # typescript
 *.tsbuildinfo
-
-<<<<<<< HEAD
-ios/
-android/
-=======
-# ios
-ios/*
-android/*
->>>>>>> 893ea80 (auth)

App.tsx

@@ -1,4 +1,6 @@
 import React from 'react';
+
+
 import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
 import { DefaultTheme, NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
@@ -72,4 +74,30 @@ export default function App() {
       </LoginStack.Navigator>
     </NavigationContainer>
   );
+
+
+import { Text } from 'react-native';
+import { useFonts } from 'expo-font';
+import { DMSans_400Regular, DMSans_700Bold } from '@expo-google-fonts/dm-sans';
+import { DefaultTheme } from '@react-navigation/native';
+import AppNavigator from '@/navigation/AppNavigator';
+import colors from '@/styles/colors';
+
+DefaultTheme.colors.background = colors.white;
+
+export default function App() {
+  const [fontsLoaded] = useFonts({
+    DMSans_400Regular,
+    DMSans_700Bold,
+  });
+
+  if (!fontsLoaded) {
+    return null;
+  }
+
+  const defaultFontFamily = 'DMSans_400Regular';
+  (Text as any).defaultProps = (Text as any).defaultProps || {};
+  (Text as any).defaultProps.style = { fontFamily: defaultFontFamily };
+
+  return <AppNavigator />;
 }

app.json

@@ -26,7 +26,6 @@
       "resizeMode": "contain",
       "backgroundColor": "#ffffff"
     },
-
     "platforms": ["ios", "android", "web"],
     "ios": {
       "bundleIdentifier": "org.calblueprint.ourcityforest",

index.ts

@@ -0,0 +1,4 @@
+import { registerRootComponent } from 'expo';
+import App from './App';
+
+registerRootComponent(App);