diff --git a/Apollon.WPF/App.xaml b/Apollon.WPF/App.xaml
index 88905b4..493b04a 100644
--- a/Apollon.WPF/App.xaml
+++ b/Apollon.WPF/App.xaml
@@ -8,6 +8,7 @@
+
diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml
index 8e04884..3bf256c 100644
--- a/Apollon.WPF/MainWindow.xaml
+++ b/Apollon.WPF/MainWindow.xaml
@@ -56,7 +56,7 @@
-
+
diff --git a/Apollon.WPF/MainWindow.xaml.cs b/Apollon.WPF/MainWindow.xaml.cs
index f637aa2..d3fe678 100644
--- a/Apollon.WPF/MainWindow.xaml.cs
+++ b/Apollon.WPF/MainWindow.xaml.cs
@@ -49,6 +49,7 @@ namespace Apollon.WPF
else
this.WindowState = WindowState.Maximized;
+ this.Topmost = true;
}
diff --git a/Apollon.WPF/Themes/NavBarTemplate.xaml b/Apollon.WPF/Themes/NavBarTemplate.xaml
new file mode 100644
index 0000000..bbc0114
--- /dev/null
+++ b/Apollon.WPF/Themes/NavBarTemplate.xaml
@@ -0,0 +1,209 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Apollon.WPF/ViewModels/RootdatesViewModel.cs b/Apollon.WPF/ViewModels/NameListViewModel.cs
similarity index 76%
rename from Apollon.WPF/ViewModels/RootdatesViewModel.cs
rename to Apollon.WPF/ViewModels/NameListViewModel.cs
index 5597346..0cace66 100644
--- a/Apollon.WPF/ViewModels/RootdatesViewModel.cs
+++ b/Apollon.WPF/ViewModels/NameListViewModel.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Apollon.WPF.ViewModels
{
- public class RootdatesViewModel : ViewModelBase
+ public class NameListViewModel : ViewModelBase
{
}
}
diff --git a/Apollon.WPF/ViewModels/NavigationBarViewModel.cs b/Apollon.WPF/ViewModels/NavigationBarViewModel.cs
new file mode 100644
index 0000000..b83533f
--- /dev/null
+++ b/Apollon.WPF/ViewModels/NavigationBarViewModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace Apollon.WPF.ViewModels
+{
+ public class NavigationBarViewModel : ViewModelBase
+ {
+ public ICommand NavigateNameListCommand { get;}
+ public ICommand GroupsCommand { get;}
+
+ }
+}
diff --git a/Apollon.WPF/ViewModels/OverviewViewModel.cs b/Apollon.WPF/ViewModels/OverviewViewModel.cs
index 3ce5dac..7374a5e 100644
--- a/Apollon.WPF/ViewModels/OverviewViewModel.cs
+++ b/Apollon.WPF/ViewModels/OverviewViewModel.cs
@@ -58,7 +58,7 @@ namespace Apollon.WPF.ViewModels
LoadTournamentsCommand = new LoadTournamentsCommand(this, tournamentStore);
AddTournamentCommand = new OpenAddTournamentCommand(tournamentStore, modalNavigationStore, navigationStore, selectedTournamentStore);
- NavigateNameListCommand = new NavigateCommand(navigationStore, () => new RootdatesViewModel());
+ NavigateNameListCommand = new NavigateCommand(navigationStore, () => new NameListViewModel());
}
diff --git a/Apollon.WPF/Views/Components/NavBarView.xaml b/Apollon.WPF/Views/Components/NavBarView.xaml
new file mode 100644
index 0000000..7a650c2
--- /dev/null
+++ b/Apollon.WPF/Views/Components/NavBarView.xaml
@@ -0,0 +1,379 @@
+
+
+
+
+
+
diff --git a/Apollon.WPF/Views/Components/NavBarView.xaml.cs b/Apollon.WPF/Views/Components/NavBarView.xaml.cs
new file mode 100644
index 0000000..f975869
--- /dev/null
+++ b/Apollon.WPF/Views/Components/NavBarView.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.Components
+{
+ ///
+ /// Interaction logic for NavBarView.xaml
+ ///
+ public partial class NavBarView : UserControl
+ {
+ public NavBarView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/Apollon.WPF/Views/Components/TournamentDetails.xaml b/Apollon.WPF/Views/Components/TournamentDetails.xaml
index 20e78e7..271cb1d 100644
--- a/Apollon.WPF/Views/Components/TournamentDetails.xaml
+++ b/Apollon.WPF/Views/Components/TournamentDetails.xaml
@@ -9,7 +9,7 @@
-
+
-
+ mc:Ignorable="d">
+
-
-
+
+
-
-
+
+
+
-
+
+