diff --git a/.gitignore b/.gitignore index bd5d1f6..db49453 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ yarn-error.* # typescript *.tsbuildinfo + +ios/ diff --git a/App.tsx b/App.tsx index 408f14d..c9c6f9c 100644 --- a/App.tsx +++ b/App.tsx @@ -1,8 +1,8 @@ import { NavigationContainer } from '@react-navigation/native'; import { createNativeStackNavigator } from '@react-navigation/native-stack'; import { LoginStackParamList } from '@/navigation/types'; +import AdminLoginScreen from '@/screens/AdminLoginScreen'; import LoginScreen from '@/screens/LoginScreen'; -import MemberLoginScreen from '@/screens/MemberLoginScreen'; const Stack = createNativeStackNavigator(); @@ -11,7 +11,7 @@ export default function App() { - + ); diff --git a/src/components/Login.tsx b/src/components/Login.tsx index 4116ad9..22648cc 100644 --- a/src/components/Login.tsx +++ b/src/components/Login.tsx @@ -16,9 +16,9 @@ export default function Login({ navigation, route }: LoginProps) { navigation.navigate('MemberLogin')} + onPress={() => navigation.navigate('AdminLogin')} > - Staff or Member + Admin diff --git a/src/navigation/types.tsx b/src/navigation/types.tsx index edf2cc0..b679a59 100644 --- a/src/navigation/types.tsx +++ b/src/navigation/types.tsx @@ -1,5 +1,5 @@ export type LoginStackParamList = { Login: undefined; GuestLogin: undefined; - MemberLogin: undefined; + AdminLogin: undefined; }; diff --git a/src/screens/MemberLoginScreen.tsx b/src/screens/AdminLoginScreen.tsx similarity index 75% rename from src/screens/MemberLoginScreen.tsx rename to src/screens/AdminLoginScreen.tsx index 96cde22..f2d06d1 100644 --- a/src/screens/MemberLoginScreen.tsx +++ b/src/screens/AdminLoginScreen.tsx @@ -2,10 +2,10 @@ import { Text, TouchableOpacity, View } from 'react-native'; import Svg, { Circle } from 'react-native-svg'; import { styles } from '@/screens/styles'; -export default function MemberLoginScreen() { +export default function AdminLoginScreen() { return ( - - Staff and Member Login + + Admin Login diff --git a/src/screens/styles.ts b/src/screens/styles.ts index ba87cfd..b634c16 100644 --- a/src/screens/styles.ts +++ b/src/screens/styles.ts @@ -44,7 +44,7 @@ export const styles = StyleSheet.create({ fontSize: 16, }, - memberLoginContainer: { + adminLoginContainer: { flex: 1, flexDirection: 'column', justifyContent: 'flex-start',