From 0f69d9c87cb94905a3b100e2967df91cdb12fee0 Mon Sep 17 00:00:00 2001
From: Yvan CALATAYUD <yvcalatayu>
Date: Thu, 1 Jun 2023 17:47:30 +0200
Subject: [PATCH] =?UTF-8?q?Amelioration=20de=20la=20connexion(Change=20aut?=
 =?UTF-8?q?omatiquement=20la=20PageProfil/PageConnexion=20si=20user=20conn?=
 =?UTF-8?q?ect=C3=A9)=20+=20Navigation=20TabBar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GameAtlas/GameAtlas/AppShell.xaml                 |  6 +++---
 GameAtlas/GameAtlas/Models/Manager.cs             | 12 ++++++++++--
 GameAtlas/GameAtlas/Views/PageAccueil.xaml        |  2 +-
 GameAtlas/GameAtlas/Views/PageConnexion.xaml.cs   |  4 +++-
 GameAtlas/GameAtlas/Views/PageInscription.xaml.cs |  3 ++-
 GameAtlas/GameAtlas/Views/PageProfil.xaml.cs      | 13 +++++++++++++
 6 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/GameAtlas/GameAtlas/AppShell.xaml b/GameAtlas/GameAtlas/AppShell.xaml
index 381d174..3242a3c 100644
--- a/GameAtlas/GameAtlas/AppShell.xaml
+++ b/GameAtlas/GameAtlas/AppShell.xaml
@@ -21,7 +21,7 @@
         </ResourceDictionary>
     </Shell.Resources>
 
-    <TabBar>
+    <TabBar Route="page">
         <ShellContent
             Title="Accueil"
             Icon="home"
@@ -37,11 +37,11 @@
             Icon="account"
             ContentTemplate="{DataTemplate views:PageProfil}"
             Route="PageProfil" />
-        <ShellContent
+        <!--<ShellContent
             Title="Connexion"
             Icon="account"
             ContentTemplate="{DataTemplate views:PageConnexion}"
-            Route="PageConnexion" />
+            Route="PageConnexion" />-->
     </TabBar>
 
 
diff --git a/GameAtlas/GameAtlas/Models/Manager.cs b/GameAtlas/GameAtlas/Models/Manager.cs
index 5f4bf7d..412eb3d 100644
--- a/GameAtlas/GameAtlas/Models/Manager.cs
+++ b/GameAtlas/GameAtlas/Models/Manager.cs
@@ -1,13 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace GameAtlas.Models
 {
-    public class Manager
+    public class Manager : INotifyPropertyChanged
     {
         public List<Jeu> ListJeux { get; private set; }
         public List<Admin> Admins { get; private set; }
@@ -21,23 +23,29 @@ namespace GameAtlas.Models
             set
             {
                 connectedUser = value;
-                //OnPropertyChanged();
+                OnPropertyChanged();
             }
         }
         private Utilisateur connectedUser;
 
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        void OnPropertyChanged([CallerMemberName] string propertyName = null)
+            => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 
         public Manager(IPersistanceManager persistance)
         {
             Utilisateurs = new List<Utilisateur>();
             ListJeux = new List<Jeu>();
             Persistance = persistance;
+            ConnectedUser = null;
         }
 
         public Manager() {
             ListJeux = new List<Jeu>();
             Admins = new List<Admin>();
             Utilisateurs = new List<Utilisateur>();
+            ConnectedUser = null;
         }
 
         public void AddJeux(Jeu jeux)
diff --git a/GameAtlas/GameAtlas/Views/PageAccueil.xaml b/GameAtlas/GameAtlas/Views/PageAccueil.xaml
index c4ecce0..b3af869 100644
--- a/GameAtlas/GameAtlas/Views/PageAccueil.xaml
+++ b/GameAtlas/GameAtlas/Views/PageAccueil.xaml
@@ -39,7 +39,7 @@
                 />
 
                     <Label
-                        Text="Pseudonyme"
+                        Text="{Binding ConnectedUser.Pseudo}"
                         FontFamily="AladinRegular"
                         FontSize="18"
                         Grid.Row="1"
diff --git a/GameAtlas/GameAtlas/Views/PageConnexion.xaml.cs b/GameAtlas/GameAtlas/Views/PageConnexion.xaml.cs
index 4936d9a..257779a 100644
--- a/GameAtlas/GameAtlas/Views/PageConnexion.xaml.cs
+++ b/GameAtlas/GameAtlas/Views/PageConnexion.xaml.cs
@@ -41,7 +41,9 @@ public partial class PageConnexion : ContentPage
         connexionWorked = Verification(username, password);
         if (connexionWorked)
         {
-            await Navigation.PushAsync(new PageAcceuil());
+            //await Navigation.PushAsync(new PageAcceuil());
+            await Navigation.PopAsync();
+            //await Shell.Current.GoToAsync("//page/PageAccueil");
         }
     }
 
diff --git a/GameAtlas/GameAtlas/Views/PageInscription.xaml.cs b/GameAtlas/GameAtlas/Views/PageInscription.xaml.cs
index dc6740e..597dfe4 100644
--- a/GameAtlas/GameAtlas/Views/PageInscription.xaml.cs
+++ b/GameAtlas/GameAtlas/Views/PageInscription.xaml.cs
@@ -48,7 +48,8 @@ public partial class PageInscription : ContentPage
         //PersistanceManager.SauvegardeUser(utilisateur);
         Debug.WriteLine(InscriptionManager.Utilisateurs.Count);
 
-        await Navigation.PushAsync(new PageAcceuil());
+        //await Navigation.PushAsync(new PageAcceuil());
+        await Shell.Current.GoToAsync("//page/PageAccueil");
 
 
         bool IsPasswordStrong(string password)
diff --git a/GameAtlas/GameAtlas/Views/PageProfil.xaml.cs b/GameAtlas/GameAtlas/Views/PageProfil.xaml.cs
index d40dade..67ef85c 100644
--- a/GameAtlas/GameAtlas/Views/PageProfil.xaml.cs
+++ b/GameAtlas/GameAtlas/Views/PageProfil.xaml.cs
@@ -9,8 +9,21 @@ public partial class PageProfil : ContentPage
 	{
 		InitializeComponent();
         BindingContext = ProfilManager;
+        SwitchPage();
 	}
 
+    async void SwitchPage()
+    {
+        if (ProfilManager.ConnectedUser == null)
+        {
+            await Navigation.PushAsync(new PageConnexion());
+        }
+        else
+        {
+            await Shell.Current.GoToAsync("//page/PageProfil");
+        }
+    }
+
     async void OnGame_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
     {
         await Shell.Current.GoToAsync(nameof(PageJeu));