From 873d130aaa28a3b8b07cef7603d01f04dce71445 Mon Sep 17 00:00:00 2001 From: Natlinux <97396587+Natlinux81@users.noreply.github.com> Date: Sat, 26 Nov 2022 17:58:31 +0100 Subject: [PATCH] try navigationservices --- Apollon.WPF/ViewModels/ArchersViewModel.cs | 12 ++++++++ Apollon.WPF/ViewModels/ClassesViewModel.cs | 12 ++++++++ Apollon.WPF/ViewModels/GroupsViewModel.cs | 12 ++++++++ .../NavBarTournamentDetailsViewModel.cs | 9 ++++-- Apollon.WPF/Views/AddTournamentView.xaml | 2 +- Apollon.WPF/Views/ArchersView.xaml | 12 ++++++++ Apollon.WPF/Views/ArchersView.xaml.cs | 28 +++++++++++++++++++ Apollon.WPF/Views/ClassesView.xaml | 12 ++++++++ Apollon.WPF/Views/ClassesView.xaml.cs | 28 +++++++++++++++++++ .../NavBarTournamentDetailsView.xaml | 13 +-------- Apollon.WPF/Views/EditTournamentView.xaml | 2 +- Apollon.WPF/Views/GroupsView.xaml | 12 ++++++++ Apollon.WPF/Views/GroupsView.xaml.cs | 28 +++++++++++++++++++ 13 files changed, 165 insertions(+), 17 deletions(-) create mode 100644 Apollon.WPF/ViewModels/ArchersViewModel.cs create mode 100644 Apollon.WPF/ViewModels/ClassesViewModel.cs create mode 100644 Apollon.WPF/ViewModels/GroupsViewModel.cs create mode 100644 Apollon.WPF/Views/ArchersView.xaml create mode 100644 Apollon.WPF/Views/ArchersView.xaml.cs create mode 100644 Apollon.WPF/Views/ClassesView.xaml create mode 100644 Apollon.WPF/Views/ClassesView.xaml.cs create mode 100644 Apollon.WPF/Views/GroupsView.xaml create mode 100644 Apollon.WPF/Views/GroupsView.xaml.cs diff --git a/Apollon.WPF/ViewModels/ArchersViewModel.cs b/Apollon.WPF/ViewModels/ArchersViewModel.cs new file mode 100644 index 0000000..6395209 --- /dev/null +++ b/Apollon.WPF/ViewModels/ArchersViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Apollon.WPF.ViewModels +{ + public class ArchersViewModel : ViewModelBase + { + } +} diff --git a/Apollon.WPF/ViewModels/ClassesViewModel.cs b/Apollon.WPF/ViewModels/ClassesViewModel.cs new file mode 100644 index 0000000..16480c5 --- /dev/null +++ b/Apollon.WPF/ViewModels/ClassesViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Apollon.WPF.ViewModels +{ + public class ClassesViewModel : ViewModelBase + { + } +} diff --git a/Apollon.WPF/ViewModels/GroupsViewModel.cs b/Apollon.WPF/ViewModels/GroupsViewModel.cs new file mode 100644 index 0000000..ee2094e --- /dev/null +++ b/Apollon.WPF/ViewModels/GroupsViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Apollon.WPF.ViewModels +{ + public class GroupsViewModel : ViewModelBase + { + } +} diff --git a/Apollon.WPF/ViewModels/NavBarTournamentDetailsViewModel.cs b/Apollon.WPF/ViewModels/NavBarTournamentDetailsViewModel.cs index 468f1a8..5ddadd7 100644 --- a/Apollon.WPF/ViewModels/NavBarTournamentDetailsViewModel.cs +++ b/Apollon.WPF/ViewModels/NavBarTournamentDetailsViewModel.cs @@ -1,4 +1,5 @@ -using System; +using Apollon.WPF.Commands; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -9,8 +10,10 @@ namespace Apollon.WPF.ViewModels { public class NavBarTournamentDetailsViewModel : ViewModelBase { - public ICommand NavigateNameListCommand { get;} - public ICommand GroupsCommand { get;} + public ICommand NavigateArchersCommand { get;} + public ICommand NavigateGroupsCommand { get;} + public ICommand NavigateClassesCommand { get;} + } } diff --git a/Apollon.WPF/Views/AddTournamentView.xaml b/Apollon.WPF/Views/AddTournamentView.xaml index 5c9cb79..35794cb 100644 --- a/Apollon.WPF/Views/AddTournamentView.xaml +++ b/Apollon.WPF/Views/AddTournamentView.xaml @@ -7,7 +7,7 @@ xmlns:components="clr-namespace:Apollon.WPF.Views.Components" mc:Ignorable="d"> - + + + + diff --git a/Apollon.WPF/Views/ArchersView.xaml.cs b/Apollon.WPF/Views/ArchersView.xaml.cs new file mode 100644 index 0000000..2a3037b --- /dev/null +++ b/Apollon.WPF/Views/ArchersView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Apollon.WPF.Views +{ + /// + /// Interaction logic for ArchersView.xaml + /// + public partial class ArchersView : UserControl + { + public ArchersView() + { + InitializeComponent(); + } + } +} diff --git a/Apollon.WPF/Views/ClassesView.xaml b/Apollon.WPF/Views/ClassesView.xaml new file mode 100644 index 0000000..a33f8c4 --- /dev/null +++ b/Apollon.WPF/Views/ClassesView.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/Apollon.WPF/Views/ClassesView.xaml.cs b/Apollon.WPF/Views/ClassesView.xaml.cs new file mode 100644 index 0000000..d8aa166 --- /dev/null +++ b/Apollon.WPF/Views/ClassesView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Apollon.WPF.Views +{ + /// + /// Interaction logic for ClassesView.xaml + /// + public partial class ClassesView : UserControl + { + public ClassesView() + { + InitializeComponent(); + } + } +} diff --git a/Apollon.WPF/Views/Components/NavBarTournamentDetailsView.xaml b/Apollon.WPF/Views/Components/NavBarTournamentDetailsView.xaml index 7a650c2..6c41de3 100644 --- a/Apollon.WPF/Views/Components/NavBarTournamentDetailsView.xaml +++ b/Apollon.WPF/Views/Components/NavBarTournamentDetailsView.xaml @@ -65,18 +65,7 @@ HorizontalAlignment="Center" VerticalAlignment="Center"/> - - - - - - + diff --git a/Apollon.WPF/Views/EditTournamentView.xaml b/Apollon.WPF/Views/EditTournamentView.xaml index e50ae55..21ffe14 100644 --- a/Apollon.WPF/Views/EditTournamentView.xaml +++ b/Apollon.WPF/Views/EditTournamentView.xaml @@ -7,7 +7,7 @@ xmlns:components="clr-namespace:Apollon.WPF.Views.Components" mc:Ignorable="d"> - + + + + diff --git a/Apollon.WPF/Views/GroupsView.xaml.cs b/Apollon.WPF/Views/GroupsView.xaml.cs new file mode 100644 index 0000000..a5afe54 --- /dev/null +++ b/Apollon.WPF/Views/GroupsView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Apollon.WPF.Views +{ + /// + /// Interaction logic for GroupsView.xaml + /// + public partial class GroupsView : UserControl + { + public GroupsView() + { + InitializeComponent(); + } + } +}