Skip to content

Commit

Permalink
feat: hi-fi login flow (#14)
Browse files Browse the repository at this point in the history
* Completed login flow and Google Authentication setup.

* Implemented hi-fi login screens with navigation.

* Added Google authentication.

---------

- Adjusted file structure and added placeholder screens for Directory and SpeciesInfo.
- Cleaned up navigation and removed redundant scripts.

---------

Co-authored-by: Chris Torres <[email protected]>
Co-authored-by: Alex Wang <[email protected]>
Co-authored-by: Aditya Pawar <[email protected]>
Co-authored-by: Chris Torres <[email protected]>
  • Loading branch information
5 people authored Dec 6, 2024
1 parent e64788b commit a5dd674
Show file tree
Hide file tree
Showing 32 changed files with 4,870 additions and 4,655 deletions.
8 changes: 8 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
},
},
};
22 changes: 4 additions & 18 deletions App.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
import React from 'react';
import { NavigationContainer } from '@react-navigation/native';
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import ContactPage from './src/screens/contactPage';
import SearchScreen from './src/screens/searchScreen';
import { DefaultTheme } from '@react-navigation/native';
import AppNavigator from '@/navigation/AppNavigator';

export type RootStackParamList = {
Search: undefined;
Contact: undefined;
};

const Stack = createNativeStackNavigator<RootStackParamList>();
DefaultTheme.colors.background = '#FFFFFF';

export default function App() {
return (
<NavigationContainer>
<Stack.Navigator initialRouteName="Search">
<Stack.Screen name="Search" component={SearchScreen} />
<Stack.Screen name="Contact" component={ContactPage} />
</Stack.Navigator>
</NavigationContainer>
);
return <AppNavigator />;
}
18 changes: 8 additions & 10 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,19 @@
{
"cameraPermission": "Allow Our City Forest to access your camera to scan QR codes."
}
]
],
"splash": {
"image": "./assets/bp-splash.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},
"plugins": [
],
[
"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",
Expand All @@ -47,11 +45,11 @@
"web": {
"favicon": "./assets/bp-favicon.png"
},
"scheme": "org.calblueprint.ourcityforest",
"extra": {
"eas": {
"projectId": "d04f2944-f495-4c9b-b330-6e13ce59c6ff"
}
}
},
"scheme": "our-city-forest"
}
}
Binary file added assets/ocf_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { registerRootComponent } from 'expo';
import App from './App';

registerRootComponent(App);
Loading

0 comments on commit a5dd674

Please sign in to comment.