diff --git a/LeftOvers/screens/CreateProfile.tsx b/LeftOvers/screens/CreateProfile.tsx index 6cdd97e..d77b825 100644 --- a/LeftOvers/screens/CreateProfile.tsx +++ b/LeftOvers/screens/CreateProfile.tsx @@ -1,11 +1,11 @@ import React from 'react'; import {StyleSheet, View, ScrollView, useWindowDimensions} from 'react-native'; -import ProfileModification from '../components/ProfileModification'; -import ValidateButton from '../components/ValidateButton'; -import TopBar from '../components/TopBar'; import { LinearGradient } from 'expo-linear-gradient'; import { SafeAreaProvider } from 'react-native-safe-area-context'; +import ProfileModification from '../components/ProfileModification'; +import ValidateButton from '../components/ValidateButton'; + export default function CreateProfile(props) { const all = [] const die = [{value: "Dairy free"}, {value: "Gluten free"}, {value: "Porkless"}, {value: "Vegan"}, {value: "Vegetarian"}, {value: "Pescatarian"}] diff --git a/LeftOvers/screens/FiltersSelection.tsx b/LeftOvers/screens/FiltersSelection.tsx index 642f92c..e83a329 100644 --- a/LeftOvers/screens/FiltersSelection.tsx +++ b/LeftOvers/screens/FiltersSelection.tsx @@ -1,13 +1,13 @@ import React from 'react'; import {StyleSheet, View, Text, ScrollView, useWindowDimensions} from 'react-native'; -import ProfileModification from '../components/ProfileModification'; +import {LinearGradient} from 'expo-linear-gradient'; +import {SafeAreaProvider} from 'react-native-safe-area-context'; + import ValidateButton from '../components/ValidateButton'; import TopBar from '../components/TopBar'; import ListSelect from '../components/ListSelect'; import ListWithoutSelect from '../components/ListWithoutSelect'; import ProfileSelection from '../components/ProfileSelection'; -import {LinearGradient} from 'expo-linear-gradient'; -import {SafeAreaProvider} from 'react-native-safe-area-context'; export default function FiltersSelection(props) { const profiles = [ @@ -55,7 +55,7 @@ export default function FiltersSelection(props) { - + console.log("change selected profile")}> @@ -76,10 +76,10 @@ export default function FiltersSelection(props) { - + console.log("add allergy")}> - + console.log("save filters")}> diff --git a/LeftOvers/screens/IngredientSelection.tsx b/LeftOvers/screens/IngredientSelection.tsx index 5ddc0bd..3b90812 100644 --- a/LeftOvers/screens/IngredientSelection.tsx +++ b/LeftOvers/screens/IngredientSelection.tsx @@ -1,11 +1,11 @@ import React from 'react'; import {View, StyleSheet, Text, Image, Pressable, ScrollView} from 'react-native'; import {SafeAreaProvider} from 'react-native-safe-area-context'; -import TopBar from '../components/TopBar'; import {Searchbar} from 'react-native-paper'; -import brochette from '../assets/images/brochette.png'; + import FoodElementText from '../components/FoodElementText'; import CustomButton from '../components/CustomButton'; + import plus from '../assets/images/plus.png'; import moins from '../assets/images/minus.png'; import meat from '../assets/images/meat_icon.png'; @@ -41,7 +41,6 @@ const ChooseItem = ({value}: ItemProps) => ( return ( - diff --git a/LeftOvers/screens/ModifyProfile.tsx b/LeftOvers/screens/ModifyProfile.tsx index 1272356..282c582 100644 --- a/LeftOvers/screens/ModifyProfile.tsx +++ b/LeftOvers/screens/ModifyProfile.tsx @@ -1,11 +1,11 @@ import React from 'react'; import {StyleSheet, View, ScrollView, useWindowDimensions} from 'react-native'; -import ProfileModification from '../components/ProfileModification'; -import ValidateButton from '../components/ValidateButton'; -import TopBar from '../components/TopBar'; import { LinearGradient } from 'expo-linear-gradient'; import { SafeAreaProvider } from 'react-native-safe-area-context'; +import ProfileModification from '../components/ProfileModification'; +import ValidateButton from '../components/ValidateButton'; + export default function ModifyProfile(props) { const all = [{value: "Mussels"}, {value: "Skimmed Milk"}, {value: "Nuts"}] const die = [{value: "Dairy free"}, {value: "Gluten free"}, {value: "Porkless"}, {value: "Vegan"}, {value: "Vegetarian"}, {value: "Pescatarian"}] diff --git a/LeftOvers/screens/RecipeDetails.tsx b/LeftOvers/screens/RecipeDetails.tsx index 6412252..fbe5a74 100644 --- a/LeftOvers/screens/RecipeDetails.tsx +++ b/LeftOvers/screens/RecipeDetails.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { View, StyleSheet, Text} from 'react-native'; import { SafeAreaProvider } from 'react-native-safe-area-context'; -import TopBar from '../components/TopBar'; + import RecipeElementReduce from '../components/RecipeElementReduce'; import AllergiesTab from '../components/AllergiesTab'; @@ -9,7 +9,6 @@ import AllergiesTab from '../components/AllergiesTab'; export default function RecipeDetails(props) { return ( -