Corection de la sépatation afin de coriger la navigation

Sources/IHM/App.xaml.cs

@@ -10,15 +10,13 @@ namespace IHM
         {
             InitializeComponent();
 
-            MainPage = new AppShell();
-
-            if(OperatingSystem.IsWindows())
+            if(OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
             {
-                MainPage = new UI_Windows.MainPage_Windows();
+                MainPage = new AppShellDesktop();
             }
-            else if(OperatingSystem.IsAndroid() || OperatingSystem.IsIOS())
+            else
             {
-                MainPage = new MainPage();
+                MainPage = new AppShell();
             }
         }
 

Sources/IHM/AppShell.xaml

@@ -3,7 +3,7 @@
     x:Class="IHM.AppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:IHM"
+    xmlns:local="clr-namespace:IHM.Mobile"
     Shell.FlyoutBehavior="Disabled"
     Shell.NavBarIsVisible="False">
 

Sources/IHM/AppShell.xaml.cs

@@ -1,4 +1,5 @@
-using Model;
+using IHM.Mobile;
+using Model;
 
 namespace IHM
 {

Sources/IHM/AppShellDesktop.xaml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Shell
+    x:Class="IHM.AppShellDesktop"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:IHM.Desktop"
+    Shell.FlyoutBehavior="Disabled"
+    Shell.NavBarIsVisible="False">
+
+    <ShellContent
+        ContentTemplate="{DataTemplate local:MainPage_Windows}"
+        Route="Inscription" />
+
+</Shell>

Sources/IHM/AppShellDesktop.xaml.cs

@@ -0,0 +1,19 @@
+using IHM.Desktop;
+using Model;
+
+namespace IHM
+{
+    public partial class AppShellDesktop : Shell
+    {
+        public Manager Mgr => (App.Current as App).Manager;
+
+        public AppShellDesktop()
+        {
+            InitializeComponent();
+        }
+
+ 
+           
+        
+    }
+}

Sources/IHM/Desktop/MainPage_Windows.xaml

@@ -1,13 +1,10 @@
 <?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="IHM.UI_Windows.MainPage_Windows"
+             x:Class="IHM.Desktop.MainPage_Windows"
              Title="MainPage_Windows">
     <StackLayout BackgroundColor="{StaticResource Primary}">
-        <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
+        
 
 
         

Sources/IHM/Desktop/MainPage_Windows.xaml.cs

@@ -1,7 +1,7 @@
 using Model;
 using System.Windows.Input;
 
-namespace IHM.UI_Windows;
+namespace IHM.Desktop;
 
 public partial class MainPage_Windows : ContentPage
 {

Sources/IHM/IHM.csproj

@@ -77,6 +77,15 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="AppShellDesktop.xaml.cs">
+	    <DependentUpon>AppShellDesktop.xaml</DependentUpon>
+	  </Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <MauiXaml Update="AppShellDesktop.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="ChangePassword.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

Sources/IHM/Mobile/ChangePassword.xaml

@@ -1,7 +1,7 @@
 <?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="IHM.ChangePassword"
+             x:Class="IHM.Mobile.ChangePassword"
              Title="ChangePassword">
     <VerticalStackLayout>
         <Label 

Sources/IHM/Mobile/ChangePassword.xaml.cs

@@ -1,6 +1,6 @@
 using Model;
 
-namespace IHM;
+namespace IHM.Mobile;
 
 public partial class ChangePassword : ContentPage
 {

Sources/IHM/Mobile/Dashboard.xaml

@@ -1,7 +1,7 @@
 <?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="IHM.DashBoard">
+             x:Class="IHM.Mobile.DashBoard">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="0.25*"/>

Sources/IHM/Mobile/Dashboard.xaml.cs

@@ -1,6 +1,6 @@
 using Model;
 
-namespace IHM;
+namespace IHM.Mobile;
 
 public partial class DashBoard : ContentPage
 {

Sources/IHM/Mobile/ForgetPassword.xaml

@@ -1,7 +1,7 @@
 <?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="IHM.ForgetPassword"
+             x:Class="IHM.Mobile.ForgetPassword"
              Title="ForgetPassword">
     <VerticalStackLayout
         Margin="20"

Sources/IHM/Mobile/ForgetPassword.xaml.cs

@@ -1,7 +1,7 @@
 using Model;
 using Email = Model.Email;
 
-namespace IHM;
+namespace IHM.Mobile;
 
 public partial class ForgetPassword : ContentPage
 {

Sources/IHM/Mobile/Inscription.xaml

@@ -1,7 +1,7 @@
 <?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="IHM.Inscription"
+             x:Class="IHM.Mobile.Inscription"
              Title="Inscription">
     <ScrollView>
     <VerticalStackLayout

Sources/IHM/Mobile/Inscription.xaml.cs

@@ -1,7 +1,7 @@
 using Model;
 using Email = Model.Email;
 
-namespace IHM;
+namespace IHM.Mobile;
 
 public partial class Inscription : ContentPage
 {

Sources/IHM/Mobile/MainPage.xaml

@@ -1,7 +1,7 @@
 <?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="IHM.MainPage">
+             x:Class="IHM.Mobile.MainPage">
 
     <ScrollView>
         <VerticalStackLayout

Sources/IHM/Mobile/MainPage.xaml.cs

@@ -1,7 +1,7 @@
 using Model;
 using System.Windows.Input;
 
-namespace IHM
+namespace IHM.Mobile
 {
     public partial class MainPage : ContentPage
     {

Sources/IHM/Mobile/Operations.xaml

@@ -1,7 +1,7 @@
 <?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="IHM.Operations">
+             x:Class="IHM.Mobile.Operations">
     <VerticalStackLayout>
         <Label 
             Text="Operations"

Sources/IHM/Mobile/Operations.xaml.cs

@@ -1,4 +1,4 @@
-namespace IHM;
+namespace IHM.Mobile;
 
 public partial class Operations : ContentPage
 {

Sources/IHM/Mobile/Planification.xaml

@@ -1,7 +1,7 @@
 <?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="IHM.Planification">
+             x:Class="IHM.Mobile.Planification">
     <VerticalStackLayout>
         <Label 
             Text="Planification"

Sources/IHM/Mobile/Planification.xaml.cs

@@ -1,4 +1,4 @@
-namespace IHM;
+namespace IHM.Mobile;
 
 public partial class Planification : ContentPage
 {

Sources/IHM/Mobile/Settings.xaml

@@ -1,7 +1,7 @@
 <?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="IHM.Settings">
+             x:Class="IHM.Mobile.Settings">
     <VerticalStackLayout>
         <Label 
             Text="Paramètre"

Sources/IHM/Mobile/Settings.xaml.cs

@@ -1,4 +1,4 @@
-namespace IHM;
+namespace IHM.Mobile;
 using Model;
 public partial class Settings : ContentPage
 {