sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'try-refactor-to-page' into develop

Browse Source
This commit is contained in:
shinichi
2020-10-14 08:43:11 +02:00
parent 87e199d1b5 fd4fcd0e51
commit 6ed069d0f3
9 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ClientApp/Images/gradient-geometric-shape-background_78532-374.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
ClientApp/Images/re15.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

BIN
ClientApp/Images/stone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

9
ClientApp/Views/LoginView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="ClientApp.Views.LoginView"
<Page x:Class="ClientApp.Views.LoginView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -7,7 +7,10 @@
xmlns:viewModels="clr-namespace:ClientApp.ViewModels"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<DockPanel>
<DockPanel Background="Lime">
<!--<DockPanel.Background>
<ImageBrush TileMode="Tile" ViewportUnits="Absolute" Viewport="0 0 256 256" ImageSource="\images\stone.png"/>
</DockPanel.Background>-->
<StackPanel VerticalAlignment="Center" Width="auto">
<Label Content="Username" HorizontalContentAlignment="Center" />
<TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120"/>
@@ -19,4 +22,4 @@
</Popup>
</StackPanel>
</DockPanel>
</UserControl>
</Page>

2
ClientApp/Views/LoginView.xaml.cs
View File

@@ -16,7 +16,7 @@ namespace ClientApp.Views
/// <summary>
/// Interaction logic for LoginView.xaml
/// </summary>
public partial class LoginView : UserControl
public partial class LoginView : Page
{
public LoginView()
{

4
ClientApp/Views/MainView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="ClientApp.Views.MainView"
<Page x:Class="ClientApp.Views.MainView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -49,4 +49,4 @@
</Grid>
</DockPanel>
</UserControl>
</Page>

2
ClientApp/Views/MainView.xaml.cs
View File

@@ -17,7 +17,7 @@ namespace ClientApp.Views
/// <summary>
/// Interaction logic for MainView.xaml
/// </summary>
public partial class MainView : UserControl
public partial class MainView : Page
{
public MainView()
{

6
ClientApp/Views/MainWindow.xaml
View File

@@ -9,8 +9,8 @@
Title="Whaazzzzuuuuuuuup" Height="450" Width="800">
<DockPanel>
<Grid>
<Frame Content="{Binding SelectedViewModel}" Focusable="False"/>
<Label Content="gemaakt door: mensen" DockPanel.Dock="Bottom" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontStyle="Italic" Foreground="Gray"/>
<ContentControl HorizontalAlignment="Center" VerticalAlignment="Center" Content="{Binding SelectedViewModel}" Focusable="False" />
</DockPanel>
</Grid>
</Window>