Merge branch 'Navigator' of https://codefirst.iut.uca.fr/git/hugo.livet/ConsEco into Navigator

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,6 +90,9 @@
             <Setter Property="VerticalAlignment" Value="Center"/>
         </Style>
 
+
+
+
         <Style x:Key="OrangeButtonRessource" TargetType="Button">
             <Setter Property="Template">
                 <Setter.Value>

Code/IHM/UCCompte.xaml

@@ -5,8 +5,21 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:IHM"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="350" d:DesignWidth="600"
-    <Grid>
+             Style="{StaticResource ImageFondRessource}">
+
+    <DockPanel>
+        <Border Style="{StaticResource TitleBorder}" DockPanel.Dock="Top">
+            <TextBlock Text="Nom d'utilisateur" Style="{StaticResource TitreDePage}"/>
+        </Border>
+        <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>
+
 
-    </Grid>
 </UserControl>

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>
 
@@ -36,26 +36,36 @@
 
             
             <TextBlock Style="{StaticResource TextBlockRessource}" FontSize="15">Nom d'utilisateur</TextBlock>
-            <Border  Grid.Column="1" Style="{StaticResource BorderRessource}">
+            <StackPanel Grid.Column="1" Margin="30">
-                <TextBox>
+                <TextBlock x:Name="ErrorUserName" HorizontalAlignment="Center" FontSize="15" Foreground="#FF6347" Visibility="Hidden">Veuillez renseigner votre nom d'utilisateurs</TextBlock>
-                    <TextBox.Resources>
+                <Border  Grid.Column="1" Style="{StaticResource BorderRessource}">
-                        <Style TargetType="{x:Type Border}">
+                    <TextBox x:Name="UserName">
-                            <Setter Property="CornerRadius" Value="5"/>
+                        <TextBox.Resources>
-                        </Style>
+                            <Style TargetType="{x:Type Border}">
-                    </TextBox.Resources>
+                                <Setter Property="CornerRadius" Value="5"/>
-                </TextBox>
+                            </Style>
-            </Border>
+                        </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>
+            <StackPanel Grid.Row="1" Grid.Column="1">
-                    <TextBox.Resources>
+                <TextBlock x:Name="ErrorPassword" HorizontalAlignment="Center" FontSize="15" Foreground="#FF6347" Visibility="Hidden">Veuillez renseigner votre mot de passe</TextBlock>
-                        <Style TargetType="{x:Type Border}">
+                <Border Style="{StaticResource BorderRessource}">
-                            <Setter Property="CornerRadius" Value="5"/>
+                    <PasswordBox x:Name="Password">
-                        </Style>
+                        <PasswordBox.Resources>
-                    </TextBox.Resources>
+                            <Style TargetType="{x:Type Border}">
-                </TextBox>
+                                <Setter Property="CornerRadius" Value="5"/>
-            </Border>
+                            </Style>
+                        </PasswordBox.Resources>
+                    </PasswordBox>
+                </Border>
+            </StackPanel>
+           
+
         </Grid>
     </DockPanel>
 </UserControl>

Code/IHM/UCConnexion.xaml.cs

@@ -31,5 +31,28 @@ namespace IHM
             Nav.NavigateTo(Navigator.PART_CONNEXION, Navigator.PART_MAIN);
         }
 
+        private void Button_Click_Connection(object sender, RoutedEventArgs e)
+        {
+            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)
+        {
+            // TO DO
+        }
+
     }
 }

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>

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
+        }
     }
 }