diff --git a/EstusShots.Avalonia/.gitignore b/EstusShots.Avalonia/.gitignore new file mode 100644 index 0000000..dbe7c8f --- /dev/null +++ b/EstusShots.Avalonia/.gitignore @@ -0,0 +1,337 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +## Visual Studio Code specific files and folder +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.jsons + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +**/Properties/launchSettings.json + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ diff --git a/EstusShots.Avalonia/App.xaml b/EstusShots.Avalonia/App.xaml new file mode 100644 index 0000000..7d31698 --- /dev/null +++ b/EstusShots.Avalonia/App.xaml @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/EstusShots.Avalonia/App.xaml.cs b/EstusShots.Avalonia/App.xaml.cs new file mode 100644 index 0000000..a7b638c --- /dev/null +++ b/EstusShots.Avalonia/App.xaml.cs @@ -0,0 +1,44 @@ +using Avalonia; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Markup.Xaml; +using EstusShots.Avalonia.ViewModels; +using EstusShots.Avalonia.Views; +using EstusShots.Client; +using Microsoft.Extensions.DependencyInjection; + +namespace EstusShots.Avalonia +{ + public class App : Application + { + public override void Initialize() + { + AvaloniaXamlLoader.Load(this); + } + + public override void OnFrameworkInitializationCompleted() + { + if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { + // The Application uses a single shared API client. + var apiClient = new EstusShotsClient("http://localhost:5000/api/"); + + // Add all our services to the DI Container + var serviceProvider = new ServiceCollection() + .AddSingleton(apiClient) + .AddViewModels() + .BuildServiceProvider(); + + var main = new MainWindowViewModel(serviceProvider); + Global.Navigator = new Navigator(main); + Global.Navigator.GoTo(); + + desktop.MainWindow = new MainWindow + { + DataContext = main, + }; + } + + base.OnFrameworkInitializationCompleted(); + } + } +} \ No newline at end of file diff --git a/EstusShots.Avalonia/Assets/avalonia-logo.ico b/EstusShots.Avalonia/Assets/avalonia-logo.ico new file mode 100644 index 0000000..da8d49f Binary files /dev/null and b/EstusShots.Avalonia/Assets/avalonia-logo.ico differ diff --git a/EstusShots.Avalonia/EstusShots.Avalonia.csproj b/EstusShots.Avalonia/EstusShots.Avalonia.csproj new file mode 100644 index 0000000..e614774 --- /dev/null +++ b/EstusShots.Avalonia/EstusShots.Avalonia.csproj @@ -0,0 +1,25 @@ + + + WinExe + netcoreapp3.1 + + + + + %(Filename) + + + Designer + + + + + + + + + + + + + diff --git a/EstusShots.Avalonia/Extensions.cs b/EstusShots.Avalonia/Extensions.cs new file mode 100644 index 0000000..fc2af00 --- /dev/null +++ b/EstusShots.Avalonia/Extensions.cs @@ -0,0 +1,16 @@ +using System.Linq; +using System.Reflection; +using Microsoft.Extensions.DependencyInjection; + +namespace EstusShots.Avalonia +{ + public static class Extensions + { + public static IServiceCollection AddViewModels(this IServiceCollection @this) + { + var viewModels = Assembly.GetExecutingAssembly().GetTypes().Where(x => x.Name.EndsWith("ViewModel")); + viewModels.ForEach(x => @this.AddSingleton(x)); + return @this; + } + } +} \ No newline at end of file diff --git a/EstusShots.Avalonia/Global.cs b/EstusShots.Avalonia/Global.cs new file mode 100644 index 0000000..1d788f8 --- /dev/null +++ b/EstusShots.Avalonia/Global.cs @@ -0,0 +1,26 @@ +using EstusShots.Avalonia.ViewModels; + +namespace EstusShots.Avalonia +{ + public static class Global + { + public static Navigator Navigator; + } + + public class Navigator + { + private readonly MainWindowViewModel _model; + + public Navigator(MainWindowViewModel model) + { + _model = model; + } + + public void GoTo() where TViewModel : ViewModelBase + { + var o = _model.Container.GetService(typeof(TViewModel)); + if (!(o is ViewModelBase viewModel)) return; + _model.Content = viewModel; + } + } +} \ No newline at end of file diff --git a/EstusShots.Avalonia/Program.cs b/EstusShots.Avalonia/Program.cs new file mode 100644 index 0000000..6644ca2 --- /dev/null +++ b/EstusShots.Avalonia/Program.cs @@ -0,0 +1,24 @@ +using System; +using Avalonia; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Logging.Serilog; +using Avalonia.ReactiveUI; + +namespace EstusShots.Avalonia +{ + class Program + { + // Initialization code. Don't use any Avalonia, third-party APIs or any + // SynchronizationContext-reliant code before AppMain is called: things aren't initialized + // yet and stuff might break. + public static void Main(string[] args) => BuildAvaloniaApp() + .StartWithClassicDesktopLifetime(args); + + // Avalonia configuration, don't remove; also used by visual designer. + public static AppBuilder BuildAvaloniaApp() + => AppBuilder.Configure() + .UsePlatformDetect() + .LogToDebug() + .UseReactiveUI(); + } +} diff --git a/EstusShots.Avalonia/ViewLocator.cs b/EstusShots.Avalonia/ViewLocator.cs new file mode 100644 index 0000000..5574a50 --- /dev/null +++ b/EstusShots.Avalonia/ViewLocator.cs @@ -0,0 +1,35 @@ +// Copyright (c) The Avalonia Project. All rights reserved. +// Licensed under the MIT license. See licence.md file in the project root for full license information. + +using System; +using Avalonia.Controls; +using Avalonia.Controls.Templates; +using EstusShots.Avalonia.ViewModels; + +namespace EstusShots.Avalonia +{ + public class ViewLocator : IDataTemplate + { + public bool SupportsRecycling => false; + + public IControl Build(object data) + { + var name = data.GetType().FullName.Replace("ViewModel", "View"); + var type = Type.GetType(name); + + if (type != null) + { + return (Control)Activator.CreateInstance(type); + } + else + { + return new TextBlock { Text = "Not Found: " + name }; + } + } + + public bool Match(object data) + { + return data is ViewModelBase; + } + } +} \ No newline at end of file diff --git a/EstusShots.Avalonia/ViewModels/MainWindowViewModel.cs b/EstusShots.Avalonia/ViewModels/MainWindowViewModel.cs new file mode 100644 index 0000000..3846325 --- /dev/null +++ b/EstusShots.Avalonia/ViewModels/MainWindowViewModel.cs @@ -0,0 +1,25 @@ +using System; +using ReactiveUI; + +namespace EstusShots.Avalonia.ViewModels +{ + public class MainWindowViewModel : ViewModelBase + { + public IServiceProvider Container; + + private ViewModelBase _content; + + public MainWindowViewModel(IServiceProvider container) + { + Container = container; + } + + public ViewModelBase Content + { + get => _content; + set => this.RaiseAndSetIfChanged(ref _content, value); + } + + + } +} diff --git a/EstusShots.Avalonia/ViewModels/PlayersViewModel.cs b/EstusShots.Avalonia/ViewModels/PlayersViewModel.cs new file mode 100644 index 0000000..bfe215b --- /dev/null +++ b/EstusShots.Avalonia/ViewModels/PlayersViewModel.cs @@ -0,0 +1,14 @@ +using EstusShots.Client; + +namespace EstusShots.Avalonia.ViewModels +{ + public class PlayersViewModel : ViewModelBase + { + private readonly EstusShotsClient _apiClient; + + public PlayersViewModel(EstusShotsClient apiClient) + { + _apiClient = apiClient; + } + } +} \ No newline at end of file diff --git a/EstusShots.Avalonia/ViewModels/SeasonsViewModel.cs b/EstusShots.Avalonia/ViewModels/SeasonsViewModel.cs new file mode 100644 index 0000000..aa9a126 --- /dev/null +++ b/EstusShots.Avalonia/ViewModels/SeasonsViewModel.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; +using System.Reactive; +using EstusShots.Client; +using EstusShots.Shared.Dto; +using ReactiveUI; + +namespace EstusShots.Avalonia.ViewModels +{ + public class SeasonsViewModel : ViewModelBase + { + private readonly EstusShotsClient _apiClient; + private readonly MainWindowViewModel _main; + + public List Seasons { get; set; } + + public ReactiveCommand ToPlayers { get; } + + public SeasonsViewModel(EstusShotsClient apiClient, MainWindowViewModel main) + { + _apiClient = apiClient; + _main = main; + + ToPlayers = ReactiveCommand.Create(() => { Global.Navigator.GoTo(); }); + } + } +} \ No newline at end of file diff --git a/EstusShots.Avalonia/ViewModels/ViewModelBase.cs b/EstusShots.Avalonia/ViewModels/ViewModelBase.cs new file mode 100644 index 0000000..b3e6583 --- /dev/null +++ b/EstusShots.Avalonia/ViewModels/ViewModelBase.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Text; +using ReactiveUI; + +namespace EstusShots.Avalonia.ViewModels +{ + public class ViewModelBase : ReactiveObject + { + } +} diff --git a/EstusShots.Avalonia/Views/MainWindow.xaml b/EstusShots.Avalonia/Views/MainWindow.xaml new file mode 100644 index 0000000..46ef942 --- /dev/null +++ b/EstusShots.Avalonia/Views/MainWindow.xaml @@ -0,0 +1,10 @@ + + diff --git a/EstusShots.Avalonia/Views/MainWindow.xaml.cs b/EstusShots.Avalonia/Views/MainWindow.xaml.cs new file mode 100644 index 0000000..9bf6dee --- /dev/null +++ b/EstusShots.Avalonia/Views/MainWindow.xaml.cs @@ -0,0 +1,19 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace EstusShots.Avalonia.Views +{ + public class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + + private void InitializeComponent() + { + AvaloniaXamlLoader.Load(this); + } + } +} \ No newline at end of file diff --git a/EstusShots.Avalonia/Views/PlayersView.xaml b/EstusShots.Avalonia/Views/PlayersView.xaml new file mode 100644 index 0000000..266e9d0 --- /dev/null +++ b/EstusShots.Avalonia/Views/PlayersView.xaml @@ -0,0 +1,12 @@ + + + + + + diff --git a/EstusShots.Avalonia/Views/PlayersView.xaml.cs b/EstusShots.Avalonia/Views/PlayersView.xaml.cs new file mode 100644 index 0000000..3d978c5 --- /dev/null +++ b/EstusShots.Avalonia/Views/PlayersView.xaml.cs @@ -0,0 +1,19 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace EstusShots.Avalonia.Views +{ + public class PlayersView : UserControl + { + public PlayersView() + { + InitializeComponent(); + } + + private void InitializeComponent() + { + AvaloniaXamlLoader.Load(this); + } + } +} \ No newline at end of file diff --git a/EstusShots.Avalonia/Views/SeasonsView.xaml b/EstusShots.Avalonia/Views/SeasonsView.xaml new file mode 100644 index 0000000..75a9c21 --- /dev/null +++ b/EstusShots.Avalonia/Views/SeasonsView.xaml @@ -0,0 +1,15 @@ + + + + + + +