From 7708c9327adac9cd612f06c13cb18e76399a553a Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Wed, 12 Oct 2022 15:51:15 +0200
Subject: [PATCH 1/4] =?UTF-8?q?D=C3=A9but=20de=20cr=C3=A9ation=20de=20la?=
 =?UTF-8?q?=20userControl=20de=20style=20et=20ajout=20de=20styles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/IHM/App.xaml      | 13 +++++++++++++
 Code/IHM/UCCompte.xaml | 18 ++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Code/IHM/App.xaml b/Code/IHM/App.xaml
index 1f1d72d..3e12b86 100644
--- a/Code/IHM/App.xaml
+++ b/Code/IHM/App.xaml
@@ -72,6 +72,19 @@
             <Setter Property="VerticalAlignment" Value="Center"/>
         </Style>
 
+        <Style TargetType="TextBlock" x:Key="TitreDePage">
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Background" Value="Brown" />
+        </Style>
+
+        <Style TargetType="TextBlock" x:Key="AffichageAuMilieu">
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Background" Value="Brown" />
+        </Style>
+
+
         <Style x:Key="OrangeButtonRessource" TargetType="Button">
             <Setter Property="Template">
                 <Setter.Value>
diff --git a/Code/IHM/UCCompte.xaml b/Code/IHM/UCCompte.xaml
index 97d1fa2..1659a1e 100644
--- a/Code/IHM/UCCompte.xaml
+++ b/Code/IHM/UCCompte.xaml
@@ -5,8 +5,18 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:IHM"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-            
-    </Grid>
+             d:DesignHeight="350" d:DesignWidth="600"
+             Style="{StaticResource ImageFondRessource}">
+
+    <DockPanel>
+        <Border Style="{StaticResource BorderRessource}" Height="33" DockPanel.Dock="Top">
+            <TextBlock Text="Nom d'utilisateur" Style="{StaticResource TitreDePage}"/>
+            <!--<TextBlock Text="Compte courant" Style="{StaticResource AffichageAuMilieu}"/>-->
+        </Border>
+        <Button Margin="20" DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}">
+            <TextBlock Text="Modifier votre solde"/>
+        </Button>
+    </DockPanel>
+
+
 </UserControl>

From 71acf8aac1e363801ae018dd2a9947de284161be Mon Sep 17 00:00:00 2001
From: Vincent ASTOLFI <Vincent.ASTOLFI@etu.uca.fr>
Date: Wed, 12 Oct 2022 13:53:59 +0200
Subject: [PATCH 2/4] =?UTF-8?q?ajout=20des=20Button=5FClick=20sur=20les=20?=
 =?UTF-8?q?diff=C3=A9rents=20click=20des=20UC=20connexion=20et=20inscripti?=
 =?UTF-8?q?on.=20(=20certain=20bouton=20ne=20poss=C3=A8de=20pas=20de=20cod?=
 =?UTF-8?q?e=20car=20ils=20seront=20=C3=A0=20impl=C3=A9menter=20plus=20tar?=
 =?UTF-8?q?d)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/IHM/UCConnexion.xaml      |  4 ++--
 Code/IHM/UCConnexion.xaml.cs   | 10 ++++++++++
 Code/IHM/UCInscription.xaml    |  2 +-
 Code/IHM/UCInscription.xaml.cs |  5 +++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Code/IHM/UCConnexion.xaml b/Code/IHM/UCConnexion.xaml
index 492a35b..5c947e3 100644
--- a/Code/IHM/UCConnexion.xaml
+++ b/Code/IHM/UCConnexion.xaml
@@ -16,11 +16,11 @@
             <TextBlock Text="Retour à la page d'acceuil"/>
         </Button>
         
-        <Button DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}" Height="25" Width="150">
+        <Button DockPanel.Dock="Bottom" Click="Button_Click_Connection" 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">
+        <Button DockPanel.Dock="Bottom" Click="Button_Click_Forget_Password" Style="{StaticResource OrangeButtonRessource}" Height="25" Width="170" Margin="20">
             <TextBlock Text="Mot de passe oublié ?" Style="{StaticResource TextBlockRessource}"/>
         </Button>
 
diff --git a/Code/IHM/UCConnexion.xaml.cs b/Code/IHM/UCConnexion.xaml.cs
index 18126b1..1ad5266 100644
--- a/Code/IHM/UCConnexion.xaml.cs
+++ b/Code/IHM/UCConnexion.xaml.cs
@@ -31,5 +31,15 @@ namespace IHM
             Nav.NavigateTo(Navigator.PART_CONNEXION, Navigator.PART_MAIN);
         }
 
+        private void Button_Click_Connection(object sender, RoutedEventArgs e)
+        {
+            // TO DO
+        }
+
+        private void Button_Click_Forget_Password(object sender, RoutedEventArgs e)
+        {
+            // TO DO
+        }
+
     }
 }
diff --git a/Code/IHM/UCInscription.xaml b/Code/IHM/UCInscription.xaml
index 8a31bd9..5e2f9fc 100644
--- a/Code/IHM/UCInscription.xaml
+++ b/Code/IHM/UCInscription.xaml
@@ -16,7 +16,7 @@
             <TextBlock Text="Retour à la page d'acceuil"/>
         </Button>
 
-        <Button DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}" Height="25" Width="150">
+        <Button DockPanel.Dock="Bottom" Click="Button_Click_Validation" Style="{StaticResource GreenButtonRessource}" Height="25" Width="150">
             <TextBlock Text="Valider" Style="{StaticResource TextBlockRessource}"/>
         </Button>
         <Grid>
diff --git a/Code/IHM/UCInscription.xaml.cs b/Code/IHM/UCInscription.xaml.cs
index 13c4220..b7c9612 100644
--- a/Code/IHM/UCInscription.xaml.cs
+++ b/Code/IHM/UCInscription.xaml.cs
@@ -30,5 +30,10 @@ namespace IHM
         {
             Nav.NavigateTo(Navigator.PART_CONNEXION, Navigator.PART_MAIN);
         }
+
+        private void Button_Click_Validation(object sender, RoutedEventArgs e)
+        {
+            // TO DO
+        }
     }
 }

From fbd7694f586c9511d3ea1f2238fd6347ca52fcab Mon Sep 17 00:00:00 2001
From: Vincent ASTOLFI <Vincent.ASTOLFI@etu.uca.fr>
Date: Wed, 12 Oct 2022 15:09:59 +0200
Subject: [PATCH 3/4] =?UTF-8?q?am=C3=A9lioration=20de=20l'ui=20pour=20forc?=
 =?UTF-8?q?er=20le=20remplissage=20des=20champs=20de=20l'UCConnexion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/IHM/UCConnexion.xaml    | 46 ++++++++++++++++++++++--------------
 Code/IHM/UCConnexion.xaml.cs | 15 +++++++++++-
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/Code/IHM/UCConnexion.xaml b/Code/IHM/UCConnexion.xaml
index 5c947e3..37f6298 100644
--- a/Code/IHM/UCConnexion.xaml
+++ b/Code/IHM/UCConnexion.xaml
@@ -36,26 +36,36 @@
 
             
             <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>
+            <StackPanel Grid.Column="1" Margin="30">
+                <TextBlock x:Name="ErrorUserName" HorizontalAlignment="Center" FontSize="15" Foreground="#FF6347" Visibility="Hidden">Veuillez renseigner votre nom d'utilisateurs</TextBlock>
+                <Border  Grid.Column="1" Style="{StaticResource BorderRessource}">
+                    <TextBox x:Name="UserName">
+                        <TextBox.Resources>
+                            <Style TargetType="{x:Type Border}">
+                                <Setter Property="CornerRadius" Value="5"/>
+                            </Style>
+                        </TextBox.Resources>
+                    </TextBox>
+                </Border>           
+            </StackPanel>
+            
 
             <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>
+
+            <StackPanel Grid.Row="1" Grid.Column="1">
+                <TextBlock x:Name="ErrorPassword" HorizontalAlignment="Center" FontSize="15" Foreground="#FF6347" Visibility="Hidden">Veuillez renseigner votre mot de passe</TextBlock>
+                <Border Style="{StaticResource BorderRessource}">
+                    <PasswordBox x:Name="Password">
+                        <PasswordBox.Resources>
+                            <Style TargetType="{x:Type Border}">
+                                <Setter Property="CornerRadius" Value="5"/>
+                            </Style>
+                        </PasswordBox.Resources>
+                    </PasswordBox>
+                </Border>
+            </StackPanel>
+           
+
         </Grid>
     </DockPanel>
 </UserControl>
diff --git a/Code/IHM/UCConnexion.xaml.cs b/Code/IHM/UCConnexion.xaml.cs
index 1ad5266..1292480 100644
--- a/Code/IHM/UCConnexion.xaml.cs
+++ b/Code/IHM/UCConnexion.xaml.cs
@@ -33,7 +33,20 @@ namespace IHM
 
         private void Button_Click_Connection(object sender, RoutedEventArgs e)
         {
-            // TO DO
+            ErrorPassword.Visibility = Visibility.Hidden;
+            Password.Background = new SolidColorBrush(Colors.White);
+            ErrorUserName.Visibility = Visibility.Hidden;
+            UserName.Background = new SolidColorBrush(Colors.White);
+            if (UserName.Text.ToString() == "")
+            {
+                ErrorUserName.Visibility = Visibility.Visible;
+                UserName.Background = new BrushConverter().ConvertFromString("#FF6347") as SolidColorBrush;
+            }
+            if (Password.Password.ToString() == "")
+            {
+                ErrorPassword.Visibility = Visibility.Visible;
+                Password.Background = new BrushConverter().ConvertFromString("#FF6347") as SolidColorBrush;
+            }
         }
 
         private void Button_Click_Forget_Password(object sender, RoutedEventArgs e)

From d0d8597163a6bf2888d9bc413446fc0b0e3e3e71 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Wed, 12 Oct 2022 17:13:51 +0200
Subject: [PATCH 4/4] =?UTF-8?q?Cr=C3=A9ation=20de=20l'UC=20Compte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/IHM/App.xaml      | 30 +++++++++++++++++++-----------
 Code/IHM/UCCompte.xaml | 11 +++++++----
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Code/IHM/App.xaml b/Code/IHM/App.xaml
index 3e12b86..42ac6f3 100644
--- a/Code/IHM/App.xaml
+++ b/Code/IHM/App.xaml
@@ -6,7 +6,7 @@
              StartupUri="MainWindow.xaml">
     <Application.Resources>
 
-        <conv:Func2WindowPartConverter x:Key="Func2WpConv"/>
+        <!--<conv:Func2WindowPartConverter x:Key="Func2WpConv"/>-->
 
         <Style x:Key="BorderRessource" TargetType="Border">
             <Setter Property="BorderBrush" Value="#63A4FF"/>
@@ -17,6 +17,15 @@
             <Setter Property="Width" Value="175"/>
         </Style>
 
+        <Style x:Key="TitleBorder" TargetType="Border">
+            <Setter Property="BorderThickness" Value="2" />
+            <Setter Property="BorderBrush" Value="Black" />
+            <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">
             <Setter Property="Background">
                 <Setter.Value>
@@ -38,6 +47,15 @@
             <Setter Property="VerticalAlignment" Value="Center"/>
         </Style>
 
+        <Style x:Key="TitreDePage" TargetType="TextBlock">
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Background" Value="MediumPurple" />
+            <Setter Property="FontFamily" Value="Slab serif"/>
+            <Setter Property="FontSize" Value="20"/>
+            <Setter Property="FontWeight" Value="Bold"/>
+        </Style>
+
         <Style TargetType="Button" x:Key="TransparentButtonRessource">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="TextBlock.TextAlignment" Value="Center" />
@@ -72,17 +90,7 @@
             <Setter Property="VerticalAlignment" Value="Center"/>
         </Style>
 
-        <Style TargetType="TextBlock" x:Key="TitreDePage">
-            <Setter Property="HorizontalAlignment" Value="Center"/>
-            <Setter Property="VerticalAlignment" Value="Top"/>
-            <Setter Property="Background" Value="Brown" />
-        </Style>
 
-        <Style TargetType="TextBlock" x:Key="AffichageAuMilieu">
-            <Setter Property="HorizontalAlignment" Value="Center"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="Background" Value="Brown" />
-        </Style>
 
 
         <Style x:Key="OrangeButtonRessource" TargetType="Button">
diff --git a/Code/IHM/UCCompte.xaml b/Code/IHM/UCCompte.xaml
index 1659a1e..13e96fe 100644
--- a/Code/IHM/UCCompte.xaml
+++ b/Code/IHM/UCCompte.xaml
@@ -9,13 +9,16 @@
              Style="{StaticResource ImageFondRessource}">
 
     <DockPanel>
-        <Border Style="{StaticResource BorderRessource}" Height="33" DockPanel.Dock="Top">
+        <Border Style="{StaticResource TitleBorder}" DockPanel.Dock="Top">
             <TextBlock Text="Nom d'utilisateur" Style="{StaticResource TitreDePage}"/>
-            <!--<TextBlock Text="Compte courant" Style="{StaticResource AffichageAuMilieu}"/>-->
         </Border>
-        <Button Margin="20" DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}">
-            <TextBlock Text="Modifier votre solde"/>
+        <Button DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}" Height="25" Width="170" Margin="20">
+            <TextBlock Text="Modifier votre solde" Style="{StaticResource TextBlockRessource}"/>
         </Button>
+        <Border DockPanel.Dock="Bottom" Height="25" Width="250">
+            <TextBlock Text="Compte courant : ???" Style="{StaticResource TextBlockRessource}" FontSize="16" FontWeight="DemiBold"/>
+        </Border>
+
     </DockPanel>