diff --git a/src/FLAD/App.tsx b/src/FLAD/App.tsx index 1a25a6d..9f2df37 100644 --- a/src/FLAD/App.tsx +++ b/src/FLAD/App.tsx @@ -8,9 +8,6 @@ import { NavigationContainer } from '@react-navigation/native'; import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; import { Animated, Dimensions, ImageBackground, StyleSheet, Text, View } from 'react-native'; import Card from './components/Card'; -import Login from './pages/login'; -import Spot from './pages/spot'; - export default function App() { diff --git a/src/FLAD/assets/icons/Logo_White_Flad.png b/src/FLAD/assets/icons/Logo_White_Flad.png new file mode 100644 index 0000000..69e55ab Binary files /dev/null and b/src/FLAD/assets/icons/Logo_White_Flad.png differ diff --git a/src/FLAD/assets/images/Background.png b/src/FLAD/assets/images/Background.png new file mode 100644 index 0000000..af7021a Binary files /dev/null and b/src/FLAD/assets/images/Background.png differ diff --git a/src/FLAD/assets/images/Background_Start_Page.png b/src/FLAD/assets/images/Background_Start_Page.png new file mode 100644 index 0000000..09e30f1 Binary files /dev/null and b/src/FLAD/assets/images/Background_Start_Page.png differ diff --git a/src/FLAD/components/CardMusic.tsx b/src/FLAD/components/CardMusic.tsx index 833cd28..68563fb 100644 --- a/src/FLAD/components/CardMusic.tsx +++ b/src/FLAD/components/CardMusic.tsx @@ -8,53 +8,53 @@ type CustomCardMusic = { //Props } export default function CardMusic(CBP: CustomCardMusic) { - const source = typeof CBP.image === 'string' ? { uri: CBP.image } : CBP.image; - return ( - - - - - - {CBP.title} - {CBP.description} - - - ); - } - - const styles = StyleSheet.create({ - container: { - flexDirection: 'row', - alignItems: 'center', - justifyContent: 'space-between', - margin: 20 - }, - imageContainer: { - width: 80, - height: 80, - alignItems: 'center', - justifyContent: 'center', - marginRight: 20 - }, - image: { - width: '100%', - height: '100%', - borderRadius: 10 + const source = typeof CBP.image === 'string' ? { uri: CBP.image } : CBP.image; + return ( + + + + + + {CBP.title} + {CBP.description} + + + ); +} - }, - textContainer: { - flex: 1, - alignItems: 'flex-start', - justifyContent: 'center', - }, - title: { - fontWeight: 'bold', - color: 'white', - fontSize: 20, - marginBottom: 10 - }, - description: { - color: 'white', - fontSize: 16 - } - }); \ No newline at end of file +const styles = StyleSheet.create({ + container: { + flexDirection: 'row', + alignItems: 'center', + justifyContent: 'space-between', + margin: 20 + }, + imageContainer: { + width: 80, + height: 80, + alignItems: 'center', + justifyContent: 'center', + marginRight: 20 + }, + image: { + width: '100%', + height: '100%', + borderRadius: 10 + + }, + textContainer: { + flex: 1, + alignItems: 'flex-start', + justifyContent: 'center', + }, + title: { + fontWeight: 'bold', + color: 'white', + fontSize: 20, + marginBottom: 10 + }, + description: { + color: 'white', + fontSize: 16 + } +}); \ No newline at end of file diff --git a/src/FLAD/navigation/Navigation.tsx b/src/FLAD/navigation/Navigation.tsx index b53d1bc..ee9a0e9 100644 --- a/src/FLAD/navigation/Navigation.tsx +++ b/src/FLAD/navigation/Navigation.tsx @@ -2,6 +2,7 @@ import React, {Component} from 'react'; import { NavigationContainer } from '@react-navigation/native'; import Home from '../screens/spot'; import FavoritePage from '../screens/favoritePage'; +import LoginPage from '../screens/loginPage'; import { createStackNavigator } from '@react-navigation/stack'; import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; @@ -20,7 +21,7 @@ export default function StackNavigation() { /> + + + Se connecter + + {/* */} + + + + ) +} + +const styles = StyleSheet.create ({ + container: { + flex: 1, + }, + image: { + flex: 1, + justifyContent: 'center', + }, + imageLogo: { + width: 200, + height: 100, + alignSelf: 'center', + marginTop: 50 + }, + input: { + width: 300, + height: 30, + borderRadius: 10, + color: 'black', + backgroundColor: 'white', + fontSize: 10, + alignSelf: 'center' + + }, + text: { + fontWeight: 'bold', + fontSize: 20, + alignSelf: 'center', + color: 'white' + } +}) \ No newline at end of file