diff --git a/frontend/sac-mobile/app/(auth)/login.tsx b/frontend/sac-mobile/app/(auth)/login.tsx index 0d2892ccd..d655d97a5 100644 --- a/frontend/sac-mobile/app/(auth)/login.tsx +++ b/frontend/sac-mobile/app/(auth)/login.tsx @@ -8,8 +8,8 @@ import { router } from 'expo-router'; import { ZodError, z } from 'zod'; -import {Wordmark} from '@/components/Wordmark'; -import {Button} from '@/components/button'; +import Wordmark from '@/components/Wordmark'; +import Button from '@/components/button'; import {Input} from '@/components/input'; import { useAuthStore } from '@/hooks/use-auth'; import { loginByEmail } from '@/services/auth'; @@ -51,18 +51,19 @@ const Login = () => { } } }; + return ( - - - - - Let's go - - Discover, follow, and join all the clubs & events - Northeastern has to offer - + + + + + Let's go + + Discover, follow, and join all the clubs & events + Northeastern has to offer + - + Email { Not a student? Continue as a guest. + @@ -140,18 +142,16 @@ const styles = StyleSheet.create({ paddingTop: '2%', paddingBottom: '2.5%' }, + alignContainer: { + paddingLeft: '5%', + paddingRight: '5%' + }, description: { fontSize: 20, color: 'white', paddingTop: '2%' }, - container: { - backgroundColor: 'grey', - height: '100%' - }, - innerContainer: { - flex: 1 - }, + buttonContainer: { flexDirection: 'row', justifyContent: 'space-around' diff --git a/frontend/sac-mobile/app/(auth)/register.tsx b/frontend/sac-mobile/app/(auth)/register.tsx index 7228def4e..9485ad2d5 100644 --- a/frontend/sac-mobile/app/(auth)/register.tsx +++ b/frontend/sac-mobile/app/(auth)/register.tsx @@ -6,8 +6,8 @@ import { SafeAreaView } from 'react-native-safe-area-context'; import { router } from 'expo-router'; import { ZodError, z } from 'zod'; -import {Wordmark} from '@/components/Wordmark'; -import {Button} from '@/components/button'; +import Wordmark from '@/components/Wordmark'; +import Button from '@/components/button'; import {Header} from '@/components/header'; import {DropdownComponent} from '@/components/dropdown'; diff --git a/frontend/sac-mobile/app/(auth)/welcome.tsx b/frontend/sac-mobile/app/(auth)/welcome.tsx index 339683016..32aab1ede 100644 --- a/frontend/sac-mobile/app/(auth)/welcome.tsx +++ b/frontend/sac-mobile/app/(auth)/welcome.tsx @@ -3,9 +3,8 @@ import { Pressable, SafeAreaView, StyleSheet, Text, View } from 'react-native'; import { router } from 'expo-router'; -import {Wordmark} from '@/components/Wordmark'; -import {Button } from '@/components/button'; -import { useAuthStore } from '@/hooks/use-auth'; +import Wordmark from '@/components/Wordmark'; +import Button from '@/components/button'; const Welcome = () => { const redirect = () => { @@ -38,24 +37,23 @@ const styles = StyleSheet.create({ container: { flexDirection: 'column', marginBottom: '10%', - marginLeft: 30, - marginRight: 30 + marginLeft: "8%", + marginRight: "8%" }, header: { - color: 'black', height: '20%', fontSize: 50, - marginTop: '5%', + marginTop: '10%', fontWeight: 'bold' }, imageHolder: { backgroundColor: 'gray', height: '45%', width: '100%', - borderRadius: 20 + borderRadius: 20, + marginTop: '5%' }, description: { - color: 'black', height: '15%', fontSize: 23 }, diff --git a/frontend/sac-mobile/components/Wordmark.tsx b/frontend/sac-mobile/components/Wordmark.tsx index ecc47773b..bd1c292c4 100644 --- a/frontend/sac-mobile/components/Wordmark.tsx +++ b/frontend/sac-mobile/components/Wordmark.tsx @@ -5,11 +5,11 @@ type WordmarkProps = { backgroundColor?: string; } -export const Wordmark = (props: WordmarkProps) => { +export default const Wordmark = (props: WordmarkProps) => { const styles = StyleSheet.create({ wordmark: { fontSize: 24, - paddingTop: '7.5%', + paddingTop: '2.5%', paddingBottom: '7.5%', fontWeight: 'bold', color: props.textColor diff --git a/frontend/sac-mobile/components/button.tsx b/frontend/sac-mobile/components/button.tsx index f6c6b4f41..44f9eba16 100644 --- a/frontend/sac-mobile/components/button.tsx +++ b/frontend/sac-mobile/components/button.tsx @@ -8,7 +8,7 @@ type ButtonProps = { borderColor?: string; }; -export const Button = (props: ButtonProps) => { +export default const Button = (props: ButtonProps) => { const styles = StyleSheet.create({ button: { backgroundColor: props.backgroundColor || 'gray', diff --git a/frontend/sac-mobile/components/input.tsx b/frontend/sac-mobile/components/input.tsx index 79c73b3cf..66eefee27 100644 --- a/frontend/sac-mobile/components/input.tsx +++ b/frontend/sac-mobile/components/input.tsx @@ -8,17 +8,24 @@ type InputProps = { export const Input = (props: InputProps) => { const styles = StyleSheet.create({ input: { - borderRadius: 20, - borderWidth: 1, + borderRadius: 10, + borderWidth: 1, paddingTop: '5%', paddingBottom: '5%', + width: '100%' } - }) + }); return ( - + {props.title} - + + + ); }; +export default Input;