From b271543513e5801d98737226fd5a93b53694a227 Mon Sep 17 00:00:00 2001
From: V J <Vianney.JOURDY@etu.uca.fr>
Date: Wed, 31 May 2023 15:19:34 +0200
Subject: [PATCH 1/2] =?UTF-8?q?mise=20=C3=A0=20jour?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MangaMap/Views/listPage.xaml    | 22 +---------------------
 MangaMap/Views/listPage.xaml.cs |  8 ++++----
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/MangaMap/Views/listPage.xaml b/MangaMap/Views/listPage.xaml
index b1d6e2b..4d7e04f 100644
--- a/MangaMap/Views/listPage.xaml
+++ b/MangaMap/Views/listPage.xaml
@@ -33,19 +33,6 @@
                         </Grid>
 
                         <ScrollView Grid.Row="1" VerticalScrollBarVisibility="Always">
-<<<<<<< HEAD
-                            <VerticalStackLayout Spacing="10">
-
-                                <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
-
-                                    <ImageButton Grid.Column="0" BackgroundColor="#FFFFFF" WidthRequest="100" HeightRequest="100" HorizontalOptions="Start"/>
-                                    <Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
-                                    <Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/>
-                                    <Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>
-                                </Grid>
-
-                            </VerticalStackLayout>
-=======
                             <VerticalStackLayout BindableLayout.ItemsSource="{Binding ListeOeuvreEnVisionnage}" Spacing="10">
                                 <BindableLayout.ItemTemplate>
                                     <DataTemplate>
@@ -57,14 +44,7 @@
                                         </Grid>
                                     </DataTemplate>
                                 </BindableLayout.ItemTemplate>
-
-                            </VerticalStackLayout> 
-
-                            <!--<Grid x:Name="grille"
-                                  Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
-                                
-                            </Grid>-->                            
->>>>>>> 5ff49db92d0e603606c630e81dea03593ebab802
+                            </VerticalStackLayout>
                         </ScrollView>
                     </Grid>
                 </Frame>
diff --git a/MangaMap/Views/listPage.xaml.cs b/MangaMap/Views/listPage.xaml.cs
index 449192f..7ed0a71 100644
--- a/MangaMap/Views/listPage.xaml.cs
+++ b/MangaMap/Views/listPage.xaml.cs
@@ -10,10 +10,10 @@ public partial class listPage : ContentPage
 	{
 		InitializeComponent();
         BindingContext = my_manager;
-        if (my_manager.UtilisateurActuel.Email != null)
-        {
-            chargerFavoris();
-        }
+        //if (my_manager.UtilisateurActuel.Email != null)
+        //{
+        //    chargerFavoris();
+        //}
     }
 
     private void chargerFavoris()

From d81846eecbc15b032973fc755b0f58cd85d8f770 Mon Sep 17 00:00:00 2001
From: V J <Vianney.JOURDY@etu.uca.fr>
Date: Wed, 31 May 2023 15:25:45 +0200
Subject: [PATCH 2/2] binding listePage

---
 MangaMap/Views/listPage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MangaMap/Views/listPage.xaml b/MangaMap/Views/listPage.xaml
index 4d7e04f..af59494 100644
--- a/MangaMap/Views/listPage.xaml
+++ b/MangaMap/Views/listPage.xaml
@@ -33,12 +33,12 @@
                         </Grid>
 
                         <ScrollView Grid.Row="1" VerticalScrollBarVisibility="Always">
-                            <VerticalStackLayout BindableLayout.ItemsSource="{Binding ListeOeuvreEnVisionnage}" Spacing="10">
+                            <VerticalStackLayout BindableLayout.ItemsSource="{Binding UtilisateurActuel.ListeOeuvreEnVisionnage}" Spacing="10">
                                 <BindableLayout.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
                                             <ImageButton Grid.Column="0" Source="{Binding Affiche}" BackgroundColor="#FFFFFF" WidthRequest="100" HeightRequest="100" HorizontalOptions="Start"/>
-                                            <Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
+                                            <Label Grid.Column="1" Text="{Binding Nom}" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
                                             <Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/>
                                             <Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>
                                         </Grid>