resolve conflicts

App.xaml.cs

@@ -1,23 +1,32 @@
 namespace ShoopNCook;
-using ShoopNCook.Pages;
+using Models;
-using ShoopNCook.Models;
+using Endpoint;
-using ShoopNCook.Models.API;
+using LocalEndpoint;
 
-public partial class App : Application
+public partial class App : Application, ConnectionObserver, IApp
 {
+
+    private IEndpoint Endpoint = new LocalEndpoint();
+
+    public UserNotifier Notifier => new ConsoleUserNotifier();
+
     public App()
     {
         InitializeComponent();
+        ForceLogin(); //start in login state
+    }
 
-        Account account = getUserAccount();
+    public void OnAccountConnected(Account account)
-
+    {
-        var appShell = new AppShell();
+        Shell shell = new MainAppShell(account, this);
-        MainPage = appShell;
+        shell.GoToAsync("//Home");
-        appShell.GoToAsync("//Splash");
+        MainPage = shell;
     }
 
-    private Account getUserAccount()
+    public void ForceLogin()
     {
-        return new Account(new User(new Uri("https://www.pngkey.com/png/full/115-1150152_default-profile-picture-avatar-png-green.png"), "Stub Account"), "test@example.com");
+        Shell shell = new ConnectAppShell(this, Endpoint.AccountManager, Notifier);
+        shell.GoToAsync("//Splash");
+        MainPage = shell;
     }
 }

AppShell.xaml

@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Shell
-    x:Class="ShoopNCook.AppShell"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:ShoopNCook"
-    xmlns:pages="clr-namespace:ShoopNCook.Pages"
-    Shell.FlyoutBehavior="Disabled"
-    Shell.NavBarIsVisible="False"
-    Shell.TabBarBackgroundColor="White"
-    Shell.TabBarTitleColor="{StaticResource Selected}"
-    Shell.TabBarUnselectedColor="{StaticResource TextColorSecondary}">
-
-    <ShellContent
-        x:Name="Splash"
-        Title="More"
-        ContentTemplate="{DataTemplate pages:Splash}"
-        Route="Splash"/>
-    <ShellContent
-        x:Name="LoginPage"
-        Title="Login"
-        ContentTemplate="{DataTemplate pages:LoginPage}"
-        Route="LoginPage"/>
-    <ShellContent
-        x:Name="RegisterPage"
-        Title="Register"
-        ContentTemplate="{DataTemplate pages:RegisterPage}"
-        Route="RegisterPage"/>
-    
-    
-    <TabBar>
-        
-        
-        <ShellContent
-            x:Name="HomeTab"
-            Title="Home"
-            ContentTemplate="{DataTemplate pages:HomePage}"
-            Route="HomePage"
-            Icon="home.svg"/>
-
-        <ShellContent
-            x:Name="FavoritesTab"
-            Title="Favorites"
-            ContentTemplate="{DataTemplate pages:FavoritesPage}"
-            Route="Favorites"
-            Icon="hearth_on.svg"/>
-
-        <ShellContent
-            x:Name="MyListTab"
-            Title="MyList"
-            ContentTemplate="{DataTemplate pages:MyListPage}"
-            Route="MyList"
-            Icon="list.svg"/>
-
-        <ShellContent
-            x:Name="MoreTab"
-            Title="More"
-            ContentTemplate="{DataTemplate pages:MorePage}"
-            Route="More"
-            Icon="more.svg"/>
-    </TabBar>
-    
-    <FlyoutItem Title="Search">
-        <ShellContent
-            Title="Search Page"
-            ContentTemplate="{DataTemplate pages:SearchPage}"
-            Route="Search"/>
-    </FlyoutItem>
-    <FlyoutItem Title="RecipePage">
-        <ShellContent
-            Title="RecipePage"
-            ContentTemplate="{DataTemplate pages:RecipePage}"
-            Route="RecipePage"/>
-    </FlyoutItem>
-    <FlyoutItem Title="MyRecipePage">
-        <ShellContent
-            Title="MyRecipesPage"
-            ContentTemplate="{DataTemplate pages:MyRecipesPage}"
-            Route="MyRecipe"/>
-    </FlyoutItem>
-    <FlyoutItem Title="ProfilePage">
-        <ShellContent
-            Title="ProfilePage"
-            ContentTemplate="{DataTemplate pages:ProfilePage}"
-            Route="EditProfile"/>
-    </FlyoutItem>
-    <FlyoutItem>
-        <ShellContent
-            x:Name="ForgotPassword"
-            Title="Login"
-            ContentTemplate="{DataTemplate pages:ForgotPassword}"
-            Route="ForgotPassword"/>
-    </FlyoutItem>
-    <FlyoutItem>
-        <ShellContent
-            x:Name="CreateRecipe"
-            Title="CreateRecipe"
-            ContentTemplate="{DataTemplate pages:CreateRecipePage}"
-            Route="CreateRecipe"/>
-    </FlyoutItem>
-    <FlyoutItem>
-        <ShellContent
-            x:Name="ConfirmMail"
-            Title="ConfirmMail"
-            ContentTemplate="{DataTemplate pages:ConfirmMail}"
-            Route="ConfirmEmail"/>
-    </FlyoutItem>
-    
-    
-</Shell>

AppShell.xaml.cs

@@ -1,13 +0,0 @@
-namespace ShoopNCook;
-using ShoopNCook.Pages;
-using Microsoft.Maui.Controls;
-
-
-public partial class AppShell : Shell
-{
-	public AppShell()
-	{
-		InitializeComponent();
-        
-    }
-}

ConnectAppShell.xaml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Shell
+    x:Class="ShoopNCook.ConnectAppShell"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:pages="clr-namespace:ShoopNCook.Pages"
+    Shell.FlyoutBehavior="Disabled"
+    Shell.NavBarIsVisible="False"
+    Shell.TabBarBackgroundColor="White"
+    Shell.TabBarTitleColor="{StaticResource Selected}"
+    Shell.TabBarUnselectedColor="{StaticResource TextColorSecondary}">
+
+    <ShellContent
+        x:Name="Splash"
+        Title="More"
+        ContentTemplate="{DataTemplate pages:Splash}"
+        Route="Splash"/>
+
+    <ShellContent
+        x:Name="LoginPage"
+        Title="Login"
+        Route="Login"/>
+
+    <ShellContent
+        x:Name="RegisterPage"
+        Title="Register"
+        Route="Register"/>
+
+</Shell>

ConnectAppShell.xaml.cs

@@ -0,0 +1,17 @@
+namespace ShoopNCook;
+using Microsoft.Maui.Controls;
+using Models;
+using Endpoint;
+using ShoopNCook.Controllers;
+using ShoopNCook.Pages;
+
+public partial class ConnectAppShell : Shell
+{
+	public ConnectAppShell(ConnectionObserver observer, IAccountManager accounts, UserNotifier notifier)
+	{
+		ConnectionController controller = new ConnectionController(observer, accounts, notifier);
+		InitializeComponent();
+		LoginPage.ContentTemplate = new DataTemplate(() => new LoginPage(controller));
+		RegisterPage.ContentTemplate = new DataTemplate(() => new RegisterPage(controller));
+    }
+}

ConnectionObserver.cs

@@ -0,0 +1,9 @@
+using Models;
+
+namespace ShoopNCook
+{
+    public interface ConnectionObserver
+    {
+        public void OnAccountConnected(Account account);
+    }
+}

ConsoleUserNotifier.cs

@@ -0,0 +1,24 @@
+namespace ShoopNCook
+{
+    /// <summary>
+    /// A notice reporter implementation that prints in console the applications's user notices.
+    /// </summary>
+    public class ConsoleUserNotifier :
+        UserNotifier
+    {
+        public void Error(string message)
+        {
+            Console.WriteLine("<User Notice> Error: " + message);
+        }
+
+        public void Notice(string message)
+        {
+            Console.WriteLine("<User Notice> Notice: " + message);
+        }
+
+        public void Warn(string message)
+        {
+            Console.WriteLine("<User Notice> Warn: " + message);
+        }
+    }
+}

Controllers/ConnectionController.cs

@@ -0,0 +1,39 @@
+using Endpoint;
+using Models;
+
+namespace ShoopNCook.Controllers
+{
+    public class ConnectionController : LoginController, RegisterController
+    {
+        private readonly ConnectionObserver observer;
+        private readonly IAccountManager accounts;
+        private readonly UserNotifier notifier;
+        public ConnectionController(ConnectionObserver observer, IAccountManager accounts, UserNotifier notifier) {
+            this.observer = observer;
+            this.accounts = accounts;
+            this.notifier = notifier;
+        }
+
+        public void Login(string email, string password)
+        {
+            Account? acc = accounts.Login(email, password);    
+            if (acc == null)
+            {
+                notifier.Error("Email or password invalid.");
+                return;
+            }
+            observer.OnAccountConnected(acc);
+        }
+
+        public void Register(string username, string email, string password)
+        {
+            Account? acc = accounts.Register(username, email, password);
+            if (acc == null)
+            {
+                notifier.Error("Invalid credentials.");
+                return;
+            }
+            observer.OnAccountConnected(acc);
+        }
+    }
+}

Controllers/LoginController.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ShoopNCook.Controllers
+{
+    public interface LoginController
+    {
+        public void Login(string email, string password);
+    }
+}

Controllers/MorePageController.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ShoopNCook.Controllers
+{
+    public class MorePageController
+    {
+
+        private readonly IApp app;
+
+        public MorePageController(IApp app) { 
+            this.app = app;
+        }
+
+        public void Logout()
+        {
+            app.Notifier.Notice("You have been loged out.");
+            app.ForceLogin();
+        }
+    }
+}

Controllers/RegisterController.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ShoopNCook.Controllers
+{
+    public interface RegisterController
+    {
+        public void Register(string username, string email, string password);
+    }
+}

Endpoint/Endpoint.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Models\Models.csproj" />
+  </ItemGroup>
+
+</Project>

Endpoint/IAccountManager.cs

@@ -0,0 +1,10 @@
+using Models;
+namespace Endpoint
+{
+    public interface IAccountManager
+    {
+        public Account? Login(string email, string password);
+
+        public Account? Register(string email, string username, string password);
+    }
+}

Endpoint/IEndpoint.cs

@@ -0,0 +1,11 @@
+
+
+namespace Endpoint
+{
+    public interface IEndpoint
+    {
+        public IAccountManager AccountManager { get; }
+
+    }
+}
+

IApp.cs

@@ -0,0 +1,16 @@
+using Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ShoopNCook
+{
+    public interface IApp
+    {
+        public UserNotifier Notifier { get; }
+
+        public void ForceLogin();
+    }
+}

LocalEndpoint/AccountManager.cs

@@ -0,0 +1,37 @@
+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;
+        }
+    }
+}

LocalEndpoint/LocalEndpoint.cs

@@ -0,0 +1,10 @@
+using Endpoint;
+
+namespace LocalEndpoint
+{
+    public class LocalEndpoint : IEndpoint
+    {
+        public IAccountManager AccountManager => new AccountManager();
+
+    }
+}

LocalEndpoint/LocalEndpoint.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Endpoint\Endpoint.csproj" />
+    <ProjectReference Include="..\Models\Models.csproj" />
+  </ItemGroup>
+
+</Project>

MainAppShell.xaml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Shell
+    x:Class="ShoopNCook.MainAppShell"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:pages="clr-namespace:ShoopNCook.Pages"
+    Shell.FlyoutBehavior="Disabled"
+    Shell.NavBarIsVisible="False"
+    Shell.TabBarBackgroundColor="White"
+    Shell.TabBarTitleColor="{StaticResource Selected}"
+    Shell.TabBarUnselectedColor="{StaticResource TextColorSecondary}">
+
+    <TabBar>
+        <ShellContent
+            x:Name="HomeTab"
+            Title="Home"
+            Route="Home"
+            Icon="home.svg"/>
+
+        <ShellContent
+            x:Name="FavoritesTab"
+            Title="Favorites"
+            Route="Favorites"
+            Icon="hearth_on.svg"/>
+
+        <ShellContent
+            x:Name="MyListTab"
+            Title="MyList"
+            Route="MyList"
+            Icon="list.svg"/>
+
+        <ShellContent
+            x:Name="MoreTab"
+            Title="More"
+            Route="More"
+            Icon="more.svg"/>
+    </TabBar>
+</Shell>

MainAppShell.xaml.cs

@@ -0,0 +1,17 @@
+namespace ShoopNCook;
+using Microsoft.Maui.Controls;
+using Models;
+using ShoopNCook.Controllers;
+using ShoopNCook.Pages;
+
+public partial class MainAppShell : Shell
+{
+	public MainAppShell(Account account, IApp app)
+	{
+		InitializeComponent();
+		HomeTab.ContentTemplate = new DataTemplate(() => new HomePage(account, app));
+		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)));
+    }
+}

MauiProgram.cs

@@ -16,7 +16,6 @@ public static class MauiProgram
 				fonts.AddFont("Poppins-Bold.ttf", "PoppinsBold");
 				fonts.AddFont("Poppins-Regular.ttf", "Poppins");
 				fonts.AddFont("Poppins-Medium.ttf", "PoppinsMedium");
-				fonts.AddFont("Poppins-Regular.ttf", "Poppins");
             });
 #if DEBUG
 		builder.Logging.AddDebug();

Models/API/IAccountManager.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ShoopNCook.Models.API
-{
-    public interface IAccountManager
-    {
-        public Account login(string email, string password);
-
-
-    }
-}

Models/API/IEndpoint.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ShoopNCook.Models.API
-{
-    public interface IEndpoint
-    {
-        public IAccountManager AccountManager { get; }
-        public ISearchEngine SearchEngine { get; }
-
-    }
-}
-

Models/API/ISearchEngine.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ShoopNCook.Models.API
-{
-    public interface ISearchEngine
-    {
-        //TODO define methods to search recipes
-    }
-}

Models/Account.cs

@@ -1,4 +1,4 @@
-namespace ShoopNCook.Models
+namespace Models
 {
     public class Account
     {

Models/Ingredient.cs

@@ -1,10 +1,10 @@
-
+namespace Models
-namespace ShoopNCook.Models
 {
     public class Ingredient
     {
 
-        public Ingredient(string name, float amount, Quantity quantity) { 
+        public Ingredient(string name, float amount, Quantity quantity)
+        {
             Name = name;
             Amount = amount;
             Quantity = quantity;

Models/Models.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

Models/PreparationStep.cs

@@ -1,13 +1,12 @@
-
+namespace Models
-namespace ShoopNCook.Models
 {
 
     public class PreparationStep
     {
         public PreparationStep(string name, string description)
         {
-            this.Name = name;
+            Name = name;
-            this.Description = description;
+            Description = description;
         }
 
         public string Name { get; init; }

Models/Quantity.cs

@@ -1,5 +1,4 @@
-
+namespace Models
-namespace ShoopNCook.Models
 {
     public class Quantity
     {

Models/Recipe.cs

@@ -1,5 +1,4 @@
-
+namespace Models
-namespace ShoopNCook.Models
 {
     public class Recipe
     {

Models/RecipeInfo.cs

@@ -1,5 +1,4 @@
-
+namespace Models
-namespace ShoopNCook.Models
 {
     public class RecipeInfo
     {

Models/User.cs

@@ -1,5 +1,4 @@
-
+namespace Models
-namespace ShoopNCook.Models
 {
     public class User
     {

ShoopNCook.csproj

@@ -48,14 +48,29 @@
 	<ItemGroup>
 	  <AndroidResource Remove="ShopNCookTests\**" />
 	  <AndroidResource Remove="Tests\**" />
+	  <Compile Remove="Endpoint\**" />
+	  <Compile Remove="LocalEndpoint\**" />
+	  <Compile Remove="Models\**" />
 	  <Compile Remove="ShopNCookTests\**" />
 	  <Compile Remove="Tests\**" />
+	  <EmbeddedResource Remove="Endpoint\**" />
+	  <EmbeddedResource Remove="LocalEndpoint\**" />
+	  <EmbeddedResource Remove="Models\**" />
 	  <EmbeddedResource Remove="ShopNCookTests\**" />
 	  <EmbeddedResource Remove="Tests\**" />
+	  <MauiCss Remove="Endpoint\**" />
+	  <MauiCss Remove="LocalEndpoint\**" />
+	  <MauiCss Remove="Models\**" />
 	  <MauiCss Remove="ShopNCookTests\**" />
 	  <MauiCss Remove="Tests\**" />
+	  <MauiXaml Remove="Endpoint\**" />
+	  <MauiXaml Remove="LocalEndpoint\**" />
+	  <MauiXaml Remove="Models\**" />
 	  <MauiXaml Remove="ShopNCookTests\**" />
 	  <MauiXaml Remove="Tests\**" />
+	  <None Remove="Endpoint\**" />
+	  <None Remove="LocalEndpoint\**" />
+	  <None Remove="Models\**" />
 	  <None Remove="ShopNCookTests\**" />
 	  <None Remove="Tests\**" />
 	</ItemGroup>
@@ -103,6 +118,18 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <ProjectReference Include="Endpoint\Endpoint.csproj" />
+	  <ProjectReference Include="LocalEndpoint\LocalEndpoint.csproj" />
+	  <ProjectReference Include="Models\Models.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Compile Update="ConnectAppShell.xaml.cs">
+	    <DependentUpon>ConnectAppShell.xaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="MainAppShell.xaml.cs">
+	    <DependentUpon>MainAppShell.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Views\MyListPage.xaml.cs">
 	    <DependentUpon>MyListPage.xaml</DependentUpon>
 	  </Compile>
@@ -112,6 +139,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="ConnectAppShell.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\CreateRecipePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

ShoopNCook.sln

@@ -4,7 +4,13 @@ VisualStudioVersion = 17.0.31611.283
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoopNCook", "ShoopNCook.csproj", "{8ED2FB1D-C04D-478D-9271-CC91FE110396}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{E50D92DC-0BB1-4998-B085-EF47C55675AC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{E50D92DC-0BB1-4998-B085-EF47C55675AC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Models", "Models\Models.csproj", "{A9D43E07-345D-4DD4-B4F9-CE69ED569B5F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LocalEndpoint", "LocalEndpoint\LocalEndpoint.csproj", "{57732316-93B9-4DA0-A212-F8892D3D968B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Endpoint", "Endpoint\Endpoint.csproj", "{C976BDD8-710D-4162-8A42-973B634491F9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,6 +28,18 @@ Global
 		{E50D92DC-0BB1-4998-B085-EF47C55675AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E50D92DC-0BB1-4998-B085-EF47C55675AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E50D92DC-0BB1-4998-B085-EF47C55675AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9D43E07-345D-4DD4-B4F9-CE69ED569B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9D43E07-345D-4DD4-B4F9-CE69ED569B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9D43E07-345D-4DD4-B4F9-CE69ED569B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9D43E07-345D-4DD4-B4F9-CE69ED569B5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57732316-93B9-4DA0-A212-F8892D3D968B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57732316-93B9-4DA0-A212-F8892D3D968B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57732316-93B9-4DA0-A212-F8892D3D968B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57732316-93B9-4DA0-A212-F8892D3D968B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C976BDD8-710D-4162-8A42-973B634491F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C976BDD8-710D-4162-8A42-973B634491F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C976BDD8-710D-4162-8A42-973B634491F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C976BDD8-710D-4162-8A42-973B634491F9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

UserNotifier.cs

@@ -0,0 +1,18 @@
+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);
+    }
+}

Views/Components/RecipeView.xaml

@@ -23,8 +23,7 @@
                 StrokeShape="RoundRectangle 20"
                 BackgroundColor="{StaticResource ImageBackground}">
                 <Grid>
-                    <Image 
+                    <Image x:Name="RecipeImage" />
-                        x:Name="RecipeImage"/>
                     <HorizontalStackLayout
                         x:Name="Stars"
                         VerticalOptions="End"

Views/Components/RecipeView.xaml.cs

@@ -1,5 +1,5 @@
 using ShoopNCook.Pages;
-using ShoopNCook.Models;
+using Models;
 namespace ShoopNCook.Views;
 
 public partial class RecipeView : ContentView

Views/FavoritesPage.xaml.cs

@@ -1,10 +1,12 @@
+using Models;
+
 namespace ShoopNCook.Pages;
-using ShoopNCook.Models;
+using Models;
 using ShoopNCook.Views;
 
 public partial class FavoritesPage : ContentPage
 {
-    public FavoritesPage()
+    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)));

Views/HomePage.xaml

@@ -13,19 +13,19 @@
                 JustifyContent="SpaceBetween"
                 AlignItems="Center"
                 AlignContent="Center"
-                Margin="20,35,20,20"
+                Margin="20,35,20,20">
-                >
 
                 <Border 
                     Style="{StaticResource SecondaryBorder}"
                     BackgroundColor="{StaticResource BackgroundSecondary}" 
-                    StrokeShape="RoundRectangle 1500"
+                    StrokeShape="RoundRectangle 1500">
-                    >
                     <ImageButton 
-                        Source="default_profile_picture.png" 
+                        x:Name="ProfilePictureImage" 
                         WidthRequest="65" 
                         HeightRequest="65"/>
                 </Border>
+
+                <Label Style="{StaticResource h1}" x:Name="ProfilePictureName"/>
             </FlexLayout>
             <Grid 
                 ColumnDefinitions="*,Auto"

Views/HomePage.xaml.cs

@@ -1,10 +1,11 @@
+
 namespace ShoopNCook.Pages;
-using ShoopNCook.Models;
+using Models;
 using ShoopNCook.Views;
 
 public partial class HomePage : ContentPage
 {
-	public HomePage()
+	public HomePage(Account account, IApp app)
     {
 		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)));
@@ -18,6 +19,9 @@ public partial class HomePage : ContentPage
         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)));
+        
+        ProfilePictureImage.Source = ImageSource.FromUri(account.User.ProfilePicture);
+        ProfilePictureName.Text = account.User.Name;
 	}
     private async void OnSyncButtonClicked(object sender, EventArgs e)
     {

Views/LoginPage.xaml

@@ -38,7 +38,8 @@
                 <Entry 
                     Style="{StaticResource UserInput}"
                     Grid.Column="2"
-                    Placeholder="Mail address"/>
+                    Placeholder="Mail address"
+                    x:Name="EmailEntry"/>
             </Grid>
         </Border>
 
@@ -57,7 +58,8 @@
                 <Entry 
                     Style="{StaticResource UserInput}"
                     Grid.Column="2"
-                    Placeholder="Password"/>
+                    Placeholder="Password"
+                    x:Name="PasswordEntry"/>
                 <ImageButton
                     Grid.Column="3"
                     Source="visibility_off.svg"

Views/LoginPage.xaml.cs

@@ -1,20 +1,21 @@
+using Endpoint;
+using ShoopNCook.Controllers;
+
 namespace ShoopNCook.Pages;
 
 public partial class LoginPage : ContentPage
 {
-	public LoginPage()
+    private readonly LoginController controller;
+	public LoginPage(LoginController controller)
 	{
 		InitializeComponent();
+        this.controller = controller;
 	}
     private async void OnLoginButtonClicked(object sender, EventArgs e)
     {
-        // Vérifiez les informations d'identification de l'utilisateur ici
+        string email = EmailEntry.Text;
-        bool isValidUser = true;
+        string password = PasswordEntry.Text;
-
+        controller.Login(email, password);
-        if (isValidUser)
-        {
-            await Shell.Current.GoToAsync("//HomePage");
-        }
     }
     private async void ForgotPasswordTapped(object sender, EventArgs e)
     {
@@ -22,6 +23,6 @@ public partial class LoginPage : ContentPage
     }
     private async void RegisterLabbelTapped(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//RegisterPage");
+        await Shell.Current.GoToAsync("//Register");
     }
 }

Views/MorePage.xaml.cs

@@ -1,17 +1,21 @@
+using Models;
+using ShoopNCook.Controllers;
+
 namespace ShoopNCook.Pages;
 
 public partial class MorePage : ContentPage
 {
-	public MorePage(): this("Adom Shafi", ImageSource.FromFile("default_profile_picture.png"))
-	{
-	}
 
-	public MorePage(string userName, ImageSource userImage)
+    private readonly MorePageController controller;
+
+	public MorePage(Account account, MorePageController controller)
 	{
         InitializeComponent();
-		ProfileImage.Source = userImage;
+		ProfileImage.Source = ImageSource.FromUri(account.User.ProfilePicture);
-		ProfileName.Text = userName;
+		ProfileName.Text = account.User.Name;
+        this.controller = controller;
     }
+
     private async void OnMyRecipesButtonTapped(object sender, EventArgs e)
     {
         await Shell.Current.Navigation.PushAsync(new MyRecipesPage());
@@ -22,9 +26,9 @@ public partial class MorePage : ContentPage
         await Shell.Current.Navigation.PushAsync(new ProfilePage());
     }
     
-    private async void OnLogoutButtonTapped(object sender, EventArgs e)
+    private void OnLogoutButtonTapped(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//LoginPage");
+        controller.Logout();
     }
     private async void OnShareButtonClicked(object sender, EventArgs e)
     {

Views/MyListPage.xaml.cs

@@ -1,8 +1,10 @@
+using Models;
+
 namespace ShoopNCook.Pages;
 
 public partial class MyListPage : ContentPage
 {
-	public MyListPage()
+	public MyListPage(Account account, IApp app)
     {
 		InitializeComponent();
 	}

Views/RegisterPage.xaml

@@ -40,7 +40,8 @@
                     <Entry 
                         Style="{StaticResource UserInput}"
                         Grid.Column="2"
-                        Placeholder="User Name"/>
+                        Placeholder="User Name"
+                        x:Name="UserNameEntry"/>
                 </Grid>
             </Border>
 
@@ -59,7 +60,8 @@
                     <Entry 
                         Style="{StaticResource UserInput}"
                         Grid.Column="2"
-                        Placeholder="Mail address"/>
+                        Placeholder="Mail address"
+                        x:Name="EmailEntry"/>
                 </Grid>
             </Border>
 
@@ -76,7 +78,8 @@
                     <Entry 
                         Style="{StaticResource UserInput}"
                         Grid.Column="2"
-                        Placeholder="Password"/>
+                        Placeholder="Password"
+                        x:Name="PasswordEntry"/>
                     <ImageButton
                         Grid.Column="3"
                         Source="visibility_off.svg"
@@ -84,8 +87,6 @@
                 </Grid>
             </Border>
 
-
-
             <Border
                 Margin="0, 30, 0, 0"
                 Stroke="{StaticResource BackgroundPrimary}"

Views/RegisterPage.xaml.cs

@@ -1,17 +1,24 @@
+using ShoopNCook.Controllers;
+
 namespace ShoopNCook.Pages;
 
 public partial class RegisterPage : ContentPage
 {
-	public RegisterPage()
+    private readonly RegisterController controller;
+	public RegisterPage(RegisterController controller)
 	{
 		InitializeComponent();
+        this.controller = controller;
 	}
     private async void LoginTapped(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//LoginPage");
+        await Shell.Current.GoToAsync("//Login");
     }
-    private async void RegisterTapped(object sender, EventArgs e)
+    private void RegisterTapped(object sender, EventArgs e)
     {
-        await Navigation.PushAsync(new ConfirmMail());
+        string email = EmailEntry.Text;
+        string password = PasswordEntry.Text;
+        string username = UserNameEntry.Text;
+        controller.Register(username, email, password);
     }
 }

Views/SearchPage.xaml.cs

@@ -1,5 +1,5 @@
 namespace ShoopNCook.Pages;
-using ShoopNCook.Models;
+using Models;
 using ShoopNCook.Views;
 public partial class SearchPage : ContentPage
 {

Views/Splash.xaml

@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ShoopNCook.Pages.Splash"
-             Title="Splash">
+             Title="Splash"
+             BackgroundColor="{StaticResource BackgroundPrimary}">
     <Grid
         RowDefinitions="Auto,Auto,*,Auto">
         <Image Grid.Row="0"

Views/Splash.xaml.cs

@@ -5,12 +5,10 @@ public partial class Splash : ContentPage
 	public Splash()
 	{
 		InitializeComponent();
-        NavigationPage.SetHasNavigationBar(this, false);
-
 	}
     private async void OnGetStartedButtonClicked(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//LoginPage");
+        await Shell.Current.GoToAsync("//Login");
     }
 
 }