diff --git a/LaDOSE.Src/LaDOSE.Api.DTO/LaDOSE.Api.DTO.csproj b/LaDOSE.Src/LaDOSE.Api.DTO/LaDOSE.Api.DTO.csproj
deleted file mode 100644
index 5766db6..0000000
--- a/LaDOSE.Src/LaDOSE.Api.DTO/LaDOSE.Api.DTO.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- netcoreapp2.0
-
-
-
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/64x64.ico b/LaDOSE.Src/LaDOSE.DesktopApp/64x64.ico
new file mode 100644
index 0000000..5c5c739
Binary files /dev/null and b/LaDOSE.Src/LaDOSE.DesktopApp/64x64.ico differ
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/App.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/App.xaml
index 5b6efc4..9ba2bc2 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/App.xaml
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/App.xaml
@@ -10,7 +10,8 @@
-
+
+
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj b/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj
index 0c7e86a..754da4f 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj
@@ -8,7 +8,7 @@
WinExe
LaDOSE.DesktopApp
LaDOSE.DesktopApp
- v4.6.2
+ v4.6.1
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
@@ -35,6 +35,9 @@
prompt
4
+
+ 64x64.ico
+
..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll
@@ -79,6 +82,8 @@
+
+
@@ -106,6 +111,10 @@
App.xaml
Code
+
+ MSBuild:Compile
+ Designer
+
Designer
MSBuild:Compile
@@ -162,7 +171,9 @@
LaDOSE.DTO
-
+
+
+
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Themes/LeftMarginMultiplierConverter.cs b/LaDOSE.Src/LaDOSE.DesktopApp/Themes/LeftMarginMultiplierConverter.cs
new file mode 100644
index 0000000..95ce71a
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Themes/LeftMarginMultiplierConverter.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace DarkBlendTheme
+{
+ public class LeftMarginMultiplierConverter : IValueConverter
+ {
+ public double Length { get; set; }
+
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ var item = value as TreeViewItem;
+ if (item == null)
+ return new Thickness(0);
+
+ return new Thickness(Length * item.GetDepth(), 0, 0, 0);
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new System.NotImplementedException();
+ }
+ }
+}
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Themes/Styles.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/Themes/Styles.xaml
new file mode 100644
index 0000000..95d89b9
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Themes/Styles.xaml
@@ -0,0 +1,3096 @@
+
+
+
+
+
+
+ #444444
+ #333333
+ #595959
+ #3D3D3D
+ #424242
+ #666666
+
+ #EFEFEF
+
+ #BDBDBD
+ #525252
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ M-0.7,5.2 L-2.2,6.7 3.6,12.6 9.5,6.7 8,5.2 3.6,9.6 z
+ M-2.2,10.9 L-0.7,12.4 3.7,8 8,12.4 9.5,10.9 3.7,5 z
+ M1.0E-41,4.2 L0,2.1 2.5,4.5 6.7,4.4E-47 6.7,2.3 2.5,6.7 z
+ M7.2,5 L5.5,7.16 4.16,6.3 3.5,6.7 5.5,8.4 8.6,5.25 C8.6,5.25 8,4.7 7.22,5
+ M 0,0 L 4,3.5 L 0,7 Z
+ M 1,1.5 L 4.5,5 L 8,1.5
+ M 1,4.5 L 4.5,1 L 8,4.5
+ M6.5,2.6C4.767,0.973 2.509,0 0,0 0,0 0,19 0,19L23,19z
+ M3.5445026,0 L7.0890052,7.0890053 L3.0459049E-09,7.0890053 z
+ M-0,6 L-0,8 8,8 8,-0 6,-0 6,6 z
+ M5,-0 L9,5 1,5 z
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Themes/TreeViewItemExtensions.cs b/LaDOSE.Src/LaDOSE.DesktopApp/Themes/TreeViewItemExtensions.cs
new file mode 100644
index 0000000..e6c605c
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Themes/TreeViewItemExtensions.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace DarkBlendTheme
+{
+ public static class TreeViewItemExtensions
+ {
+ public static int GetDepth(this TreeViewItem item)
+ {
+ TreeViewItem parent;
+ while ((parent = GetParent(item)) != null)
+ {
+ return GetDepth(parent) + 1;
+ }
+ return 0;
+ }
+
+ private static TreeViewItem GetParent(TreeViewItem item)
+ {
+ var parent = VisualTreeHelper.GetParent(item);
+
+ while (!(parent is TreeViewItem || parent is TreeView))
+ {
+ if (parent == null) return null;
+ parent = VisualTreeHelper.GetParent(parent);
+ }
+ return parent as TreeViewItem;
+ }
+ }
+}
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/UserControls/BookingUserControl.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/UserControls/BookingUserControl.xaml
index 0774619..e882970 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/UserControls/BookingUserControl.xaml
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/UserControls/BookingUserControl.xaml
@@ -6,21 +6,24 @@
xmlns:local="clr-namespace:LaDOSE.DesktopApp.UserControls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
+
>
-
+
-
-
+
+
-
-
+
+
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml
index b24e19e..72bd338 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml
@@ -9,7 +9,8 @@
xmlns:cal="http://www.caliburnproject.org"
Icon="{Binding Path=AppIcon}"
mc:Ignorable="d"
- d:DesignHeight="450" d:DesignWidth="800">
+ d:DesignHeight="450" d:DesignWidth="800"
+ Style="{StaticResource {x:Type Window}}">
@@ -53,11 +54,20 @@
-
-
-
-
+
+
+
+
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml
index 2e3615d..27898ea 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml
@@ -22,11 +22,11 @@
-
-
+
+
-
@@ -46,7 +46,7 @@
+ x:Name="BookingList" IsTextSearchEnabled="True" TextSearch.TextPath="WpUserDto.Name" Margin="2">
@@ -67,7 +67,7 @@
-
+
@@ -79,7 +79,7 @@
+ SelectedItem="{Binding SelectedGame,UpdateSourceTrigger=PropertyChanged}" IsTextSearchEnabled="True" TextSearch.TextPath="Name" Margin="2">
@@ -102,7 +102,7 @@
-
+
@@ -116,7 +116,7 @@
-
+
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/packages.config b/LaDOSE.Src/LaDOSE.DesktopApp/packages.config
index 5443c16..d5fb30e 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/packages.config
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/packages.config
@@ -3,4 +3,5 @@
+
\ No newline at end of file