diff --git a/Frontend/Animations/Easein.js b/Frontend/Animations/Easein.js index bc6b3c4..98bd43f 100644 --- a/Frontend/Animations/Easein.js +++ b/Frontend/Animations/Easein.js @@ -5,7 +5,7 @@ import {Animated} from 'react-native'; export default function Easein(props) { const fadeAnim = useRef(new Animated.Value(0)).current; // Initial value for opacity: 0 - React.useEffect(() => { + useEffect(() => { Animated.timing(fadeAnim, { toValue: 1, duration: 500, diff --git a/Frontend/Screens/Login.js b/Frontend/Screens/Login.js index 2de0bc3..efff83d 100644 --- a/Frontend/Screens/Login.js +++ b/Frontend/Screens/Login.js @@ -1,25 +1,17 @@ -/* eslint-disable react-native/no-inline-styles */ -/* eslint-disable prettier/prettier */ -import React, { useState } from 'react'; -import { - Image, - View, - Text, - StyleSheet, - ImageBackground, -} from 'react-native'; -import PlaceHolders from '../Components/PlaceHolders'; -import PasswordInput from '../Components/PasswordInput'; -import codeyLogo from '../assets/images/CodeyDark.png'; -import LoginButton from '../Components/Button.js'; -import { TouchableOpacity, ScrollView } from 'react-native-gesture-handler'; -import Oauth from '../Components/GoogleButton'; +import React from 'react'; +import { Dimensions, Image, ImageBackground, KeyboardAvoidingView, StyleSheet, Text } from 'react-native'; +import { ScrollView, TouchableOpacity } from 'react-native-gesture-handler'; +import Easein from '../Animations/Easein'; +import FadeInView from '../Animations/FadeIn'; +import Facebook from '../assets/icons/facebook.png'; import Google from '../assets/icons/G.png'; import Github from '../assets/icons/git.png'; -import Facebook from '../assets/icons/facebook.png'; +import CodeyLogo from '../assets/images/CodeyDark.png'; import TextHere from '../Components/--TextHere---'; -import Easein from '../Animations/Easein'; -import FadeInView from '../Animations/FadeIn'; +import LoginButton from '../Components/Button.js'; +import Oauth from '../Components/GoogleButton'; +import PasswordInput from '../Components/PasswordInput'; +import PlaceHolders from '../Components/PlaceHolders'; const styles = StyleSheet.create({ logo: { width: '70%', @@ -50,8 +42,10 @@ const styles = StyleSheet.create({ marginLeft: '10%', }, backgroundImage: { - width: '100%', - height: '100%', + width: Dimensions.get('window').width, + height: Dimensions.get('window').height, + zIndex: -1, + position: "absolute", }, entriesContainer: { borderWidth: 0, @@ -74,47 +68,49 @@ const styles = StyleSheet.create({ justifyContent: 'flex-start', }, }); -export default function login({ route, navigation }, props) { +export default function login({ navigation }) { return ( <> - - - - - - - - Login - - - navigation.navigate('Posts')} - /> - - - - - - - - - navigation.navigate('Register')}> - Don't Have An Account? - + + + + + + + + Login + + + navigation.navigate('Posts')} + /> + + + + + + + - - - + navigation.navigate('Register')}> + Don't Have An Account? + + + + + + ); } diff --git a/Frontend/Screens/Register.js b/Frontend/Screens/Register.js index 591e537..461e821 100644 --- a/Frontend/Screens/Register.js +++ b/Frontend/Screens/Register.js @@ -1,25 +1,30 @@ /* eslint-disable react-native/no-inline-styles */ import React from 'react'; import { - Image, - View, - Text, - StyleSheet, + Dimensions, Image, + + + ImageBackground, - TouchableOpacity, + + + KeyboardAvoidingView, StyleSheet, Text, + + + TouchableOpacity } from 'react-native'; -import PlaceHolders from '../Components/PlaceHolders'; -import PasswordInput from '../Components/PasswordInput'; -import codeyLogo from '../assets/images/CodeyDark.png'; -import LoginButton from '../Components/Button.js'; -import OAuth from '../Components/GoogleButton'; +import { ScrollView } from 'react-native-gesture-handler'; +import Easein from '../Animations/Easein'; +import FadeInView from '../Animations/FadeIn'; +import Facebook from '../assets/icons/facebook.png'; import Google from '../assets/icons/G.png'; import Github from '../assets/icons/git.png'; -import Facebook from '../assets/icons/facebook.png'; +import codeyLogo from '../assets/images/CodeyDark.png'; import TextHere from '../Components/--TextHere---'; -import {ScrollView} from 'react-native-gesture-handler'; -import FadeInView from '../Animations/FadeIn'; -import Easein from '../Animations/Easein'; +import LoginButton from '../Components/Button.js'; +import OAuth from '../Components/GoogleButton'; +import PasswordInput from '../Components/PasswordInput'; +import PlaceHolders from '../Components/PlaceHolders'; const styles = StyleSheet.create({ logo: { width: '70%', @@ -57,8 +62,10 @@ const styles = StyleSheet.create({ textAlign: 'center', }, backgroundImage: { - width: '100%', - height: '100%', + width: Dimensions.get('window').width, + height: Dimensions.get('window').height, + zIndex: -1, + position: "absolute", }, registerWithContainer: { marginLeft: 35, @@ -80,10 +87,8 @@ const styles = StyleSheet.create({ export default function login({navigation}) { return ( <> - - + + @@ -123,8 +128,10 @@ export default function login({navigation}) { - - + + ); } diff --git a/Frontend/Screens/import React, {Component} from 'react';.tsx b/Frontend/Screens/import React, {Component} from 'react';.tsx deleted file mode 100644 index 53f2146..0000000 --- a/Frontend/Screens/import React, {Component} from 'react';.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import React, {Component} from 'react'; -import { Platform, StyleSheet, Text, View, TouchableHighlight, Dimensions, Animated, PanResponder } from 'react-native'; - - -type Props = {}; -export default class App extends Component { - - componentWillMount(){ - - this.position = new Animated.ValueXY(0,0) - Animated.spring( this.position , { - toValue: { x: 300, y: 100 } - } ).start() - - } - - render() { - - return ( - - - - - - - ); - } -} - -const styles = StyleSheet.create({ - container: { - flex: 1, - backgroundColor: '#F5FCFF', - }, - square:{ - backgroundColor: '#000000', - height: 35, - width: 35, - position: 'absolute' - } - -}); \ No newline at end of file diff --git a/Frontend/yarn.lock b/Frontend/yarn.lock index 5ca110d..c160db5 100644 --- a/Frontend/yarn.lock +++ b/Frontend/yarn.lock @@ -3711,6 +3711,11 @@ inquirer@^7.0.0: strip-ansi "^6.0.0" through "^2.3.6" +install@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/install/-/install-0.13.0.tgz#6af6e9da9dd0987de2ab420f78e60d9c17260776" + integrity sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA== + invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"