Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
86 changes: 84 additions & 2 deletions apps/client/app/(auth)/login.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { useEffect } from 'react';
import {
View,
Text,
Expand All @@ -7,19 +7,30 @@ import {
ScrollView,
ActivityIndicator,
} from 'react-native';
import { router } from 'expo-router';
import { useAuth } from '@/contexts/AuthContext';
import { useGoogleAuth } from '@/contexts/GoogleAuthContext';
import { useDevMode } from '@/contexts/DevModeContext';
import { DEV_ACCOUNTS } from '@/constants/devAccounts';
import { useResponsive } from '@/hooks/useResponsive';
import { useAppTheme } from '@/hooks/useAppTheme';
import { AppPalette } from '@/constants/theme';

export default function LoginScreen() {
const { isLoading, error } = useAuth();
const { isLoading, error, isAuthenticated } = useAuth();
const { googleSignIn, isLoading: isGoogleLoading } = useGoogleAuth();
const { isDevMode, signInAsDevUser } = useDevMode();
const { isMobile } = useResponsive();
const { colors, fontScale } = useAppTheme();
const styles = React.useMemo(() => createStyles(colors, fontScale), [colors, fontScale]);

// Covers both Google sign-in and dev-mode test accounts
useEffect(() => {
if (isAuthenticated) {
router.replace('/(tabs)');
}
}, [isAuthenticated]);

const handleGoogleSignIn = async () => {
await googleSignIn();
// On success, onAuthStateChange will set session; tabs layout redirects to /(tabs)
Expand Down Expand Up @@ -73,7 +84,32 @@ export default function LoginScreen() {
<Text style={styles.signupLink}>Sign up with Google</Text>
</TouchableOpacity>
</View>

{/* Dev mode: CMU SSO becomes optional — sign in as a local test persona */}
{isDevMode && (
<View style={styles.devSection}>
<View style={styles.devDivider}>
<View style={styles.devDividerLine} />
<Text style={styles.devDividerText}>DEV MODE · TEST ACCOUNTS</Text>
<View style={styles.devDividerLine} />
</View>
{DEV_ACCOUNTS.map((account) => (
<TouchableOpacity
key={account.user.id}
style={styles.devAccountButton}
onPress={() => signInAsDevUser(account.user.id)}
>
<Text style={styles.devAccountName}>{account.user.name}</Text>
<Text style={styles.devAccountHint}>{account.description}</Text>
</TouchableOpacity>
))}
</View>
)}
</View>

<TouchableOpacity onPress={() => router.push('/dev')} style={styles.devLink}>
<Text style={styles.devLinkText}>Developer mode</Text>
</TouchableOpacity>
</ScrollView>
);
}
Expand Down Expand Up @@ -187,4 +223,50 @@ const createStyles = (colors: AppPalette, fontScale: number) =>
color: colors.primary,
fontWeight: '600',
},
devSection: {
marginTop: 24,
},
devDivider: {
flexDirection: 'row',
alignItems: 'center',
gap: 10,
marginBottom: 12,
},
devDividerLine: {
flex: 1,
height: 1,
backgroundColor: colors.border,
},
devDividerText: {
fontSize: 10 * fontScale,
fontWeight: '700',
letterSpacing: 1,
color: colors.textTertiary,
},
devAccountButton: {
borderWidth: 1,
borderColor: colors.border,
borderRadius: 10,
paddingHorizontal: 14,
paddingVertical: 10,
marginBottom: 8,
},
devAccountName: {
fontSize: 14 * fontScale,
fontWeight: '600',
color: colors.textPrimary,
},
devAccountHint: {
fontSize: 12 * fontScale,
color: colors.textSecondary,
marginTop: 1,
},
devLink: {
marginTop: 20,
padding: 8,
},
devLinkText: {
fontSize: 12 * fontScale,
color: colors.textTertiary,
},
});
31 changes: 18 additions & 13 deletions apps/client/app/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { StatusBar } from 'expo-status-bar';
import 'react-native-reanimated';

import { AuthProvider } from '@/contexts/AuthContext';
import { DevModeProvider } from '@/contexts/DevModeContext';
import { GoogleAuthProvider } from '@/contexts/GoogleAuthContext';
import { GoogleCalendarProvider } from '@/contexts/GoogleCalendarContext';
import { EventsProvider } from '@/contexts/EventsContext';
Expand All @@ -25,6 +26,8 @@ function ThemedStack() {
<Stack.Screen name="(auth)/callback" options={{ headerShown: false }} />
<Stack.Screen name="(tabs)" options={{ headerShown: false }} />
<Stack.Screen name="settings" options={{ headerShown: false }} />
<Stack.Screen name="resources" options={{ headerShown: false }} />
<Stack.Screen name="dev" options={{ headerShown: false }} />
<Stack.Screen name="event/[id]" options={{ presentation: 'modal', title: 'Event Details' }} />
</Stack>
<StatusBar style={currentTheme === 'dark' ? 'light' : 'dark'} />
Expand All @@ -34,18 +37,20 @@ function ThemedStack() {

export default function RootLayout() {
return (
<GoogleAuthProvider>
<AuthProvider>
<GoogleCalendarProvider>
<SettingsProvider>
<EventsProvider>
<SlackProvider>
<ThemedStack />
</SlackProvider>
</EventsProvider>
</SettingsProvider>
</GoogleCalendarProvider>
</AuthProvider>
</GoogleAuthProvider>
<DevModeProvider>
<GoogleAuthProvider>
<AuthProvider>
<GoogleCalendarProvider>
<SettingsProvider>
<EventsProvider>
<SlackProvider>
<ThemedStack />
</SlackProvider>
</EventsProvider>
</SettingsProvider>
</GoogleCalendarProvider>
</AuthProvider>
</GoogleAuthProvider>
</DevModeProvider>
);
}
Loading
Loading