Merge branch 'UI_Windows' of https://codefirst.iut.uca.fr/git/ConsEcoTeam/ConsEco into UI_Windows

Sources/IHM/Desktop/Planification.xaml

@@ -4,22 +4,41 @@
              x:Class="IHM.Desktop.Planification"
              Title="Planification">
     <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
 
-        <StackLayout BackgroundColor="{StaticResource Gray900}" VerticalOptions="Start">
-            <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="10" Margin="10" HorizontalOptions="End"></Button>
-        </StackLayout>
+            <HorizontalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="4" >
+                <Image Source="logo_sans_fond.png" HeightRequest="100" Margin="50,10,0,0" HorizontalOptions="Start"/>
+                <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" HorizontalOptions="End" MaximumHeightRequest="50"></Button>
+            </HorizontalStackLayout>
+<!--
 
-        <StackLayout BackgroundColor="{StaticResource Gray900}" HorizontalOptions="StartAndExpand" VerticalOptions="FillAndExpand">
-
-            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" Padding="20" Margin="20" ></Button>
-            <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Primary}"  TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20" ></Button>
-        </StackLayout>
-        
-        
+            <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" HorizontalOptions="StartAndExpand" VerticalOptions="CenterAndExpand" >
+                <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
+                <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
+                <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
+                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
+                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource White}" Padding="20" Margin="21" ></Button>
+                <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
+            </VerticalStackLayout>
+-->s
 
+           
+        </Grid>
+  
+      
     </StackLayout>
 
+   
+
 </ContentPage>

Sources/IHM/Desktop/Planification.xaml.cs

@@ -1,9 +1,15 @@
+using Model;
+
 namespace IHM.Desktop;
 
 public partial class Planification : ContentPage
 {
-	public Planification()
+    public Manager Mgr => (App.Current as App).Manager;
+    public Planification()
 	{
 		InitializeComponent();
+		BindingContext = Mgr;
+		
+		
 	}
 }

Sources/IHM/Resources/Styles/Colors.xaml

@@ -4,9 +4,9 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-    <Color x:Key="Primary">#512BD4</Color>
-    <Color x:Key="Secondary">#DFD8F7</Color>
-    <Color x:Key="Tertiary">#2B0B98</Color>
+    <Color x:Key="Primary">#7FB196</Color>
+    <Color x:Key="Secondary">#3C425A</Color>
+    <Color x:Key="Tertiary">#DF775C</Color>
     <Color x:Key="White">White</Color>
     <Color x:Key="Black">Black</Color>
     <Color x:Key="Gray100">#E1E1E1</Color>