From e878c2ccb353b4631e8a9ae9b48464665fbf2949 Mon Sep 17 00:00:00 2001
From: "leo.tuaillon" <leo.TUAILLON@etu.uca.fr>
Date: Tue, 9 May 2023 21:52:13 +0200
Subject: [PATCH 1/9] some add fonction on button

---
 AppShell.xaml                         | 9 +++++++++
 Platforms/Android/AndroidManifest.xml | 2 +-
 Views/ConfirmMail.xaml                | 9 ++++++---
 Views/ConfirmMail.xaml.cs             | 8 ++++++++
 Views/RegisterPage.xaml.cs            | 2 +-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/AppShell.xaml b/AppShell.xaml
index ea876cf..319b35a 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -98,4 +98,13 @@
             ContentTemplate="{DataTemplate pages:CreateRecipePage}"
             Route="CreateRecipe"/>
     </FlyoutItem>
+    <FlyoutItem>
+        <ShellContent
+            x:Name="ConfirmMail"
+            Title="ConfirmMail"
+            ContentTemplate="{DataTemplate pages:ConfirmMail}"
+            Route="ConfirmEmail"/>
+    </FlyoutItem>
+    
+    
 </Shell>
\ No newline at end of file
diff --git a/Platforms/Android/AndroidManifest.xml b/Platforms/Android/AndroidManifest.xml
index e9937ad..728b4d6 100644
--- a/Platforms/Android/AndroidManifest.xml
+++ b/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
+	<application android:allowBackup="true"  android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/Views/ConfirmMail.xaml b/Views/ConfirmMail.xaml
index acc8df7..ae22bca 100644
--- a/Views/ConfirmMail.xaml
+++ b/Views/ConfirmMail.xaml
@@ -21,7 +21,8 @@
            
                         HeightRequest="50"
                         WidthRequest="50"
-                        Source="arrow_back.svg"/>
+                        Source="arrow_back.svg"
+                        Clicked="OnBackButtonClicked"/>
                 </HorizontalStackLayout>
                 <Label 
                     Margin="-40,10,0,0"
@@ -78,7 +79,8 @@
                             BackgroundColor="{StaticResource ActionButton}"
                             FontFamily="PoppinsMedium"
                             TextColor="White"
-                            Text="That's been my email"/>
+                            Text="That's been my email"
+                            />
                     </Border>
                 </VerticalStackLayout>
             </Grid>
@@ -136,7 +138,8 @@
                         BackgroundColor="{StaticResource ActionButton}"
                         FontFamily="PoppinsMedium"
                         TextColor="White"
-                        Text="Confirm my email"/>
+                        Text="Confirm my email"
+                        Clicked="OnRegiterButtonTapped"/>
                 </Border>
             </VerticalStackLayout>
 
diff --git a/Views/ConfirmMail.xaml.cs b/Views/ConfirmMail.xaml.cs
index 7d186ea..94418e9 100644
--- a/Views/ConfirmMail.xaml.cs
+++ b/Views/ConfirmMail.xaml.cs
@@ -6,4 +6,12 @@ public partial class ConfirmMail : ContentPage
 	{
 		InitializeComponent();
 	}
+    private async void OnRegiterButtonTapped(object sender, EventArgs e)
+    {
+        await Shell.Current.GoToAsync("//LoginPage");
+    }
+    private async void OnBackButtonClicked(object sender, EventArgs e)
+    {
+        await Navigation.PopAsync();
+    }
 }
\ No newline at end of file
diff --git a/Views/RegisterPage.xaml.cs b/Views/RegisterPage.xaml.cs
index ee764f0..4e93a2b 100644
--- a/Views/RegisterPage.xaml.cs
+++ b/Views/RegisterPage.xaml.cs
@@ -12,6 +12,6 @@ public partial class RegisterPage : ContentPage
     }
     private async void RegisterTapped(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//LoginPage");
+        await Navigation.PushAsync(new ConfirmMail());
     }
 }
\ No newline at end of file

From 0ae9159b2010740707f1d0dd51f104b217da68f8 Mon Sep 17 00:00:00 2001
From: letuaillon <leo.TUAILLON@etu.uca.fr>
Date: Wed, 10 May 2023 09:55:05 +0200
Subject: [PATCH 2/9] recipe data

---
 Views/Components/RecipeView.xaml    |  3 ++-
 Views/Components/RecipeView.xaml.cs | 14 ++++++--------
 Views/FavoritesPage.xaml            | 15 +++------------
 Views/FavoritesPage.xaml.cs         |  8 ++++++++
 Views/HomePage.xaml                 | 20 ++++++--------------
 Views/HomePage.xaml.cs              | 15 ++++++++++++++-
 Views/SearchPage.xaml               | 11 +++--------
 Views/SearchPage.xaml.cs            | 10 ++++++++--
 8 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/Views/Components/RecipeView.xaml b/Views/Components/RecipeView.xaml
index 1842b45..7604ccc 100644
--- a/Views/Components/RecipeView.xaml
+++ b/Views/Components/RecipeView.xaml
@@ -23,7 +23,8 @@
                 StrokeShape="RoundRectangle 20"
                 BackgroundColor="{StaticResource ImageBackground}">
                 <Grid>
-                    <Image />
+                    <Image 
+                        x:Name="RecipeImage"/>
                     <HorizontalStackLayout
                         x:Name="Stars"
                         VerticalOptions="End"
diff --git a/Views/Components/RecipeView.xaml.cs b/Views/Components/RecipeView.xaml.cs
index ed1b99c..4a5dfaa 100644
--- a/Views/Components/RecipeView.xaml.cs
+++ b/Views/Components/RecipeView.xaml.cs
@@ -1,19 +1,17 @@
 using ShoopNCook.Pages;
-
+using ShoopNCook.Models;
 namespace ShoopNCook.Views;
 
 public partial class RecipeView : ContentView
 {
 
-	public RecipeView(): this(5, "Title", "Subtitle")
-	{}
-
-	public RecipeView(float note, string title, string subtitle)
+	public RecipeView(RecipeInfo info)
 	{
 		InitializeComponent();
-        Note = note;
-        Title = title;
-        Subtitle = subtitle;
+        Note = info.AverageNote;
+        Title = info.Name;
+        Subtitle = info.Description;
+        RecipeImage.Source = ImageSource.FromUri(info.Image);
 	}
 
     public float Note
diff --git a/Views/FavoritesPage.xaml b/Views/FavoritesPage.xaml
index 4bc78ac..8b1f118 100644
--- a/Views/FavoritesPage.xaml
+++ b/Views/FavoritesPage.xaml
@@ -35,18 +35,9 @@
                 AlignItems="Start"
                 AlignContent="Start"
                 Direction="Row"
-                Wrap="Wrap">
-
-                <views:RecipeView Margin="5" Note="4.5" Title="Spaghetti Bolognese" Subtitle="30 min"/>
-                <views:RecipeView Margin="5" Note="3" Title="Chickend Curry" Subtitle="45 min"/>
-                <views:RecipeView Margin="5" Note="0.2" Title="Beef Stroganoff" Subtitle="10 min"/>
-                <views:RecipeView Margin="5" Note="1.6" Title="Fish And Ships" Subtitle="15 min"/>
-                <views:RecipeView Margin="5" Note="5" Title="Caesar Salad" Subtitle="20 min"/>
-                <views:RecipeView Margin="5" Note="3.5" Title="Vegetables" Subtitle="60 min"/>
-                <views:RecipeView Margin="5" Note="4.6" Title="Guacamole" Subtitle="90 min"/>
-                <views:RecipeView Margin="5" Note="4" Title="Pad Thai" Subtitle="10 min"/>
-                <views:RecipeView Margin="5" Note="3" Title="French Toast" Subtitle="5 min"/>
-                <views:RecipeView Margin="5" Note="2" Title="Margherita Pizza" Subtitle="2 min"/>
+                Wrap="Wrap"
+                x:Name="RecipeViewLayout">
+                
             </FlexLayout>
         </ScrollView>
     </Grid>
diff --git a/Views/FavoritesPage.xaml.cs b/Views/FavoritesPage.xaml.cs
index 636662e..da20fb4 100644
--- a/Views/FavoritesPage.xaml.cs
+++ b/Views/FavoritesPage.xaml.cs
@@ -1,10 +1,18 @@
 namespace ShoopNCook.Pages;
+using ShoopNCook.Models;
+using ShoopNCook.Views;
 
 public partial class FavoritesPage : ContentPage
 {
     public FavoritesPage()
     {
         InitializeComponent();
+        RecipeViewLayout.Children.Add(new RecipeView(new RecipeInfo("Chicken Curry", "45 min", new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3)));
+        RecipeViewLayout.Children.Add(new RecipeView(new RecipeInfo("Spaghetti Bolognese", "30 min", new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1)));
+        RecipeViewLayout.Children.Add(new RecipeView(new RecipeInfo("Beef Stroganoff", "10 min", new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5)));
+        RecipeViewLayout.Children.Add(new RecipeView(new RecipeInfo("Fish And Ships", "15 min", new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4)));
+        RecipeViewLayout.Children.Add(new RecipeView(new RecipeInfo("Caesar Salad", "20 min", new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)));
+
     }
     
 }
\ No newline at end of file
diff --git a/Views/HomePage.xaml b/Views/HomePage.xaml
index 92d7809..3ed3863 100644
--- a/Views/HomePage.xaml
+++ b/Views/HomePage.xaml
@@ -75,12 +75,9 @@
                     Orientation="Horizontal">
                     <HorizontalStackLayout 
                         Spacing="10"
-                        Padding="0,0,0,40">
-                        <views:RecipeView/>
-                        <views:RecipeView/>
-                        <views:RecipeView/>
-                        <views:RecipeView/>
-                        <views:RecipeView/>
+                        Padding="0,0,0,40"
+                        x:Name="FavoritesList">
+                        
                     </HorizontalStackLayout>
                 </ScrollView>
 
@@ -109,14 +106,9 @@
                         AlignItems="Start"
                         AlignContent="Start"
                         Direction="Row"
-                        Wrap="Wrap">
-                    <views:RecipeView Margin="2.5"/>
-                    <views:RecipeView Margin="2.5"/>
-                    <views:RecipeView Margin="2.5"/>
-                    <views:RecipeView Margin="2.5"/>
-                    <views:RecipeView Margin="2.5"/>
-                    <views:RecipeView Margin="2.5"/>
-                    <views:RecipeView Margin="2.5"/>
+                        Wrap="Wrap"
+                        x:Name="BasicRecipeView">
+                    
                     </FlexLayout>
                 </ScrollView>
             </VerticalStackLayout>
diff --git a/Views/HomePage.xaml.cs b/Views/HomePage.xaml.cs
index e245dde..cdbe047 100644
--- a/Views/HomePage.xaml.cs
+++ b/Views/HomePage.xaml.cs
@@ -1,11 +1,24 @@
 namespace ShoopNCook.Pages;
+using ShoopNCook.Models;
+using ShoopNCook.Views;
 
 public partial class HomePage : ContentPage
 {
 	public HomePage()
 	{
 		InitializeComponent();
-	}
+        FavoritesList.Children.Add(new RecipeView(new RecipeInfo("Chicken Curry", "45 min", new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3)));
+        FavoritesList.Children.Add(new RecipeView(new RecipeInfo("Spaghetti Bolognese", "30 min", new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1)));
+        FavoritesList.Children.Add(new RecipeView(new RecipeInfo("Beef Stroganoff", "10 min", new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5)));
+        FavoritesList.Children.Add(new RecipeView(new RecipeInfo("Fish And Ships", "15 min", new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4)));
+        FavoritesList.Children.Add(new RecipeView(new RecipeInfo("Caesar Salad", "20 min", new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)));
+
+        BasicRecipeView.Children.Add(new RecipeView(new RecipeInfo("Chicken Curry", "45 min", new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3)));
+        BasicRecipeView.Children.Add(new RecipeView(new RecipeInfo("Spaghetti Bolognese", "30 min", new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1)));
+        BasicRecipeView.Children.Add(new RecipeView(new RecipeInfo("Beef Stroganoff", "10 min", new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5)));
+        BasicRecipeView.Children.Add(new RecipeView(new RecipeInfo("Fish And Ships", "15 min", new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4)));
+        BasicRecipeView.Children.Add(new RecipeView(new RecipeInfo("Caesar Salad", "20 min", new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)));
+    }
     private async void OnSyncButtonClicked(object sender, EventArgs e)
     {
         await Shell.Current.Navigation.PushAsync(new SearchPage());
diff --git a/Views/SearchPage.xaml b/Views/SearchPage.xaml
index 9cc5e11..6d2dce6 100644
--- a/Views/SearchPage.xaml
+++ b/Views/SearchPage.xaml
@@ -105,14 +105,9 @@
                 AlignItems="Start"
                 AlignContent="Start"
                 Direction="Row"
-                Wrap="Wrap">
-                <views:RecipeView Margin="5"/>
-                <views:RecipeView Margin="5"/>
-                <views:RecipeView Margin="5"/>
-                <views:RecipeView Margin="5"/>
-                <views:RecipeView Margin="5"/>
-                <views:RecipeView Margin="5"/>
-                <views:RecipeView Margin="5"/>
+                Wrap="Wrap"
+                x:Name="ResultSearchView">
+                
             </FlexLayout>
         </ScrollView>
 
diff --git a/Views/SearchPage.xaml.cs b/Views/SearchPage.xaml.cs
index aa6ae33..473349f 100644
--- a/Views/SearchPage.xaml.cs
+++ b/Views/SearchPage.xaml.cs
@@ -1,11 +1,17 @@
 namespace ShoopNCook.Pages;
-
+using ShoopNCook.Models;
+using ShoopNCook.Views;
 public partial class SearchPage : ContentPage
 {
 	public SearchPage()
 	{
 		InitializeComponent();
-	}
+        ResultSearchView.Children.Add(new RecipeView(new RecipeInfo("Chicken Curry", "45 min", new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3)));
+        ResultSearchView.Children.Add(new RecipeView(new RecipeInfo("Spaghetti Bolognese", "30 min", new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1)));
+        ResultSearchView.Children.Add(new RecipeView(new RecipeInfo("Beef Stroganoff", "10 min", new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5)));
+        ResultSearchView.Children.Add(new RecipeView(new RecipeInfo("Fish And Ships", "15 min", new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4)));
+        ResultSearchView.Children.Add(new RecipeView(new RecipeInfo("Caesar Salad", "20 min", new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)));
+    }
     private async void OnBackButtonClicked(object sender, EventArgs e)
     {
         await Navigation.PopAsync();

From adda823bf942a936b4fee7c84aa809554c3e675d Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Wed, 10 May 2023 20:42:21 +0200
Subject: [PATCH 3/9] integrate recipes in HomePage

---
 App.xaml.cs                             |  4 +-
 Endpoint/IEndpoint.cs                   |  2 +
 Endpoint/IRecipesService.cs             | 20 +++++++++
 LocalEndpoint/AccountManager.cs         |  3 +-
 LocalEndpoint/LocalEndpoint.cs          |  1 +
 LocalEndpoint/RecipesService.cs         | 48 ++++++++++++++++++++
 MainAppShell.xaml.cs                    |  6 +--
 Models/Ingredient.cs                    |  4 +-
 Models/Quantity.cs                      |  6 ---
 Models/RecipeInfo.cs                    |  9 ++--
 Models/RecipeState.cs                   | 22 ++++++++++
 ShoopNCook.csproj                       |  4 +-
 Views/Components/IngredientView.xaml.cs | 11 +++--
 Views/Components/RecipeView.xaml.cs     | 15 ++++---
 Views/FavoritesPage.xaml.cs             | 30 ++++++-------
 Views/HomePage.xaml                     |  6 +--
 Views/HomePage.xaml.cs                  | 40 ++++++++++-------
 Views/RecipePage.xaml.cs                | 58 ++++++++++---------------
 Views/SearchPage.xaml.cs                |  6 +--
 19 files changed, 189 insertions(+), 106 deletions(-)
 create mode 100644 Endpoint/IRecipesService.cs
 create mode 100644 LocalEndpoint/RecipesService.cs
 delete mode 100644 Models/Quantity.cs
 create mode 100644 Models/RecipeState.cs

diff --git a/App.xaml.cs b/App.xaml.cs
index 16b7b95..5e0f01e 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -13,12 +13,12 @@ public partial class App : Application, ConnectionObserver, IApp
     public App()
     {
         InitializeComponent();
-        ForceLogin(); //start in login state
+        ForceLogin(); //start in login shell
     }
 
     public void OnAccountConnected(Account account)
     {
-        Shell shell = new MainAppShell(account, this);
+        Shell shell = new MainAppShell(account, Endpoint, this);
         shell.GoToAsync("//Home");
         MainPage = shell;
     }
diff --git a/Endpoint/IEndpoint.cs b/Endpoint/IEndpoint.cs
index 649e501..10906ee 100644
--- a/Endpoint/IEndpoint.cs
+++ b/Endpoint/IEndpoint.cs
@@ -6,6 +6,8 @@ namespace Endpoint
     {
         public IAccountManager AccountManager { get; }
 
+        public IRecipesService RecipesService { get; }
+
     }
 }
 
diff --git a/Endpoint/IRecipesService.cs b/Endpoint/IRecipesService.cs
new file mode 100644
index 0000000..9708611
--- /dev/null
+++ b/Endpoint/IRecipesService.cs
@@ -0,0 +1,20 @@
+using Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Endpoint
+{
+    public interface IRecipesService
+    {
+        public List<RecipeInfo> RecommendedRecipes(Account account);
+
+        public List<RecipeInfo> PopularRecipes();
+
+        public Recipe GetRecipe(RecipeInfo info);
+
+        public RecipeState RecipeStateOf(Account account, Recipe recipe);
+    }
+}
diff --git a/LocalEndpoint/AccountManager.cs b/LocalEndpoint/AccountManager.cs
index 2a3dbc2..e3df8fc 100644
--- a/LocalEndpoint/AccountManager.cs
+++ b/LocalEndpoint/AccountManager.cs
@@ -14,7 +14,7 @@ namespace LocalEndpoint
 
         private Account userAccount = new Account(new User(DEFAULT_ACCOUNT_IMAGE, "Stub Account"), "test@example.com");
         private string userPassword = "123456";
-        
+
         public Account? Login(string email, string password)
         {
             if (userAccount.Email == email && userPassword == password)
@@ -24,6 +24,7 @@ namespace LocalEndpoint
             return null;
         }
 
+
         public Account? Register(string email, string username, string password)
         {
             if (email == null || username == null || password == null)
diff --git a/LocalEndpoint/LocalEndpoint.cs b/LocalEndpoint/LocalEndpoint.cs
index d2696f7..1a8e310 100644
--- a/LocalEndpoint/LocalEndpoint.cs
+++ b/LocalEndpoint/LocalEndpoint.cs
@@ -6,5 +6,6 @@ namespace LocalEndpoint
     {
         public IAccountManager AccountManager => new AccountManager();
 
+        public IRecipesService RecipesService => new RecipesService();  
     }
 }
\ No newline at end of file
diff --git a/LocalEndpoint/RecipesService.cs b/LocalEndpoint/RecipesService.cs
new file mode 100644
index 0000000..b7891cc
--- /dev/null
+++ b/LocalEndpoint/RecipesService.cs
@@ -0,0 +1,48 @@
+using Endpoint;
+using Models;
+
+namespace LocalEndpoint
+{
+    internal class RecipesService : IRecipesService
+    {
+
+        public List<RecipeInfo> PopularRecipes()
+        {
+            return new List<RecipeInfo> {
+                new RecipeInfo("Chicken Curry", 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3),
+                new RecipeInfo("Spaghetti Bolognese", 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1),
+                new RecipeInfo("Beef Stroganoff", 10, new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5),
+                new RecipeInfo("Fish And Ships", 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4),
+                new RecipeInfo("Caesar Salad", 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)
+            };
+        }
+
+
+        public List<RecipeInfo> RecommendedRecipes(Account account)
+        {
+            return new List<RecipeInfo> {
+                new RecipeInfo("Chicken Salad", 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4),
+                new RecipeInfo("Chocolate Cake", 10, new Uri("https://bakewithshivesh.com/wp-content/uploads/2022/08/IMG_0248-scaled.jpg"), 3),
+                new RecipeInfo("Salmon", 10, new Uri("https://www.wholesomeyum.com/wp-content/uploads/2021/06/wholesomeyum-Pan-Seared-Salmon-Recipe-13.jpg"), 4),
+                new RecipeInfo("Fish", 30, new Uri("https://www.ciaanet.org/wp-content/uploads/2022/07/Atlantic-and-Pacific-whole-salmon-1024x683.jpg"), 4.5F),
+                new RecipeInfo("Space Cake", 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5)
+            };
+        }
+
+        public Recipe GetRecipe(RecipeInfo info)
+        {
+            User owner = new User(new Uri("https://i.ibb.co/L6t6bGR/DALL-E-2023-05-10-20-27-31-cook-looking-at-the-camera-with-a-chef-s-hat-laughing-in-an-exaggerated-w.png"), "The Funny Chief");
+            List<Ingredient> ingredients = new List<Ingredient> { new Ingredient("Banana", 12), new Ingredient("Apple", 2) };
+            List<PreparationStep> steps = new List<PreparationStep> { new PreparationStep("Step 1", "This step is an hardcoded step from a stub implementation of IRecipesSeervice") };
+            return new Recipe(info, owner, ingredients, steps);
+        }
+
+        public RecipeState RecipeStateOf(Account account, Recipe recipe)
+        {
+            Random random = new Random();
+            return new RecipeState((uint) random.Next(1, 10), random.Next() % 2 == 0, (uint)random.Next(0, 6), recipe);
+        }
+
+
+    }
+}
diff --git a/MainAppShell.xaml.cs b/MainAppShell.xaml.cs
index d8df598..70ce6aa 100644
--- a/MainAppShell.xaml.cs
+++ b/MainAppShell.xaml.cs
@@ -3,13 +3,13 @@ using Microsoft.Maui.Controls;
 using Models;
 using ShoopNCook.Controllers;
 using ShoopNCook.Pages;
-
+using Endpoint;
 public partial class MainAppShell : Shell
 {
-	public MainAppShell(Account account, IApp app)
+	public MainAppShell(Account account, IEndpoint endpoint, IApp app)
 	{
 		InitializeComponent();
-		HomeTab.ContentTemplate = new DataTemplate(() => new HomePage(account, app));
+		HomeTab.ContentTemplate = new DataTemplate(() => new HomePage(account, endpoint));
 		FavoritesTab.ContentTemplate = new DataTemplate(() => new FavoritesPage(account, app));
 		MyListTab.ContentTemplate = new DataTemplate(() => new MyListPage(account, app));
 		MoreTab.ContentTemplate = new DataTemplate(() => new MorePage(account, new MorePageController(app)));
diff --git a/Models/Ingredient.cs b/Models/Ingredient.cs
index 48f1f21..ed74bff 100644
--- a/Models/Ingredient.cs
+++ b/Models/Ingredient.cs
@@ -3,15 +3,13 @@
     public class Ingredient
     {
 
-        public Ingredient(string name, float amount, Quantity quantity)
+        public Ingredient(string name, float amount)
         {
             Name = name;
             Amount = amount;
-            Quantity = quantity;
         }
 
         public string Name { get; init; }
         public float Amount { get; init; }
-        public Quantity Quantity { get; init; }
     }
 }
diff --git a/Models/Quantity.cs b/Models/Quantity.cs
deleted file mode 100644
index 51433d5..0000000
--- a/Models/Quantity.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Models
-{
-    public class Quantity
-    {
-    }
-}
diff --git a/Models/RecipeInfo.cs b/Models/RecipeInfo.cs
index 4640626..b43580a 100644
--- a/Models/RecipeInfo.cs
+++ b/Models/RecipeInfo.cs
@@ -3,14 +3,17 @@
     public class RecipeInfo
     {
         public string Name { get; init; }
-        public string Description { get; init; }
+        public uint CookTimeMins { get; init; }
+
+        public uint Energy { get; init; }
+
         public Uri Image { get; init; }
         public float AverageNote { get; init; }
 
-        public RecipeInfo(string name, string description, Uri image, float averageNote)
+        public RecipeInfo(string name, uint cookTimeMins, Uri image, float averageNote)
         {
             Name = name;
-            Description = description;
+            CookTimeMins = cookTimeMins;
             Image = image;
             AverageNote = averageNote;
         }
diff --git a/Models/RecipeState.cs b/Models/RecipeState.cs
new file mode 100644
index 0000000..87a137a
--- /dev/null
+++ b/Models/RecipeState.cs
@@ -0,0 +1,22 @@
+
+
+namespace Models
+{
+    public class RecipeState
+    {
+
+        public uint PersonAmount { get; private init; }
+        public bool IsAccountFavorite { get; private init; }
+        public uint AccountNote { get; private init; }
+
+        public Recipe Recipe { get; private init; }
+
+        public RecipeState(uint personAmount, bool isAccountFavorite, uint accountNote, Recipe recipe)
+        {
+            PersonAmount = personAmount;
+            IsAccountFavorite = isAccountFavorite;
+            AccountNote = accountNote;
+            Recipe = recipe;
+        }
+    }
+}
diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index 8f865ed..063bc5b 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -196,9 +196,7 @@
 	</ItemGroup>
 
 	<ProjectExtensions>
-		<VisualStudio>
-			<UserProperties XamarinHotReloadDebuggerTimeoutExceptionShoopNCookHideInfoBar="True" XamarinHotReloadUnhandledDeviceExceptionShoopNCookHideInfoBar="True" />
-		</VisualStudio>
+		<VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionShoopNCookHideInfoBar="True" XamarinHotReloadGenericExceptionInfoBarShoopNCookHideInfoBar="True" XamarinHotReloadUnhandledDeviceExceptionShoopNCookHideInfoBar="True" /></VisualStudio>
 	</ProjectExtensions>
 
 </Project>
diff --git a/Views/Components/IngredientView.xaml.cs b/Views/Components/IngredientView.xaml.cs
index 2013447..466d557 100644
--- a/Views/Components/IngredientView.xaml.cs
+++ b/Views/Components/IngredientView.xaml.cs
@@ -1,3 +1,5 @@
+using Models;
+
 namespace ShoopNCook.Views;
 
 public partial class IngredientView : ContentView
@@ -30,12 +32,13 @@ public partial class IngredientView : ContentView
         set => SetValue(UnitProperty, value);
     }
 
-    public IngredientView(string name, float quantity, string unit)
+    public IngredientView(Ingredient ingredient)
     {
         InitializeComponent();
 
-        Name = name;
-        Quantity = quantity;
-        Unit = unit;
+        Name = ingredient.Name;
+        Quantity = ingredient.Amount;
+        //TODO Unit implementation in IngredientView.xaml.cs
+        Unit = "TODO: Unit implementation in IngredientView.xaml.cs";
     }
 }
\ No newline at end of file
diff --git a/Views/Components/RecipeView.xaml.cs b/Views/Components/RecipeView.xaml.cs
index e4ed079..c5248aa 100644
--- a/Views/Components/RecipeView.xaml.cs
+++ b/Views/Components/RecipeView.xaml.cs
@@ -5,14 +5,19 @@ namespace ShoopNCook.Views;
 public partial class RecipeView : ContentView
 {
 
-	public RecipeView(RecipeInfo info)
+    private readonly Action callback;
+
+	public RecipeView(RecipeInfo info, Action onClickCallback)
 	{
 		InitializeComponent();
         Note = info.AverageNote;
         Title = info.Name;
-        Subtitle = info.Description;
+        Subtitle = info.CookTimeMins + " min";
         RecipeImage.Source = ImageSource.FromUri(info.Image);
-	}
+        
+        callback = onClickCallback;
+
+    }
 
     public float Note
     {
@@ -43,8 +48,8 @@ public partial class RecipeView : ContentView
             else img.Opacity = 1;
         }
 	}
-    private async void OnRecipeTapped(object sender, EventArgs e)
+    private void OnRecipeTapped(object sender, EventArgs e)
     {
-        await Shell.Current.Navigation.PushAsync(new RecipePage());
+        callback();
     }
 }
\ No newline at end of file
diff --git a/Views/FavoritesPage.xaml.cs b/Views/FavoritesPage.xaml.cs
index 07d716a..aa2cf24 100644
--- a/Views/FavoritesPage.xaml.cs
+++ b/Views/FavoritesPage.xaml.cs
@@ -1,20 +1,16 @@
 using Models;
 
-namespace ShoopNCook.Pages;
-using Models;
-using ShoopNCook.Views;
-
-public partial class FavoritesPage : ContentPage
-{
-    public FavoritesPage(Account account, IApp app)
-    {
-        InitializeComponent();
-        RecipeViewLayout.Children.Add(new RecipeView(new RecipeInfo("Chicken Curry", "45 min", new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3)));
-        RecipeViewLayout.Children.Add(new RecipeView(new RecipeInfo("Spaghetti Bolognese", "30 min", new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1)));
-        RecipeViewLayout.Children.Add(new RecipeView(new RecipeInfo("Beef Stroganoff", "10 min", new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5)));
-        RecipeViewLayout.Children.Add(new RecipeView(new RecipeInfo("Fish And Ships", "15 min", new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4)));
-        RecipeViewLayout.Children.Add(new RecipeView(new RecipeInfo("Caesar Salad", "20 min", new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)));
-
-    }
-    
+namespace ShoopNCook.Pages;
+using Models;
+using ShoopNCook.Views;
+
+public partial class FavoritesPage : ContentPage
+{
+    public FavoritesPage(Account account, IApp app)
+    {
+        InitializeComponent();
+        
+        //TODO
+    }
+    
 }
\ No newline at end of file
diff --git a/Views/HomePage.xaml b/Views/HomePage.xaml
index e0fab49..38dcd43 100644
--- a/Views/HomePage.xaml
+++ b/Views/HomePage.xaml
@@ -62,7 +62,7 @@
                     Margin="20"
                     HeightRequest="30">
                     <Label 
-                        Text="Popular recipe" 
+                        Text="Popular recipes" 
                         Style="{StaticResource h2}"/>
 
                     <Label 
@@ -76,7 +76,7 @@
                     <HorizontalStackLayout 
                         Spacing="10"
                         Padding="0,0,0,40"
-                        x:Name="FavoritesList">
+                        x:Name="PopularsList">
                         
                     </HorizontalStackLayout>
                 </ScrollView>
@@ -107,7 +107,7 @@
                         AlignContent="Start"
                         Direction="Row"
                         Wrap="Wrap"
-                        x:Name="BasicRecipeView">
+                        x:Name="RecommendedList">
                     
                     </FlexLayout>
                 </ScrollView>
diff --git a/Views/HomePage.xaml.cs b/Views/HomePage.xaml.cs
index a174549..6da81e7 100644
--- a/Views/HomePage.xaml.cs
+++ b/Views/HomePage.xaml.cs
@@ -2,29 +2,39 @@
 namespace ShoopNCook.Pages;
 using Models;
 using ShoopNCook.Views;
+using Endpoint;
 
 public partial class HomePage : ContentPage
 {
-	public HomePage(Account account, IApp app)
+	public HomePage(Account account, IEndpoint endpoint)
     {
 		InitializeComponent();
-        FavoritesList.Children.Add(new RecipeView(new RecipeInfo("Chicken Curry", "45 min", new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3)));
-        FavoritesList.Children.Add(new RecipeView(new RecipeInfo("Spaghetti Bolognese", "30 min", new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1)));
-        FavoritesList.Children.Add(new RecipeView(new RecipeInfo("Beef Stroganoff", "10 min", new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5)));
-        FavoritesList.Children.Add(new RecipeView(new RecipeInfo("Fish And Ships", "15 min", new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4)));
-        FavoritesList.Children.Add(new RecipeView(new RecipeInfo("Caesar Salad", "20 min", new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)));
-
-        BasicRecipeView.Children.Add(new RecipeView(new RecipeInfo("Chicken Curry", "45 min", new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3)));
-        BasicRecipeView.Children.Add(new RecipeView(new RecipeInfo("Spaghetti Bolognese", "30 min", new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1)));
-        BasicRecipeView.Children.Add(new RecipeView(new RecipeInfo("Beef Stroganoff", "10 min", new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5)));
-        BasicRecipeView.Children.Add(new RecipeView(new RecipeInfo("Fish And Ships", "15 min", new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4)));
-        BasicRecipeView.Children.Add(new RecipeView(new RecipeInfo("Caesar Salad", "20 min", new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)));
-        
+
+        IRecipesService service = endpoint.RecipesService;
+
+        void PushRecipe(Layout layout, RecipeInfo info)
+        {
+            layout.Children.Add(new RecipeView(info, () =>
+            {
+                Recipe recipe = service.GetRecipe(info);
+                RecipeState state = service.RecipeStateOf(account, recipe);
+                Shell.Current.Navigation.PushAsync(new RecipePage(state));
+            }));
+        }
+
+
+        service.PopularRecipes().ForEach(recipe => PushRecipe(PopularsList, recipe));
+        service.RecommendedRecipes(account).ForEach(recipe => PushRecipe(RecommendedList, recipe));
+
         ProfilePictureImage.Source = ImageSource.FromUri(account.User.ProfilePicture);
         ProfilePictureName.Text = account.User.Name;
 	}
-    private async void OnSyncButtonClicked(object sender, EventArgs e)
+
+
+    
+
+    private void OnSyncButtonClicked(object sender, EventArgs e)
     {
-        await Shell.Current.Navigation.PushAsync(new SearchPage());
+        Shell.Current.Navigation.PushAsync(new SearchPage());
     }
 }
\ No newline at end of file
diff --git a/Views/RecipePage.xaml.cs b/Views/RecipePage.xaml.cs
index 2edc5c0..c440166 100644
--- a/Views/RecipePage.xaml.cs
+++ b/Views/RecipePage.xaml.cs
@@ -1,6 +1,6 @@
 using ShoopNCook.Views;
 using System.Windows.Input;
-
+using Models;
 namespace ShoopNCook.Pages;
 
 public partial class RecipePage : ContentPage
@@ -9,53 +9,39 @@ public partial class RecipePage : ContentPage
     private uint note;
     private bool isFavorite;
 
-    public ICommand StarCommand => new Command<string>(count =>
-    {
-        SetNote(uint.Parse(count));
-    });
-
-    public RecipePage() :
-        this("Recipe Sample", 32, 250,
-            true, 2, 0,
-            new List<IngredientView> {
-                new IngredientView("Chocolate", 25, "g"),
-                new IngredientView("Flour", 250, "g"),
-                new IngredientView("Sugar", 0.5F, "kg")
-            },
-            new List<string> { "This is the first preparation step", "add to furnace and wait", "Enjoy !" }
-        )
-    {}
-
-    public RecipePage(
-        string name,
-        uint cookTime,
-        uint energy,
-        bool isFavorite,
-        uint nbPers,
-        uint note,
-        List<IngredientView> ingredients,
-        List<string> steps
-        )
+    public ICommand StarCommand => new Command<string>(count => SetNote(uint.Parse(count)));
+
+
+    public RecipePage(RecipeState state)
     {
         InitializeComponent();
-        Counter.Count = nbPers;
+
+        Recipe recipe = state.Recipe;
+        RecipeInfo info = recipe.Info;
+
+        note = state.AccountNote;
+        isFavorite = state.IsAccountFavorite;
+
+        Counter.Count = state.PersonAmount;
         SetFavorite(isFavorite);
         SetNote(note);
 
-        CookTime.Text = cookTime.ToString();
-        Energy.Text = energy.ToString();
-        RecipeName.Text = name;
+        CookTime.Text = info.CookTimeMins.ToString();
+        Energy.Text = info.Energy.ToString();
+        RecipeName.Text = info.Name;
 
-        foreach (IngredientView iv in ingredients)
-            IngredientList.Add(iv);
+        foreach (Ingredient ingredient in recipe.Ingredients)
+            IngredientList.Add(new IngredientView(ingredient));
 
+        //retrieves the app's styles
         var styles = Application.Current.Resources.MergedDictionaries.ElementAt(1);
 
         int count = 0;
-        foreach (string step in steps) {
+        foreach (PreparationStep step in recipe.Steps) {
+            //TODO display name of PreparationSteps.
             Label label = new Label();
             label.Style = (Style)styles["Small"];
-            label.Text = "Step " + ++count + ": " + step;
+            label.Text = "Step " + ++count + ": " + step.Description;
             StepList.Add(label);
         }
     }
diff --git a/Views/SearchPage.xaml.cs b/Views/SearchPage.xaml.cs
index 4be52d0..1e8e0ed 100644
--- a/Views/SearchPage.xaml.cs
+++ b/Views/SearchPage.xaml.cs
@@ -6,11 +6,7 @@ public partial class SearchPage : ContentPage
 	public SearchPage()
 	{
 		InitializeComponent();
-        ResultSearchView.Children.Add(new RecipeView(new RecipeInfo("Chicken Curry", "45 min", new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3)));
-        ResultSearchView.Children.Add(new RecipeView(new RecipeInfo("Spaghetti Bolognese", "30 min", new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1)));
-        ResultSearchView.Children.Add(new RecipeView(new RecipeInfo("Beef Stroganoff", "10 min", new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5)));
-        ResultSearchView.Children.Add(new RecipeView(new RecipeInfo("Fish And Ships", "15 min", new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4)));
-        ResultSearchView.Children.Add(new RecipeView(new RecipeInfo("Caesar Salad", "20 min", new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)));
+        //TODO
     }
     private async void OnBackButtonClicked(object sender, EventArgs e)
     {

From 60d3d6267c32bd64b716bbc83c07ba6384912097 Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Wed, 10 May 2023 21:03:26 +0200
Subject: [PATCH 4/9] convert current Models to records, unencapsulate
 RecipeState into Recipe and AccountRecipeRate

---
 Endpoint/IRecipesService.cs     |  2 +-
 LocalEndpoint/RecipesService.cs | 24 ++++++++++++------------
 Models/Account.cs               | 13 +------------
 Models/AccountRecipeRate.cs     |  5 +++++
 Models/Ingredient.cs            | 13 +------------
 Models/PreparationStep.cs       | 12 +-----------
 Models/Recipe.cs                | 27 +++++----------------------
 Models/RecipeInfo.cs            | 19 +------------------
 Models/RecipeState.cs           | 22 ----------------------
 Models/User.cs                  | 13 +------------
 Views/HomePage.xaml.cs          |  4 ++--
 Views/RecipePage.xaml.cs        | 14 +++++++-------
 12 files changed, 37 insertions(+), 131 deletions(-)
 create mode 100644 Models/AccountRecipeRate.cs
 delete mode 100644 Models/RecipeState.cs

diff --git a/Endpoint/IRecipesService.cs b/Endpoint/IRecipesService.cs
index 9708611..64a392d 100644
--- a/Endpoint/IRecipesService.cs
+++ b/Endpoint/IRecipesService.cs
@@ -15,6 +15,6 @@ namespace Endpoint
 
         public Recipe GetRecipe(RecipeInfo info);
 
-        public RecipeState RecipeStateOf(Account account, Recipe recipe);
+        public AccountRecipeRate GetRateOf(Account account, Recipe recipe);
     }
 }
diff --git a/LocalEndpoint/RecipesService.cs b/LocalEndpoint/RecipesService.cs
index b7891cc..10ad843 100644
--- a/LocalEndpoint/RecipesService.cs
+++ b/LocalEndpoint/RecipesService.cs
@@ -9,11 +9,11 @@ namespace LocalEndpoint
         public List<RecipeInfo> PopularRecipes()
         {
             return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Curry", 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3),
-                new RecipeInfo("Spaghetti Bolognese", 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1),
-                new RecipeInfo("Beef Stroganoff", 10, new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5),
-                new RecipeInfo("Fish And Ships", 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4),
-                new RecipeInfo("Caesar Salad", 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)
+                new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3),
+                new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1),
+                new RecipeInfo("Beef Stroganoff", 100, 10, new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5),
+                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4),
+                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)
             };
         }
 
@@ -21,11 +21,11 @@ namespace LocalEndpoint
         public List<RecipeInfo> RecommendedRecipes(Account account)
         {
             return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Salad", 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4),
-                new RecipeInfo("Chocolate Cake", 10, new Uri("https://bakewithshivesh.com/wp-content/uploads/2022/08/IMG_0248-scaled.jpg"), 3),
-                new RecipeInfo("Salmon", 10, new Uri("https://www.wholesomeyum.com/wp-content/uploads/2021/06/wholesomeyum-Pan-Seared-Salmon-Recipe-13.jpg"), 4),
-                new RecipeInfo("Fish", 30, new Uri("https://www.ciaanet.org/wp-content/uploads/2022/07/Atlantic-and-Pacific-whole-salmon-1024x683.jpg"), 4.5F),
-                new RecipeInfo("Space Cake", 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5)
+                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4),
+                new RecipeInfo("Chocolate Cake", 2500, 10, new Uri("https://bakewithshivesh.com/wp-content/uploads/2022/08/IMG_0248-scaled.jpg"), 3),
+                new RecipeInfo("Salmon", 20, 10, new Uri("https://www.wholesomeyum.com/wp-content/uploads/2021/06/wholesomeyum-Pan-Seared-Salmon-Recipe-13.jpg"), 4),
+                new RecipeInfo("Fish", 50, 30, new Uri("https://www.ciaanet.org/wp-content/uploads/2022/07/Atlantic-and-Pacific-whole-salmon-1024x683.jpg"), 4.5F),
+                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5)
             };
         }
 
@@ -37,10 +37,10 @@ namespace LocalEndpoint
             return new Recipe(info, owner, ingredients, steps);
         }
 
-        public RecipeState RecipeStateOf(Account account, Recipe recipe)
+        public AccountRecipeRate GetRateOf(Account account, Recipe recipe)
         {
             Random random = new Random();
-            return new RecipeState((uint) random.Next(1, 10), random.Next() % 2 == 0, (uint)random.Next(0, 6), recipe);
+            return new AccountRecipeRate(random.Next() % 2 == 0, (uint)random.Next(0, 6));
         }
 
 
diff --git a/Models/Account.cs b/Models/Account.cs
index 6d5a31c..5a9973b 100644
--- a/Models/Account.cs
+++ b/Models/Account.cs
@@ -1,15 +1,4 @@
 namespace Models
 {
-    public class Account
-    {
-
-        public Account(User usr, string mail)
-        {
-            User = usr;
-            Email = mail;
-        }
-
-        public User User { get; init; }
-        public string Email { get; init; }
-    }
+    public record Account(User User, string Email);
 }
diff --git a/Models/AccountRecipeRate.cs b/Models/AccountRecipeRate.cs
new file mode 100644
index 0000000..c23fdf9
--- /dev/null
+++ b/Models/AccountRecipeRate.cs
@@ -0,0 +1,5 @@
+
+namespace Models
+{
+    public record AccountRecipeRate(bool IsFavorite, uint Rate);
+}
diff --git a/Models/Ingredient.cs b/Models/Ingredient.cs
index ed74bff..3a40a75 100644
--- a/Models/Ingredient.cs
+++ b/Models/Ingredient.cs
@@ -1,15 +1,4 @@
 namespace Models
 {
-    public class Ingredient
-    {
-
-        public Ingredient(string name, float amount)
-        {
-            Name = name;
-            Amount = amount;
-        }
-
-        public string Name { get; init; }
-        public float Amount { get; init; }
-    }
+    public record Ingredient(string Name, float Amount);
 }
diff --git a/Models/PreparationStep.cs b/Models/PreparationStep.cs
index d85cf91..40899a7 100644
--- a/Models/PreparationStep.cs
+++ b/Models/PreparationStep.cs
@@ -1,15 +1,5 @@
 namespace Models
 {
 
-    public class PreparationStep
-    {
-        public PreparationStep(string name, string description)
-        {
-            Name = name;
-            Description = description;
-        }
-
-        public string Name { get; init; }
-        public string Description { get; init; }
-    }
+    public record PreparationStep(string Name, string Description);
 }
diff --git a/Models/Recipe.cs b/Models/Recipe.cs
index 15d09ae..523a221 100644
--- a/Models/Recipe.cs
+++ b/Models/Recipe.cs
@@ -1,25 +1,8 @@
 namespace Models
 {
-    public class Recipe
-    {
-
-        public RecipeInfo Info { get; init; }
-
-        public User Owner { get; init; }
-
-        public List<Ingredient> Ingredients { get; init; }
-        public List<PreparationStep> Steps { get; init; }
-
-        public Recipe(
-            RecipeInfo info,
-            User owner,
-            List<Ingredient> ingredients,
-            List<PreparationStep> steps)
-        {
-            Info = info;
-            Owner = owner;
-            Ingredients = ingredients;
-            Steps = steps;
-        }
-    }
+    public record Recipe(
+            RecipeInfo Info,
+            User Owner,
+            List<Ingredient> Ingredients,
+            List<PreparationStep> Steps);
 }
\ No newline at end of file
diff --git a/Models/RecipeInfo.cs b/Models/RecipeInfo.cs
index b43580a..7846de1 100644
--- a/Models/RecipeInfo.cs
+++ b/Models/RecipeInfo.cs
@@ -1,21 +1,4 @@
 namespace Models
 {
-    public class RecipeInfo
-    {
-        public string Name { get; init; }
-        public uint CookTimeMins { get; init; }
-
-        public uint Energy { get; init; }
-
-        public Uri Image { get; init; }
-        public float AverageNote { get; init; }
-
-        public RecipeInfo(string name, uint cookTimeMins, Uri image, float averageNote)
-        {
-            Name = name;
-            CookTimeMins = cookTimeMins;
-            Image = image;
-            AverageNote = averageNote;
-        }
-    }
+    public record RecipeInfo(string Name, uint CalPerPers, uint CookTimeMins, Uri Image, float AverageNote);
 }
diff --git a/Models/RecipeState.cs b/Models/RecipeState.cs
deleted file mode 100644
index 87a137a..0000000
--- a/Models/RecipeState.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-namespace Models
-{
-    public class RecipeState
-    {
-
-        public uint PersonAmount { get; private init; }
-        public bool IsAccountFavorite { get; private init; }
-        public uint AccountNote { get; private init; }
-
-        public Recipe Recipe { get; private init; }
-
-        public RecipeState(uint personAmount, bool isAccountFavorite, uint accountNote, Recipe recipe)
-        {
-            PersonAmount = personAmount;
-            IsAccountFavorite = isAccountFavorite;
-            AccountNote = accountNote;
-            Recipe = recipe;
-        }
-    }
-}
diff --git a/Models/User.cs b/Models/User.cs
index 2f19f35..981cef6 100644
--- a/Models/User.cs
+++ b/Models/User.cs
@@ -1,15 +1,4 @@
 namespace Models
 {
-    public class User
-    {
-
-        public User(Uri profilePicture, string name)
-        {
-            ProfilePicture = profilePicture;
-            Name = name;
-        }
-
-        public Uri ProfilePicture { get; init; }
-        public string Name { get; init; }
-    }
+    public record User(Uri ProfilePicture, string Name);
 }
diff --git a/Views/HomePage.xaml.cs b/Views/HomePage.xaml.cs
index 6da81e7..33b1c44 100644
--- a/Views/HomePage.xaml.cs
+++ b/Views/HomePage.xaml.cs
@@ -17,8 +17,8 @@ public partial class HomePage : ContentPage
             layout.Children.Add(new RecipeView(info, () =>
             {
                 Recipe recipe = service.GetRecipe(info);
-                RecipeState state = service.RecipeStateOf(account, recipe);
-                Shell.Current.Navigation.PushAsync(new RecipePage(state));
+                AccountRecipeRate rate = service.GetRateOf(account, recipe);
+                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, 1));
             }));
         }
 
diff --git a/Views/RecipePage.xaml.cs b/Views/RecipePage.xaml.cs
index c440166..61c4c2b 100644
--- a/Views/RecipePage.xaml.cs
+++ b/Views/RecipePage.xaml.cs
@@ -12,22 +12,22 @@ public partial class RecipePage : ContentPage
     public ICommand StarCommand => new Command<string>(count => SetNote(uint.Parse(count)));
 
 
-    public RecipePage(RecipeState state)
+    public RecipePage(Recipe recipe, AccountRecipeRate rate, uint amount)
     {
         InitializeComponent();
 
-        Recipe recipe = state.Recipe;
-        RecipeInfo info = recipe.Info;
+        Counter.Count = amount;
 
-        note = state.AccountNote;
-        isFavorite = state.IsAccountFavorite;
+        note = rate.Rate;
+        isFavorite = rate.IsFavorite;
 
-        Counter.Count = state.PersonAmount;
         SetFavorite(isFavorite);
         SetNote(note);
 
+        RecipeInfo info = recipe.Info;
+
         CookTime.Text = info.CookTimeMins.ToString();
-        Energy.Text = info.Energy.ToString();
+        Energy.Text = info.CalPerPers.ToString() + " cal/pers";
         RecipeName.Text = info.Name;
 
         foreach (Ingredient ingredient in recipe.Ingredients)

From b213edb4efbe727fec7acadb98522c2ba6db0c39 Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Wed, 10 May 2023 21:49:40 +0200
Subject: [PATCH 5/9] integrate recipes in MyList and Favorite pages, fixed
 rating bugs in RecipeViews

---
 Endpoint/IRecipesService.cs               |  7 ++++-
 LocalEndpoint/RecipesService.cs           | 32 ++++++++++++++++++-----
 MainAppShell.xaml.cs                      | 28 ++++++++++----------
 Views/Components/OwnedRecipeView.xaml.cs  |  2 +-
 Views/Components/RecipeView.xaml.cs       |  4 +--
 Views/Components/StoredRecipeView.xaml    | 12 ++++++---
 Views/Components/StoredRecipeView.xaml.cs | 26 ++++++++++++------
 Views/FavoritesPage.xaml                  |  1 -
 Views/FavoritesPage.xaml.cs               | 18 ++++++++++---
 Views/HomePage.xaml.cs                    |  4 ++-
 Views/MyListPage.xaml                     | 16 +++---------
 Views/MyListPage.xaml.cs                  | 29 ++++++++++++++------
 12 files changed, 118 insertions(+), 61 deletions(-)

diff --git a/Endpoint/IRecipesService.cs b/Endpoint/IRecipesService.cs
index 64a392d..5f78d26 100644
--- a/Endpoint/IRecipesService.cs
+++ b/Endpoint/IRecipesService.cs
@@ -9,12 +9,17 @@ namespace Endpoint
 {
     public interface IRecipesService
     {
-        public List<RecipeInfo> RecommendedRecipes(Account account);
 
         public List<RecipeInfo> PopularRecipes();
 
         public Recipe GetRecipe(RecipeInfo info);
 
+        public List<RecipeInfo> RecommendedRecipesOf(Account account);
+
+        public List<RecipeInfo> LookupFavoritesOf(Account account);
+
+        public List<(RecipeInfo, uint)> LookupWeeklyListOf(Account account);
+
         public AccountRecipeRate GetRateOf(Account account, Recipe recipe);
     }
 }
diff --git a/LocalEndpoint/RecipesService.cs b/LocalEndpoint/RecipesService.cs
index 10ad843..ad91dd9 100644
--- a/LocalEndpoint/RecipesService.cs
+++ b/LocalEndpoint/RecipesService.cs
@@ -17,8 +17,16 @@ namespace LocalEndpoint
             };
         }
 
+        public Recipe GetRecipe(RecipeInfo info)
+        {
+            User owner = new User(new Uri("https://i.ibb.co/L6t6bGR/DALL-E-2023-05-10-20-27-31-cook-looking-at-the-camera-with-a-chef-s-hat-laughing-in-an-exaggerated-w.png"), "The Funny Chief");
+            List<Ingredient> ingredients = new List<Ingredient> { new Ingredient("Banana", 12), new Ingredient("Apple", 2) };
+            List<PreparationStep> steps = new List<PreparationStep> { new PreparationStep("Step 1", "This step is an hardcoded step from a stub implementation of IRecipesSeervice") };
+            return new Recipe(info, owner, ingredients, steps);
+        }
+
 
-        public List<RecipeInfo> RecommendedRecipes(Account account)
+        public List<RecipeInfo> RecommendedRecipesOf(Account account)
         {
             return new List<RecipeInfo> {
                 new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4),
@@ -29,14 +37,26 @@ namespace LocalEndpoint
             };
         }
 
-        public Recipe GetRecipe(RecipeInfo info)
+        public List<RecipeInfo> LookupFavoritesOf(Account account)
         {
-            User owner = new User(new Uri("https://i.ibb.co/L6t6bGR/DALL-E-2023-05-10-20-27-31-cook-looking-at-the-camera-with-a-chef-s-hat-laughing-in-an-exaggerated-w.png"), "The Funny Chief");
-            List<Ingredient> ingredients = new List<Ingredient> { new Ingredient("Banana", 12), new Ingredient("Apple", 2) };
-            List<PreparationStep> steps = new List<PreparationStep> { new PreparationStep("Step 1", "This step is an hardcoded step from a stub implementation of IRecipesSeervice") };
-            return new Recipe(info, owner, ingredients, steps);
+            return new List<RecipeInfo> {
+                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4),
+                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5),
+                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4),
+                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)
+            };
         }
 
+        public List<(RecipeInfo, uint)> LookupWeeklyListOf(Account account)
+        {
+            return new List<(RecipeInfo, uint)> {
+                (new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5), 4),
+                (new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3), 4),
+                (new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1), 1),
+            };
+        }
+
+
         public AccountRecipeRate GetRateOf(Account account, Recipe recipe)
         {
             Random random = new Random();
diff --git a/MainAppShell.xaml.cs b/MainAppShell.xaml.cs
index 70ce6aa..218e9de 100644
--- a/MainAppShell.xaml.cs
+++ b/MainAppShell.xaml.cs
@@ -1,17 +1,17 @@
-namespace ShoopNCook;
-using Microsoft.Maui.Controls;
-using Models;
+namespace ShoopNCook;
+using Microsoft.Maui.Controls;
+using Models;
 using ShoopNCook.Controllers;
 using ShoopNCook.Pages;
 using Endpoint;
-public partial class MainAppShell : Shell
-{
-	public MainAppShell(Account account, IEndpoint endpoint, IApp app)
-	{
-		InitializeComponent();
-		HomeTab.ContentTemplate = new DataTemplate(() => new HomePage(account, endpoint));
-		FavoritesTab.ContentTemplate = new DataTemplate(() => new FavoritesPage(account, app));
-		MyListTab.ContentTemplate = new DataTemplate(() => new MyListPage(account, app));
-		MoreTab.ContentTemplate = new DataTemplate(() => new MorePage(account, new MorePageController(app)));
-    }
-}
+public partial class MainAppShell : Shell
+{
+	public MainAppShell(Account account, IEndpoint endpoint, IApp app)
+	{
+		InitializeComponent();
+		HomeTab.ContentTemplate = new DataTemplate(() => new HomePage(account, endpoint));
+		FavoritesTab.ContentTemplate = new DataTemplate(() => new FavoritesPage(account, endpoint.RecipesService));
+		MyListTab.ContentTemplate = new DataTemplate(() => new MyListPage(account, endpoint.RecipesService));
+		MoreTab.ContentTemplate = new DataTemplate(() => new MorePage(account, new MorePageController(app)));
+    }
+}
diff --git a/Views/Components/OwnedRecipeView.xaml.cs b/Views/Components/OwnedRecipeView.xaml.cs
index d10a211..257d5f9 100644
--- a/Views/Components/OwnedRecipeView.xaml.cs
+++ b/Views/Components/OwnedRecipeView.xaml.cs
@@ -28,7 +28,7 @@ public partial class OwnedRecipeView : ContentView
         int i = 1;
         foreach (Image img in Stars.Children)
         {
-            if (i <= note)
+            if (i < note)
             {
                 img.Opacity = 0;
                 i++;
diff --git a/Views/Components/RecipeView.xaml.cs b/Views/Components/RecipeView.xaml.cs
index c5248aa..44d826b 100644
--- a/Views/Components/RecipeView.xaml.cs
+++ b/Views/Components/RecipeView.xaml.cs
@@ -12,7 +12,7 @@ public partial class RecipeView : ContentView
 		InitializeComponent();
         Note = info.AverageNote;
         Title = info.Name;
-        Subtitle = info.CookTimeMins + " min";
+        Subtitle = info.CookTimeMins + " min"; 
         RecipeImage.Source = ImageSource.FromUri(info.Image);
         
         callback = onClickCallback;
@@ -40,7 +40,7 @@ public partial class RecipeView : ContentView
         int i = 1;
         foreach (Image img in Stars.Children)
         {
-            if (i <= note)
+            if (i < note)
             {
                 img.Opacity = 0;
                 i++;
diff --git a/Views/Components/StoredRecipeView.xaml b/Views/Components/StoredRecipeView.xaml
index 84ecb88..23e6035 100644
--- a/Views/Components/StoredRecipeView.xaml
+++ b/Views/Components/StoredRecipeView.xaml
@@ -14,13 +14,18 @@
             MinimumHeightRequest="250"
             MinimumWidthRequest="150"
             RowDefinitions="*, Auto">
+
+            <Grid.GestureRecognizers>
+                <TapGestureRecognizer Tapped="OnRecipeTapped"/>
+            </Grid.GestureRecognizers>
+
             <Border
                 Grid.Row="0"
                 Stroke="Transparent"
                 StrokeShape="RoundRectangle 20"
                 BackgroundColor="{StaticResource ImageBackground}">
                 <Grid>
-                    <Image />
+                    <Image x:Name="RecipeImage"/>
                     <HorizontalStackLayout
                         x:Name="Stars"
                         VerticalOptions="End"
@@ -51,8 +56,9 @@
                 <Label
                     TextColor="{StaticResource TextColorPrimary}"
                     x:Name="TitleLabel"/>
-                <Grid></Grid>
-                <views:CounterView CounterText="pers"/>
+                <views:CounterView 
+                    CounterText="pers"
+                    x:Name="Counter"/>
             </VerticalStackLayout>
         </Grid>
     </Border>
diff --git a/Views/Components/StoredRecipeView.xaml.cs b/Views/Components/StoredRecipeView.xaml.cs
index 1eb7ae1..da2a32c 100644
--- a/Views/Components/StoredRecipeView.xaml.cs
+++ b/Views/Components/StoredRecipeView.xaml.cs
@@ -1,16 +1,23 @@
+using Models;
+
 namespace ShoopNCook.Views;
 
 public partial class StoredRecipeView : ContentView
 {
 
-    public StoredRecipeView() : this(5, "Title")
-    { }
+    private readonly Action<uint> clickCallback;
+
 
-    public StoredRecipeView(float note, string title)
+    public StoredRecipeView(RecipeInfo info, uint personCount, Action<uint> onClickCallback)
     {
         InitializeComponent();
-        Note = note;
-        Title = title;
+
+        clickCallback = onClickCallback;
+
+        Note = info.AverageNote;
+        Title = info.Name;
+        RecipeImage.Source = ImageSource.FromUri(info.Image);
+        Counter.Count = personCount;
     }
 
     public float Note
@@ -23,14 +30,12 @@ public partial class StoredRecipeView : ContentView
         set => TitleLabel.Text = value;
     }
 
-
-
     private void SetNote(float note)
     {
         int i = 1;
         foreach (Image img in Stars.Children)
         {
-            if (i <= note)
+            if (i < note)
             {
                 img.Opacity = 0;
                 i++;
@@ -38,4 +43,9 @@ public partial class StoredRecipeView : ContentView
             else img.Opacity = 1;
         }
     }
+
+    private void OnRecipeTapped(object sender, TappedEventArgs e)
+    {
+        clickCallback(Counter.Count);
+    }
 }
\ No newline at end of file
diff --git a/Views/FavoritesPage.xaml b/Views/FavoritesPage.xaml
index 8b1f118..ca8b233 100644
--- a/Views/FavoritesPage.xaml
+++ b/Views/FavoritesPage.xaml
@@ -15,7 +15,6 @@
             ColumnDefinitions="*"
             MaximumHeightRequest="60">
 
-
             <Label 
                 Grid.Column="0"
                 FontSize="24"
diff --git a/Views/FavoritesPage.xaml.cs b/Views/FavoritesPage.xaml.cs
index aa2cf24..26f7483 100644
--- a/Views/FavoritesPage.xaml.cs
+++ b/Views/FavoritesPage.xaml.cs
@@ -1,16 +1,28 @@
 using Models;
 
 namespace ShoopNCook.Pages;
+
+using Endpoint;
 using Models;
 using ShoopNCook.Views;
 
 public partial class FavoritesPage : ContentPage
 {
-    public FavoritesPage(Account account, IApp app)
+    public FavoritesPage(Account account, IRecipesService service)
     {
         InitializeComponent();
-        
-        //TODO
+
+        //TODO this code can be factorised (see HomePage, MyListPage)
+        service.LookupFavoritesOf(account).ForEach(info =>
+        {
+            RecipeViewLayout.Children.Add(new RecipeView(info, () =>
+            {
+                Recipe recipe = service.GetRecipe(info);
+                AccountRecipeRate rate = service.GetRateOf(account, recipe);
+                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, 1));
+            }));
+        });
+
     }
     
 }
\ No newline at end of file
diff --git a/Views/HomePage.xaml.cs b/Views/HomePage.xaml.cs
index 33b1c44..8c1fe20 100644
--- a/Views/HomePage.xaml.cs
+++ b/Views/HomePage.xaml.cs
@@ -12,6 +12,8 @@ public partial class HomePage : ContentPage
 
         IRecipesService service = endpoint.RecipesService;
 
+
+        //TODO this code can be factorised
         void PushRecipe(Layout layout, RecipeInfo info)
         {
             layout.Children.Add(new RecipeView(info, () =>
@@ -24,7 +26,7 @@ public partial class HomePage : ContentPage
 
 
         service.PopularRecipes().ForEach(recipe => PushRecipe(PopularsList, recipe));
-        service.RecommendedRecipes(account).ForEach(recipe => PushRecipe(RecommendedList, recipe));
+        service.RecommendedRecipesOf(account).ForEach(recipe => PushRecipe(RecommendedList, recipe));
 
         ProfilePictureImage.Source = ImageSource.FromUri(account.User.ProfilePicture);
         ProfilePictureName.Text = account.User.Name;
diff --git a/Views/MyListPage.xaml b/Views/MyListPage.xaml
index 3c621c8..1568766 100644
--- a/Views/MyListPage.xaml
+++ b/Views/MyListPage.xaml
@@ -32,23 +32,13 @@
                 VerticalOptions="Center"/>
         </Grid>
 
-        <!-- Favorite items -->
+        <!-- Account Recipe List items -->
         <ScrollView
             Grid.Row="1">
             <VerticalStackLayout
                 Padding="30, 0, 30, 0"
-                Spacing="12">
-
-                <views:StoredRecipeView Note="4.5" Title="Spaghetti Bolognese"/>
-                <views:StoredRecipeView Note="3" Title="Chickend Curry"/>
-                <views:StoredRecipeView Note="0.2" Title="Beef Stroganoff"/>
-                <views:StoredRecipeView Note="1.6" Title="Fish And Ships" />
-                <views:StoredRecipeView Note="5" Title="Caesar Salad"/>
-                <views:StoredRecipeView Note="3.5" Title="Vegetables"/>
-                <views:StoredRecipeView Note="4.6" Title="Guacamole"/>
-                <views:StoredRecipeView Note="4" Title="Pad Thai"/>
-                <views:StoredRecipeView Note="3" Title="French Toast"/>
-                <views:StoredRecipeView Note="2" Title="Margherita Pizza"/>
+                Spacing="12"
+                x:Name="RecipesLayout">
             </VerticalStackLayout>
         </ScrollView>
 
diff --git a/Views/MyListPage.xaml.cs b/Views/MyListPage.xaml.cs
index d7ffcef..1aa06b7 100644
--- a/Views/MyListPage.xaml.cs
+++ b/Views/MyListPage.xaml.cs
@@ -1,11 +1,24 @@
+using Endpoint;
 using Models;
+using ShoopNCook.Views;
 
-namespace ShoopNCook.Pages;
-
-public partial class MyListPage : ContentPage
-{
-	public MyListPage(Account account, IApp app)
-    {
-		InitializeComponent();
-	}
+namespace ShoopNCook.Pages;
+
+public partial class MyListPage : ContentPage
+{
+	public MyListPage(Account account, IRecipesService service)
+    {
+		InitializeComponent();
+
+        service.LookupWeeklyListOf(account).ForEach(info =>
+        {
+            RecipesLayout.Children.Add(new StoredRecipeView(info.Item1, info.Item2, amount =>
+            {
+                Recipe recipe = service.GetRecipe(info.Item1);
+                AccountRecipeRate rate = service.GetRateOf(account, recipe);
+                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, amount));
+            }));
+        });
+
+    }
 }
\ No newline at end of file

From c04fec0927eb7d41849e05da07c055698a0a006c Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Thu, 11 May 2023 14:51:26 +0200
Subject: [PATCH 6/9] make remove recipe system

---
 App.xaml.cs                              |  2 +-
 ConnectAppShell.xaml.cs                  |  2 +-
 ConsoleUserNotifier.cs                   |  9 ++-
 Controllers/ConnectionController.cs      |  4 +-
 Controllers/MorePageController.cs        | 25 +++++--
 Endpoint/IAccountRecipes.cs              | 32 +++++++++
 Endpoint/IRecipesService.cs              | 10 +--
 IApp.cs                                  |  2 +-
 UserNotifier.cs => IUserNotifier.cs      | 37 ++++++-----
 LocalEndpoint/AccountRecipes.cs          | 84 ++++++++++++++++++++++++
 LocalEndpoint/LocalEndpoint.cs           |  7 +-
 LocalEndpoint/RecipesService.cs          | 61 ++++++-----------
 MainAppShell.xaml.cs                     |  2 +-
 Models/Recipe.cs                         |  8 ++-
 Models/RecipeInfo.cs                     |  8 ++-
 Views/Components/OwnedRecipeView.xaml    | 11 +++-
 Views/Components/OwnedRecipeView.xaml.cs | 32 +++++++--
 Views/Components/RecipeView.xaml.cs      |  3 +-
 Views/FavoritesPage.xaml.cs              |  7 +-
 Views/HomePage.xaml.cs                   |  7 +-
 Views/MorePage.xaml.cs                   |  8 +--
 Views/MyListPage.xaml.cs                 | 11 ++--
 Views/MyRecipesPage.xaml                 | 13 +---
 Views/MyRecipesPage.xaml.cs              | 52 ++++++++++++++-
 Views/ProfilePage.xaml.cs                |  4 +-
 Views/RecipePage.xaml.cs                 |  6 +-
 26 files changed, 320 insertions(+), 127 deletions(-)
 create mode 100644 Endpoint/IAccountRecipes.cs
 rename UserNotifier.cs => IUserNotifier.cs (78%)
 create mode 100644 LocalEndpoint/AccountRecipes.cs

diff --git a/App.xaml.cs b/App.xaml.cs
index 5e0f01e..9c150df 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -8,7 +8,7 @@ public partial class App : Application, ConnectionObserver, IApp
 
     private IEndpoint Endpoint = new LocalEndpoint();
 
-    public UserNotifier Notifier => new ConsoleUserNotifier();
+    public IUserNotifier Notifier => new ConsoleUserNotifier();
 
     public App()
     {
diff --git a/ConnectAppShell.xaml.cs b/ConnectAppShell.xaml.cs
index 15aad38..29f3275 100644
--- a/ConnectAppShell.xaml.cs
+++ b/ConnectAppShell.xaml.cs
@@ -7,7 +7,7 @@ using ShoopNCook.Pages;
 
 public partial class ConnectAppShell : Shell
 {
-	public ConnectAppShell(ConnectionObserver observer, IAccountManager accounts, UserNotifier notifier)
+	public ConnectAppShell(ConnectionObserver observer, IAccountManager accounts, IUserNotifier notifier)
 	{
 		ConnectionController controller = new ConnectionController(observer, accounts, notifier);
 		InitializeComponent();
diff --git a/ConsoleUserNotifier.cs b/ConsoleUserNotifier.cs
index 04b7221..1a06c28 100644
--- a/ConsoleUserNotifier.cs
+++ b/ConsoleUserNotifier.cs
@@ -4,8 +4,15 @@
     /// A notice reporter implementation that prints in console the applications's user notices.
     /// </summary>
     public class ConsoleUserNotifier :
-        UserNotifier
+        IUserNotifier
     {
+
+        public void Success(string message)
+        {
+            Console.WriteLine("<User Notice> Success: " + message);
+        }
+
+
         public void Error(string message)
         {
             Console.WriteLine("<User Notice> Error: " + message);
diff --git a/Controllers/ConnectionController.cs b/Controllers/ConnectionController.cs
index 2ed88de..6ecfd51 100644
--- a/Controllers/ConnectionController.cs
+++ b/Controllers/ConnectionController.cs
@@ -7,8 +7,8 @@ namespace ShoopNCook.Controllers
     {
         private readonly ConnectionObserver observer;
         private readonly IAccountManager accounts;
-        private readonly UserNotifier notifier;
-        public ConnectionController(ConnectionObserver observer, IAccountManager accounts, UserNotifier notifier) {
+        private readonly IUserNotifier notifier;
+        public ConnectionController(ConnectionObserver observer, IAccountManager accounts, IUserNotifier notifier) {
             this.observer = observer;
             this.accounts = accounts;
             this.notifier = notifier;
diff --git a/Controllers/MorePageController.cs b/Controllers/MorePageController.cs
index f4698fa..c8ecee8 100644
--- a/Controllers/MorePageController.cs
+++ b/Controllers/MorePageController.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Endpoint;
+using Models;
+using ShoopNCook.Pages;
 
 namespace ShoopNCook.Controllers
 {
@@ -10,9 +8,14 @@ namespace ShoopNCook.Controllers
     {
 
         private readonly IApp app;
+        private readonly IEndpoint endpoint;
+        private readonly Account account;
 
-        public MorePageController(IApp app) { 
+        public MorePageController(Account account, IEndpoint endpoint, IApp app)
+        {
             this.app = app;
+            this.endpoint = endpoint;
+            this.account = account;
         }
 
         public void Logout()
@@ -20,5 +23,15 @@ namespace ShoopNCook.Controllers
             app.Notifier.Notice("You have been loged out.");
             app.ForceLogin();
         }
+
+        public void GoToMyRecipesPage()
+        {
+            Shell.Current.Navigation.PushAsync(new MyRecipesPage(account, endpoint.RecipesService, app.Notifier));
+        }
+
+        public void GoToProfilePage()
+        {
+            Shell.Current.Navigation.PushAsync(new ProfilePage(account));
+        }
     }
 }
diff --git a/Endpoint/IAccountRecipes.cs b/Endpoint/IAccountRecipes.cs
new file mode 100644
index 0000000..fd61153
--- /dev/null
+++ b/Endpoint/IAccountRecipes.cs
@@ -0,0 +1,32 @@
+using Models;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LocalEndpoint
+{
+    public interface IAccountRecipes
+    {
+
+        public Account Account { get; }
+
+        public bool UploadRecipe(Recipe recipe);
+
+        public bool RemoveRecipe(RecipeInfo info);
+
+        public void SetRate(RecipeInfo info, AccountRecipeRate rate);
+
+        public AccountRecipeRate? FindRate(RecipeInfo info);
+
+        public ImmutableList<RecipeInfo> GetAccountRecipes();
+
+        public ImmutableList<RecipeInfo> GetRecommendedRecipes();
+
+        public ImmutableList<RecipeInfo> GetFavorites();
+
+        public ImmutableList<(RecipeInfo, uint)> GetWeeklyList();
+    }
+}
diff --git a/Endpoint/IRecipesService.cs b/Endpoint/IRecipesService.cs
index 5f78d26..df7d16a 100644
--- a/Endpoint/IRecipesService.cs
+++ b/Endpoint/IRecipesService.cs
@@ -1,4 +1,5 @@
-using Models;
+using LocalEndpoint;
+using Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,17 +10,12 @@ namespace Endpoint
 {
     public interface IRecipesService
     {
-
         public List<RecipeInfo> PopularRecipes();
 
         public Recipe GetRecipe(RecipeInfo info);
 
-        public List<RecipeInfo> RecommendedRecipesOf(Account account);
-
-        public List<RecipeInfo> LookupFavoritesOf(Account account);
+        public IAccountRecipes GetRecipesOf(Account account);
 
-        public List<(RecipeInfo, uint)> LookupWeeklyListOf(Account account);
 
-        public AccountRecipeRate GetRateOf(Account account, Recipe recipe);
     }
 }
diff --git a/IApp.cs b/IApp.cs
index 32a77b0..dad1336 100644
--- a/IApp.cs
+++ b/IApp.cs
@@ -9,7 +9,7 @@ namespace ShoopNCook
 {
     public interface IApp
     {
-        public UserNotifier Notifier { get; }
+        public IUserNotifier Notifier { get; }
 
         public void ForceLogin();
     }
diff --git a/UserNotifier.cs b/IUserNotifier.cs
similarity index 78%
rename from UserNotifier.cs
rename to IUserNotifier.cs
index bfd4c07..4576a70 100644
--- a/UserNotifier.cs
+++ b/IUserNotifier.cs
@@ -1,18 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ShoopNCook
-{
-    public interface UserNotifier
-
-    {
-        public void Notice(string message);
-
-        public void Error(string message);
-
-        public void Warn(string message);
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ShoopNCook
+{
+    public interface IUserNotifier
+    {
+        public void Success(string message);
+
+        public void Notice(string message);
+
+        public void Error(string message);
+
+        public void Warn(string message);
+    }
+}
diff --git a/LocalEndpoint/AccountRecipes.cs b/LocalEndpoint/AccountRecipes.cs
new file mode 100644
index 0000000..bd1b3fc
--- /dev/null
+++ b/LocalEndpoint/AccountRecipes.cs
@@ -0,0 +1,84 @@
+using LocalEndpoint;
+using Models;
+using System.Collections.Immutable;
+
+namespace Endpoint
+{
+    internal class AccountRecipes : IAccountRecipes
+    {
+
+        public Account Account { get; init; }
+
+        private readonly Dictionary<Guid, Recipe> ownedRecipes = new Dictionary<Guid, Recipe>();
+        private readonly Dictionary<Guid, AccountRecipeRate> ratedRecipes = new Dictionary<Guid, AccountRecipeRate>();
+
+        public AccountRecipes(Account account)
+        {
+            Account = account;
+        }
+
+        public bool UploadRecipe(Recipe recipe)
+        {
+            Guid id = recipe.Info.Id;
+            if (ownedRecipes.ContainsKey(id))
+            {
+                return false;
+            }
+            ownedRecipes.Add(id, recipe);
+            return true;
+        }
+
+        public bool RemoveRecipe(RecipeInfo info)
+        {
+            return ownedRecipes.Remove(info.Id);
+        }
+
+        public ImmutableList<RecipeInfo> GetAccountRecipes()
+        {
+            return ownedRecipes.Values.ToImmutableList().ConvertAll(r => r.Info);
+        }
+
+
+        public ImmutableList<RecipeInfo> GetRecommendedRecipes()
+        {
+            return new List<RecipeInfo> {
+                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4, new Guid()),
+                new RecipeInfo("Chocolate Cake", 2500, 10, new Uri("https://bakewithshivesh.com/wp-content/uploads/2022/08/IMG_0248-scaled.jpg"), 3, new Guid()),
+                new RecipeInfo("Salmon", 20, 10, new Uri("https://www.wholesomeyum.com/wp-content/uploads/2021/06/wholesomeyum-Pan-Seared-Salmon-Recipe-13.jpg"), 4, new Guid()),
+                new RecipeInfo("Fish", 50, 30, new Uri("https://www.ciaanet.org/wp-content/uploads/2022/07/Atlantic-and-Pacific-whole-salmon-1024x683.jpg"), 4.5F, new Guid()),
+                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, new Guid())
+            }.ToImmutableList();
+        }
+
+        public ImmutableList<RecipeInfo> GetFavorites()
+        {
+            return new List<RecipeInfo> {
+                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4, new Guid()),
+                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, new Guid()),
+                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4, new Guid()),
+                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1, new Guid())
+            }.ToImmutableList();
+        }
+
+        public ImmutableList<(RecipeInfo, uint)> GetWeeklyList()
+        {
+            return new List<(RecipeInfo, uint)> {
+                (new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, new Guid()), 4),
+                (new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3, new Guid()), 4),
+                (new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1, new Guid()), 1),
+            }.ToImmutableList();
+        }
+
+        public void SetRate(RecipeInfo info, AccountRecipeRate rate)
+        {
+            ratedRecipes.Add(info.Id, rate);
+        }
+
+        public AccountRecipeRate? FindRate(RecipeInfo info)
+        {
+            AccountRecipeRate? rate = null;
+            ratedRecipes.TryGetValue(info.Id, out rate);
+            return rate;
+        }
+    }
+}
diff --git a/LocalEndpoint/LocalEndpoint.cs b/LocalEndpoint/LocalEndpoint.cs
index 1a8e310..dd5a112 100644
--- a/LocalEndpoint/LocalEndpoint.cs
+++ b/LocalEndpoint/LocalEndpoint.cs
@@ -4,8 +4,11 @@ namespace LocalEndpoint
 {
     public class LocalEndpoint : IEndpoint
     {
-        public IAccountManager AccountManager => new AccountManager();
+        private IAccountManager accountManager = new AccountManager();
+        private IRecipesService recipesService = new RecipesService();
+        public IAccountManager AccountManager => accountManager;
+
+        public IRecipesService RecipesService => recipesService;
 
-        public IRecipesService RecipesService => new RecipesService();  
     }
 }
\ No newline at end of file
diff --git a/LocalEndpoint/RecipesService.cs b/LocalEndpoint/RecipesService.cs
index ad91dd9..4125a05 100644
--- a/LocalEndpoint/RecipesService.cs
+++ b/LocalEndpoint/RecipesService.cs
@@ -1,66 +1,45 @@
 using Endpoint;
 using Models;
+using System.Collections.Immutable;
 
 namespace LocalEndpoint
 {
     internal class RecipesService : IRecipesService
     {
 
+        private readonly Dictionary<Account, IAccountRecipes> accountsRecipes = new Dictionary<Account, IAccountRecipes>();
+
         public List<RecipeInfo> PopularRecipes()
         {
             return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3),
-                new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1),
-                new RecipeInfo("Beef Stroganoff", 100, 10, new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5),
-                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4),
-                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)
+                new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3, new Guid()),
+                new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1, new Guid()),
+                new RecipeInfo("Beef Stroganoff", 100, 10, new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5, new Guid()),
+                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4, new Guid()),
+                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1, new Guid())
             };
         }
 
         public Recipe GetRecipe(RecipeInfo info)
         {
             User owner = new User(new Uri("https://i.ibb.co/L6t6bGR/DALL-E-2023-05-10-20-27-31-cook-looking-at-the-camera-with-a-chef-s-hat-laughing-in-an-exaggerated-w.png"), "The Funny Chief");
-            List<Ingredient> ingredients = new List<Ingredient> { new Ingredient("Banana", 12), new Ingredient("Apple", 2) };
-            List<PreparationStep> steps = new List<PreparationStep> { new PreparationStep("Step 1", "This step is an hardcoded step from a stub implementation of IRecipesSeervice") };
+            var ingredients = new List<Ingredient> { new Ingredient("Banana", 12), new Ingredient("Apple", 2) }.ToImmutableList();
+            var steps = new List<PreparationStep> { new PreparationStep("Step 1", "This step is an hardcoded step from a stub implementation of IRecipesSeervice") }.ToImmutableList();
             return new Recipe(info, owner, ingredients, steps);
         }
 
 
-        public List<RecipeInfo> RecommendedRecipesOf(Account account)
-        {
-            return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4),
-                new RecipeInfo("Chocolate Cake", 2500, 10, new Uri("https://bakewithshivesh.com/wp-content/uploads/2022/08/IMG_0248-scaled.jpg"), 3),
-                new RecipeInfo("Salmon", 20, 10, new Uri("https://www.wholesomeyum.com/wp-content/uploads/2021/06/wholesomeyum-Pan-Seared-Salmon-Recipe-13.jpg"), 4),
-                new RecipeInfo("Fish", 50, 30, new Uri("https://www.ciaanet.org/wp-content/uploads/2022/07/Atlantic-and-Pacific-whole-salmon-1024x683.jpg"), 4.5F),
-                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5)
-            };
-        }
-
-        public List<RecipeInfo> LookupFavoritesOf(Account account)
-        {
-            return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4),
-                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5),
-                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4),
-                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1)
-            };
-        }
-
-        public List<(RecipeInfo, uint)> LookupWeeklyListOf(Account account)
-        {
-            return new List<(RecipeInfo, uint)> {
-                (new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5), 4),
-                (new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3), 4),
-                (new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1), 1),
-            };
-        }
-
-
-        public AccountRecipeRate GetRateOf(Account account, Recipe recipe)
+        public IAccountRecipes GetRecipesOf(Account account)
         {
-            Random random = new Random();
-            return new AccountRecipeRate(random.Next() % 2 == 0, (uint)random.Next(0, 6));
+            IAccountRecipes? recipes;
+            accountsRecipes.TryGetValue(account, out recipes);
+
+            if (recipes == null) { 
+                recipes = new AccountRecipes(account);
+                recipes.UploadRecipe(new Recipe(new RecipeInfo("Cupcake", 500, 12, new Uri("https://www.mycake.fr/wp-content/uploads/2015/12/rs_cupcake_4x3.jpg"), 4.2F, new Guid()), account.User, new List<Ingredient> { new Ingredient("Chocolate", 4) }.ToImmutableList(), new List<PreparationStep> { new PreparationStep("Eat Chocolate", "Eat the chocolate") }.ToImmutableList()));
+                accountsRecipes.Add(account, recipes);
+            }
+            return recipes;
         }
 
 
diff --git a/MainAppShell.xaml.cs b/MainAppShell.xaml.cs
index 218e9de..decb72a 100644
--- a/MainAppShell.xaml.cs
+++ b/MainAppShell.xaml.cs
@@ -12,6 +12,6 @@ public partial class MainAppShell : Shell
 		HomeTab.ContentTemplate = new DataTemplate(() => new HomePage(account, endpoint));
 		FavoritesTab.ContentTemplate = new DataTemplate(() => new FavoritesPage(account, endpoint.RecipesService));
 		MyListTab.ContentTemplate = new DataTemplate(() => new MyListPage(account, endpoint.RecipesService));
-		MoreTab.ContentTemplate = new DataTemplate(() => new MorePage(account, new MorePageController(app)));
+		MoreTab.ContentTemplate = new DataTemplate(() => new MorePage(account, new MorePageController(account, endpoint, app)));
     }
 }
diff --git a/Models/Recipe.cs b/Models/Recipe.cs
index 523a221..e077c22 100644
--- a/Models/Recipe.cs
+++ b/Models/Recipe.cs
@@ -1,8 +1,10 @@
-namespace Models
+using System.Collections.Immutable;
+
+namespace Models
 {
     public record Recipe(
             RecipeInfo Info,
             User Owner,
-            List<Ingredient> Ingredients,
-            List<PreparationStep> Steps);
+            ImmutableList<Ingredient> Ingredients,
+            ImmutableList<PreparationStep> Steps);
 }
\ No newline at end of file
diff --git a/Models/RecipeInfo.cs b/Models/RecipeInfo.cs
index 7846de1..0783744 100644
--- a/Models/RecipeInfo.cs
+++ b/Models/RecipeInfo.cs
@@ -1,4 +1,10 @@
 namespace Models
 {
-    public record RecipeInfo(string Name, uint CalPerPers, uint CookTimeMins, Uri Image, float AverageNote);
+    public record RecipeInfo(
+        string Name,
+        uint CalPerPers,
+        uint CookTimeMins,
+        Uri Image,
+        float AverageNote,
+        Guid Id);
 }
diff --git a/Views/Components/OwnedRecipeView.xaml b/Views/Components/OwnedRecipeView.xaml
index 627cc7c..dc14df3 100644
--- a/Views/Components/OwnedRecipeView.xaml
+++ b/Views/Components/OwnedRecipeView.xaml
@@ -12,13 +12,20 @@
             MinimumHeightRequest="175"
             MinimumWidthRequest="150"
             RowDefinitions="*, Auto">
+
+            <Grid.GestureRecognizers>
+                <TapGestureRecognizer 
+                    Tapped="OnViewTapped" 
+                    NumberOfTapsRequired="1"/>
+            </Grid.GestureRecognizers>
+
             <Border
                 Grid.Row="0"
                 Stroke="Transparent"
                 StrokeShape="RoundRectangle 20"
                 BackgroundColor="{StaticResource ImageBackground}">
                 <Grid>
-                    <Image />
+                    <Image x:Name="RecipeImage" />
                     <HorizontalStackLayout
                         x:Name="Stars"
                         VerticalOptions="End"
@@ -60,7 +67,7 @@
                         >
                         <Grid.GestureRecognizers>
                             <TapGestureRecognizer 
-                                Tapped="TapGestureRecognizer_Tapped" 
+                                Tapped="OnRemoveButtonTapped" 
                                 NumberOfTapsRequired="1"/>
                         </Grid.GestureRecognizers>
                         <Image
diff --git a/Views/Components/OwnedRecipeView.xaml.cs b/Views/Components/OwnedRecipeView.xaml.cs
index 257d5f9..7330171 100644
--- a/Views/Components/OwnedRecipeView.xaml.cs
+++ b/Views/Components/OwnedRecipeView.xaml.cs
@@ -1,18 +1,31 @@
+using Models;
+
 namespace ShoopNCook.Views;
 
 public partial class OwnedRecipeView : ContentView
 {
 
-    public OwnedRecipeView() : this(5, "Title")
-    { }
+    private readonly Action clickCallback;
+    private readonly Action removeCallback;
+    private readonly RecipeInfo recipeInfo;
 
-    public OwnedRecipeView(float note, string title)
+    public OwnedRecipeView(RecipeInfo info, Action onClickCallback, Action onRemoveCallback)
     {
         InitializeComponent();
-        Note = note;
-        Title = title;
+
+        RecipeImage.Source = ImageSource.FromUri(info.Image);
+        Note = info.AverageNote;
+        Title = info.Name;
+
+        this.recipeInfo = info;
+        this.clickCallback = onClickCallback;
+        this.removeCallback = onRemoveCallback;
     }
 
+    public bool IsViewing(RecipeInfo info)
+    {
+        return recipeInfo == info;
+    }
     public float Note
     {
         set => SetNote(value);
@@ -37,8 +50,13 @@ public partial class OwnedRecipeView : ContentView
         }
     }
 
-    private void TapGestureRecognizer_Tapped(object sender, TappedEventArgs e)
+    private void OnViewTapped(object sender, TappedEventArgs e)
+    {
+        clickCallback();
+    }
+
+    private void OnRemoveButtonTapped(object sender, TappedEventArgs e)
     {
-        Console.WriteLine("This is a test");
+        removeCallback();
     }
 }
\ No newline at end of file
diff --git a/Views/Components/RecipeView.xaml.cs b/Views/Components/RecipeView.xaml.cs
index 44d826b..ab44ee4 100644
--- a/Views/Components/RecipeView.xaml.cs
+++ b/Views/Components/RecipeView.xaml.cs
@@ -19,6 +19,8 @@ public partial class RecipeView : ContentView
 
     }
 
+
+
     public float Note
     {
         set => SetNote(value);
@@ -34,7 +36,6 @@ public partial class RecipeView : ContentView
         set => SubtitleLabel.Text = value;
     }
 
-
     private void SetNote(float note)
 	{
         int i = 1;
diff --git a/Views/FavoritesPage.xaml.cs b/Views/FavoritesPage.xaml.cs
index 26f7483..ae667ed 100644
--- a/Views/FavoritesPage.xaml.cs
+++ b/Views/FavoritesPage.xaml.cs
@@ -3,6 +3,7 @@ using Models;
 namespace ShoopNCook.Pages;
 
 using Endpoint;
+using LocalEndpoint;
 using Models;
 using ShoopNCook.Views;
 
@@ -12,13 +13,13 @@ public partial class FavoritesPage : ContentPage
     {
         InitializeComponent();
 
-        //TODO this code can be factorised (see HomePage, MyListPage)
-        service.LookupFavoritesOf(account).ForEach(info =>
+        IAccountRecipes recipes = service.GetRecipesOf(account);
+        recipes.GetFavorites().ForEach(info =>
         {
             RecipeViewLayout.Children.Add(new RecipeView(info, () =>
             {
                 Recipe recipe = service.GetRecipe(info);
-                AccountRecipeRate rate = service.GetRateOf(account, recipe);
+                AccountRecipeRate? rate = recipes.FindRate(info);
                 Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, 1));
             }));
         });
diff --git a/Views/HomePage.xaml.cs b/Views/HomePage.xaml.cs
index 8c1fe20..2082d1f 100644
--- a/Views/HomePage.xaml.cs
+++ b/Views/HomePage.xaml.cs
@@ -3,6 +3,7 @@ namespace ShoopNCook.Pages;
 using Models;
 using ShoopNCook.Views;
 using Endpoint;
+using LocalEndpoint;
 
 public partial class HomePage : ContentPage
 {
@@ -11,6 +12,7 @@ public partial class HomePage : ContentPage
 		InitializeComponent();
 
         IRecipesService service = endpoint.RecipesService;
+        IAccountRecipes recipes = service.GetRecipesOf(account);
 
 
         //TODO this code can be factorised
@@ -19,14 +21,13 @@ public partial class HomePage : ContentPage
             layout.Children.Add(new RecipeView(info, () =>
             {
                 Recipe recipe = service.GetRecipe(info);
-                AccountRecipeRate rate = service.GetRateOf(account, recipe);
+                AccountRecipeRate rate = recipes.FindRate(info);
                 Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, 1));
             }));
         }
 
-
         service.PopularRecipes().ForEach(recipe => PushRecipe(PopularsList, recipe));
-        service.RecommendedRecipesOf(account).ForEach(recipe => PushRecipe(RecommendedList, recipe));
+        recipes.GetRecommendedRecipes().ForEach(recipe => PushRecipe(RecommendedList, recipe));
 
         ProfilePictureImage.Source = ImageSource.FromUri(account.User.ProfilePicture);
         ProfilePictureName.Text = account.User.Name;
diff --git a/Views/MorePage.xaml.cs b/Views/MorePage.xaml.cs
index 3564167..9e20b5e 100644
--- a/Views/MorePage.xaml.cs
+++ b/Views/MorePage.xaml.cs
@@ -16,14 +16,14 @@ public partial class MorePage : ContentPage
         this.controller = controller;
     }
 
-    private async void OnMyRecipesButtonTapped(object sender, EventArgs e)
+    private void OnMyRecipesButtonTapped(object sender, EventArgs e)
     {
-        await Shell.Current.Navigation.PushAsync(new MyRecipesPage());
+        controller.GoToMyRecipesPage();
     }
     
-    private async void OnEditProfileButtonTapped(object sender, EventArgs e)
+    private void OnEditProfileButtonTapped(object sender, EventArgs e)
     {
-        await Shell.Current.Navigation.PushAsync(new ProfilePage());
+        controller.GoToProfilePage();
     }
     
     private void OnLogoutButtonTapped(object sender, EventArgs e)
diff --git a/Views/MyListPage.xaml.cs b/Views/MyListPage.xaml.cs
index 1aa06b7..f09d1c7 100644
--- a/Views/MyListPage.xaml.cs
+++ b/Views/MyListPage.xaml.cs
@@ -1,4 +1,5 @@
 using Endpoint;
+using LocalEndpoint;
 using Models;
 using ShoopNCook.Views;
 
@@ -10,12 +11,14 @@ public partial class MyListPage : ContentPage
     {
 		InitializeComponent();
 
-        service.LookupWeeklyListOf(account).ForEach(info =>
+        IAccountRecipes recipes = service.GetRecipesOf(account);
+        recipes.GetWeeklyList().ForEach(tuple =>
         {
-            RecipesLayout.Children.Add(new StoredRecipeView(info.Item1, info.Item2, amount =>
+            RecipeInfo info = tuple.Item1;
+            RecipesLayout.Children.Add(new StoredRecipeView(info, tuple.Item2, amount =>
             {
-                Recipe recipe = service.GetRecipe(info.Item1);
-                AccountRecipeRate rate = service.GetRateOf(account, recipe);
+                Recipe recipe = service.GetRecipe(info);
+                AccountRecipeRate? rate = recipes.FindRate(info);
                 Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, amount));
             }));
         });
diff --git a/Views/MyRecipesPage.xaml b/Views/MyRecipesPage.xaml
index 34835d0..f9f2b2a 100644
--- a/Views/MyRecipesPage.xaml
+++ b/Views/MyRecipesPage.xaml
@@ -38,18 +38,9 @@
                 AlignItems="Start"
                 AlignContent="Start"
                 Direction="Row"
-                Wrap="Wrap">
+                Wrap="Wrap"
+                x:Name="RecipesLayout">
 
-                <views:OwnedRecipeView Margin="5" Note="4.5" Title="Spaghetti Bolognese"/>
-                <views:OwnedRecipeView Margin="5" Note="3" Title="Chickend Curry"/>
-                <views:OwnedRecipeView Margin="5" Note="0.2" Title="Beef Stroganoff"/>
-                <views:OwnedRecipeView Margin="5" Note="1.6" Title="Fish And Ships"/>
-                <views:OwnedRecipeView Margin="5" Note="5" Title="Caesar Salad"/>
-                <views:OwnedRecipeView Margin="5" Note="3.5" Title="Vegetables"/>
-                <views:OwnedRecipeView Margin="5" Note="4.6" Title="Guacamole"/>
-                <views:OwnedRecipeView Margin="5" Note="4" Title="Pad Thai"/>
-                <views:OwnedRecipeView Margin="5" Note="3" Title="French Toast"/>
-                <views:OwnedRecipeView Margin="5" Note="2" Title="Margherita Pizza"/>
             </FlexLayout>
         </ScrollView>
 
diff --git a/Views/MyRecipesPage.xaml.cs b/Views/MyRecipesPage.xaml.cs
index cabf0bf..ebd37ba 100644
--- a/Views/MyRecipesPage.xaml.cs
+++ b/Views/MyRecipesPage.xaml.cs
@@ -1,12 +1,58 @@
+using Endpoint;
+using LocalEndpoint;
+using Models;
+using ShoopNCook.Controllers;
+using ShoopNCook.Views;
+
 namespace ShoopNCook.Pages;
 
 public partial class MyRecipesPage : ContentPage
 {
-	public MyRecipesPage()
-	{
+
+    private IUserNotifier notifier;
+    private IAccountRecipes recipes;
+
+	public MyRecipesPage(
+            Account account,
+            IRecipesService service,
+            IUserNotifier notifier)
+    {
         InitializeComponent();
 
-	}
+        this.notifier = notifier;
+        this.recipes = service.GetRecipesOf(account);
+
+        recipes.GetAccountRecipes().ForEach(info =>
+        {
+            RecipesLayout.Children.Add(new OwnedRecipeView(info, () =>
+            {
+                Recipe recipe = service.GetRecipe(info);
+                AccountRecipeRate? rate = recipes.FindRate(info);
+                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, 1));
+            },
+            () => RemoveRecipe(info)
+            ));
+        });
+    }
+
+    private void RemoveRecipe(RecipeInfo info)
+    {
+        if (!recipes.RemoveRecipe(info))
+        {
+            notifier.Error("Could not remove recipe");
+            return;
+        }
+        foreach (OwnedRecipeView view in RecipesLayout.Children)
+        {
+            if (view.IsViewing(info))
+            {
+                RecipesLayout.Remove(view);
+                break;
+            }
+        }
+        notifier.Success("Recipe successfully removed");
+    }
+
     private async void OnBackButtonClicked(object sender, EventArgs e)
     {
         await Navigation.PopAsync();
diff --git a/Views/ProfilePage.xaml.cs b/Views/ProfilePage.xaml.cs
index 86b31c0..9b90431 100644
--- a/Views/ProfilePage.xaml.cs
+++ b/Views/ProfilePage.xaml.cs
@@ -1,8 +1,10 @@
+using Models;
+
 namespace ShoopNCook.Pages;
 
 public partial class ProfilePage : ContentPage
 {
-	public ProfilePage()
+	public ProfilePage(Account account)
 	{
 		InitializeComponent();
 	}
diff --git a/Views/RecipePage.xaml.cs b/Views/RecipePage.xaml.cs
index 61c4c2b..e0df08b 100644
--- a/Views/RecipePage.xaml.cs
+++ b/Views/RecipePage.xaml.cs
@@ -12,14 +12,14 @@ public partial class RecipePage : ContentPage
     public ICommand StarCommand => new Command<string>(count => SetNote(uint.Parse(count)));
 
 
-    public RecipePage(Recipe recipe, AccountRecipeRate rate, uint amount)
+    public RecipePage(Recipe recipe, AccountRecipeRate? rate, uint amount)
     {
         InitializeComponent();
 
         Counter.Count = amount;
 
-        note = rate.Rate;
-        isFavorite = rate.IsFavorite;
+        note = rate?.Rate ?? 0;
+        isFavorite = rate?.IsFavorite ?? false;
 
         SetFavorite(isFavorite);
         SetNote(note);

From ebeed7a28c0676bcf9cc05cc80abcecfe38dbc04 Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Thu, 11 May 2023 16:27:37 +0200
Subject: [PATCH 7/9] add recipe upload handling on frontend side and in
 LocalEndpoint

---
 LocalEndpoint/AccountRecipes.cs           | 24 ++++-----
 LocalEndpoint/RecipesService.cs           | 12 ++---
 Models/RecipeBuilder.cs                   | 65 +++++++++++++++++++++++
 Models/RecipeInfo.cs                      |  2 +-
 Views/Components/IngredientEntry.xaml     | 10 ++--
 Views/Components/IngredientEntry.xaml.cs  | 15 ++++++
 Views/Components/OwnedRecipeView.xaml.cs  | 15 +++---
 Views/Components/RecipeView.xaml.cs       | 25 +++++----
 Views/Components/StepEntry.xaml           |  3 +-
 Views/Components/StepEntry.xaml.cs        |  7 +++
 Views/Components/StoredRecipeView.xaml.cs | 17 +++---
 Views/CreateRecipePage.xaml               | 26 +++++++--
 Views/CreateRecipePage.xaml.cs            | 55 +++++++++++++++++--
 Views/MyRecipesPage.xaml                  |  2 +-
 Views/MyRecipesPage.xaml.cs               | 43 +++++++++------
 15 files changed, 249 insertions(+), 72 deletions(-)
 create mode 100644 Models/RecipeBuilder.cs

diff --git a/LocalEndpoint/AccountRecipes.cs b/LocalEndpoint/AccountRecipes.cs
index bd1b3fc..12c7aa4 100644
--- a/LocalEndpoint/AccountRecipes.cs
+++ b/LocalEndpoint/AccountRecipes.cs
@@ -42,30 +42,30 @@ namespace Endpoint
         public ImmutableList<RecipeInfo> GetRecommendedRecipes()
         {
             return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4, new Guid()),
-                new RecipeInfo("Chocolate Cake", 2500, 10, new Uri("https://bakewithshivesh.com/wp-content/uploads/2022/08/IMG_0248-scaled.jpg"), 3, new Guid()),
-                new RecipeInfo("Salmon", 20, 10, new Uri("https://www.wholesomeyum.com/wp-content/uploads/2021/06/wholesomeyum-Pan-Seared-Salmon-Recipe-13.jpg"), 4, new Guid()),
-                new RecipeInfo("Fish", 50, 30, new Uri("https://www.ciaanet.org/wp-content/uploads/2022/07/Atlantic-and-Pacific-whole-salmon-1024x683.jpg"), 4.5F, new Guid()),
-                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, new Guid())
+                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4, Guid.NewGuid()),
+                new RecipeInfo("Chocolate Cake", 2500, 10, new Uri("https://bakewithshivesh.com/wp-content/uploads/2022/08/IMG_0248-scaled.jpg"), 3, Guid.NewGuid()),
+                new RecipeInfo("Salmon", 20, 10, new Uri("https://www.wholesomeyum.com/wp-content/uploads/2021/06/wholesomeyum-Pan-Seared-Salmon-Recipe-13.jpg"), 4, Guid.NewGuid()),
+                new RecipeInfo("Fish", 50, 30, new Uri("https://www.ciaanet.org/wp-content/uploads/2022/07/Atlantic-and-Pacific-whole-salmon-1024x683.jpg"), 4.5F, Guid.NewGuid()),
+                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, Guid.NewGuid())
             }.ToImmutableList();
         }
 
         public ImmutableList<RecipeInfo> GetFavorites()
         {
             return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4, new Guid()),
-                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, new Guid()),
-                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4, new Guid()),
-                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1, new Guid())
+                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4, Guid.NewGuid()),
+                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, Guid.NewGuid()),
+                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4, Guid.NewGuid()),
+                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1, Guid.NewGuid())
             }.ToImmutableList();
         }
 
         public ImmutableList<(RecipeInfo, uint)> GetWeeklyList()
         {
             return new List<(RecipeInfo, uint)> {
-                (new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, new Guid()), 4),
-                (new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3, new Guid()), 4),
-                (new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1, new Guid()), 1),
+                (new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, Guid.NewGuid()), 4),
+                (new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3, Guid.NewGuid()), 4),
+                (new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1, Guid.NewGuid()), 1),
             }.ToImmutableList();
         }
 
diff --git a/LocalEndpoint/RecipesService.cs b/LocalEndpoint/RecipesService.cs
index 4125a05..37f6c8e 100644
--- a/LocalEndpoint/RecipesService.cs
+++ b/LocalEndpoint/RecipesService.cs
@@ -12,11 +12,11 @@ namespace LocalEndpoint
         public List<RecipeInfo> PopularRecipes()
         {
             return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3, new Guid()),
-                new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1, new Guid()),
-                new RecipeInfo("Beef Stroganoff", 100, 10, new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5, new Guid()),
-                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4, new Guid()),
-                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1, new Guid())
+                new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3, Guid.NewGuid()),
+                new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1, Guid.NewGuid()),
+                new RecipeInfo("Beef Stroganoff", 100, 10, new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5, Guid.NewGuid()),
+                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4, Guid.NewGuid()),
+                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1, Guid.NewGuid())
             };
         }
 
@@ -36,7 +36,7 @@ namespace LocalEndpoint
 
             if (recipes == null) { 
                 recipes = new AccountRecipes(account);
-                recipes.UploadRecipe(new Recipe(new RecipeInfo("Cupcake", 500, 12, new Uri("https://www.mycake.fr/wp-content/uploads/2015/12/rs_cupcake_4x3.jpg"), 4.2F, new Guid()), account.User, new List<Ingredient> { new Ingredient("Chocolate", 4) }.ToImmutableList(), new List<PreparationStep> { new PreparationStep("Eat Chocolate", "Eat the chocolate") }.ToImmutableList()));
+                recipes.UploadRecipe(new Recipe(new RecipeInfo("Cupcake", 500, 12, new Uri("https://www.mycake.fr/wp-content/uploads/2015/12/rs_cupcake_4x3.jpg"), 4.2F, Guid.NewGuid()), account.User, new List<Ingredient> { new Ingredient("Chocolate", 4) }.ToImmutableList(), new List<PreparationStep> { new PreparationStep("Eat Chocolate", "Eat the chocolate") }.ToImmutableList()));
                 accountsRecipes.Add(account, recipes);
             }
             return recipes;
diff --git a/Models/RecipeBuilder.cs b/Models/RecipeBuilder.cs
new file mode 100644
index 0000000..047a4c6
--- /dev/null
+++ b/Models/RecipeBuilder.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Models
+{
+    public class RecipeBuilder
+    {
+        private readonly string name;
+        private readonly User owner;
+
+        private uint callPerPers;
+        private uint cookTimeMins;
+        private Uri? image;
+
+        private List<Ingredient> ingredients = new List<Ingredient>();
+        private List<PreparationStep> steps = new List<PreparationStep>();
+
+
+        public RecipeBuilder(string name, User owner) 
+        {
+            this.name = name;
+            this.owner = owner;
+        }
+
+        public RecipeBuilder SetCallPerPers(uint callPerPers)
+        {
+            this.callPerPers = callPerPers;
+            return this;
+        }
+
+        public RecipeBuilder SetCookTimeMins(uint cookTimeMins)
+        {
+            this.cookTimeMins = cookTimeMins;
+            return this;
+        }
+
+        public RecipeBuilder SetImage(Uri image)
+        {
+            this.image = image;
+            return this;
+        }
+
+        public RecipeBuilder AddIngredient(Ingredient ingredient)
+        {
+            this.ingredients.Add(ingredient);
+            return this;
+        }
+
+        public RecipeBuilder AddStep(PreparationStep step)
+        {
+            this.steps.Add(step);
+            return this;
+        }
+
+        public Recipe Build()
+        {
+            RecipeInfo info = new RecipeInfo(name, callPerPers, cookTimeMins, image, 0, Guid.NewGuid());
+            return new Recipe(info, owner, ingredients.ToImmutableList(), steps.ToImmutableList());
+        }
+    }
+}
diff --git a/Models/RecipeInfo.cs b/Models/RecipeInfo.cs
index 0783744..1265c96 100644
--- a/Models/RecipeInfo.cs
+++ b/Models/RecipeInfo.cs
@@ -4,7 +4,7 @@
         string Name,
         uint CalPerPers,
         uint CookTimeMins,
-        Uri Image,
+        Uri? Image,
         float AverageNote,
         Guid Id);
 }
diff --git a/Views/Components/IngredientEntry.xaml b/Views/Components/IngredientEntry.xaml
index e18d75a..0a39bdc 100644
--- a/Views/Components/IngredientEntry.xaml
+++ b/Views/Components/IngredientEntry.xaml
@@ -21,7 +21,8 @@
                 <Entry 
                     Style="{StaticResource UserInput}"
                     Placeholder="Ingredient Name"
-                    HeightRequest="40"/>
+                    HeightRequest="40"
+                    x:Name="NameEntry"/>
             </Border>
             <Border
                 Grid.Column="1"
@@ -32,7 +33,9 @@
                 <Entry 
                     Style="{StaticResource UserInput}"
                     Placeholder="Quantity"
-                    HeightRequest="40"/>
+                    HeightRequest="40"
+                    Keyboard="Numeric"
+                    x:Name="QuantityEntry"/>
             </Border>
             <Border
                 Grid.Column="2"
@@ -44,7 +47,8 @@
                     Title="Unit"
                     TextColor="{StaticResource TextColorPrimary}"
                     TitleColor="{StaticResource TextColorSecondary}"
-                    FontFamily="PoppinsMedium">
+                    FontFamily="PoppinsMedium"
+                    x:Name="UnitPicker">
                     <Picker.ItemsSource>
                         <x:Array Type="{x:Type x:String}">
                             <x:String>G</x:String>
diff --git a/Views/Components/IngredientEntry.xaml.cs b/Views/Components/IngredientEntry.xaml.cs
index 2d777b1..72a0bc3 100644
--- a/Views/Components/IngredientEntry.xaml.cs
+++ b/Views/Components/IngredientEntry.xaml.cs
@@ -1,3 +1,5 @@
+using Models;
+
 namespace ShoopNCook.Views;
 
 public partial class IngredientEntry : ContentView
@@ -6,4 +8,17 @@ public partial class IngredientEntry : ContentView
 	{
 		InitializeComponent();
 	}
+
+	public Ingredient MakeValue()
+	{
+        float quantity;
+
+        if (!float.TryParse(QuantityEntry.Text, out quantity))
+        {
+            quantity = 0;
+            // TODO handle quantity text malformation by raising exception 
+        }
+
+        return new Ingredient(NameEntry.Text, quantity);
+    }
 }
\ No newline at end of file
diff --git a/Views/Components/OwnedRecipeView.xaml.cs b/Views/Components/OwnedRecipeView.xaml.cs
index 7330171..56c47d1 100644
--- a/Views/Components/OwnedRecipeView.xaml.cs
+++ b/Views/Components/OwnedRecipeView.xaml.cs
@@ -13,7 +13,8 @@ public partial class OwnedRecipeView : ContentView
     {
         InitializeComponent();
 
-        RecipeImage.Source = ImageSource.FromUri(info.Image);
+        if (info.Image != null)
+            RecipeImage.Source = ImageSource.FromUri(info.Image);
         Note = info.AverageNote;
         Title = info.Name;
 
@@ -38,15 +39,15 @@ public partial class OwnedRecipeView : ContentView
 
     private void SetNote(float note)
     {
-        int i = 1;
-        foreach (Image img in Stars.Children)
+        note = (uint)note; //truncate integer as we currently do not handle semi stars
+        foreach (Image img in Stars.Children.Reverse())
         {
-            if (i < note)
+            if (note > 0)
             {
-                img.Opacity = 0;
-                i++;
+                img.Opacity = 1;
+                note--;
             }
-            else img.Opacity = 1;
+            else img.Opacity = 0;
         }
     }
 
diff --git a/Views/Components/RecipeView.xaml.cs b/Views/Components/RecipeView.xaml.cs
index ab44ee4..e30c89e 100644
--- a/Views/Components/RecipeView.xaml.cs
+++ b/Views/Components/RecipeView.xaml.cs
@@ -10,11 +10,14 @@ public partial class RecipeView : ContentView
 	public RecipeView(RecipeInfo info, Action onClickCallback)
 	{
 		InitializeComponent();
+
+        if (info.Image != null)
+            RecipeImage.Source = ImageSource.FromUri(info.Image);
+
         Note = info.AverageNote;
         Title = info.Name;
-        Subtitle = info.CookTimeMins + " min"; 
-        RecipeImage.Source = ImageSource.FromUri(info.Image);
-        
+        Subtitle = info.CookTimeMins + " min";
+
         callback = onClickCallback;
 
     }
@@ -37,18 +40,18 @@ public partial class RecipeView : ContentView
     }
 
     private void SetNote(float note)
-	{
-        int i = 1;
-        foreach (Image img in Stars.Children)
+    {
+        note = (uint)note; //truncate integer as we currently do not handle semi stars
+        foreach (Image img in Stars.Children.Reverse())
         {
-            if (i < note)
+            if (note > 0)
             {
-                img.Opacity = 0;
-                i++;
+                img.Opacity = 1;
+                note--;
             }
-            else img.Opacity = 1;
+            else img.Opacity = 0;
         }
-	}
+    }
     private void OnRecipeTapped(object sender, EventArgs e)
     {
         callback();
diff --git a/Views/Components/StepEntry.xaml b/Views/Components/StepEntry.xaml
index 3bff27a..f07c71e 100644
--- a/Views/Components/StepEntry.xaml
+++ b/Views/Components/StepEntry.xaml
@@ -22,7 +22,8 @@
                 MaxLength="10000"
                 Style="{StaticResource UserInput}"
                 AutoSize="TextChanges"
-                FontSize="15"/>
+                FontSize="15"
+                x:Name="StepEditor"/>
         </Border>
 
     </VerticalStackLayout>
diff --git a/Views/Components/StepEntry.xaml.cs b/Views/Components/StepEntry.xaml.cs
index a2a229c..cc7203e 100644
--- a/Views/Components/StepEntry.xaml.cs
+++ b/Views/Components/StepEntry.xaml.cs
@@ -1,3 +1,5 @@
+using Models;
+
 namespace ShoopNCook.Views;
 
 public partial class StepEntry : ContentView
@@ -12,6 +14,11 @@ public partial class StepEntry : ContentView
 		Ordinal = ordinal;
 	}
 
+	public PreparationStep MakeStep()
+	{
+		return new PreparationStep("Step " + Ordinal, StepEditor.Text);
+	}
+
 	public uint Ordinal { 
 		get => uint.Parse(OrdinalLabel.Text);
 		set => OrdinalLabel.Text = value.ToString();
diff --git a/Views/Components/StoredRecipeView.xaml.cs b/Views/Components/StoredRecipeView.xaml.cs
index da2a32c..1915216 100644
--- a/Views/Components/StoredRecipeView.xaml.cs
+++ b/Views/Components/StoredRecipeView.xaml.cs
@@ -12,11 +12,12 @@ public partial class StoredRecipeView : ContentView
     {
         InitializeComponent();
 
-        clickCallback = onClickCallback;
+        if (info.Image != null)
+            RecipeImage.Source = ImageSource.FromUri(info.Image);
 
         Note = info.AverageNote;
         Title = info.Name;
-        RecipeImage.Source = ImageSource.FromUri(info.Image);
+        clickCallback = onClickCallback;
         Counter.Count = personCount;
     }
 
@@ -32,15 +33,15 @@ public partial class StoredRecipeView : ContentView
 
     private void SetNote(float note)
     {
-        int i = 1;
-        foreach (Image img in Stars.Children)
+        note = (uint)note; //truncate integer as we currently do not handle semi stars
+        foreach (Image img in Stars.Children.Reverse())
         {
-            if (i < note)
+            if (note > 0)
             {
-                img.Opacity = 0;
-                i++;
+                img.Opacity = 1;
+                note--;
             }
-            else img.Opacity = 1;
+            else img.Opacity = 0;
         }
     }
 
diff --git a/Views/CreateRecipePage.xaml b/Views/CreateRecipePage.xaml
index 63cd5f7..0f1bbc9 100644
--- a/Views/CreateRecipePage.xaml
+++ b/Views/CreateRecipePage.xaml
@@ -56,9 +56,10 @@
                         VerticalOptions="End"
                         TranslationY="20"
                         TranslationX="-20">
+                        
                         <ImageButton
-                        Source="edit.svg"
-                        WidthRequest="30"/>
+                            Source="edit.svg"
+                            WidthRequest="30"/>
                     </Border>
                 </Grid>
                 
@@ -66,7 +67,8 @@
                     <!--Ingredients-->
                     <Entry
                         Style="{StaticResource UserInput}"
-                        Placeholder="Specify your recipe name"/>
+                        Placeholder="Specify your recipe name"
+                        x:Name="RecipeNameEntry"/>
                     <Label
                         Style="{StaticResource h2}"
                         Text="Ingredient list (for 1 person)"/>
@@ -115,6 +117,21 @@
                             Text="minutes"/>
                     </HorizontalStackLayout>
 
+                    <HorizontalStackLayout>
+                        <Label
+                            Style="{StaticResource h3}"
+                            VerticalTextAlignment="Center"
+                            Text="Estimated cal/persons: "/>
+                        <Entry
+                            Style="{StaticResource UserInput}"
+                            Keyboard="Numeric"
+                            x:Name="EnergyInput"/>
+                        <Label
+                            Style="{StaticResource h3}"
+                            VerticalTextAlignment="Center"
+                            Text="cal/pers"/>
+                    </HorizontalStackLayout>
+
                     <!--Preparation entry steps list-->
                     <Label
                         Style="{StaticResource h2}"
@@ -154,7 +171,8 @@
             Grid.Row="3"
             Style="{StaticResource UserButton}"
             BackgroundColor="{StaticResource ActionButton}"
-            Text="Upload recipe"/>
+            Text="Upload recipe"
+            Clicked="OnUploadRecipeClicked"/>
     </Grid>
     
 </ContentPage>
\ No newline at end of file
diff --git a/Views/CreateRecipePage.xaml.cs b/Views/CreateRecipePage.xaml.cs
index 64b0fd5..8c5bea0 100644
--- a/Views/CreateRecipePage.xaml.cs
+++ b/Views/CreateRecipePage.xaml.cs
@@ -1,12 +1,21 @@
+using Models;
 using ShoopNCook.Views;
 
 namespace ShoopNCook.Pages;
 
 public partial class CreateRecipePage : ContentPage
 {
-	public CreateRecipePage()
+
+    private User owner;
+    private Action<Recipe> onRecipeCreated;
+    private IUserNotifier notifier;
+
+	public CreateRecipePage(User owner, IUserNotifier notifier, Action<Recipe> onRecipeCreated)
 	{
 		InitializeComponent();
+        this.owner = owner;
+        this.onRecipeCreated = onRecipeCreated;
+        this.notifier = notifier;
 	}
 
     private void OnAddIngredientTapped(object sender, TappedEventArgs e)
@@ -18,8 +27,48 @@ public partial class CreateRecipePage : ContentPage
     {
         StepList.Children.Add(new StepEntry((uint) StepList.Children.Count() + 1));
     }
-    private async void OnBackButtonClicked(object sender, EventArgs e)
+    private void OnBackButtonClicked(object sender, EventArgs e)
     {
-        await Navigation.PopAsync();
+        Navigation.PopAsync();
+    }
+
+    private void OnUploadRecipeClicked(object sender, EventArgs e)
+    {
+
+        uint callPerPers;
+        uint cookTimeMins;
+        bool hadErrors = false;
+
+        if (!uint.TryParse(EnergyInput.Text, out callPerPers))
+        {
+            hadErrors = true;
+            //TODO change EnergyInput background to red.
+        }
+
+        if (!uint.TryParse(CookTimeInput.Text, out cookTimeMins))
+        {
+            hadErrors = true;
+            //TODO change CookTimeInput background to red.
+        }
+
+        if (hadErrors)
+        {
+            notifier.Error("You need to fix input errors before upload.");
+            return;
+        }
+
+        RecipeBuilder builder = new RecipeBuilder(RecipeNameEntry.Text, owner)
+            .SetCallPerPers(callPerPers)
+            .SetCookTimeMins(cookTimeMins)
+     //TODO .SetImage(RecipeImage)
+            ;
+
+        foreach (IngredientEntry entry in IngredientList.Children)
+            builder.AddIngredient(entry.MakeValue());
+
+        foreach (StepEntry entry in StepList.Children)
+            builder.AddStep(entry.MakeStep());
+
+        onRecipeCreated(builder.Build());
     }
 }
\ No newline at end of file
diff --git a/Views/MyRecipesPage.xaml b/Views/MyRecipesPage.xaml
index f9f2b2a..4f248bc 100644
--- a/Views/MyRecipesPage.xaml
+++ b/Views/MyRecipesPage.xaml
@@ -52,7 +52,7 @@
                 Style="{StaticResource UserButton}"
                 BackgroundColor="{StaticResource Selected}"
                 Text="Add a new recipe"
-                Clicked="AddRecipeButtonClicked"/>
+                Clicked="OnAddRecipeButtonClicked"/>
         </Border>
     </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/Views/MyRecipesPage.xaml.cs b/Views/MyRecipesPage.xaml.cs
index ebd37ba..1754c71 100644
--- a/Views/MyRecipesPage.xaml.cs
+++ b/Views/MyRecipesPage.xaml.cs
@@ -1,7 +1,6 @@
 using Endpoint;
 using LocalEndpoint;
 using Models;
-using ShoopNCook.Controllers;
 using ShoopNCook.Views;
 
 namespace ShoopNCook.Pages;
@@ -10,6 +9,7 @@ public partial class MyRecipesPage : ContentPage
 {
 
     private IUserNotifier notifier;
+    private IRecipesService service;
     private IAccountRecipes recipes;
 
 	public MyRecipesPage(
@@ -20,19 +20,22 @@ public partial class MyRecipesPage : ContentPage
         InitializeComponent();
 
         this.notifier = notifier;
+        this.service = service;
         this.recipes = service.GetRecipesOf(account);
+    
+        recipes.GetAccountRecipes().ForEach(AddRecipeView);
+    }
 
-        recipes.GetAccountRecipes().ForEach(info =>
+    private void AddRecipeView(RecipeInfo info)
+    {
+        RecipesLayout.Children.Add(new OwnedRecipeView(info, () =>
         {
-            RecipesLayout.Children.Add(new OwnedRecipeView(info, () =>
-            {
-                Recipe recipe = service.GetRecipe(info);
-                AccountRecipeRate? rate = recipes.FindRate(info);
-                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, 1));
-            },
+            Recipe recipe = service.GetRecipe(info);
+            AccountRecipeRate? rate = recipes.FindRate(info);
+            Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, 1));
+        },
             () => RemoveRecipe(info)
-            ));
-        });
+        ));
     }
 
     private void RemoveRecipe(RecipeInfo info)
@@ -53,13 +56,23 @@ public partial class MyRecipesPage : ContentPage
         notifier.Success("Recipe successfully removed");
     }
 
-    private async void OnBackButtonClicked(object sender, EventArgs e)
+    private void OnBackButtonClicked(object sender, EventArgs e)
     {
-        await Navigation.PopAsync();
+        Navigation.PopAsync();
     }
-    private async void AddRecipeButtonClicked(object sender, EventArgs e)
+    private void OnAddRecipeButtonClicked(object sender, EventArgs e)
     {
-        await Shell.Current.Navigation.PushAsync(new CreateRecipePage());
-        
+        var page = new CreateRecipePage(recipes.Account.User, notifier, recipe =>
+        {
+            if (!recipes.UploadRecipe(recipe))
+            {
+                notifier.Error("Could not upload recipe.");
+                return;
+            }
+            notifier.Success("Recipe Successfuly uploaded !");
+            AddRecipeView(recipe.Info);
+            Shell.Current.Navigation.PopAsync(); //go back to current recipe page.
+        });
+        Shell.Current.Navigation.PushAsync(page); //display RecipePage editor
     }
 }
\ No newline at end of file

From 4638b3efd621a7303efdd4de66ebdc694aa9b50a Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Thu, 11 May 2023 18:25:06 +0200
Subject: [PATCH 8/9] add favorite list handlings on app side and LocalEnpoint.
 Add 'RecipeDatabase' class to simulate a Recipe database

---
 Endpoint/IAccountOwnedRecipes.cs              | 23 +++++
 ...cipes.cs => IAccountRecipesPreferences.cs} | 19 ++--
 Endpoint/IRecipesService.cs                   |  6 +-
 LocalEndpoint/AccountData.cs                  | 11 +++
 LocalEndpoint/AccountManager.cs               | 38 --------
 LocalEndpoint/AccountOwnedRecipes.cs          | 52 +++++++++++
 LocalEndpoint/AccountRecipes.cs               | 84 -----------------
 LocalEndpoint/AccountRecipesPreferences.cs    | 91 +++++++++++++++++++
 LocalEndpoint/ConnectionManager.cs            | 33 +++++++
 LocalEndpoint/Constants.cs                    | 20 ++++
 LocalEndpoint/LocalEndpoint.cs                | 27 +++++-
 LocalEndpoint/RecipesDatabase.cs              | 43 +++++++++
 LocalEndpoint/RecipesService.cs               | 50 +++++-----
 MainAppShell.xaml.cs                          |  6 +-
 Models/AccountRecipeRate.cs                   |  2 +-
 Views/FavoritesPage.xaml                      |  3 +-
 Views/FavoritesPage.xaml.cs                   | 29 ++++--
 Views/HomePage.xaml.cs                        |  9 +-
 Views/MyListPage.xaml.cs                      |  9 +-
 Views/MyRecipesPage.xaml.cs                   | 21 +++--
 Views/RecipePage.xaml                         |  7 +-
 Views/RecipePage.xaml.cs                      | 40 ++++++--
 22 files changed, 425 insertions(+), 198 deletions(-)
 create mode 100644 Endpoint/IAccountOwnedRecipes.cs
 rename Endpoint/{IAccountRecipes.cs => IAccountRecipesPreferences.cs} (54%)
 create mode 100644 LocalEndpoint/AccountData.cs
 delete mode 100644 LocalEndpoint/AccountManager.cs
 create mode 100644 LocalEndpoint/AccountOwnedRecipes.cs
 delete mode 100644 LocalEndpoint/AccountRecipes.cs
 create mode 100644 LocalEndpoint/AccountRecipesPreferences.cs
 create mode 100644 LocalEndpoint/ConnectionManager.cs
 create mode 100644 LocalEndpoint/Constants.cs
 create mode 100644 LocalEndpoint/RecipesDatabase.cs

diff --git a/Endpoint/IAccountOwnedRecipes.cs b/Endpoint/IAccountOwnedRecipes.cs
new file mode 100644
index 0000000..69d6b7b
--- /dev/null
+++ b/Endpoint/IAccountOwnedRecipes.cs
@@ -0,0 +1,23 @@
+using Models;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LocalEndpoint
+{
+    public interface IAccountOwnedRecipes
+    {
+
+        public Account Account { get; }
+
+        public bool UploadRecipe(Recipe recipe);
+
+        public bool RemoveRecipe(RecipeInfo info);
+
+
+        public ImmutableList<RecipeInfo> GetAccountRecipes();
+    }
+}
diff --git a/Endpoint/IAccountRecipes.cs b/Endpoint/IAccountRecipesPreferences.cs
similarity index 54%
rename from Endpoint/IAccountRecipes.cs
rename to Endpoint/IAccountRecipesPreferences.cs
index fd61153..cc2ae12 100644
--- a/Endpoint/IAccountRecipes.cs
+++ b/Endpoint/IAccountRecipesPreferences.cs
@@ -6,27 +6,24 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace LocalEndpoint
+namespace Endpoint
 {
-    public interface IAccountRecipes
+    public interface IAccountRecipesPreferences
     {
-
         public Account Account { get; }
 
-        public bool UploadRecipe(Recipe recipe);
-
-        public bool RemoveRecipe(RecipeInfo info);
 
-        public void SetRate(RecipeInfo info, AccountRecipeRate rate);
+        public void AddToFavorites(RecipeInfo info);
+        public void RemoveFromFavorites(RecipeInfo info);
+        public void SetReviewScore(RecipeInfo info, uint score);
 
-        public AccountRecipeRate? FindRate(RecipeInfo info);
+        public AccountRecipeRate GetRate(RecipeInfo info);
 
-        public ImmutableList<RecipeInfo> GetAccountRecipes();
+        public ImmutableList<RecipeInfo> GetFavorites();
 
         public ImmutableList<RecipeInfo> GetRecommendedRecipes();
 
-        public ImmutableList<RecipeInfo> GetFavorites();
-
         public ImmutableList<(RecipeInfo, uint)> GetWeeklyList();
+
     }
 }
diff --git a/Endpoint/IRecipesService.cs b/Endpoint/IRecipesService.cs
index df7d16a..f9159c2 100644
--- a/Endpoint/IRecipesService.cs
+++ b/Endpoint/IRecipesService.cs
@@ -2,6 +2,7 @@
 using Models;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,11 +11,12 @@ namespace Endpoint
 {
     public interface IRecipesService
     {
-        public List<RecipeInfo> PopularRecipes();
+        public ImmutableList<RecipeInfo> PopularRecipes();
 
         public Recipe GetRecipe(RecipeInfo info);
 
-        public IAccountRecipes GetRecipesOf(Account account);
+        public IAccountOwnedRecipes GetRecipesOf(Account account);
+        public IAccountRecipesPreferences GetPreferencesOf(Account account);
 
 
     }
diff --git a/LocalEndpoint/AccountData.cs b/LocalEndpoint/AccountData.cs
new file mode 100644
index 0000000..cf84b07
--- /dev/null
+++ b/LocalEndpoint/AccountData.cs
@@ -0,0 +1,11 @@
+using Endpoint;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LocalEndpoint
+{
+    internal record AccountData(IAccountOwnedRecipes Recipes, IAccountRecipesPreferences Preferences);
+}
diff --git a/LocalEndpoint/AccountManager.cs b/LocalEndpoint/AccountManager.cs
deleted file mode 100644
index e3df8fc..0000000
--- a/LocalEndpoint/AccountManager.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Models;
-using Endpoint;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LocalEndpoint
-{
-    internal class AccountManager : IAccountManager
-    {
-        private static readonly Uri DEFAULT_ACCOUNT_IMAGE = new Uri("https://www.pngkey.com/png/full/115-1150152_default-profile-picture-avatar-png-green.png");
-
-        private Account userAccount = new Account(new User(DEFAULT_ACCOUNT_IMAGE, "Stub Account"), "test@example.com");
-        private string userPassword = "123456";
-
-        public Account? Login(string email, string password)
-        {
-            if (userAccount.Email == email && userPassword == password)
-            {
-                return userAccount;
-            }
-            return null;
-        }
-
-
-        public Account? Register(string email, string username, string password)
-        {
-            if (email == null || username == null || password == null)
-                return null;
-
-            userAccount = new Account(new User(DEFAULT_ACCOUNT_IMAGE, username), email);
-            userPassword = password;
-            return userAccount;
-        }
-    }
-}
diff --git a/LocalEndpoint/AccountOwnedRecipes.cs b/LocalEndpoint/AccountOwnedRecipes.cs
new file mode 100644
index 0000000..e3d8059
--- /dev/null
+++ b/LocalEndpoint/AccountOwnedRecipes.cs
@@ -0,0 +1,52 @@
+using LocalEndpoint;
+using Models;
+using System.Collections.Immutable;
+
+namespace Endpoint
+{
+    internal class AccountOwnedRecipes : IAccountOwnedRecipes
+    {
+
+        public Account Account { get; init; }
+
+        private readonly Dictionary<Guid, Recipe> ownedRecipes = new Dictionary<Guid, Recipe>();
+        private readonly RecipesDatabase db;
+
+        public AccountOwnedRecipes(Account account, RecipesDatabase db)
+        {
+            Account = account;
+            this.db = db;
+
+            //Retrieve all owned recipes from database.
+            db.ListAll().ForEach(recipe =>
+            {
+                if (recipe.Owner == account.User) ownedRecipes[recipe.Info.Id] = recipe;
+            });
+        }
+
+        public bool UploadRecipe(Recipe recipe)
+        {
+            Guid id = recipe.Info.Id;
+            if (ownedRecipes.ContainsKey(id))
+            {
+                return false;
+            }
+            db.Insert(recipe);
+            ownedRecipes.Add(id, recipe);
+            return true;
+        }
+
+        public bool RemoveRecipe(RecipeInfo info)
+        {
+            db.Remove(info.Id);
+            return ownedRecipes.Remove(info.Id);
+        }
+
+        public ImmutableList<RecipeInfo> GetAccountRecipes()
+        {
+            return ownedRecipes.Values.ToImmutableList().ConvertAll(r => r.Info);
+        }
+
+
+    }
+}
diff --git a/LocalEndpoint/AccountRecipes.cs b/LocalEndpoint/AccountRecipes.cs
deleted file mode 100644
index 12c7aa4..0000000
--- a/LocalEndpoint/AccountRecipes.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using LocalEndpoint;
-using Models;
-using System.Collections.Immutable;
-
-namespace Endpoint
-{
-    internal class AccountRecipes : IAccountRecipes
-    {
-
-        public Account Account { get; init; }
-
-        private readonly Dictionary<Guid, Recipe> ownedRecipes = new Dictionary<Guid, Recipe>();
-        private readonly Dictionary<Guid, AccountRecipeRate> ratedRecipes = new Dictionary<Guid, AccountRecipeRate>();
-
-        public AccountRecipes(Account account)
-        {
-            Account = account;
-        }
-
-        public bool UploadRecipe(Recipe recipe)
-        {
-            Guid id = recipe.Info.Id;
-            if (ownedRecipes.ContainsKey(id))
-            {
-                return false;
-            }
-            ownedRecipes.Add(id, recipe);
-            return true;
-        }
-
-        public bool RemoveRecipe(RecipeInfo info)
-        {
-            return ownedRecipes.Remove(info.Id);
-        }
-
-        public ImmutableList<RecipeInfo> GetAccountRecipes()
-        {
-            return ownedRecipes.Values.ToImmutableList().ConvertAll(r => r.Info);
-        }
-
-
-        public ImmutableList<RecipeInfo> GetRecommendedRecipes()
-        {
-            return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4, Guid.NewGuid()),
-                new RecipeInfo("Chocolate Cake", 2500, 10, new Uri("https://bakewithshivesh.com/wp-content/uploads/2022/08/IMG_0248-scaled.jpg"), 3, Guid.NewGuid()),
-                new RecipeInfo("Salmon", 20, 10, new Uri("https://www.wholesomeyum.com/wp-content/uploads/2021/06/wholesomeyum-Pan-Seared-Salmon-Recipe-13.jpg"), 4, Guid.NewGuid()),
-                new RecipeInfo("Fish", 50, 30, new Uri("https://www.ciaanet.org/wp-content/uploads/2022/07/Atlantic-and-Pacific-whole-salmon-1024x683.jpg"), 4.5F, Guid.NewGuid()),
-                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, Guid.NewGuid())
-            }.ToImmutableList();
-        }
-
-        public ImmutableList<RecipeInfo> GetFavorites()
-        {
-            return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4, Guid.NewGuid()),
-                new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, Guid.NewGuid()),
-                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4, Guid.NewGuid()),
-                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1, Guid.NewGuid())
-            }.ToImmutableList();
-        }
-
-        public ImmutableList<(RecipeInfo, uint)> GetWeeklyList()
-        {
-            return new List<(RecipeInfo, uint)> {
-                (new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, Guid.NewGuid()), 4),
-                (new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3, Guid.NewGuid()), 4),
-                (new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1, Guid.NewGuid()), 1),
-            }.ToImmutableList();
-        }
-
-        public void SetRate(RecipeInfo info, AccountRecipeRate rate)
-        {
-            ratedRecipes.Add(info.Id, rate);
-        }
-
-        public AccountRecipeRate? FindRate(RecipeInfo info)
-        {
-            AccountRecipeRate? rate = null;
-            ratedRecipes.TryGetValue(info.Id, out rate);
-            return rate;
-        }
-    }
-}
diff --git a/LocalEndpoint/AccountRecipesPreferences.cs b/LocalEndpoint/AccountRecipesPreferences.cs
new file mode 100644
index 0000000..65b41b9
--- /dev/null
+++ b/LocalEndpoint/AccountRecipesPreferences.cs
@@ -0,0 +1,91 @@
+using Endpoint;
+using Models;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LocalEndpoint
+{
+    internal class AccountRecipesPreferences : IAccountRecipesPreferences
+    {
+        //Binds a recipe's id to it's account review ratings.
+        private readonly Dictionary<Guid, AccountRecipeRate> ratings = new Dictionary<Guid, AccountRecipeRate>();
+
+        //Binds a recipe's id to its amount of person stored in the account's weekly list
+        private readonly Dictionary<Guid, uint> weekly = new Dictionary<Guid, uint>();
+
+        private readonly RecipesDatabase db;
+        public AccountRecipesPreferences(Account account, RecipesDatabase db)
+        {
+            Account = account;
+            this.db = db;
+        }
+
+        public Account Account { get; init; }
+
+        public ImmutableList<RecipeInfo> GetRecommendedRecipes()
+        {
+            return db.ListAll().ConvertAll(recipe => recipe.Info);
+        }
+
+        public ImmutableList<RecipeInfo> GetFavorites()
+        {
+            List<RecipeInfo> favorites = new List<RecipeInfo>();
+            foreach (Recipe recipe in db.ListAll())
+            {
+                if (ratings.TryGetValue(recipe.Info.Id, out AccountRecipeRate? rate))
+                {
+                    if (rate.IsFavorite) 
+                        favorites.Add(recipe.Info);
+                }
+            }
+            return favorites.ToImmutableList();
+        }
+
+        public ImmutableList<(RecipeInfo, uint)> GetWeeklyList()
+        {
+            List<(RecipeInfo, uint)> weekly = new List<(RecipeInfo, uint)>();
+            foreach (Recipe recipe in db.ListAll())
+            {
+                if (this.weekly.TryGetValue(recipe.Info.Id, out uint personAmmount))
+                {
+                    weekly.Add((recipe.Info, personAmmount));
+                }
+            }
+            return weekly.ToImmutableList();
+        }
+
+        
+        public AccountRecipeRate GetRate(RecipeInfo info)
+        {
+            AccountRecipeRate rate = null;
+            if (!ratings.TryGetValue(info.Id, out rate))
+            {
+                rate = new AccountRecipeRate();
+                ratings.Add(info.Id, rate);
+            }
+            return rate;
+        }
+
+        public void AddToFavorites(RecipeInfo info)
+        {
+            AccountRecipeRate rate = GetRate(info);
+            ratings[info.Id] = new AccountRecipeRate(true, rate.Rate);
+        }
+
+        public void RemoveFromFavorites(RecipeInfo info)
+        {
+            AccountRecipeRate rate = GetRate(info);
+            ratings[info.Id] = new AccountRecipeRate(false, rate.Rate);
+        }
+
+        public void SetReviewScore(RecipeInfo info, uint score)
+        {
+            AccountRecipeRate rate = GetRate(info);
+            ratings[info.Id] = new AccountRecipeRate(rate.IsFavorite, score);
+        }
+    }
+}
diff --git a/LocalEndpoint/ConnectionManager.cs b/LocalEndpoint/ConnectionManager.cs
new file mode 100644
index 0000000..427814e
--- /dev/null
+++ b/LocalEndpoint/ConnectionManager.cs
@@ -0,0 +1,33 @@
+using Models;
+using Endpoint;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LocalEndpoint
+{
+    internal class ConnectionManager : IAccountManager
+    {
+        private Account userAccount = Constants.MAIN_USER_ACCOUNT;
+        private string userPassword = Constants.MAIN_USER_PASSWORD;
+        public Account? Login(string email, string password)
+        {
+            if (Constants.MAIN_USER_ACCOUNT.Email == email && Constants.MAIN_USER_PASSWORD == password)
+                return Constants.MAIN_USER_ACCOUNT;
+            return null;
+        }
+
+
+        public Account? Register(string email, string username, string password)
+        {
+            if (email == null || username == null || password == null)
+                return null;
+
+            userAccount = new Account(new User(Constants.DEFAULT_ACCOUNT_IMAGE, username), email);
+            userPassword = password;
+            return userAccount;
+        }
+    }
+}
diff --git a/LocalEndpoint/Constants.cs b/LocalEndpoint/Constants.cs
new file mode 100644
index 0000000..249a016
--- /dev/null
+++ b/LocalEndpoint/Constants.cs
@@ -0,0 +1,20 @@
+using Models;
+
+namespace LocalEndpoint
+{
+    internal class Constants
+    {
+
+        public static readonly Uri DEFAULT_ACCOUNT_IMAGE = new Uri("https://www.pngkey.com/png/full/115-1150152_default-profile-picture-avatar-png-green.png");
+
+        // User account for tests
+        public static readonly Account MAIN_USER_ACCOUNT = new Account(new User(DEFAULT_ACCOUNT_IMAGE, "Example Account"), "test@example.com");
+        public static readonly string  MAIN_USER_PASSWORD = "123456";
+
+        // other user samples
+        public static readonly User USER1 = new User(new Uri("https://i.ibb.co/L6t6bGR/DALL-E-2023-05-10-20-27-31-cook-looking-at-the-camera-with-a-chef-s-hat-laughing-in-an-exaggerated-w.png"), "The Funny Chief");
+        public static readonly User USER2 = new User(DEFAULT_ACCOUNT_IMAGE, "Yanis");
+        public static readonly User USER3 = new User(DEFAULT_ACCOUNT_IMAGE, "Leo");
+
+    }
+}
diff --git a/LocalEndpoint/LocalEndpoint.cs b/LocalEndpoint/LocalEndpoint.cs
index dd5a112..9b27f1e 100644
--- a/LocalEndpoint/LocalEndpoint.cs
+++ b/LocalEndpoint/LocalEndpoint.cs
@@ -1,11 +1,34 @@
 using Endpoint;
+using Models;
+using System.Collections.Immutable;
 
 namespace LocalEndpoint
 {
+
+    /// <summary>
+    /// The local endpoint is an implementation of the Endpoint API definition.
+    ///
+    /// </summary>
     public class LocalEndpoint : IEndpoint
     {
-        private IAccountManager accountManager = new AccountManager();
-        private IRecipesService recipesService = new RecipesService();
+        private readonly IAccountManager accountManager = new ConnectionManager();
+        private readonly IRecipesService recipesService;
+
+
+        public LocalEndpoint()
+        {
+            RecipesDatabase db = new RecipesDatabase();
+
+            //miam
+            db.Insert(new Recipe(new RecipeInfo("Chicken Salad", 500, 20, new Uri("https://healthyfitnessmeals.com/wp-content/uploads/2021/04/Southwest-chicken-salad-7-500x500.jpg"), 4, Guid.NewGuid()), Constants.USER1, new List<Ingredient> { new Ingredient("Ingredient 1", 6) }.ToImmutableList(), new List<PreparationStep> { new PreparationStep("Step 1", "Bake the eggs") }.ToImmutableList()));
+            db.Insert(new Recipe(new RecipeInfo("Chocolate Cake", 2500, 10, new Uri("https://bakewithshivesh.com/wp-content/uploads/2022/08/IMG_0248-scaled.jpg"), 3, Guid.NewGuid()), Constants.USER2, new List<Ingredient> { new Ingredient("Ingredient 1", 6) }.ToImmutableList(), new List<PreparationStep> { new PreparationStep("Step 1", "Bake the eggs") }.ToImmutableList()));
+            db.Insert(new Recipe(new RecipeInfo("Salmon", 20, 10, new Uri("https://www.wholesomeyum.com/wp-content/uploads/2021/06/wholesomeyum-Pan-Seared-Salmon-Recipe-13.jpg"), 4, Guid.NewGuid()), Constants.MAIN_USER_ACCOUNT.User, new List<Ingredient> { new Ingredient("Ingredient 1", 6) }.ToImmutableList(), new List<PreparationStep> { new PreparationStep("Step 1", "Bake the eggs") }.ToImmutableList()));
+            db.Insert(new Recipe(new RecipeInfo("Fish", 50, 30, new Uri("https://www.ciaanet.org/wp-content/uploads/2022/07/Atlantic-and-Pacific-whole-salmon-1024x683.jpg"), 4.5F, Guid.NewGuid()), Constants.MAIN_USER_ACCOUNT.User, new List<Ingredient> { new Ingredient("Ingredient 1", 6) }.ToImmutableList(), new List<PreparationStep> { new PreparationStep("Step 1", "Bake the eggs") }.ToImmutableList()));
+            db.Insert(new Recipe(new RecipeInfo("Space Cake", 800, 5, new Uri("https://static.youmiam.com/images/recipe/1500x1000/space-cake-22706?placeholder=web_recipe&sig=f14a7a86da837c6b8cc678cde424d6d5902f99ec&v3"), 5, Guid.NewGuid()), Constants.USER3, new List<Ingredient> { new Ingredient("Ingredient 1", 6) }.ToImmutableList(), new List<PreparationStep> { new PreparationStep("Step 1", "Bake the eggs") }.ToImmutableList()));
+
+            recipesService = new RecipesService(db);
+        }
+
         public IAccountManager AccountManager => accountManager;
 
         public IRecipesService RecipesService => recipesService;
diff --git a/LocalEndpoint/RecipesDatabase.cs b/LocalEndpoint/RecipesDatabase.cs
new file mode 100644
index 0000000..511cd80
--- /dev/null
+++ b/LocalEndpoint/RecipesDatabase.cs
@@ -0,0 +1,43 @@
+using Models;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+
+namespace LocalEndpoint
+{
+
+    //Simple class to simulate a recipe database
+    internal class RecipesDatabase
+    {
+
+        private Dictionary<Guid, Recipe> recipes = new Dictionary<Guid, Recipe>();
+
+        public Recipe? Lookup(Guid id)
+        {
+            Recipe? recipe;
+            recipes.TryGetValue(id, out recipe);
+            return recipe;
+        }
+
+
+        public Recipe Get(Guid id)
+        {
+            return recipes[id];
+        }
+
+        public void Insert(Recipe recipe)
+        {
+            recipes[recipe.Info.Id] = recipe; 
+        }
+
+        public void Remove(Guid id)
+        {
+            recipes.Remove(id);
+        }
+
+        public ImmutableList<Recipe> ListAll()
+        {
+            return recipes.Values.ToImmutableList();
+        }
+
+    }
+}
diff --git a/LocalEndpoint/RecipesService.cs b/LocalEndpoint/RecipesService.cs
index 37f6c8e..9684e02 100644
--- a/LocalEndpoint/RecipesService.cs
+++ b/LocalEndpoint/RecipesService.cs
@@ -7,41 +7,49 @@ namespace LocalEndpoint
     internal class RecipesService : IRecipesService
     {
 
-        private readonly Dictionary<Account, IAccountRecipes> accountsRecipes = new Dictionary<Account, IAccountRecipes>();
+        private readonly RecipesDatabase db;
+        private readonly Dictionary<Account, AccountData> accountsData = new Dictionary<Account, AccountData>();
 
-        public List<RecipeInfo> PopularRecipes()
+        public RecipesService(RecipesDatabase db)
         {
-            return new List<RecipeInfo> {
-                new RecipeInfo("Chicken Curry", 500, 45, new Uri("https://cdn.chefclub.tools/uploads/recipes/cover-thumbnail/f287b191-dc8e-4c85-bbb6-e26387c354d3.jpg"), 3, Guid.NewGuid()),
-                new RecipeInfo("Spaghetti Bolognese", 1000, 30, new Uri("https://media.istockphoto.com/id/1144823591/fr/photo/spaghetti-dans-un-plat-sur-un-fond-blanc.jpg?s=612x612&w=0&k=20&c=qFzd8iE185mpsX7hWqYaieOWlzJVCkzFdYsxmwUT3-Q="), 1, Guid.NewGuid()),
-                new RecipeInfo("Beef Stroganoff", 100, 10, new Uri("https://www.cookwithnabeela.com/wp-content/uploads/2023/02/BeefStroganoff.webp"), 5, Guid.NewGuid()),
-                new RecipeInfo("Fish And Ships", 450, 15, new Uri("https://upload.wikimedia.org/wikipedia/commons/f/ff/Fish_and_chips_blackpool.jpg"), 4, Guid.NewGuid()),
-                new RecipeInfo("Caesar Salad", 150, 20, new Uri("https://www.galbani.fr/wp-content/uploads/2020/04/AdobeStock_157570276-2.jpeg"), 1, Guid.NewGuid())
-            };
+            this.db = db;
+        }
+
+        public ImmutableList<RecipeInfo> PopularRecipes()
+        {
+            return db.ListAll().Take(4).ToImmutableList().ConvertAll(v => v.Info);
         }
 
         public Recipe GetRecipe(RecipeInfo info)
         {
-            User owner = new User(new Uri("https://i.ibb.co/L6t6bGR/DALL-E-2023-05-10-20-27-31-cook-looking-at-the-camera-with-a-chef-s-hat-laughing-in-an-exaggerated-w.png"), "The Funny Chief");
-            var ingredients = new List<Ingredient> { new Ingredient("Banana", 12), new Ingredient("Apple", 2) }.ToImmutableList();
-            var steps = new List<PreparationStep> { new PreparationStep("Step 1", "This step is an hardcoded step from a stub implementation of IRecipesSeervice") }.ToImmutableList();
-            return new Recipe(info, owner, ingredients, steps);
+            return db.Get(info.Id);
         }
 
 
-        public IAccountRecipes GetRecipesOf(Account account)
+        public IAccountOwnedRecipes GetRecipesOf(Account account)
+        {
+            return GetOrInitData(account).Recipes;
+        }
+        public IAccountRecipesPreferences GetPreferencesOf(Account account)
         {
-            IAccountRecipes? recipes;
-            accountsRecipes.TryGetValue(account, out recipes);
+            return GetOrInitData(account).Preferences;
+        }
+
+        private AccountData GetOrInitData(Account account)
+        {
+            AccountData? data;
+            accountsData.TryGetValue(account, out data);
 
-            if (recipes == null) { 
-                recipes = new AccountRecipes(account);
+            if (data == null)
+            {
+                AccountOwnedRecipes recipes = new AccountOwnedRecipes(account, db);
                 recipes.UploadRecipe(new Recipe(new RecipeInfo("Cupcake", 500, 12, new Uri("https://www.mycake.fr/wp-content/uploads/2015/12/rs_cupcake_4x3.jpg"), 4.2F, Guid.NewGuid()), account.User, new List<Ingredient> { new Ingredient("Chocolate", 4) }.ToImmutableList(), new List<PreparationStep> { new PreparationStep("Eat Chocolate", "Eat the chocolate") }.ToImmutableList()));
-                accountsRecipes.Add(account, recipes);
+                AccountRecipesPreferences preferences = new AccountRecipesPreferences(account, db);
+                data = new AccountData(recipes, preferences);
+                accountsData.Add(account, data);
             }
-            return recipes;
+            return data;
         }
 
-
     }
 }
diff --git a/MainAppShell.xaml.cs b/MainAppShell.xaml.cs
index decb72a..d3f6bc1 100644
--- a/MainAppShell.xaml.cs
+++ b/MainAppShell.xaml.cs
@@ -9,9 +9,9 @@ public partial class MainAppShell : Shell
 	public MainAppShell(Account account, IEndpoint endpoint, IApp app)
 	{
 		InitializeComponent();
-		HomeTab.ContentTemplate = new DataTemplate(() => new HomePage(account, endpoint));
-		FavoritesTab.ContentTemplate = new DataTemplate(() => new FavoritesPage(account, endpoint.RecipesService));
-		MyListTab.ContentTemplate = new DataTemplate(() => new MyListPage(account, endpoint.RecipesService));
+		HomeTab.ContentTemplate = new DataTemplate(() => new HomePage(account, app.Notifier, endpoint));
+		FavoritesTab.ContentTemplate = new DataTemplate(() => new FavoritesPage(account, app.Notifier, endpoint.RecipesService));
+		MyListTab.ContentTemplate = new DataTemplate(() => new MyListPage(account, app.Notifier, endpoint.RecipesService));
 		MoreTab.ContentTemplate = new DataTemplate(() => new MorePage(account, new MorePageController(account, endpoint, app)));
     }
 }
diff --git a/Models/AccountRecipeRate.cs b/Models/AccountRecipeRate.cs
index c23fdf9..caf7658 100644
--- a/Models/AccountRecipeRate.cs
+++ b/Models/AccountRecipeRate.cs
@@ -1,5 +1,5 @@
 
 namespace Models
 {
-    public record AccountRecipeRate(bool IsFavorite, uint Rate);
+    public record AccountRecipeRate(bool IsFavorite = false, uint Rate = 0);
 }
diff --git a/Views/FavoritesPage.xaml b/Views/FavoritesPage.xaml
index ca8b233..6f7bd4f 100644
--- a/Views/FavoritesPage.xaml
+++ b/Views/FavoritesPage.xaml
@@ -4,7 +4,8 @@
              x:Class="ShoopNCook.Pages.FavoritesPage"
              Title="FavoritesPage"
              xmlns:views="clr-namespace:ShoopNCook.Views"
-             BackgroundColor="{StaticResource BackgroundPrimary}">
+             BackgroundColor="{StaticResource BackgroundPrimary}"
+             NavigatedTo="ContentPage_NavigatedTo">
     
     <Grid
         RowDefinitions="Auto, *">
diff --git a/Views/FavoritesPage.xaml.cs b/Views/FavoritesPage.xaml.cs
index ae667ed..8282f86 100644
--- a/Views/FavoritesPage.xaml.cs
+++ b/Views/FavoritesPage.xaml.cs
@@ -6,24 +6,41 @@ using Endpoint;
 using LocalEndpoint;
 using Models;
 using ShoopNCook.Views;
+using System.Security.Principal;
 
 public partial class FavoritesPage : ContentPage
 {
-    public FavoritesPage(Account account, IRecipesService service)
+
+    private readonly Account account;
+    private readonly IUserNotifier notifier;
+    private IRecipesService service;
+
+    public FavoritesPage(Account account, IUserNotifier notifier, IRecipesService service)
     {
         InitializeComponent();
+        this.account = account;
+        this.notifier = notifier;
+        this.service = service;
+
+        UpdateFavorites();
+    }
 
-        IAccountRecipes recipes = service.GetRecipesOf(account);
-        recipes.GetFavorites().ForEach(info =>
+    private void UpdateFavorites()
+    {
+        IAccountRecipesPreferences preferences = service.GetPreferencesOf(account);
+        RecipeViewLayout.Children.Clear();
+        preferences.GetFavorites().ForEach(info =>
         {
             RecipeViewLayout.Children.Add(new RecipeView(info, () =>
             {
                 Recipe recipe = service.GetRecipe(info);
-                AccountRecipeRate? rate = recipes.FindRate(info);
-                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, 1));
+                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, notifier, preferences, 1));
             }));
         });
+    }
 
+    private void ContentPage_NavigatedTo(object sender, NavigatedToEventArgs e)
+    {
+        UpdateFavorites();
     }
-    
 }
\ No newline at end of file
diff --git a/Views/HomePage.xaml.cs b/Views/HomePage.xaml.cs
index 2082d1f..b74cfd2 100644
--- a/Views/HomePage.xaml.cs
+++ b/Views/HomePage.xaml.cs
@@ -7,12 +7,12 @@ using LocalEndpoint;
 
 public partial class HomePage : ContentPage
 {
-	public HomePage(Account account, IEndpoint endpoint)
+	public HomePage(Account account, IUserNotifier notifier, IEndpoint endpoint)
     {
 		InitializeComponent();
 
         IRecipesService service = endpoint.RecipesService;
-        IAccountRecipes recipes = service.GetRecipesOf(account);
+        IAccountRecipesPreferences preferences = service.GetPreferencesOf(account);
 
 
         //TODO this code can be factorised
@@ -21,13 +21,12 @@ public partial class HomePage : ContentPage
             layout.Children.Add(new RecipeView(info, () =>
             {
                 Recipe recipe = service.GetRecipe(info);
-                AccountRecipeRate rate = recipes.FindRate(info);
-                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, 1));
+                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, notifier, preferences, 1));
             }));
         }
 
         service.PopularRecipes().ForEach(recipe => PushRecipe(PopularsList, recipe));
-        recipes.GetRecommendedRecipes().ForEach(recipe => PushRecipe(RecommendedList, recipe));
+        preferences.GetRecommendedRecipes().ForEach(recipe => PushRecipe(RecommendedList, recipe));
 
         ProfilePictureImage.Source = ImageSource.FromUri(account.User.ProfilePicture);
         ProfilePictureName.Text = account.User.Name;
diff --git a/Views/MyListPage.xaml.cs b/Views/MyListPage.xaml.cs
index f09d1c7..973dde1 100644
--- a/Views/MyListPage.xaml.cs
+++ b/Views/MyListPage.xaml.cs
@@ -7,19 +7,18 @@ namespace ShoopNCook.Pages;
 
 public partial class MyListPage : ContentPage
 {
-	public MyListPage(Account account, IRecipesService service)
+	public MyListPage(Account account, IUserNotifier notifier, IRecipesService service)
     {
 		InitializeComponent();
 
-        IAccountRecipes recipes = service.GetRecipesOf(account);
-        recipes.GetWeeklyList().ForEach(tuple =>
+        IAccountRecipesPreferences preferences = service.GetPreferencesOf(account);
+        preferences.GetWeeklyList().ForEach(tuple =>
         {
             RecipeInfo info = tuple.Item1;
             RecipesLayout.Children.Add(new StoredRecipeView(info, tuple.Item2, amount =>
             {
                 Recipe recipe = service.GetRecipe(info);
-                AccountRecipeRate? rate = recipes.FindRate(info);
-                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, amount));
+                Shell.Current.Navigation.PushAsync(new RecipePage(recipe, notifier, preferences, amount));
             }));
         });
 
diff --git a/Views/MyRecipesPage.xaml.cs b/Views/MyRecipesPage.xaml.cs
index 1754c71..952d786 100644
--- a/Views/MyRecipesPage.xaml.cs
+++ b/Views/MyRecipesPage.xaml.cs
@@ -10,7 +10,7 @@ public partial class MyRecipesPage : ContentPage
 
     private IUserNotifier notifier;
     private IRecipesService service;
-    private IAccountRecipes recipes;
+    private Account account;
 
 	public MyRecipesPage(
             Account account,
@@ -21,9 +21,12 @@ public partial class MyRecipesPage : ContentPage
 
         this.notifier = notifier;
         this.service = service;
-        this.recipes = service.GetRecipesOf(account);
-    
-        recipes.GetAccountRecipes().ForEach(AddRecipeView);
+        this.account = account;
+
+        service
+            .GetRecipesOf(account)
+            .GetAccountRecipes()
+            .ForEach(AddRecipeView);
     }
 
     private void AddRecipeView(RecipeInfo info)
@@ -31,8 +34,8 @@ public partial class MyRecipesPage : ContentPage
         RecipesLayout.Children.Add(new OwnedRecipeView(info, () =>
         {
             Recipe recipe = service.GetRecipe(info);
-            AccountRecipeRate? rate = recipes.FindRate(info);
-            Shell.Current.Navigation.PushAsync(new RecipePage(recipe, rate, 1));
+            IAccountRecipesPreferences preferences = service.GetPreferencesOf(account);
+            Shell.Current.Navigation.PushAsync(new RecipePage(recipe, notifier, preferences, 1));
         },
             () => RemoveRecipe(info)
         ));
@@ -40,6 +43,8 @@ public partial class MyRecipesPage : ContentPage
 
     private void RemoveRecipe(RecipeInfo info)
     {
+        IAccountOwnedRecipes recipes = service.GetRecipesOf(account);
+
         if (!recipes.RemoveRecipe(info))
         {
             notifier.Error("Could not remove recipe");
@@ -62,7 +67,9 @@ public partial class MyRecipesPage : ContentPage
     }
     private void OnAddRecipeButtonClicked(object sender, EventArgs e)
     {
-        var page = new CreateRecipePage(recipes.Account.User, notifier, recipe =>
+        IAccountOwnedRecipes recipes = service.GetRecipesOf(account);
+
+        var page = new CreateRecipePage(account.User, notifier, recipe =>
         {
             if (!recipes.UploadRecipe(recipe))
             {
diff --git a/Views/RecipePage.xaml b/Views/RecipePage.xaml
index 32679e9..dbb8080 100644
--- a/Views/RecipePage.xaml
+++ b/Views/RecipePage.xaml
@@ -8,7 +8,6 @@
              BackgroundColor="{StaticResource BackgroundPrimary}">
     
     <Grid
-       
         RowDefinitions="90*, 10*"
         Padding="10">
         
@@ -51,7 +50,8 @@
                     StrokeShape="RoundRectangle 20"
                     BackgroundColor="{StaticResource ImageBackground}">
                     <Image 
-                        HeightRequest="250"/>
+                        HeightRequest="250"
+                        x:Name="RecipeImage"/>
                 </Border>
 
                 <!--Steps-->
@@ -146,7 +146,8 @@
                             BackgroundColor="{StaticResource Selected}"
                             VerticalOptions="Center"
                             HorizontalOptions="Center"
-                            Text="Submit"/>
+                            Text="Submit"
+                            Clicked="OnSubmitReviewClicked"/>
                     </Border>
                 </HorizontalStackLayout>
             </Grid>
diff --git a/Views/RecipePage.xaml.cs b/Views/RecipePage.xaml.cs
index e0df08b..5e650cb 100644
--- a/Views/RecipePage.xaml.cs
+++ b/Views/RecipePage.xaml.cs
@@ -1,6 +1,9 @@
 using ShoopNCook.Views;
 using System.Windows.Input;
 using Models;
+using LocalEndpoint;
+using Endpoint;
+
 namespace ShoopNCook.Pages;
 
 public partial class RecipePage : ContentPage
@@ -9,27 +12,39 @@ public partial class RecipePage : ContentPage
     private uint note;
     private bool isFavorite;
 
-    public ICommand StarCommand => new Command<string>(count => SetNote(uint.Parse(count)));
 
+    private IAccountRecipesPreferences preferences;
+    private IUserNotifier notifier;
+    private RecipeInfo info;
+
+    public ICommand StarCommand => new Command<string>(count => SetNote(uint.Parse(count)));
 
-    public RecipePage(Recipe recipe, AccountRecipeRate? rate, uint amount)
+    public RecipePage(Recipe recipe, IUserNotifier notifier, IAccountRecipesPreferences preferences, uint amount)
     {
         InitializeComponent();
 
-        Counter.Count = amount;
+        this.preferences = preferences;
+        this.notifier = notifier;
+        this.info = recipe.Info;
+
+        AccountRecipeRate rate = preferences.GetRate(recipe.Info);
 
-        note = rate?.Rate ?? 0;
-        isFavorite = rate?.IsFavorite ?? false;
+        note = rate.Rate;
+        isFavorite = rate.IsFavorite;
 
         SetFavorite(isFavorite);
         SetNote(note);
 
         RecipeInfo info = recipe.Info;
 
+        Counter.Count = amount;
         CookTime.Text = info.CookTimeMins.ToString();
         Energy.Text = info.CalPerPers.ToString() + " cal/pers";
         RecipeName.Text = info.Name;
 
+        if (info.Image != null)
+            RecipeImage.Source = ImageSource.FromUri(info.Image);
+
         foreach (Ingredient ingredient in recipe.Ingredients)
             IngredientList.Add(new IngredientView(ingredient));
 
@@ -58,9 +73,7 @@ public partial class RecipePage : ContentPage
                 i++;
             }
             else
-            {
                 img.Source = ImageSource.FromFile("star_empty.svg");
-            }
         }
     }
 
@@ -69,21 +82,30 @@ public partial class RecipePage : ContentPage
         SetFavorite(!isFavorite);
     }
 
+    private void OnSubmitReviewClicked(object o, EventArgs e)
+    {
+        preferences.SetReviewScore(info, note);
+        notifier.Success("Your review has been successfuly submited");
+    }
+
     private void SetFavorite(bool isFavorite)
     {
         this.isFavorite = isFavorite;
         if (isFavorite)
         {
             Favorite.Source = ImageSource.FromFile("hearth_on.svg");
+            preferences.AddToFavorites(info);
         }
         else
         {
             Favorite.Source = ImageSource.FromFile("hearth_off.svg");
+            preferences.RemoveFromFavorites(info);
         }
     }
-    private async void OnBackButtonClicked(object sender, EventArgs e)
+    private void OnBackButtonClicked(object sender, EventArgs e)
     {
-        await Navigation.PopAsync();
+
+        Navigation.PopAsync();
     }
 
 }
\ No newline at end of file

From 8ca9eaea7fb1ed7591c9da901c9b59a889fdce59 Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Thu, 11 May 2023 18:41:49 +0200
Subject: [PATCH 9/9] add MyList registraction to LocalEndpoint and app side

---
 Endpoint/IAccountRecipesPreferences.cs     |  6 +-----
 LocalEndpoint/AccountRecipesPreferences.cs | 11 +++++++++++
 Views/MyListPage.xaml                      |  3 ++-
 Views/MyListPage.xaml.cs                   | 20 +++++++++++++++++++-
 Views/RecipePage.xaml                      |  3 ++-
 Views/RecipePage.xaml.cs                   |  8 ++++++++
 6 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/Endpoint/IAccountRecipesPreferences.cs b/Endpoint/IAccountRecipesPreferences.cs
index cc2ae12..1a40745 100644
--- a/Endpoint/IAccountRecipesPreferences.cs
+++ b/Endpoint/IAccountRecipesPreferences.cs
@@ -1,10 +1,5 @@
 using Models;
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Endpoint
 {
@@ -16,6 +11,7 @@ namespace Endpoint
         public void AddToFavorites(RecipeInfo info);
         public void RemoveFromFavorites(RecipeInfo info);
         public void SetReviewScore(RecipeInfo info, uint score);
+        public bool AddToWeeklyList(RecipeInfo info, uint persAmount);
 
         public AccountRecipeRate GetRate(RecipeInfo info);
 
diff --git a/LocalEndpoint/AccountRecipesPreferences.cs b/LocalEndpoint/AccountRecipesPreferences.cs
index 65b41b9..ce8f296 100644
--- a/LocalEndpoint/AccountRecipesPreferences.cs
+++ b/LocalEndpoint/AccountRecipesPreferences.cs
@@ -76,6 +76,17 @@ namespace LocalEndpoint
             ratings[info.Id] = new AccountRecipeRate(true, rate.Rate);
         }
 
+
+        public bool AddToWeeklyList(RecipeInfo info, uint persAmount)
+        {
+            if (weekly.ContainsKey(info.Id))
+                return false;
+
+            weekly[info.Id] = persAmount;
+
+            return true;
+        }
+
         public void RemoveFromFavorites(RecipeInfo info)
         {
             AccountRecipeRate rate = GetRate(info);
diff --git a/Views/MyListPage.xaml b/Views/MyListPage.xaml
index 1568766..1272415 100644
--- a/Views/MyListPage.xaml
+++ b/Views/MyListPage.xaml
@@ -4,7 +4,8 @@
              x:Class="ShoopNCook.Pages.MyListPage"
              Title="MyList"
              BackgroundColor="{StaticResource BackgroundPrimary}"
-             xmlns:views="clr-namespace:ShoopNCook.Views">
+             xmlns:views="clr-namespace:ShoopNCook.Views"
+             NavigatedTo="ContentPage_NavigatedTo">
     <Grid
          RowDefinitions="Auto, *, Auto">
         <!-- Header label and return button -->
diff --git a/Views/MyListPage.xaml.cs b/Views/MyListPage.xaml.cs
index 973dde1..87cddb5 100644
--- a/Views/MyListPage.xaml.cs
+++ b/Views/MyListPage.xaml.cs
@@ -7,11 +7,25 @@ namespace ShoopNCook.Pages;
 
 public partial class MyListPage : ContentPage
 {
+
+    private readonly IAccountRecipesPreferences preferences;
+    private readonly IUserNotifier notifier;
+    private readonly IRecipesService service;
+
 	public MyListPage(Account account, IUserNotifier notifier, IRecipesService service)
     {
 		InitializeComponent();
 
-        IAccountRecipesPreferences preferences = service.GetPreferencesOf(account);
+        this.preferences = service.GetPreferencesOf(account);
+        this.notifier = notifier;
+        this.service = service;
+
+        UpdateMyList();
+    }
+
+    private void UpdateMyList()
+    {
+        RecipesLayout.Children.Clear();
         preferences.GetWeeklyList().ForEach(tuple =>
         {
             RecipeInfo info = tuple.Item1;
@@ -21,6 +35,10 @@ public partial class MyListPage : ContentPage
                 Shell.Current.Navigation.PushAsync(new RecipePage(recipe, notifier, preferences, amount));
             }));
         });
+    }
 
+    private void ContentPage_NavigatedTo(object sender, NavigatedToEventArgs e)
+    {
+        UpdateMyList();
     }
 }
\ No newline at end of file
diff --git a/Views/RecipePage.xaml b/Views/RecipePage.xaml
index dbb8080..bca49c4 100644
--- a/Views/RecipePage.xaml
+++ b/Views/RecipePage.xaml
@@ -171,7 +171,8 @@
                 Text="Add to list"
                 Style="{StaticResource UserButton}"
                 TextColor="White"
-                BackgroundColor="Gray">
+                BackgroundColor="Gray"
+                Clicked="OnAddToMyListClicked">
             </Button>
         </FlexLayout>
     </Grid>
diff --git a/Views/RecipePage.xaml.cs b/Views/RecipePage.xaml.cs
index 5e650cb..d40478d 100644
--- a/Views/RecipePage.xaml.cs
+++ b/Views/RecipePage.xaml.cs
@@ -88,6 +88,14 @@ public partial class RecipePage : ContentPage
         notifier.Success("Your review has been successfuly submited");
     }
 
+    private void OnAddToMyListClicked(object o, EventArgs e)
+    {
+        if (!preferences.AddToWeeklyList(info, Counter.Count))
+            notifier.Notice("You already added this recipe to you weekly list!");
+        else
+            notifier.Success("Recipe added to your weekly list.");
+    }
+
     private void SetFavorite(bool isFavorite)
     {
         this.isFavorite = isFavorite;