-
-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
5d0c812
commit 09b85cb
Showing
10 changed files
with
146 additions
and
134 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,55 @@ | ||
| <reactiveUi:ReactiveUserControl | ||
| x:TypeArguments="viewModels:SignUpViewModel" | ||
| <reactiveUi:ReactiveUserControl | ||
| x:Class="LoginApp.Wpf.Views.SignUpView" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" | ||
| xmlns:reactiveUi="http://reactiveui.net" | ||
| xmlns:viewModels="clr-namespace:LoginApp.ViewModels;assembly=LoginApp" | ||
| xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" | ||
| x:Class="LoginApp.Wpf.Views.SignUpView"> | ||
| x:TypeArguments="viewModels:SignUpViewModel"> | ||
| <StackPanel Margin="10"> | ||
| <TextBlock Text="Sign Up" /> | ||
| <TextBox Margin="0 10 0 0" | ||
| mah:TextBoxHelper.ClearTextButton="True" | ||
| mah:TextBoxHelper.UseFloatingWatermark="True" | ||
| mah:TextBoxHelper.Watermark="Please, enter user name..." | ||
| Text="{Binding UserName, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" /> | ||
| <TextBlock x:Name="UserNameValidation" | ||
| Foreground="Red" | ||
| FontSize="12" /> | ||
|
|
||
| <TextBox Margin="0 10 0 0" | ||
| mah:TextBoxHelper.ClearTextButton="True" | ||
| mah:TextBoxHelper.UseFloatingWatermark="True" | ||
| mah:TextBoxHelper.Watermark="Please, enter new password..." | ||
| Text="{Binding Password, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" /> | ||
| <TextBlock x:Name="PasswordValidation" | ||
| Foreground="Red" | ||
| FontSize="12" /> | ||
|
|
||
| <TextBox Margin="0 10 0 0" | ||
| mah:TextBoxHelper.ClearTextButton="True" | ||
| mah:TextBoxHelper.UseFloatingWatermark="True" | ||
| mah:TextBoxHelper.Watermark="Please, confirm the password..." | ||
| Text="{Binding ConfirmPassword, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" /> | ||
| <TextBlock x:Name="ConfirmPasswordValidation" | ||
| TextWrapping="Wrap" | ||
| Foreground="Red" | ||
| FontSize="12" /> | ||
|
|
||
| <Button Margin="0 10 0 5" | ||
| Content="Sign up" | ||
| Command="{Binding SignUp}" /> | ||
| <TextBlock x:Name="CompoundValidation" | ||
| TextWrapping="Wrap" | ||
| Foreground="Red" | ||
| FontSize="12" /> | ||
| <TextBox | ||
| Margin="0,10,0,0" | ||
| mah:TextBoxHelper.ClearTextButton="True" | ||
| mah:TextBoxHelper.UseFloatingWatermark="True" | ||
| mah:TextBoxHelper.Watermark="Please, enter user name..." | ||
| Text="{Binding UserName, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" /> | ||
| <TextBlock | ||
| x:Name="UserNameValidation" | ||
| FontSize="12" | ||
| Foreground="Red" /> | ||
|
|
||
| <TextBox | ||
| Margin="0,10,0,0" | ||
| mah:TextBoxHelper.ClearTextButton="True" | ||
| mah:TextBoxHelper.UseFloatingWatermark="True" | ||
| mah:TextBoxHelper.Watermark="Please, enter new password..." | ||
| Text="{Binding Password, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" /> | ||
| <TextBlock | ||
| x:Name="PasswordValidation" | ||
| FontSize="12" | ||
| Foreground="Red" /> | ||
|
|
||
| <TextBox | ||
| Margin="0,10,0,0" | ||
| mah:TextBoxHelper.ClearTextButton="True" | ||
| mah:TextBoxHelper.UseFloatingWatermark="True" | ||
| mah:TextBoxHelper.Watermark="Please, confirm the password..." | ||
| Text="{Binding ConfirmPassword, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" /> | ||
| <TextBlock | ||
| x:Name="ConfirmPasswordValidation" | ||
| FontSize="12" | ||
| Foreground="Red" | ||
| TextWrapping="Wrap" /> | ||
|
|
||
| <Button | ||
| Margin="0,10,0,5" | ||
| Command="{Binding SignUp}" | ||
| Content="Sign up" /> | ||
| <TextBlock | ||
| x:Name="CompoundValidation" | ||
| FontSize="12" | ||
| Foreground="Red" | ||
| TextWrapping="Wrap" /> | ||
| </StackPanel> | ||
| </reactiveUi:ReactiveUserControl> | ||
| </reactiveUi:ReactiveUserControl> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,12 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <LangVersion>latest</LangVersion> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="ReactiveUI.Fody" Version="19.*" /> | ||
| <PackageReference Include="ReactiveUI.Validation" Version="3.*" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\ReactiveUI.Validation\ReactiveUI.Validation.csproj" /> | ||
| </ItemGroup> | ||
| </Project> |
Oops, something went wrong.