From c69fe4a92936bede79d515dff46b403864786af0 Mon Sep 17 00:00:00 2001
From: Vincent ASTOLFI <Vincent.ASTOLFI@etu.uca.fr>
Date: Wed, 12 Oct 2022 09:54:34 +0200
Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20des=20diff=C3=A9rents=20UC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/IHM/App.xaml              |  22 ++++++
 Code/IHM/UCConnexion.xaml      | 138 ++++++++++-----------------------
 Code/IHM/UCInscription.xaml    |  89 ++++++++++++++++++++-
 Code/IHM/UCInscription.xaml.cs |   6 ++
 4 files changed, 154 insertions(+), 101 deletions(-)

diff --git a/Code/IHM/App.xaml b/Code/IHM/App.xaml
index 01ae433..1f1d72d 100644
--- a/Code/IHM/App.xaml
+++ b/Code/IHM/App.xaml
@@ -13,6 +13,8 @@
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="Margin" Value="20"/>
             <Setter Property="CornerRadius" Value="5"/>
+            <Setter Property="Height" Value="30"/>
+            <Setter Property="Width" Value="175"/>
         </Style>
 
         <Style TargetType="UserControl" x:Key="ImageFondRessource">
@@ -70,6 +72,26 @@
             <Setter Property="VerticalAlignment" Value="Center"/>
         </Style>
 
+        <Style x:Key="OrangeButtonRessource" TargetType="Button">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border CornerRadius="5" BorderBrush="#63A4FF" BorderThickness="1" >
+                            <Border.Background>
+                                <LinearGradientBrush>
+                                    <GradientStop Color="#FBD72B" Offset="0"/>
+                                    <GradientStop Color="#F9484A" Offset="1"/>
+                                </LinearGradientBrush>
+                            </Border.Background>
+                            <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+        </Style>
+
         <SolidColorBrush x:Key="CouleurPrincipale" Color="Black"/>
 
     </Application.Resources>
diff --git a/Code/IHM/UCConnexion.xaml b/Code/IHM/UCConnexion.xaml
index 5406984..492a35b 100644
--- a/Code/IHM/UCConnexion.xaml
+++ b/Code/IHM/UCConnexion.xaml
@@ -9,109 +9,53 @@
              Style="{StaticResource ImageFondRessource}">
 
     <DockPanel>
-
-        <Border DockPanel.Dock="Top" Style="{StaticResource BorderRessource}">
-            <Border.Background>White</Border.Background>
-            <TextBlock Text="Login" Style="{StaticResource TextBlockRessource}"/>
-        </Border>
+        <TextBlock DockPanel.Dock="Top" Foreground="White" HorizontalAlignment="Center" FontSize="30" Margin="20">Connexion</TextBlock>
+        <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center" FontSize="15" Margin="20">Connectez vous à un compte déjà existant</TextBlock>
 
         <Button Click="Button_Click_Acceuil" Margin="20" DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}">
             <TextBlock Text="Retour à la page d'acceuil"/>
         </Button>
-
-        <Border Style="{StaticResource BorderRessource}" Grid.Column="1">
-            <StackPanel>
-                <Border Style="{StaticResource BorderRessource}">
-                    <TextBlock Text="Inscription" Style="{StaticResource TextBlockRessource}"/>
-                </Border>
-
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition/>
-                        <RowDefinition/>
-                        <RowDefinition/>
-                        <RowDefinition/>
-                        <RowDefinition/>
-                    </Grid.RowDefinitions>
-                    <Border Style="{StaticResource BorderRessource}">
-                        <TextBlock Text="Nom d'utilisateur" Style="{StaticResource TextBlockRessource}"/>
-                    </Border>
-                    <Border Grid.Column="1" Style="{StaticResource BorderRessource}">
-                        <TextBox>
-                            <TextBox.Resources>
-                                <Style TargetType="{x:Type Border}">
-                                    <Setter Property="CornerRadius" Value="5"/>
-                                </Style>
-                            </TextBox.Resources>
-                        </TextBox>
-                    </Border>
-
-                    <Border Style="{StaticResource BorderRessource}" Grid.Row="1">
-                        <TextBlock Text="Nom" Style="{StaticResource TextBlockRessource}"/>
-                    </Border>
-                    <Border Grid.Column="1" Grid.Row="1" Style="{StaticResource BorderRessource}">
-                        <TextBox>
-                            <TextBox.Resources>
-                                <Style TargetType="{x:Type Border}">
-                                    <Setter Property="CornerRadius" Value="5"/>
-                                </Style>
-                            </TextBox.Resources>
-                        </TextBox>
-                    </Border>
-
-                    <Border Grid.Row="2" Style="{StaticResource BorderRessource}" >
-                        <TextBlock Text="Prenom" Style="{StaticResource TextBlockRessource}"/>
-                    </Border>
-                    <Border Grid.Column="1" Grid.Row="2" Style="{StaticResource BorderRessource}">
-                        <TextBox>
-                            <TextBox.Resources>
-                                <Style TargetType="{x:Type Border}">
-                                    <Setter Property="CornerRadius" Value="5"/>
-                                </Style>
-                            </TextBox.Resources>
-                        </TextBox>
-                    </Border>
-
-                    <Border Grid.Row="3" Style="{StaticResource BorderRessource}" >
-                        <TextBlock Text="Mail" Style="{StaticResource TextBlockRessource}"/>
-                    </Border>
-                    <Border Grid.Column="1" Grid.Row="3" Style="{StaticResource BorderRessource}">
-                        <TextBox>
-                            <TextBox.Resources>
-                                <Style TargetType="{x:Type Border}">
-                                    <Setter Property="CornerRadius" Value="5"/>
-                                </Style>
-                            </TextBox.Resources>
-                        </TextBox>
-                    </Border>
-
-                    <Border Grid.Row="4" Style="{StaticResource BorderRessource}" >
-                        <TextBlock Text="Mot de passe" Style="{StaticResource TextBlockRessource}"/>
-                    </Border>
-                    <Border Grid.Column="1" Grid.Row="4" Style="{StaticResource BorderRessource}">
-                        <TextBox>
-                            <TextBox.Resources>
-                                <Style TargetType="{x:Type Border}">
-                                    <Setter Property="CornerRadius" Value="5"/>
-                                </Style>
-                            </TextBox.Resources>
-                        </TextBox>
-                    </Border>
-                </Grid>
-
-                <Button Style="{StaticResource GreenButtonRessource}" Height="25" Width="150">
-                    <TextBlock Text="Valider" Style="{StaticResource TextBlockRessource}"/>
-                </Button>
-
-            </StackPanel>
-        </Border>
-
         
+        <Button DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}" Height="25" Width="150">
+            <TextBlock Text="Se connecter" Style="{StaticResource TextBlockRessource}"/>
+        </Button>
 
+        <Button DockPanel.Dock="Bottom" Style="{StaticResource OrangeButtonRessource}" Height="25" Width="170" Margin="20">
+            <TextBlock Text="Mot de passe oublié ?" Style="{StaticResource TextBlockRessource}"/>
+        </Button>
 
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+
+            
+            <TextBlock Style="{StaticResource TextBlockRessource}" FontSize="15">Nom d'utilisateur</TextBlock>
+            <Border  Grid.Column="1" Style="{StaticResource BorderRessource}">
+                <TextBox>
+                    <TextBox.Resources>
+                        <Style TargetType="{x:Type Border}">
+                            <Setter Property="CornerRadius" Value="5"/>
+                        </Style>
+                    </TextBox.Resources>
+                </TextBox>
+            </Border>
+
+            <TextBlock Grid.Row="1" Style="{StaticResource TextBlockRessource}" FontSize="15">Mot de passe</TextBlock>
+            <Border  Grid.Column="1" Grid.Row="1" Style="{StaticResource BorderRessource}">
+                <TextBox>
+                    <TextBox.Resources>
+                        <Style TargetType="{x:Type Border}">
+                            <Setter Property="CornerRadius" Value="5"/>
+                        </Style>
+                    </TextBox.Resources>
+                </TextBox>
+            </Border>
+        </Grid>
     </DockPanel>
 </UserControl>
diff --git a/Code/IHM/UCInscription.xaml b/Code/IHM/UCInscription.xaml
index 128e46f..8a31bd9 100644
--- a/Code/IHM/UCInscription.xaml
+++ b/Code/IHM/UCInscription.xaml
@@ -6,8 +6,89 @@
              xmlns:local="clr-namespace:IHM"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
-             Background="DarkSalmon">
-    <Grid>
-            
-    </Grid>
+             Style="{StaticResource ImageFondRessource}">
+    <DockPanel>
+        
+        <TextBlock DockPanel.Dock="Top" Foreground="White" HorizontalAlignment="Center" FontSize="30" Margin="20">Inscription</TextBlock>
+        <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center" FontSize="15" Margin="20">Veuillez créer votre compte en retrant vos informations</TextBlock>
+
+        <Button Click="Button_Click_Acceuil" Margin="20" DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}">
+            <TextBlock Text="Retour à la page d'acceuil"/>
+        </Button>
+
+        <Button DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}" Height="25" Width="150">
+            <TextBlock Text="Valider" Style="{StaticResource TextBlockRessource}"/>
+        </Button>
+        <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+
+            <TextBlock Text="Nom d'utilisateur" Style="{StaticResource TextBlockRessource}"/>
+            <Border Grid.Column="1" Style="{StaticResource BorderRessource}">
+                <TextBox>
+                    <TextBox.Resources>
+                        <Style TargetType="{x:Type Border}">
+                            <Setter Property="CornerRadius" Value="5"/>
+                        </Style>
+                    </TextBox.Resources>
+                </TextBox>
+            </Border>
+
+            <TextBlock Grid.Row="1" Text="Nom" Style="{StaticResource TextBlockRessource}"/>
+            <Border Grid.Column="1" Grid.Row="1" Style="{StaticResource BorderRessource}">
+                        <TextBox>
+                            <TextBox.Resources>
+                                <Style TargetType="{x:Type Border}">
+                                    <Setter Property="CornerRadius" Value="5"/>
+                                </Style>
+                            </TextBox.Resources>
+                        </TextBox>
+                    </Border>
+
+            <TextBlock Grid.Row="2" Text="Prenom" Style="{StaticResource TextBlockRessource}"/>
+                    <Border Grid.Column="1" Grid.Row="2" Style="{StaticResource BorderRessource}">
+                        <TextBox>
+                            <TextBox.Resources>
+                                <Style TargetType="{x:Type Border}">
+                                    <Setter Property="CornerRadius" Value="5"/>
+                                </Style>
+                            </TextBox.Resources>
+                        </TextBox>
+                    </Border>
+
+                <TextBlock Grid.Row="3" Text="Mail" Style="{StaticResource TextBlockRessource}"/>
+                    <Border Grid.Column="1" Grid.Row="3" Style="{StaticResource BorderRessource}">
+                        <TextBox>
+                            <TextBox.Resources>
+                                <Style TargetType="{x:Type Border}">
+                                    <Setter Property="CornerRadius" Value="5"/>
+                                </Style>
+                            </TextBox.Resources>
+                        </TextBox>
+                    </Border>
+
+                <TextBlock Grid.Row="4" Text="Mot de passe" Style="{StaticResource TextBlockRessource}"/>
+                    <Border Grid.Column="1" Grid.Row="4" Style="{StaticResource BorderRessource}">
+                        <TextBox>
+                            <TextBox.Resources>
+                                <Style TargetType="{x:Type Border}">
+                                    <Setter Property="CornerRadius" Value="5"/>
+                                </Style>
+                            </TextBox.Resources>
+                        </TextBox>
+                    </Border>
+                </Grid>
+
+
+
+    </DockPanel>
 </UserControl>
diff --git a/Code/IHM/UCInscription.xaml.cs b/Code/IHM/UCInscription.xaml.cs
index e70213e..13c4220 100644
--- a/Code/IHM/UCInscription.xaml.cs
+++ b/Code/IHM/UCInscription.xaml.cs
@@ -20,9 +20,15 @@ namespace IHM
     /// </summary>
     public partial class UCInscription : UserControl
     {
+        public Navigator Nav => (App.Current as App).Navigator;
+
         public UCInscription()
         {
             InitializeComponent();
         }
+        private void Button_Click_Acceuil(object sender, RoutedEventArgs e)
+        {
+            Nav.NavigateTo(Navigator.PART_CONNEXION, Navigator.PART_MAIN);
+        }
     }
 }