diff --git a/frontend/app/(app)/(tabs)/index.js b/frontend/app/(app)/(tabs)/index.js index 8c53e83..e9e4105 100644 --- a/frontend/app/(app)/(tabs)/index.js +++ b/frontend/app/(app)/(tabs)/index.js @@ -2,7 +2,7 @@ import { StyleSheet, Text, View } from "react-native"; import Button from "@components/Button"; import { colors } from "@components/style"; import { useAuth } from "@context/AuthContext"; -import Link from "@components/Link"; +import { router } from "expo-router"; export default function Index() { const { onLogout, authState } = useAuth(); @@ -10,8 +10,19 @@ export default function Index() { return ( - Welcome {user.username} - Go to BEER + Welcome {user.username}! + We hope, you're enjoying your beer. + + + ); } @@ -27,4 +38,16 @@ const styles = StyleSheet.create({ textAlign: "center", paddingTop: "20%", }, + h2: { + color: "#FFF", + fontSize: 20, + textAlign: "center", + paddingTop: "1%", + }, + button: { + color: colors.charcoal, + fontSize: 30, + textAlign: "center", + paddingTop: "2%", + }, }); diff --git a/frontend/app/login.js b/frontend/app/login.js index 4602ead..e1e69ac 100644 --- a/frontend/app/login.js +++ b/frontend/app/login.js @@ -83,7 +83,6 @@ const styles = StyleSheet.create({ container: { width: "100%", height: "100%", - backgroundColor: colors.dark, justifyContent: "center", alignItems: "center", }, diff --git a/frontend/app/signup.js b/frontend/app/signup.js index 75ee540..dab38ef 100644 --- a/frontend/app/signup.js +++ b/frontend/app/signup.js @@ -155,6 +155,13 @@ const styles = StyleSheet.create({ fontSize: 14, marginTop: 10, }, + gradient: { + position: "absolute", + left: 0, + right: 0, + top: 0, + height: "100%", + }, }); export default SignupPage; diff --git a/frontend/components/Button.js b/frontend/components/Button.js index 117982d..41f0b08 100644 --- a/frontend/components/Button.js +++ b/frontend/components/Button.js @@ -2,7 +2,12 @@ import React from "react"; import { Text, StyleSheet, Pressable } from "react-native"; export default function Button(props) { - const { onPress, title = "Button", color = "black" } = props; + const { + onPress, + title = "Button", + color = "black", + textColor = "white", + } = props; return ( [ @@ -17,7 +22,7 @@ export default function Button(props) { ]} onPress={onPress} > - {title} + {title} ); } @@ -36,6 +41,6 @@ const styles = StyleSheet.create({ lineHeight: 21, fontWeight: "bold", letterSpacing: 0.25, - color: "white", + //color: textColor, }, });