diff --git a/Apollon.WPF/Apollon.WPF.csproj b/Apollon.WPF/Apollon.WPF.csproj index 9ed4feb..145af72 100644 --- a/Apollon.WPF/Apollon.WPF.csproj +++ b/Apollon.WPF/Apollon.WPF.csproj @@ -9,6 +9,7 @@ + diff --git a/Apollon.WPF/App.xaml b/Apollon.WPF/App.xaml index 40588a8..d4263ba 100644 --- a/Apollon.WPF/App.xaml +++ b/Apollon.WPF/App.xaml @@ -6,6 +6,7 @@ + diff --git a/Apollon.WPF/App.xaml.cs b/Apollon.WPF/App.xaml.cs index fce5914..918dbaa 100644 --- a/Apollon.WPF/App.xaml.cs +++ b/Apollon.WPF/App.xaml.cs @@ -25,7 +25,7 @@ namespace Apollon.WPF { MainWindow = new MainWindow() { - DataContext = new ApollonOverviewViewModel(_selectedTournamentStore) + DataContext = new OverviewViewModel(_selectedTournamentStore) }; MainWindow.Show(); diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml index 37ef4fd..9e1cf85 100644 --- a/Apollon.WPF/MainWindow.xaml +++ b/Apollon.WPF/MainWindow.xaml @@ -13,17 +13,18 @@ AllowsTransparency="True" WindowStyle="None" MouseDown="Window_MouseDown"> + + + + - - - + + - - - - - - + + + + + + + + diff --git a/Apollon.WPF/Themes/ButtonTheme.xaml b/Apollon.WPF/Themes/ButtonTheme.xaml index 9db8c87..a9bd3d8 100644 --- a/Apollon.WPF/Themes/ButtonTheme.xaml +++ b/Apollon.WPF/Themes/ButtonTheme.xaml @@ -6,7 +6,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/Apollon.WPF/Themes/ModalTextblockTheme.xaml b/Apollon.WPF/Themes/ModalTextblockTheme.xaml new file mode 100644 index 0000000..a9bd094 --- /dev/null +++ b/Apollon.WPF/Themes/ModalTextblockTheme.xaml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs new file mode 100644 index 0000000..ec48dd6 --- /dev/null +++ b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.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 +{ + internal class AddEditDetailsViewModel + { + } +} diff --git a/Apollon.WPF/ViewModels/AddTournametViewModel.cs b/Apollon.WPF/ViewModels/AddTournametViewModel.cs new file mode 100644 index 0000000..aa58e8c --- /dev/null +++ b/Apollon.WPF/ViewModels/AddTournametViewModel.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 +{ + internal class AddTournametViewModel + { + } +} diff --git a/Apollon.WPF/ViewModels/ApollonOverviewListingViewModel.cs b/Apollon.WPF/ViewModels/ApollonOverviewListingViewModel.cs deleted file mode 100644 index d50032a..0000000 --- a/Apollon.WPF/ViewModels/ApollonOverviewListingViewModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Apollon.WPF.Models; -using Apollon.WPF.Stores; -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Apollon.WPF.ViewModels -{ - public class ApollonOverviewListingViewModel : ViewModelBase - { - private readonly ObservableCollection _apollonOverviewListingItemViewModels; - private readonly SelectedTournamentStore _selectedTournamentStore; - - public IEnumerable ApollonOverviewListingItemViewModels => _apollonOverviewListingItemViewModels; - - private ApollonOverviewListingItemViewModel _selectedOverviewListingItemViewModel; - - public ApollonOverviewListingItemViewModel SelectedOverviewListingItemViewModel - { - get - { - return _selectedOverviewListingItemViewModel; - } - set - { - _selectedOverviewListingItemViewModel = value; - OnPropertyChanged(nameof(SelectedOverviewListingItemViewModel)); - - _selectedTournamentStore.SelectedTournament = _selectedOverviewListingItemViewModel.Tournament; - } - } - - public ApollonOverviewListingViewModel(SelectedTournamentStore selectedTournamentStore) - { - - _selectedTournamentStore = selectedTournamentStore; - _apollonOverviewListingItemViewModels = new ObservableCollection(); - - _apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft1", "Halle", "01.01.2021", "05.01.2021", "Wiesbaden"))); - _apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft2", "im Freien", "01.01.2021", "05.01.2021", "Berlin"))); - _apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft3", "Halle", "01.01.2021", "05.01.2021", "Bruchsal"))); - - } - } -} diff --git a/Apollon.WPF/ViewModels/ApollonOverviewViewModel.cs b/Apollon.WPF/ViewModels/ApollonOverviewViewModel.cs deleted file mode 100644 index 994cf94..0000000 --- a/Apollon.WPF/ViewModels/ApollonOverviewViewModel.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Apollon.WPF.Stores; -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 ApollonOverviewViewModel : ViewModelBase - { - public ApollonOverviewListingViewModel ApollonOverviewListingViewModel { get; } - public ApollonOverviewDetailsViewModel ApollonOverviewDetailsViewModel{ get; } - public ICommand AddTournamentCommand { get; } - - public ApollonOverviewViewModel(SelectedTournamentStore _selectedTournamentStore) - { - ApollonOverviewListingViewModel = new ApollonOverviewListingViewModel(_selectedTournamentStore); - ApollonOverviewDetailsViewModel = new ApollonOverviewDetailsViewModel(_selectedTournamentStore); - } - } -} diff --git a/Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs similarity index 91% rename from Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs rename to Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs index 14afa6f..6098506 100644 --- a/Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs +++ b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace Apollon.WPF.ViewModels { - public class ApollonOverviewDetailsViewModel : ViewModelBase + public class OverviewDetailsViewModel : ViewModelBase { private readonly SelectedTournamentStore _selectedTournamentStore; @@ -22,7 +22,7 @@ namespace Apollon.WPF.ViewModels public string Enddate => SelectedTournament?.Enddate ?? "kein Datum"; public string Location => SelectedTournament?.Location ?? "kein Ort"; - public ApollonOverviewDetailsViewModel(SelectedTournamentStore selectedTournamentStore) + public OverviewDetailsViewModel(SelectedTournamentStore selectedTournamentStore) { _selectedTournamentStore = selectedTournamentStore; diff --git a/Apollon.WPF/ViewModels/ApollonOverviewListingItemViewModel.cs b/Apollon.WPF/ViewModels/OverviewListingItemViewModel.cs similarity index 76% rename from Apollon.WPF/ViewModels/ApollonOverviewListingItemViewModel.cs rename to Apollon.WPF/ViewModels/OverviewListingItemViewModel.cs index e0ac067..d471113 100644 --- a/Apollon.WPF/ViewModels/ApollonOverviewListingItemViewModel.cs +++ b/Apollon.WPF/ViewModels/OverviewListingItemViewModel.cs @@ -8,14 +8,14 @@ using System.Windows.Input; namespace Apollon.WPF.ViewModels { - public class ApollonOverviewListingItemViewModel : ViewModelBase + public class OverviewListingItemViewModel : ViewModelBase { public Tournament Tournament { get;} public string Tournamentname => Tournament.Tournamentname; public ICommand DeleteCommand { get; } - public ApollonOverviewListingItemViewModel(Tournament tournament) + public OverviewListingItemViewModel(Tournament tournament) { Tournament = tournament; } diff --git a/Apollon.WPF/ViewModels/OverviewListingViewModel.cs b/Apollon.WPF/ViewModels/OverviewListingViewModel.cs new file mode 100644 index 0000000..23453e0 --- /dev/null +++ b/Apollon.WPF/ViewModels/OverviewListingViewModel.cs @@ -0,0 +1,48 @@ +using Apollon.WPF.Models; +using Apollon.WPF.Stores; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Apollon.WPF.ViewModels +{ + public class OverviewListingViewModel : ViewModelBase + { + private readonly ObservableCollection _apollonOverviewListingItemViewModels; + private readonly SelectedTournamentStore _selectedTournamentStore; + + public IEnumerable ApollonOverviewListingItemViewModels => _apollonOverviewListingItemViewModels; + + private OverviewListingItemViewModel _selectedOverviewListingItemViewModel; + + public OverviewListingItemViewModel SelectedOverviewListingItemViewModel + { + get + { + return _selectedOverviewListingItemViewModel; + } + set + { + _selectedOverviewListingItemViewModel = value; + OnPropertyChanged(nameof(SelectedOverviewListingItemViewModel)); + + _selectedTournamentStore.SelectedTournament = _selectedOverviewListingItemViewModel.Tournament; + } + } + + public OverviewListingViewModel(SelectedTournamentStore selectedTournamentStore) + { + + _selectedTournamentStore = selectedTournamentStore; + _apollonOverviewListingItemViewModels = new ObservableCollection(); + + _apollonOverviewListingItemViewModels.Add(new OverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft1", "Halle", "01.01.2021", "05.01.2021", "Wiesbaden"))); + _apollonOverviewListingItemViewModels.Add(new OverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft2", "im Freien", "01.01.2021", "05.01.2021", "Berlin"))); + _apollonOverviewListingItemViewModels.Add(new OverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft3", "Halle", "01.01.2021", "05.01.2021", "Bruchsal"))); + + } + } +} diff --git a/Apollon.WPF/ViewModels/OverviewViewModel.cs b/Apollon.WPF/ViewModels/OverviewViewModel.cs new file mode 100644 index 0000000..b918cfd --- /dev/null +++ b/Apollon.WPF/ViewModels/OverviewViewModel.cs @@ -0,0 +1,23 @@ +using Apollon.WPF.Stores; +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 OverviewViewModel : ViewModelBase + { + public OverviewListingViewModel ApollonOverviewListingViewModel { get; } + public OverviewDetailsViewModel ApollonOverviewDetailsViewModel{ get; } + public ICommand AddTournamentCommand { get; } + + public OverviewViewModel(SelectedTournamentStore _selectedTournamentStore) + { + ApollonOverviewListingViewModel = new OverviewListingViewModel(_selectedTournamentStore); + ApollonOverviewDetailsViewModel = new OverviewDetailsViewModel(_selectedTournamentStore); + } + } +} diff --git a/Apollon.WPF/Views/AddTournamentView.xaml b/Apollon.WPF/Views/AddTournamentView.xaml new file mode 100644 index 0000000..6a8b098 --- /dev/null +++ b/Apollon.WPF/Views/AddTournamentView.xaml @@ -0,0 +1,19 @@ + + + + + + diff --git a/Apollon.WPF/Views/AddTournamentView.xaml.cs b/Apollon.WPF/Views/AddTournamentView.xaml.cs new file mode 100644 index 0000000..2a32612 --- /dev/null +++ b/Apollon.WPF/Views/AddTournamentView.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 AddTournamentView.xaml + /// + public partial class AddTournamentView : UserControl + { + public AddTournamentView() + { + InitializeComponent(); + } + } +} diff --git a/Apollon.WPF/Views/Components/AddEditDetails.xaml b/Apollon.WPF/Views/Components/AddEditDetails.xaml new file mode 100644 index 0000000..ce7b758 --- /dev/null +++ b/Apollon.WPF/Views/Components/AddEditDetails.xaml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +