From 70c960e538f92e19c42bfda1a5b29129c3cb0b44 Mon Sep 17 00:00:00 2001
From: Guillaume REY <gurey2>
Date: Wed, 26 Apr 2023 17:33:11 +0200
Subject: [PATCH] page bateau en cs + navig sur page bateau

---
 Sources/Model/Bateau.cs              |  14 ++-
 Sources/Model/Stub/StubBateau.cs     |  21 ++++
 Sources/Ohara/MainPage.xaml          |   2 +-
 Sources/Ohara/MainPage.xaml.cs       |   4 +
 Sources/Ohara/PageBateau.xaml        | 141 ++++++++++++---------------
 Sources/Ohara/PageBateau.xaml.cs     |  30 +++++-
 Sources/Ohara/PageCarte.xaml         |   4 +-
 Sources/Ohara/PageCarte.xaml.cs      |   7 +-
 Sources/Ohara/PageEquipage.xaml      |   4 +-
 Sources/Ohara/PageEquipage.xaml.cs   |   6 +-
 Sources/Ohara/PageFDD.xaml           |   4 +-
 Sources/Ohara/PageFDD.xaml.cs        |   6 +-
 Sources/Ohara/PagePersonnage.xaml    |   4 +-
 Sources/Ohara/PagePersonnage.xaml.cs |   6 +-
 Sources/TestConsole/Program.cs       |   9 --
 15 files changed, 154 insertions(+), 108 deletions(-)
 create mode 100644 Sources/Model/Stub/StubBateau.cs

diff --git a/Sources/Model/Bateau.cs b/Sources/Model/Bateau.cs
index bbc197c..813d841 100644
--- a/Sources/Model/Bateau.cs
+++ b/Sources/Model/Bateau.cs
@@ -10,21 +10,27 @@ namespace Model
     {
         public string Nom { get; set; }
         public string NomRomanise { get; set; }
-        public Equipage Affiliation { get; set; }
+        public Equipage? Affiliation { get; set; }
         public int PremierChap { get; set; }
         public int PremierEp { get; set; }
         public string Description { get; set; }
         public string Caracteristique { get; set; }
-
-        public Bateau(string nom, string nomRomanise, Equipage affiliation, int premierChap, int premierEp, string description, string caracteristique) 
+        public string? Image { get; set; }
+        
+        
+        public Bateau(string nom, string nomRomanise, int premierChap, int premierEp, string description, string caracteristique, string image) 
         {
             Nom = nom;
             NomRomanise = nomRomanise;
-            Affiliation = affiliation;
             PremierChap = premierChap;
             PremierEp = premierEp;
             Description = description;
             Caracteristique = caracteristique;
         }
+
+        public Bateau(string nom, string nomRomanise, Equipage affiliation, int premierChap, int premierEp, string description, string caracteristique, string image) : this(nom,nomRomanise,premierChap,premierEp,description,caracteristique,image)
+        {
+            Affiliation = affiliation;
+        }
     }
 }
diff --git a/Sources/Model/Stub/StubBateau.cs b/Sources/Model/Stub/StubBateau.cs
new file mode 100644
index 0000000..95ed74c
--- /dev/null
+++ b/Sources/Model/Stub/StubBateau.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static System.Net.Mime.MediaTypeNames;
+
+namespace Model.Stub
+{
+    public static class StubBateau
+    {
+        public static IEnumerable<Bateau> RecupererBateau()
+        {
+            List<Bateau> bateau = new List<Bateau>()
+            {
+                new Bateau("Sunny", "Sauzando Sani-go", 435, 321, "Le Thousand Sunny est...", "Ce bateau a pour particularités ...", "sunny.png"),
+            };
+            return bateau;
+        }
+    }
+}
diff --git a/Sources/Ohara/MainPage.xaml b/Sources/Ohara/MainPage.xaml
index f4c0b60..631a036 100644
--- a/Sources/Ohara/MainPage.xaml
+++ b/Sources/Ohara/MainPage.xaml
@@ -28,7 +28,7 @@
             <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
             <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
             <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
             <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
diff --git a/Sources/Ohara/MainPage.xaml.cs b/Sources/Ohara/MainPage.xaml.cs
index 701ad37..afe3eeb 100644
--- a/Sources/Ohara/MainPage.xaml.cs
+++ b/Sources/Ohara/MainPage.xaml.cs
@@ -26,5 +26,9 @@ public partial class MainPage : ContentPage
     {
         await Navigation.PushAsync(new PageCarte());
     }
+    private async void Hyperlink_Bateau(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageBateau());
+    }
 }
 
diff --git a/Sources/Ohara/PageBateau.xaml b/Sources/Ohara/PageBateau.xaml
index 20f91b5..a94433d 100644
--- a/Sources/Ohara/PageBateau.xaml
+++ b/Sources/Ohara/PageBateau.xaml
@@ -22,14 +22,14 @@
             </Image>
 
 
-            <Button Style="{StaticResource buttonMenu}" Text="Accueil"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Carte"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
             <Button Style="{StaticResource buttonMenu2}" Text="Bateaux"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
         </VerticalStackLayout>
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
             <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
@@ -51,86 +51,71 @@
                     <Label Text="Trier" HorizontalTextAlignment="Center"  />
                 </Frame>
             </Grid>
+
             <ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
-                <HorizontalStackLayout Spacing="40" Padding="40">
-
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <Image Source="sunny.png" HeightRequest="800" HorizontalOptions="Start" Grid.Row="0"/>
-                        <Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Margin="20, 50" Padding="20" WidthRequest="350" HeightRequest="200" Grid.Row="0" VerticalOptions="End">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="*" />
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <Label Text="Thousand Sunny" FontAttributes="Bold" FontSize="22" TextColor="White" Grid.Row="0" HorizontalOptions="Center" Margin="10"/>
-                                <Label Text="________________________" FontAttributes="Bold" FontSize="20" TextColor="White" Grid.Row="1" HorizontalOptions="Center" Margin="-15"/>
-                                <Label Text="Cliquez ici pour voir en détail" FontAttributes="Bold,Italic" FontSize="15" TextColor="White" Grid.Row="2" TextDecorations="Underline" HorizontalOptions="Center"/>
-                            </Grid>
-                        </Frame>
-                    </Grid>
-
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <Image Source="vogue_merry.png" HeightRequest="800" HorizontalOptions="Start"/>
-                        <Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Margin="20, 50" Padding="20" WidthRequest="350" HeightRequest="200" Grid.Row="0" VerticalOptions="End">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="*" />
-                                </Grid.RowDefinitions>
+                <CollectionView x:Name="listeBateau" ItemsLayout="HorizontalList">
+                    <CollectionView.ItemTemplate>
+                        <DataTemplate>
+
+                            <Grid Padding="50" ColumnSpacing="10">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="400"/>
                                 </Grid.ColumnDefinitions>
-                                <Label Text="Vogue Merry" FontAttributes="Bold" FontSize="22" TextColor="White" Grid.Row="0" HorizontalOptions="Center" Margin="10"/>
-                                <Label Text="________________________" FontAttributes="Bold" FontSize="20" TextColor="White" Grid.Row="1" HorizontalOptions="Center" Margin="-15"/>
-                                <Label Text="Cliquez ici pour voir en détail" FontAttributes="Bold,Italic" FontSize="15" TextColor="White" Grid.Row="2" TextDecorations="Underline" HorizontalOptions="Center"/>
-                            </Grid>
-                        </Frame>
-                    </Grid>
-
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <Image Source="moby_dick.png" HeightRequest="800" HorizontalOptions="Start"/>
-                        <Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Margin="20, 50" Padding="20" WidthRequest="350" HeightRequest="200" Grid.Row="0" VerticalOptions="End">
-                            <Grid>
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="750"/>
                                 </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <Label Text="Moby Dick" FontAttributes="Bold" FontSize="22" TextColor="White" Grid.Row="0" HorizontalOptions="Center" Margin="10"/>
-                                <Label Text="________________________" FontAttributes="Bold" FontSize="20" TextColor="White" Grid.Row="1" HorizontalOptions="Center" Margin="-15"/>
-                                <Label Text="Cliquez ici pour voir en détail" FontAttributes="Bold,Italic" FontSize="15" TextColor="White" Grid.Row="2" TextDecorations="Underline" HorizontalOptions="Center"/>
-                            </Grid>
-                        </Frame>
-                    </Grid>
 
 
-                </HorizontalStackLayout>
+                                <Image
+                                        Source="{Binding Image}"
+                                        HeightRequest="800"
+                                        WidthRequest="450"
+                                        />
+
+
+
+                                <Frame CornerRadius="20" 
+                                        BorderColor="#72a3b3"
+                                        BackgroundColor="#72a3b3"
+                                        Margin="20, 50" Padding="20"
+                                        WidthRequest="275"
+                                        HeightRequest="150"
+                                        Grid.Row="0" 
+                                        VerticalOptions="End">
+
+
+                                    <StackLayout Orientation="Vertical" Spacing="20">
+                                        <Label 
+                                                Text="{Binding Nom}" 
+                                                FontAttributes="Bold" 
+                                                FontSize="22" 
+                                                TextColor="White"  
+                                                HorizontalOptions="Center" 
+                                       
+                                                />
+
+                                        <Label 
+                                                Text="________________________" 
+                                                FontAttributes="Bold" 
+                                                FontSize="20" 
+                                                TextColor="White"
+                                                HorizontalOptions="Center" 
+                                                />
+
+                                        <Label 
+                                                Text="Cliquez ici pour voir en détail"
+                                                FontAttributes="Bold,Italic"
+                                                FontSize="15" 
+                                                TextColor="White"
+                                                TextDecorations="Underline" 
+                                                HorizontalOptions="Center"/>
+
+                                    </StackLayout>
+                                </Frame>
+                            </Grid>
+                        </DataTemplate>
+                    </CollectionView.ItemTemplate>
+                </CollectionView>
             </ScrollView>
         </VerticalStackLayout>
 
diff --git a/Sources/Ohara/PageBateau.xaml.cs b/Sources/Ohara/PageBateau.xaml.cs
index aa4a044..6892255 100644
--- a/Sources/Ohara/PageBateau.xaml.cs
+++ b/Sources/Ohara/PageBateau.xaml.cs
@@ -1,3 +1,6 @@
+using Model.Stub;
+using Model;
+
 namespace Ohara;
 
 public partial class PageBateau : ContentPage
@@ -5,5 +8,30 @@ public partial class PageBateau : ContentPage
 	public PageBateau()
 	{
 		InitializeComponent();
-	}
+        List<Bateau> bateau = StubBateau.RecupererBateau().ToList();
+
+        listeBateau.ItemsSource = bateau;
+    }
+
+    private async void Hyperlink_FDD(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageFDD());
+    }
+
+    private async void Hyperlink_Equip(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageEquipage());
+    }
+    private async void Hyperlink_Perso(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PagePersonnage());
+    }
+    private async void Hyperlink_Carte(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageCarte());
+    }
+    private async void Hyperlink_Accueil(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new MainPage());
+    }
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageCarte.xaml b/Sources/Ohara/PageCarte.xaml
index b4354d3..03ae775 100644
--- a/Sources/Ohara/PageCarte.xaml
+++ b/Sources/Ohara/PageCarte.xaml
@@ -22,11 +22,11 @@
             </Image>
 
 
-            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Acceuil"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
             <Button Style="{StaticResource buttonMenu2}" Text="Carte"/>
             <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
             <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
             <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
diff --git a/Sources/Ohara/PageCarte.xaml.cs b/Sources/Ohara/PageCarte.xaml.cs
index 84cc32d..586c45e 100644
--- a/Sources/Ohara/PageCarte.xaml.cs
+++ b/Sources/Ohara/PageCarte.xaml.cs
@@ -6,7 +6,7 @@ public partial class PageCarte : ContentPage
 	{
 		InitializeComponent();
 	}
-    private async void Hyperlink_Acceuil(object sender, EventArgs e)
+    private async void Hyperlink_Accueil(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new MainPage());
     }
@@ -25,9 +25,8 @@ public partial class PageCarte : ContentPage
     {
         await Navigation.PushAsync(new PagePersonnage());
     }
-
-    private void Button_Clicked(object sender, EventArgs e)
+    private async void Hyperlink_Bateau(object sender, EventArgs e)
     {
-
+        await Navigation.PushAsync(new PageBateau());
     }
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageEquipage.xaml b/Sources/Ohara/PageEquipage.xaml
index f577084..1879def 100644
--- a/Sources/Ohara/PageEquipage.xaml
+++ b/Sources/Ohara/PageEquipage.xaml
@@ -21,11 +21,11 @@
             </Image>
 
 
-            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Acceuil"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
             <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
             <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
             <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
             <Button Style="{StaticResource buttonMenu2}" Text="Équipages"/>
diff --git a/Sources/Ohara/PageEquipage.xaml.cs b/Sources/Ohara/PageEquipage.xaml.cs
index 5fe053b..d894059 100644
--- a/Sources/Ohara/PageEquipage.xaml.cs
+++ b/Sources/Ohara/PageEquipage.xaml.cs
@@ -18,7 +18,7 @@ public partial class PageEquipage : ContentPage
         await Navigation.PushAsync(new PageFDD());
     }
 
-    private async void Hyperlink_Acceuil(object sender, EventArgs e)
+    private async void Hyperlink_Accueil(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new MainPage());
     }
@@ -31,4 +31,8 @@ public partial class PageEquipage : ContentPage
     {
         await Navigation.PushAsync(new PageCarte());
     }
+    private async void Hyperlink_Bateau(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageBateau());
+    }
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml
index 7c01c9c..997a774 100644
--- a/Sources/Ohara/PageFDD.xaml
+++ b/Sources/Ohara/PageFDD.xaml
@@ -24,11 +24,11 @@
             </Image>
 
 
-            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Acceuil"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
             <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
             <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
             <Button Style="{StaticResource buttonMenu2}" Text="Fruits du démon"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
             <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
diff --git a/Sources/Ohara/PageFDD.xaml.cs b/Sources/Ohara/PageFDD.xaml.cs
index 426599f..b78228f 100644
--- a/Sources/Ohara/PageFDD.xaml.cs
+++ b/Sources/Ohara/PageFDD.xaml.cs
@@ -20,7 +20,7 @@ public partial class PageFDD : ContentPage
 
     }
 
-    private async void Hyperlink_Acceuil(object sender, EventArgs e)
+    private async void Hyperlink_Accueil(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new MainPage());
     }
@@ -38,4 +38,8 @@ public partial class PageFDD : ContentPage
     {
         await Navigation.PushAsync(new PageCarte());
     }
+    private async void Hyperlink_Bateau(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageBateau());
+    }
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PagePersonnage.xaml b/Sources/Ohara/PagePersonnage.xaml
index cda7693..d57a80c 100644
--- a/Sources/Ohara/PagePersonnage.xaml
+++ b/Sources/Ohara/PagePersonnage.xaml
@@ -22,11 +22,11 @@
             </Image>
 
 
-            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Acceuil"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
             <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
             <Button Style="{StaticResource buttonMenu2}" Text="Personnages"/>
             <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
             <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
diff --git a/Sources/Ohara/PagePersonnage.xaml.cs b/Sources/Ohara/PagePersonnage.xaml.cs
index c0df5ba..35e9bbc 100644
--- a/Sources/Ohara/PagePersonnage.xaml.cs
+++ b/Sources/Ohara/PagePersonnage.xaml.cs
@@ -15,7 +15,7 @@ public partial class PagePersonnage : ContentPage
         listePerso.ItemsSource = perso;
     }
 
-    private async void Hyperlink_Acceuil(object sender, EventArgs e)
+    private async void Hyperlink_Accueil(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new MainPage());
     }
@@ -33,4 +33,8 @@ public partial class PagePersonnage : ContentPage
     {
         await Navigation.PushAsync(new PageCarte());
     }
+    private async void Hyperlink_Bateau(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageBateau());
+    }
 }
\ No newline at end of file
diff --git a/Sources/TestConsole/Program.cs b/Sources/TestConsole/Program.cs
index 9db3398..64c4abb 100644
--- a/Sources/TestConsole/Program.cs
+++ b/Sources/TestConsole/Program.cs
@@ -1,12 +1,3 @@
 // See https://aka.ms/new-console-template for more information
 using Model;
 
-FruitDuDemon nika = new FruitDuDemon("Fruit de l'humain modèle Nika", "Nika Nika No Mi", "Zoan Mythologique", 1, 1, "Le fruit ...", "Forces :", "Faiblesses :");
-FruitDuDemon fumer = new FruitDuDemon("Fruit de la fumée", "Moku Moky No Mi", "Logia", 50, 50, "Le fruit est ..", "Forces :", "Faiblesses :", "fumer.png");
-Personnage luffy = new Personnage("Monkey D. Luffy", "Chapeau de paille", 19,1.74,"East Blue","Monkey D. Luffy est...","Le Roi des Pirates ce sera moi !" );
-Personnage zoro = new Personnage("Roronoa Zoro", "Chasseur de pirates", 21, 1.81, "East Blue", "Roronoa Zoro est ...", "Le plus grand des racistes ce sera moi !");
-Personnage sanji = new Personnage("Sanji", "La jambe noire", 21, 1.80, "East Blue", "Sanji né Vinsmoke Sanji ..", "As-tu déjà entendu parler de All Blue ?");
-
-
-nika.Utilisateur = new List<Personnage> { luffy };
-luffy.Fruit = new List<FruitDuDemon> { nika };