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

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +7 -11
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 073aa8c79a - Show all commits

4
ClientApp/ClientApp.csproj
View File

@@ -18,10 +18,6 @@
<ProjectReference Include="..\RH-Engine\RH-Engine.csproj" /> <ProjectReference Include="..\RH-Engine\RH-Engine.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Images\" />
</ItemGroup>
<Import Project="..\Hashing\Hashing.projitems" Label="Shared" /> <Import Project="..\Hashing\Hashing.projitems" Label="Shared" />
</Project> </Project>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

8
ClientApp/Views/LoginView.xaml
View File

@@ -7,10 +7,10 @@
xmlns:viewModels="clr-namespace:ClientApp.ViewModels" xmlns:viewModels="clr-namespace:ClientApp.ViewModels"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<DockPanel> <DockPanel Background="Lime">
<DockPanel.Background> <!--<DockPanel.Background>
<ImageBrush TileMode="Tile" ViewportUnits="Absolute" Viewport="0 0 355 200" ImageSource="/Images/re15.jpg"/> <ImageBrush TileMode="Tile" ViewportUnits="Absolute" Viewport="0 0 256 256" ImageSource="\images\stone.png"/>
</DockPanel.Background> </DockPanel.Background>-->
<StackPanel VerticalAlignment="Center" Width="auto"> <StackPanel VerticalAlignment="Center" Width="auto">
<Label Content="Username" HorizontalContentAlignment="Center" /> <Label Content="Username" HorizontalContentAlignment="Center" />
<TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120"/> <TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120"/>

6
ClientApp/Views/MainWindow.xaml
View File

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