diff --git a/src/FLAD/assets/icons/icons/Spotify.png b/src/FLAD/assets/icons/icons/Spotify.png new file mode 100644 index 0000000..011863b Binary files /dev/null and b/src/FLAD/assets/icons/icons/Spotify.png differ diff --git a/src/FLAD/assets/icons/icons/User.png b/src/FLAD/assets/icons/icons/User.png index d90f31a..48d70b0 100644 Binary files a/src/FLAD/assets/icons/icons/User.png and b/src/FLAD/assets/icons/icons/User.png differ diff --git a/src/FLAD/assets/icons/icons/next.png b/src/FLAD/assets/icons/icons/next.png new file mode 100644 index 0000000..2583f38 Binary files /dev/null and b/src/FLAD/assets/icons/icons/next.png differ diff --git a/src/FLAD/components/NextButton.tsx b/src/FLAD/components/NextButton.tsx index 87f7388..f0c6c9a 100644 --- a/src/FLAD/components/NextButton.tsx +++ b/src/FLAD/components/NextButton.tsx @@ -75,8 +75,7 @@ const styles = StyleSheet.create({ container: { flex: 1, justifyContent: 'center', - alignItems: 'center', - marginTop: -70 + alignItems: 'center' }, button: { position: 'absolute', diff --git a/src/FLAD/components/Onboarding.tsx b/src/FLAD/components/Onboarding.tsx index 6faa8ea..ead6b94 100644 --- a/src/FLAD/components/Onboarding.tsx +++ b/src/FLAD/components/Onboarding.tsx @@ -34,7 +34,7 @@ export default function Onboarding() { return ( - + } @@ -50,33 +50,33 @@ export default function Onboarding() { onViewableItemsChanged={viewableItemsChanged} viewabilityConfig={viewConfig} ref={slidesRef} - /> - - + /> - - v2.0 - - - - - - - - {handleModal(); navigation.navigate('Login');}}> - CONTINUER AVEC SPOTIFY - - - S’INSCRIRE MAINTENANT - - {handleModal(); navigation.navigate('Login');}}> - SE CONNECTER - + + + v2.0 + + + + + + + + {handleModal(); navigation.navigate('Login');}}> + CONTINUER AVEC SPOTIFY + + {handleModal(); navigation.navigate('Inscription');}}> + S’INSCRIRE MAINTENANT + + {handleModal(); navigation.navigate('Login');}}> + SE CONNECTER + + @@ -94,15 +94,13 @@ const styles = StyleSheet.create({ imageLogo: { width: 280, height: 140, - position: 'absolute', - top: 150, - right: 60 + marginBottom: 100 }, balise: { flex: 1, justifyContent: 'center', alignItems: 'center', - marginTop: -130 + marginBottom: 50 }, closeButtonCircle: { backgroundColor: 'gray', @@ -123,6 +121,11 @@ const styles = StyleSheet.create({ right: '-5%', height: '100%', }, + modalView: { + flex: 1, + justifyContent: 'center', + alignItems: 'center' + }, backgroundImage: { flex: 1, width: '100%', @@ -143,28 +146,24 @@ const styles = StyleSheet.create({ buttonConnection: { width: 262, height: 57, - position: 'absolute', - top: 350, - right: 70, justifyContent: 'center', alignItems: 'center', backgroundColor: '#24CF5F', borderRadius: 11, borderColor: '#68F097', - borderWidth: 1 + borderWidth: 1, + marginBottom: 12 }, buttonInscription: { width: 262, height: 57, - position: 'absolute', - top: 420, - right: 70, justifyContent: 'center', alignItems: 'center', backgroundColor: '#951DDE', borderRadius: 11, borderColor: '#C656ED', - borderWidth: 1 + borderWidth: 1, + marginBottom: 220 }, text: { fontWeight: 'bold', diff --git a/src/FLAD/components/OnboardingItem.tsx b/src/FLAD/components/OnboardingItem.tsx index 1f4203a..e130da0 100644 --- a/src/FLAD/components/OnboardingItem.tsx +++ b/src/FLAD/components/OnboardingItem.tsx @@ -10,10 +10,9 @@ export default function Onboarding({ item }) { - {item.title} {item.description} - + ); diff --git a/src/FLAD/navigation/StartNavigation.tsx b/src/FLAD/navigation/StartNavigation.tsx index 9676d2f..ee07e8c 100644 --- a/src/FLAD/navigation/StartNavigation.tsx +++ b/src/FLAD/navigation/StartNavigation.tsx @@ -1,5 +1,6 @@ import React, {Component} from 'react'; import LoginPage from '../screens/loginPage'; +import InscriptionPage from '../screens/InscriptionPage'; import Onboarding from '../components/Onboarding'; import { createStackNavigator } from '@react-navigation/stack'; import { NavigationContainer } from '@react-navigation/native'; @@ -19,6 +20,11 @@ export default function StartNavigation() { component={LoginPage} options={{ headerShown: false }} /> + diff --git a/src/FLAD/package.json b/src/FLAD/package.json index 0a6884b..90f6178 100644 --- a/src/FLAD/package.json +++ b/src/FLAD/package.json @@ -31,7 +31,7 @@ "react-native-reanimated": "~2.12.0", "react-native-safe-area-context": "^4.4.1", "react-native-screens": "~3.18.0", - "react-native-svg": "^13.8.0", + "react-native-svg": "13.4.0", "react-native-vector-icons": "^9.2.0", "react-native-web": "~0.18.9", "rive-react-native": "^3.0.41" diff --git a/src/FLAD/screens/InscriptionPage.tsx b/src/FLAD/screens/InscriptionPage.tsx new file mode 100644 index 0000000..ef2fb15 --- /dev/null +++ b/src/FLAD/screens/InscriptionPage.tsx @@ -0,0 +1,163 @@ +import React, {Component, useState } from 'react'; +import { View, Image, StyleSheet, Text, ImageBackground, Button, TextInput, TouchableWithoutFeedback, Keyboard, TouchableOpacity } from 'react-native'; +import {useNavigation} from "@react-navigation/native"; + +const DismissKeyboard = ({ children }) => ( + Keyboard.dismiss()}> + {children} + +) + +export default function InscriptionPage() { + const [rememberMe, setRememberMe] = useState(false); + const navigation = useNavigation(); + + const toggleRememberMe = () => { + setRememberMe(!rememberMe); + } + + return ( + + + + + v2.0 + + + S'INSCRIRE + + + + + + + + + + + + + + Lier compte + + + console.log("Oui")}> + + + + Tu as déjà un compte? + navigation.navigate('Login')}> + Se connecter + + + + + + ) +} + +const styles = StyleSheet.create ({ + container: { + flex: 1 + }, + containerInput: { + justifyContent: 'center' + }, + image: { + flex: 1, + justifyContent: 'center', + }, + imageLogo: { + width: 280, + height: 140, + alignSelf: 'center', + marginBottom: 50, + marginTop: -20 + }, + button: { + marginTop: 40, + flexDirection: 'row', + alignItems: 'center', + justifyContent: 'center', + alignSelf: 'center', + backgroundColor: 'white', + width: 86, + height: 86, + borderRadius: 21 + }, + buttonImage: { + width: 40, + height: 40 + }, + versionText: { + position: 'absolute', + top: 40, + right: 20, + color: 'gray', + fontWeight: 'bold', + fontSize: 15 + }, + text: { + fontWeight: 'bold', + fontSize: 25, + alignSelf: 'center', + color: 'white', + marginBottom: 15 + }, + textIntoButton: { + fontWeight: 'bold', + fontSize: 15, + color: 'white', + marginRight: 10 + }, + shadow: { + shadowColor: '#000', + shadowOffset: { + width: 2, + height: 3, + }, + shadowOpacity: 0.50, + shadowRadius: 3.84, + }, + input: { + width: 300, + height: 42, + borderRadius: 30, + color: 'black', + backgroundColor: 'white', + fontSize: 15, + alignSelf: 'center', + marginBottom: 20, + paddingLeft: 50, + paddingRight: 20 + }, + iconUser : { + position: 'absolute', + width: 20, + height: 20, + left: '17%', + bottom: '50%' + }, + iconLock : { + position: 'absolute', + width: 20, + height: 20, + left: '17%', + bottom: '50%' + }, + inscriptionText: { + flexDirection: 'row', + alignSelf: 'center', + bottom: -80 + }, + buttonSpotify: { + width: 300, + height: 42, + backgroundColor: '#24CF5F', + justifyContent: 'center', + alignItems: 'center', + alignSelf: 'center', + borderRadius: 30, + flexDirection: 'row' + } +}) \ No newline at end of file diff --git a/src/FLAD/screens/loginPage.tsx b/src/FLAD/screens/loginPage.tsx index 5682986..d04d7b9 100644 --- a/src/FLAD/screens/loginPage.tsx +++ b/src/FLAD/screens/loginPage.tsx @@ -1,6 +1,6 @@ import React, {Component, useState } from 'react'; import { View, Image, StyleSheet, Text, ImageBackground, Button, TextInput, TouchableWithoutFeedback, Keyboard, TouchableOpacity } from 'react-native'; -import { TouchableHighlight } from 'react-native-gesture-handler'; +import {useNavigation} from "@react-navigation/native"; const DismissKeyboard = ({ children }) => ( Keyboard.dismiss()}> @@ -10,6 +10,7 @@ const DismissKeyboard = ({ children }) => ( export default function loginPage() { const [rememberMe, setRememberMe] = useState(false); + const navigation = useNavigation(); const toggleRememberMe = () => { setRememberMe(!rememberMe); @@ -17,30 +18,36 @@ export default function loginPage() { return ( - - - - v2.0 - - - SE CONNECTER - - - - - - - SE SOUVENIR DE MOI - - console.log("Oui")}> - - - - Tu n'as pas de compte? - S'inscrire - - - + + + + v2.0 + + + SE CONNECTER + + + + + + + + + + + SE SOUVENIR DE MOI + + console.log("Oui")}> + + + + Tu n'as pas de compte? + navigation.navigate('Inscription')}> + S'inscrire + + + + ) } @@ -51,6 +58,10 @@ const styles = StyleSheet.create ({ container: { flex: 1, }, + containerInput: { + justifyContent: 'center', + alignItems: 'flex-start', + }, image: { flex: 1, justifyContent: 'center', @@ -76,6 +87,20 @@ const styles = StyleSheet.create ({ width: 40, height: 40 }, + iconUser : { + position: 'absolute', + width: 20, + height: 20, + left: '17%', + bottom: '50%' + }, + iconLock : { + position: 'absolute', + width: 20, + height: 20, + left: '17%', + bottom: '50%' + }, input: { width: 300, height: 42, @@ -85,7 +110,7 @@ const styles = StyleSheet.create ({ fontSize: 15, alignSelf: 'center', marginBottom: 20, - paddingLeft: 20, + paddingLeft: 50, paddingRight: 20 }, text: {