From fe9812a00a2afb0a1044c425afda7be1dce6bc5b Mon Sep 17 00:00:00 2001
From: "leo.tuaillon" <leo.TUAILLON@etu.uca.fr>
Date: Tue, 4 Apr 2023 22:40:14 +0200
Subject: [PATCH] =?UTF-8?q?version=20bugu=C3=A9=20...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ShoopNCook.csproj      | 26 ++++++------------
 Views/HomePage.xaml    | 60 +++---------------------------------------
 Views/HomePage.xaml.cs | 11 --------
 3 files changed, 11 insertions(+), 86 deletions(-)

diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index bdc0076..024478d 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -39,7 +39,6 @@
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
-		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
 
 		<!-- Custom Fonts -->
 		<MauiFont Include="Resources\Fonts\*" />
@@ -53,16 +52,9 @@
 	  <None Remove="Resources\Images\email_icon.svg" />
 	  <None Remove="Resources\Images\facebook_logo.svg" />
 	  <None Remove="Resources\Images\password_icon.svg" />
+	  <None Remove="Resources\Images\search_options.svg" />
 	  <None Remove="Resources\Images\visibility_off.svg" />
 	  <None Remove="Resources\Images\visibility_on.svg" />
-<<<<<<< HEAD
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-	</ItemGroup>
-
-=======
 	</ItemGroup>
 
 	<ItemGroup>
@@ -78,20 +70,18 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
 	</ItemGroup>
 
->>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
 	<ItemGroup>
-	  <MauiXaml Update="Views\HomePage.xaml">
+	  <MauiXaml Update="Views\ProfilePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-<<<<<<< HEAD
-	</ItemGroup>
-
-</Project>
-=======
-	  <MauiXaml Update="Views\ProfilePage.xaml">
+	  <MauiXaml Update="Views\RecipeView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\SearchPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	</ItemGroup>
 
+	<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionShoopNCookHideInfoBar="True" XamarinHotReloadUnhandledDeviceExceptionShoopNCookHideInfoBar="True" /></VisualStudio></ProjectExtensions>
+
 </Project>
->>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
diff --git a/Views/HomePage.xaml b/Views/HomePage.xaml
index 44b3033..7573fad 100644
--- a/Views/HomePage.xaml
+++ b/Views/HomePage.xaml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@@ -179,59 +178,6 @@
                     </Grid>
                 </StackLayout>
             </ScrollView>
-</ContentPage>
-=======
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="ShoopNCook.Views.HomePage"
-             Title="HomePage">
-
-    <ScrollView>
-            <Grid x:Name="RecipesGrid"
-              RowSpacing="10"
-              ColumnSpacing="10"
-              Padding="10">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <!-- Recette 1 -->
-            <Frame Grid.Row="0" Grid.Column="0" Padding="0" Margin="5" CornerRadius="10" BackgroundColor="Aqua">
-                <Grid Padding="10">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                    <Image Grid.Row="0" Source="facebook_logo.png" Aspect="AspectFill" Margin="0,0,0,10" />
-                    <Label Grid.Row="1" Text="Titre Recette 1" FontAttributes="Bold" FontSize="Large" />
-                        <Label Grid.Row="2" Text="Temps de préparation : 30 min" FontSize="Small" />
-                    </Grid>
-                </Frame>
-
-                <!-- Recette 2 -->
-            <Frame Grid.Row="0" Grid.Column="1" Padding="0" Margin="5" CornerRadius="10" BackgroundColor="Aqua">
-                <Grid Padding="10">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                    <Image Grid.Row="0" Source="facebook_logo.png" Aspect="AspectFill" Margin="0,0,0,10" />
-                        <Label Grid.Row="1" Text="Titre Recette 2" FontAttributes="Bold" FontSize="Large" />
-                        <Label Grid.Row="2" Text="Temps de préparation : 45 min" FontSize="Small" />
-                    </Grid>
-                </Frame>
-            </Grid>
-        </ScrollView>
-    </ContentPage>
->>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
+        </StackLayout>
+    </ScrollView>
+</ContentPage>
\ No newline at end of file
diff --git a/Views/HomePage.xaml.cs b/Views/HomePage.xaml.cs
index bdcff39..bf9671b 100644
--- a/Views/HomePage.xaml.cs
+++ b/Views/HomePage.xaml.cs
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 namespace ShoopNCook.Views;
 
 public partial class HomePage : ContentPage
@@ -7,14 +6,4 @@ public partial class HomePage : ContentPage
 	{
 		InitializeComponent();
 	}
-=======
-namespace ShoopNCook.Views;
-
-public partial class HomePage : ContentPage
-{
-	public HomePage()
-	{
-		InitializeComponent();
-	}
->>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
 }
\ No newline at end of file