diff --git a/App.js b/App.js index 882ef8a..e96daf1 100644 --- a/App.js +++ b/App.js @@ -1,6 +1,6 @@ import { StatusBar } from 'expo-status-bar'; import React, { useEffect, useState } from 'react'; -import { StyleSheet, Text, View, TextInput } from 'react-native'; +import { StyleSheet, Text, View, TextInput, SafeAreaView } from 'react-native'; import API from './API.js'; import LoginForm from './components/Login.js'; import Feed from './components/Feed.js'; @@ -14,12 +14,12 @@ export default function App() { }, []); return ( - + EMI Social LOGO {!isLoggedIn && } {isLoggedIn && } - + ); } @@ -29,5 +29,6 @@ const styles = StyleSheet.create({ backgroundColor: '#fff', alignItems: 'center', justifyContent: 'center', + marginTop: 30, }, }); diff --git a/components/Feed.js b/components/Feed.js index 3d7af95..1a9daf6 100644 --- a/components/Feed.js +++ b/components/Feed.js @@ -1,7 +1,8 @@ import { StatusBar } from 'expo-status-bar'; import React, { useState, useEffect } from 'react'; -import { Text, View, ScrollView, Button } from 'react-native'; +import { Text, View, ScrollView, Button, StyleSheet } from 'react-native'; import API from './../API.js'; +import Post from './Post.js' let Feed = () => { @@ -11,18 +12,18 @@ let Feed = () => { let r = await API.getMe(); setMeProfile(r); let posts = await API.getPosts(); - setPosts(posts) + setPosts(posts); //console.log(posts) }, []); return ( - Hello: {Me.profile && Me.profile.firstName} {Me.profile && Me.profile.lastName} { Posts.map((post, i) => { return ( - {post.content} + //{post.content} + ) }) } diff --git a/components/Login.js b/components/Login.js index a088e00..17bf6b7 100644 --- a/components/Login.js +++ b/components/Login.js @@ -1,6 +1,6 @@ import { StatusBar } from 'expo-status-bar'; import React, { useState } from 'react'; -import { Text, View, TextInput, Button } from 'react-native'; +import { Text, View, TextInput, Button, StyleSheet } from 'react-native'; import API from './../API.js'; @@ -9,31 +9,27 @@ let LoginForm = ()=>{ let [password, setPassword] = useState(''); return ( - - Log in + + Log in setEmail(text)} defaultValue={email} placeholder=" email" + autoCapitalize='none' + autoComplete='email' + autoCorrect={false} /> setPassword(text)} defaultValue={password} placeholder=" password" textContentType="password" secureTextEntry={true} + autoCapitalize='none' + autoComplete='email' + autoCorrect={false} />