diff --git a/App.js b/App.js index 4f45f23..e0ae68a 100644 --- a/App.js +++ b/App.js @@ -11,7 +11,8 @@ import { createMaterialTopTabNavigator } from '@react-navigation/material-top-ta import { Ionicons, MaterialIcons } from '@expo/vector-icons'; import HomeScreen from './CoreScreens/home'; -import DetailsScreen from './Events/detailsContainer'; +import SplashScreen from './CoreScreens/splashScreen'; +import DetailsScreen from './Events/DetailsContainer'; import FriendScreen from './Friends/friendSuggestions'; import CreateScreen from './Events/createEvent'; import ChatScreen from './Chats/userChats'; @@ -281,6 +282,7 @@ export function Authentication() { + @@ -302,10 +304,10 @@ function DetermineScreen() { return ( <> - {loggedIn ? - : - - } + {/* {loggedIn ? + : */} + + {/* } */} ) } diff --git a/CoreScreens/login.js b/CoreScreens/login.js index 6391700..6a06ff5 100644 --- a/CoreScreens/login.js +++ b/CoreScreens/login.js @@ -1,5 +1,5 @@ import React, { useState, useEffect, useContext } from 'react'; -import { View, Text, ActivityIndicator, KeyboardAvoidingView, TouchableOpacity, Alert } from 'react-native'; +import { View, Text, ActivityIndicator, KeyboardAvoidingView, TouchableOpacity, ImageBackground } from 'react-native'; import * as Location from 'expo-location'; import { styles } from '../styles'; import { Input, Button } from 'react-native-elements/'; @@ -19,6 +19,8 @@ export default ({ navigation }) => { const context = useContext(Context); const [fontLoaded] = useFonts({ Fredoka: require('../assets/fonts/FredokaOne-Regular.ttf'), + OpenSans: require('../assets/fonts/OpenSans.ttf'), + OpenSansItalic: require('../assets/fonts/OpenSansItalic.ttf'), }); const setLocation = async () => { @@ -61,32 +63,40 @@ export default ({ navigation }) => { return ( <> - + + + + Login + + - YOLO } + leftIcon={} onChangeText={t => setUserName(t)} - inputContainerStyle={{ borderBottomColor: 'white', marginLeft: 20, marginRight: 20 }} + inputContainerStyle={{ borderBottomColor: 'grey', marginLeft: 20, marginRight: 20 }} containerStyle={{ marginTop: 20 }} - inputStyle={{ color: 'white', fontSize: 22 }} + inputStyle={{ color: 'grey', fontSize: 18 }} /> } + leftIcon={} onChangeText={t => setPassword(t)} - inputContainerStyle={{ borderBottomColor: 'white', marginLeft: 20, marginRight: 20 }} - inputStyle={{ color: 'white', fontSize: 22 }} + inputContainerStyle={{ borderBottomColor: 'grey', marginLeft: 20, marginRight: 20 }} + inputStyle={{ color: 'grey', fontSize: 18 }} />