Merge branch 'master' into WORK-RRE

WORK-RRE
Rémi REGNAULT 1 year ago
commit d4cd47e9b2

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 267 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 309 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 385 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 KiB

@ -105,7 +105,6 @@ export default function RecipeElement(props: RecipeElementProps) {
return categories[0]; return categories[0];
} }
console.log("LA LISTE DES CATEGORY : " + categories)
let bestMatch = { category: '', similarity: 0 }; let bestMatch = { category: '', similarity: 0 };
for (const [name, categoriesList] of Object.entries(categoryMappings)) { for (const [name, categoriesList] of Object.entries(categoryMappings)) {
@ -122,20 +121,15 @@ export default function RecipeElement(props: RecipeElementProps) {
function getImageForRecipe(recipeName: string) { function getImageForRecipe(recipeName: string) {
const categories = []; const categories = [];
console.log("NAAAAAME : " + recipeName)
for (const [category, words] of Object.entries(imagesDictionary)) { for (const [category, words] of Object.entries(imagesDictionary)) {
const matchedWords = words.filter((word) => recipeName.toLowerCase().includes(word)); const matchedWords = words.filter((word) => recipeName.toLowerCase().includes(word));
console.log("Matched Word : " + matchedWords)
if (matchedWords.length > 0) { if (matchedWords.length > 0) {
categories.push(category); categories.push(category);
console.log(category)
} }
} }
console.log("ON ENTRE DANS LA 2EME FONCTION");
const categoryName = getCategoryFromList(categories); const categoryName = getCategoryFromList(categories);
console.log("CategoryName à la fin : " + categoryName);
switch (categoryName) { switch (categoryName) {
case 'meat': case 'meat':

@ -1,36 +1,60 @@
<div align = center> <div align = center>
![Image de l'application](Images/LeftOvers_Logo.jpg) <img src="Images/LeftOvers_Logo.jpg" alt="Application image" height="300" />
</div> </div>
**Nom de lapplication** : LeftOvers :pizza: **Name of the application** : LeftOvers :pizza:
</br> </br>
**Thème de lapplication** : Trouver des recettes faisables avec les ingredients à disposition. **Thème de lapplication** : Suggest recipes with available ingredients.
</br> </br>
**Récapitulation de notre application** : 👇 **What is the application doing?** : 👇
</br> </br>
: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
<div align = center>
<img src="Images/Screens/White/home.jpg" alt="Home" height="300" />
<img src="Images/Screens/White/profil.jpg" alt="Profiles" height="300" />
<img src="Images/Screens/White/modifyProfil.jpg" alt="CreateProfile" height="300" /><br/>
<img src="Images/Screens/White/ingredientSelection.jpg" alt="IngredientSelection" height="300" />
<img src="Images/Screens/White/recipeSuggestion.jpg" alt="RecipeSuggestion" height="300" />
<img src="Images/Screens/White/recipeDetail.jpg" alt="RecipeDetails" height="300" />
</div>
## Dark Theme
<div align = center>
<img src="Images/Screens/Black/home.jpg" alt="Home" height="300" />
<img src="Images/Screens/Black/profil.jpg" alt="Profiles" height="300" />
<img src="Images/Screens/Black/createProfil.jpg" alt="CreateProfile" height="300" /><br/>
<img src="Images/Screens/Black/ingredientSelection.jpg" alt="IngredientSelection" height="300" />
<img src="Images/Screens/Black/recipeSuggestion.jpg" alt="RecipeSuggestion" height="300" />
<img src="Images/Screens/Black/recipeDetail.jpg" alt="RecipeDetails" height="300" />
</div>
# Working Environment
Application's Support :
<div align = center> <div align = center>
@ -42,7 +66,7 @@ Support de l'application :
</div> </div>
Technologies utilisées : Technologies Used :
<div align = center> <div align = center>
@ -66,7 +90,7 @@ IDE :
</div> </div>
Moyen de communication : How do we communicate? :
<div align = center> <div align = center>
@ -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:
<br> <br>
⚙️ Louison PARANT ⚙️ Louison PARANT
<br> <br>
⚙️ Rayhan HASSOU ⚙️ Rayhân HASSOU
<br> <br>
⚙️ Remi REGNAULT ⚙️ Remi REGNAULT
<div align = center> <div align = center>
© FI Groupe 2 © FI Group 2
</div> </div>
Loading…
Cancel
Save