Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: hi-fi login flow #14

Merged
merged 68 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
0695cf4
finished lo-fi login pages with navigation
carolynzhuang Oct 18, 2024
8f098f4
google auth draft
carolynzhuang Oct 26, 2024
57809ad
draft user auth
carolynzhuang Oct 26, 2024
6fedf47
draft user auth
carolynzhuang Oct 26, 2024
8ef9607
google auth draft 2
carolynzhuang Oct 31, 2024
db53f9f
google auth draft 2
carolynzhuang Oct 31, 2024
83f4017
draft
carolynzhuang Oct 31, 2024
e846bfb
draft
carolynzhuang Oct 31, 2024
32739f0
draft
carolynzhuang Nov 4, 2024
aa466fb
auth
carolynzhuang Nov 6, 2024
df39876
update gitignore
carolynzhuang Nov 6, 2024
4d0e697
delete
carolynzhuang Nov 7, 2024
155a55c
created login screen
carolynzhuang Nov 7, 2024
b32b023
hi fi login page created
carolynzhuang Nov 8, 2024
4b10654
hi fi login page created
carolynzhuang Nov 8, 2024
37c71bc
hi fi login page created
carolynzhuang Nov 8, 2024
6e20f51
login screen
carolynzhuang Nov 14, 2024
2ae126d
login screen
carolynzhuang Nov 14, 2024
49fbe54
changed file structure
carolynzhuang Nov 14, 2024
c362004
changes
carolynzhuang Nov 14, 2024
913ecd4
draft
carolynzhuang Nov 18, 2024
cc5236e
merge
carolynzhuang Nov 18, 2024
732fcfa
feat: lo-fi login flow (#4)
carolynzhuang Nov 13, 2024
5b08024
feat: species queries and types (#12)
adityapawar1 Nov 13, 2024
ed28e6e
merge
carolynzhuang Nov 18, 2024
bcbe36c
merge
carolynzhuang Nov 18, 2024
c2a8ac9
finished lo-fi login pages with navigation
carolynzhuang Oct 18, 2024
9afac0c
google auth draft
carolynzhuang Oct 26, 2024
60ee809
draft user auth
carolynzhuang Oct 26, 2024
839b51c
google auth draft 2
carolynzhuang Oct 31, 2024
0fd400f
draft
carolynzhuang Oct 31, 2024
62b14c1
draft
carolynzhuang Nov 4, 2024
2b6282d
auth
carolynzhuang Nov 6, 2024
7c3697b
created login screen
carolynzhuang Nov 7, 2024
937f7d2
hi fi login page created
carolynzhuang Nov 8, 2024
f7d7373
changed file structure
carolynzhuang Nov 14, 2024
5238296
changes
carolynzhuang Nov 17, 2024
3c190d7
changes
carolynzhuang Nov 17, 2024
bab41d7
changes
carolynzhuang Nov 17, 2024
d9b742d
draft
carolynzhuang Nov 17, 2024
74ee1d1
finished merge
carolynzhuang Nov 18, 2024
9f1128f
finished merge
carolynzhuang Nov 18, 2024
834a519
conflicts
carolynzhuang Nov 18, 2024
bd29cad
issues
christophertorres1 Nov 19, 2024
e584324
fixed
carolynzhuang Nov 21, 2024
3633c28
fixed
carolynzhuang Nov 21, 2024
51021e2
rename files
christophertorres1 Dec 4, 2024
a4a2251
more renaming
christophertorres1 Dec 4, 2024
b629807
even more renaming
christophertorres1 Dec 4, 2024
8d2ded7
fix tsconfig
christophertorres1 Dec 4, 2024
6eb1cf5
install eslint import resolver ts
christophertorres1 Dec 4, 2024
967f6ad
fix eslint
christophertorres1 Dec 4, 2024
f4bf2b0
Merge branch 'main' into cwz/ocf-20-hi-fi-login-flow
christophertorres1 Dec 4, 2024
3d0d236
add package-lock
christophertorres1 Dec 4, 2024
d41ccb6
fix imports
christophertorres1 Dec 4, 2024
aa36016
temp
christophertorres1 Dec 4, 2024
259dd77
fix dependencies
christophertorres1 Dec 4, 2024
11c16c9
temp
christophertorres1 Dec 4, 2024
c6747f1
add empty screens for Directory and SpeciesInfo
christophertorres1 Dec 4, 2024
da6d220
temp
christophertorres1 Dec 4, 2024
c0076d3
pls
christophertorres1 Dec 5, 2024
a65b8da
temp
christophertorres1 Dec 5, 2024
b3554fd
navigation cleanup
christophertorres1 Dec 6, 2024
7430551
remove entrypoint in app.json
christophertorres1 Dec 6, 2024
70ecc0b
remove redundant tsc script
christophertorres1 Dec 6, 2024
242fd20
update pre-commit script accordingly
christophertorres1 Dec 6, 2024
8b27669
add index.ts
christophertorres1 Dec 6, 2024
ff2e243
.
christophertorres1 Dec 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading