move Models.API in Endpoint module

App.xaml.cs

@@ -1,7 +1,6 @@
 namespace ShoopNCook;
-using ShoopNCook.Pages;
 using Models;
-using Models.Endpoint;
+using Endpoint;
 using LocalEndpoint;
 
 public partial class App : Application, ConnectionObserver, IApp

ConnectAppShell.xaml.cs

@@ -1,7 +1,7 @@
 namespace ShoopNCook;
 using Microsoft.Maui.Controls;
 using Models;
-using Models.Endpoint;
+using Endpoint;
 using ShoopNCook.Controllers;
 using ShoopNCook.Pages;
 

Controllers/ConnectionController.cs

@@ -1,4 +1,4 @@
-using Models.Endpoint;
+using Endpoint;
 using Models;
 
 namespace ShoopNCook.Controllers

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

@@ -1,10 +1,5 @@
-using System;
+using Models;
-using System.Collections.Generic;
+namespace Endpoint
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Models.Endpoint
 {
     public interface IAccountManager
     {

Endpoint/IEndpoint.cs

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

LocalEndpoint/AccountManager.cs

@@ -1,5 +1,5 @@
 using Models;
-using Models.Endpoint;
+using Endpoint;
 using System;
 using System.Collections.Generic;
 using System.Linq;

LocalEndpoint/LocalEndpoint.cs

@@ -1,11 +1,10 @@
-using Models.Endpoint;
+using Endpoint;
 
-namespace LocalEndpoint
+namespace LocalEndpoint
-{
+{
-    public class LocalEndpoint : IEndpoint
+    public class LocalEndpoint : IEndpoint
     {
         public IAccountManager AccountManager => new AccountManager();
 
-        public ISearchEngine SearchEngine => throw new NotImplementedException();
+    }
-    }
 }

LocalEndpoint/LocalEndpoint.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Endpoint\Endpoint.csproj" />
     <ProjectReference Include="..\Models\Models.csproj" />
   </ItemGroup>
 

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 Models.Endpoint
-{
-    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 Models.Endpoint
-{
-    public interface ISearchEngine
-    {
-        //TODO define methods to search recipes
-    }
-}

ShoopNCook.csproj

@@ -48,22 +48,27 @@
 	<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\**" />
@@ -113,6 +118,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <ProjectReference Include="Endpoint\Endpoint.csproj" />
 	  <ProjectReference Include="LocalEndpoint\LocalEndpoint.csproj" />
 	  <ProjectReference Include="Models\Models.csproj" />
 	</ItemGroup>

ShoopNCook.sln

@@ -10,6 +10,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Models", "Models\Models.csp
 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
 		Debug|Any CPU = Debug|Any CPU
@@ -34,6 +36,10 @@ Global
 		{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

Views/LoginPage.xaml.cs

@@ -1,28 +1,28 @@
-using Models.Endpoint;
+using Endpoint;
 using ShoopNCook.Controllers;
 
-namespace ShoopNCook.Pages;
+namespace ShoopNCook.Pages;
-
+
-public partial class LoginPage : ContentPage
+public partial class LoginPage : ContentPage
-{
+{
-    private readonly LoginController controller;
+    private readonly LoginController controller;
-	public LoginPage(LoginController controller)
+	public LoginPage(LoginController controller)
-	{
+	{
-		InitializeComponent();
+		InitializeComponent();
-        this.controller = controller;
+        this.controller = controller;
-	}
+	}
-    private async void OnLoginButtonClicked(object sender, EventArgs e)
+    private async void OnLoginButtonClicked(object sender, EventArgs e)
-    {
+    {
-        string email = EmailEntry.Text;
+        string email = EmailEntry.Text;
-        string password = PasswordEntry.Text;
+        string password = PasswordEntry.Text;
-        controller.Login(email, password);
+        controller.Login(email, password);
-    }
+    }
-    private async void ForgotPasswordTapped(object sender, EventArgs e)
+    private async void ForgotPasswordTapped(object sender, EventArgs e)
-    {
+    {
-        await Shell.Current.Navigation.PushAsync(new ForgotPassword());
+        await Shell.Current.Navigation.PushAsync(new ForgotPassword());
-    }
+    }
-    private async void RegisterLabbelTapped(object sender, EventArgs e)
+    private async void RegisterLabbelTapped(object sender, EventArgs e)
-    {
+    {
-        await Shell.Current.GoToAsync("//Register");
+        await Shell.Current.GoToAsync("//Register");
-    }
+    }
 }