diff --git a/Images/Screens/Black/createProfil.jpg b/Images/Screens/Black/createProfil.jpg new file mode 100644 index 0000000..4e60ab9 Binary files /dev/null and b/Images/Screens/Black/createProfil.jpg differ diff --git a/Images/Screens/Black/home.jpg b/Images/Screens/Black/home.jpg new file mode 100644 index 0000000..1dd925a Binary files /dev/null and b/Images/Screens/Black/home.jpg differ diff --git a/Images/Screens/Black/ingredientSelection.jpg b/Images/Screens/Black/ingredientSelection.jpg new file mode 100644 index 0000000..17d1803 Binary files /dev/null and b/Images/Screens/Black/ingredientSelection.jpg differ diff --git a/Images/Screens/Black/profil.jpg b/Images/Screens/Black/profil.jpg new file mode 100644 index 0000000..c4c8efe Binary files /dev/null and b/Images/Screens/Black/profil.jpg differ diff --git a/Images/Screens/Black/recipeDetail.jpg b/Images/Screens/Black/recipeDetail.jpg new file mode 100644 index 0000000..69b9879 Binary files /dev/null and b/Images/Screens/Black/recipeDetail.jpg differ diff --git a/Images/Screens/Black/recipeSuggestion.jpg b/Images/Screens/Black/recipeSuggestion.jpg new file mode 100644 index 0000000..e57e38a Binary files /dev/null and b/Images/Screens/Black/recipeSuggestion.jpg differ diff --git a/Images/Screens/White/home.jpg b/Images/Screens/White/home.jpg new file mode 100644 index 0000000..fcec524 Binary files /dev/null and b/Images/Screens/White/home.jpg differ diff --git a/Images/Screens/White/ingredientSelection.jpg b/Images/Screens/White/ingredientSelection.jpg new file mode 100644 index 0000000..4c6ab27 Binary files /dev/null and b/Images/Screens/White/ingredientSelection.jpg differ diff --git a/Images/Screens/White/modifyProfil.jpg b/Images/Screens/White/modifyProfil.jpg new file mode 100644 index 0000000..e87da4d Binary files /dev/null and b/Images/Screens/White/modifyProfil.jpg differ diff --git a/Images/Screens/White/profil.jpg b/Images/Screens/White/profil.jpg new file mode 100644 index 0000000..6d2d19b Binary files /dev/null and b/Images/Screens/White/profil.jpg differ diff --git a/Images/Screens/White/recipeDetail.jpg b/Images/Screens/White/recipeDetail.jpg new file mode 100644 index 0000000..e44266a Binary files /dev/null and b/Images/Screens/White/recipeDetail.jpg differ diff --git a/Images/Screens/White/recipeSuggestion.jpg b/Images/Screens/White/recipeSuggestion.jpg new file mode 100644 index 0000000..66aebbc Binary files /dev/null and b/Images/Screens/White/recipeSuggestion.jpg differ diff --git a/LeftOvers/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver b/LeftOvers/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver deleted file mode 100644 index ba627ca..0000000 --- a/LeftOvers/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver +++ /dev/null @@ -1 +0,0 @@ -1023.922.9182.0 \ No newline at end of file diff --git a/LeftOvers/assets/images/fruit.png b/LeftOvers/assets/images/fruit.png new file mode 100644 index 0000000..20a56f3 Binary files /dev/null and b/LeftOvers/assets/images/fruit.png differ diff --git a/LeftOvers/assets/images/fruitcake.png b/LeftOvers/assets/images/fruitcake.png new file mode 100644 index 0000000..271bd51 Binary files /dev/null and b/LeftOvers/assets/images/fruitcake.png differ diff --git a/LeftOvers/components/RecipeElement.tsx b/LeftOvers/components/RecipeElement.tsx index bf8ffcf..a5ca952 100644 --- a/LeftOvers/components/RecipeElement.tsx +++ b/LeftOvers/components/RecipeElement.tsx @@ -1,5 +1,5 @@ -import React, {useContext} from 'react'; -import {StyleSheet, Pressable, Text, View, Image, ScrollView} from 'react-native'; +import React, {useContext, useState} from 'react'; +import {StyleSheet, Pressable, Text, View, Image, ScrollView, ImageSourcePropType} from 'react-native'; import brochette from '../assets/images/brochette.png'; import Union_left from '../assets/images/Union_left.png'; import Union_right from '../assets/images/Union_right.png'; @@ -22,6 +22,8 @@ import riceFish from '../assets/images/rice_fish.png'; import riceEgg from '../assets/images/riceEgg.png'; import pasta from '../assets/images/pasta.png'; import ColorContext from '../theme/ColorContext'; +import fruit from '../assets/images/fruit.png'; +import fruitCake from '../assets/images/fruitcake.png'; import Recipes from '../Models/Recipes'; @@ -44,13 +46,25 @@ function convertToHoursMinutes(totalMinutes: number): string { export default function RecipeElement(props: RecipeElementProps) { const {colors} = useContext(ColorContext) - const meatDictionary: string[] = ["beef", "chicken", "turkey", "steak", "rabbit", "duck"] - const porkDictionary: string[] = ["pork", "lardon", "bacon", "ham"] + const meatDictionary: string[] = ["beef", "chicken", "turkey", "steak", "rabbit", "duck", "horse"] + const porkDictionary: string[] = ["pork", "lardon", "bacon", "ham", "pig"] const fishDictionary: string[] = ["tuna", "whiting", "mullet", "sardine", "mackerel", "salmon", "monkfish", "conger", "bass", "cod", "hake"] const vegetablesDictionary: string[] = ["vegan", "vegetarian", "lentil", "artichoke", "aubergine", "beet", "chard", "broccoli", "carrot", "celery", "cabbage", "cauliflower", "zucchini", "spinach", "fennel", "curly", "bean", "lettuce", "apple", "corn", "onion", "parsnips", "leek", "pepper", "potato", "pumpkin", "radish", "scarole", "tomato"] - const riceDictionary: string[] = ["ric", "quinoa"] + const fruitDictionnary: string[] = [ + "fruit", + "berries", + "apple", + "banana", + "orange", + "grapes", + "strawberry", + "pineapple", + "watermelon", + "kiwi" + ]; + const riceDictionary: string[] = ["rice", "quinoa"] const eggDictionary: string[] = ["egg", "omelette"]; - const soupDictionary: string[] = ["soup"]; + const soupDictionary: string[] = ["soup", "ragout"]; const pizzaDictionary: string[] = ["pizza"]; const dessertDictionary: string[] = ['cake', 'cupcake', 'muffin', 'cookie', 'brownie', 'pie', 'tart', 'macaron', 'doughnut', 'eclair', 'pancake', 'waffle', 'crepe', 'pudding', 'gelato', 'sorbet', 'ice cream', 'cheesecake', 'sugar']; const pastaDictionary: string[] = [ @@ -83,6 +97,7 @@ export default function RecipeElement(props: RecipeElementProps) { soup : soupDictionary, dessert : dessertDictionary, pasta : pastaDictionary, + fruit : fruitDictionnary, unknown: [], }; @@ -99,6 +114,7 @@ export default function RecipeElement(props: RecipeElementProps) { soupMeat: ['soup', 'meat'], soupVeggie: ['soup', 'vegetables'], soupFish: ['soup', 'fish'], + fruitDessert: ['fruit', 'dessert'] }; if(categories.length == 1){ @@ -168,6 +184,10 @@ export default function RecipeElement(props: RecipeElementProps) { return soupMeat; case 'soupFish': return soupFish; + case 'fruitDessert': + return fruitCake; + case 'fruit': + return fruit; default: return inconnu; } @@ -255,7 +275,7 @@ export default function RecipeElement(props: RecipeElementProps) { Description - + {props.recipe.description} @@ -263,5 +283,7 @@ export default function RecipeElement(props: RecipeElementProps) { {convertToHoursMinutes(props.recipe.time_to_cook)} - ); + ); + + } \ No newline at end of file diff --git a/LeftOvers/screens/RecipeDetails.tsx b/LeftOvers/screens/RecipeDetails.tsx index 553584c..838fcff 100644 --- a/LeftOvers/screens/RecipeDetails.tsx +++ b/LeftOvers/screens/RecipeDetails.tsx @@ -26,6 +26,8 @@ import riceFish from '../assets/images/rice_fish.png'; import riceEgg from '../assets/images/riceEgg.png'; import brochette from '../assets/images/brochette.png'; import pasta from '../assets/images/pasta.png'; +import fruit from '../assets/images/fruit.png'; +import fruitCake from '../assets/images/fruitcake.png'; @@ -41,13 +43,25 @@ export default function RecipeDetails({ route }) { const { recipeId } = route.params; - const meatDictionary: string[] = ["beef", "chicken", "turkey", "steak", "rabbit", "duck"] - const porkDictionary: string[] = ["pork", "lardon", "bacon", "ham"] + const meatDictionary: string[] = ["beef", "chicken", "turkey", "steak", "rabbit", "duck", "horse"] + const porkDictionary: string[] = ["pork", "lardon", "bacon", "ham", "pig"] const fishDictionary: string[] = ["tuna", "whiting", "mullet", "sardine", "mackerel", "salmon", "monkfish", "conger", "bass", "cod", "hake"] const vegetablesDictionary: string[] = ["vegan", "vegetarian", "lentil", "artichoke", "aubergine", "beet", "chard", "broccoli", "carrot", "celery", "cabbage", "cauliflower", "zucchini", "spinach", "fennel", "curly", "bean", "lettuce", "apple", "corn", "onion", "parsnips", "leek", "pepper", "potato", "pumpkin", "radish", "scarole", "tomato"] - const riceDictionary: string[] = ["ric", "quinoa"] + const fruitDictionnary: string[] = [ + "fruit", + "berries", + "apple", + "banana", + "orange", + "grapes", + "strawberry", + "pineapple", + "watermelon", + "kiwi" + ]; + const riceDictionary: string[] = ["rice", "quinoa"] const eggDictionary: string[] = ["egg", "omelette"]; - const soupDictionary: string[] = ["soup"]; + const soupDictionary: string[] = ["soup", "ragout"]; const pizzaDictionary: string[] = ["pizza"]; const dessertDictionary: string[] = ['cake', 'cupcake', 'muffin', 'cookie', 'brownie', 'pie', 'tart', 'macaron', 'doughnut', 'eclair', 'pancake', 'waffle', 'crepe', 'pudding', 'gelato', 'sorbet', 'ice cream', 'cheesecake', 'sugar']; const pastaDictionary: string[] = [ @@ -80,6 +94,7 @@ export default function RecipeDetails({ route }) { soup : soupDictionary, dessert : dessertDictionary, pasta : pastaDictionary, + fruit : fruitDictionnary, unknown: [], }; @@ -96,6 +111,7 @@ export default function RecipeDetails({ route }) { soupMeat: ['soup', 'meat'], soupVeggie: ['soup', 'vegetables'], soupFish: ['soup', 'fish'], + fruitDessert: ['fruit', 'dessert'] }; if(categories.length == 1){ @@ -165,6 +181,10 @@ export default function RecipeDetails({ route }) { return soupMeat; case 'soupFish': return soupFish; + case 'fruitDessert': + return fruitCake; + case 'fruit': + return fruit; default: return inconnu; } diff --git a/README.md b/README.md index 4bfad80..f5ae8e9 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,60 @@
-![Image de l'application](Images/LeftOvers_Logo.jpg) +Application image
-**Nom de l’application** : LeftOvers :pizza: +**Name of the application** : LeftOvers :pizza:
-**Thème de l’application** : Trouver des recettes faisables avec les ingredients à disposition. +**Thème de l’application** : Suggest recipes with available ingredients.
-**Récapitulation de notre application** : 👇 +**What is the application doing?** : 👇
-:information_source: Une application mobile (Ios/Android), dans lequel les utilisateurs pourront choisir des aliments et l'application leur fournira une liste de recette adaptée. +:information_source: A mobile application (IOS/Android) that enables users to choose ingredients in order to cook. The app will return a list of adapted recipes. -# Répartition du Repository Git +# Git Repository Repartition -La racine de notre repo est composée de deux dossiers essentiels au projet: +The Git root is made of two majors repositories for the project: -[**LeftOvers**](LeftOvers) : **Toute la partie codage de l'application mobile** +[**LeftOvers**](LeftOvers) : **The code part of the application** -[**Images**](Images) : **Images de l'application** +[**Images**](Images) : **Application's Images** -👉 [**Solution de l'application**](LeftOvers/App.tsx) +👉 [**Application's solution**](LeftOvers/App.tsx) -# Fonctionnement +# How it works? -# Environnement de Travail +# Application's Visual Chart -Support de l'application : + ## Light Theme + +
+ Home + Profiles + CreateProfile
+ IngredientSelection + RecipeSuggestion + RecipeDetails +
+ + ## Dark Theme + +
+ Home + Profiles + CreateProfile
+ IngredientSelection + RecipeSuggestion + RecipeDetails +
+ +# Working Environment + +Application's Support :
@@ -42,7 +66,7 @@ Support de l'application :
-Technologies utilisées : +Technologies Used :
@@ -66,7 +90,7 @@ IDE :
-Moyen de communication : +How do we communicate? :
@@ -92,16 +116,16 @@ Design : -# Technicien en charge de l'application +# Application Developers and Admins -La composition pour le projet se voit réaliser par trois élèves de l'IUT d'Aubière: +The team of the project is composed by three students from the Aubière's IUT in Computer Science:
⚙️ Louison PARANT
-⚙️ Rayhan HASSOU +⚙️ Rayhân HASSOU
⚙️ Remi REGNAULT
-© FI Groupe 2 +© FI Group 2
\ No newline at end of file