From 80893e55dee08a16f03c528a1b858945d99645b7 Mon Sep 17 00:00:00 2001
From: Darkstack <1835601+darkstack@users.noreply.github.com>
Date: Mon, 27 May 2019 23:18:27 +0200
Subject: [PATCH] Add tournament window
---
.../LaDOSE.DesktopApp.csproj | 8 +++++
.../ViewModels/ShellViewModel.cs | 4 +--
.../ViewModels/TournamentResultViewModel.cs | 11 ++++++
.../LaDOSE.DesktopApp/Views/ShellView.xaml | 4 +--
.../Views/TournamentResultView.xaml | 25 +++++++++++++
.../Views/TournamentResultView.xaml.cs | 36 +++++++++++++++++++
6 files changed, 84 insertions(+), 4 deletions(-)
create mode 100644 LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/TournamentResultViewModel.cs
create mode 100644 LaDOSE.Src/LaDOSE.DesktopApp/Views/TournamentResultView.xaml
create mode 100644 LaDOSE.Src/LaDOSE.DesktopApp/Views/TournamentResultView.xaml.cs
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj b/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj
index b6a044e..1dcb326 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj
@@ -112,6 +112,7 @@
+
@@ -123,6 +124,9 @@
GameView.xaml
+
+ TournamentResultView.xaml
+
WordPressView.xaml
@@ -150,6 +154,10 @@
MSBuild:Compile
Designer
+
+ MSBuild:Compile
+ Designer
+
Designer
MSBuild:Compile
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs
index 19b8148..be92ad8 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs
@@ -62,9 +62,9 @@ namespace LaDOSE.DesktopApp.ViewModels
ActivateItem(new GameViewModel(IoC.Get()));
}
- public void OpenWeb()
+ public void TournamentResult()
{
- ActivateItem(new WebNavigationViewModel("www.google.com"));
+ ActivateItem(new TournamentResultViewModel());
}
}
}
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/TournamentResultViewModel.cs b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/TournamentResultViewModel.cs
new file mode 100644
index 0000000..45ff786
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/TournamentResultViewModel.cs
@@ -0,0 +1,11 @@
+using Caliburn.Micro;
+
+namespace LaDOSE.DesktopApp.ViewModels
+{
+
+
+ public class TournamentResultViewModel : Screen
+ {
+ public override string DisplayName => "Tournament Result";
+ }
+}
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml
index 52533b3..0ac4764 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml
@@ -39,10 +39,10 @@
-