Merge branch 'main' into ocf-18-qr-gen-edge

.eslintrc.js

@@ -3,11 +3,22 @@ module.exports = {
   extends: ['expo', 'prettier', 'eslint:recommended'],
   plugins: ['prettier', '@typescript-eslint'],
   parser: '@typescript-eslint/parser',
+  env: {
+    node: true,
+  },
   rules: {
     // add project-specific linting rules here
     'prettier/prettier': 'error',
     '@typescript-eslint/no-explicit-any': 'warn',
     '@typescript-eslint/no-shadow': 'error',
   },
   ignorePatterns: ['src/supabase/functions/'],
+  settings: {
+    'import/resolver': {
+      typescript: {
+        alwaysTryTypes: true,
+        project: './tsconfig.json',
+      },
+    },
+  },
 };

.gitignore

@@ -8,6 +8,10 @@ node_modules/
 dist/
 web-build/
 
+# Platforms
+ios/
+android/
+
 # Native
 *.orig.*
 *.jks

App.tsx

@@ -1,22 +1,26 @@
-import { StyleSheet, Text, View } from 'react-native';
-import { StatusBar } from 'expo-status-bar';
-import Logo from '@/components/Logo';
+import React from 'react';
+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() {
-  return (
-    <View style={styles.container}>
-      <Logo />
-      <Text>Open up App.tsx to start working on your app!</Text>
-      <StatusBar style="auto" />
-    </View>
-  );
-}
+  const [fontsLoaded] = useFonts({
+    DMSans_400Regular,
+    DMSans_700Bold,
+  });
+
+  if (!fontsLoaded) {
+    return null;
+  }
 
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-});
+  const defaultFontFamily = 'DMSans_400Regular';
+  (Text as any).defaultProps = (Text as any).defaultProps || {};
+  (Text as any).defaultProps.style = { fontFamily: defaultFontFamily };
+
+  return <AppNavigator />;
+}

app.json

@@ -2,16 +2,31 @@
   "expo": {
     "name": "Our City Forest",
     "slug": "our-city-forest",
-    "owner": "calblueprint",
+    "owner": "ocfdev",
     "version": "1.0.0",
     "orientation": "portrait",
     "icon": "./assets/bp-icon.png",
     "userInterfaceStyle": "light",
+    "plugins": [
+      [
+        "expo-camera",
+        {
+          "cameraPermission": "Allow Our City Forest to access your camera to scan QR codes."
+        }
+      ],
+      [
+        "expo-dev-launcher",
+        {
+          "launchMode": "most-recent"
+        }
+      ]
+    ],
     "splash": {
       "image": "./assets/bp-splash.png",
       "resizeMode": "contain",
       "backgroundColor": "#ffffff"
     },
+    "platforms": ["ios", "android", "web"],
     "ios": {
       "bundleIdentifier": "org.calblueprint.ourcityforest",
       "supportsTablet": true,
@@ -29,6 +44,12 @@
     },
     "web": {
       "favicon": "./assets/bp-favicon.png"
-    }
+    },
+    "extra": {
+      "eas": {
+        "projectId": "d04f2944-f495-4c9b-b330-6e13ce59c6ff"
+      }
+    },
+    "scheme": "our-city-forest"
   }
 }

eas.json

@@ -0,0 +1,21 @@
+{
+  "cli": {
+    "version": ">= 12.6.1",
+    "appVersionSource": "remote"
+  },
+  "build": {
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal"
+    },
+    "preview": {
+      "distribution": "internal"
+    },
+    "production": {
+      "autoIncrement": true
+    }
+  },
+  "submit": {
+    "production": {}
+  }
+}

index.ts

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