From 737f69d7da9355bd9c6096041be33be98c95eebc Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 24 May 2020 22:10:20 +0100 Subject: [PATCH] Move all Blazor code to code-behind files. --- Marechai/Pages/Companies/Index.razor | 52 ------------------- Marechai/Pages/Companies/Index.razor.cs | 60 ++++++++++++++++++++++ Marechai/Pages/Companies/View.razor | 53 -------------------- Marechai/Pages/Companies/View.razor.cs | 63 ++++++++++++++++++++++++ Marechai/Pages/Computers/Index.razor | 17 ------- Marechai/Pages/Computers/Index.razor.cs | 21 ++++++++ Marechai/Pages/Computers/Search.razor | 43 ---------------- Marechai/Pages/Computers/Search.razor.cs | 50 +++++++++++++++++++ Marechai/Pages/Consoles/Index.razor | 17 ------- Marechai/Pages/Consoles/Index.razor.cs | 21 ++++++++ Marechai/Pages/Consoles/Search.razor | 45 +---------------- Marechai/Pages/Consoles/Search.razor.cs | 50 +++++++++++++++++++ Marechai/Pages/Home/Index.razor | 10 ---- Marechai/Pages/Home/Index.razor.cs | 12 +++++ Marechai/Pages/Machines/View.razor | 23 --------- Marechai/Pages/Machines/View.razor.cs | 29 +++++++++++ 16 files changed, 307 insertions(+), 259 deletions(-) create mode 100644 Marechai/Pages/Companies/Index.razor.cs create mode 100644 Marechai/Pages/Companies/View.razor.cs create mode 100644 Marechai/Pages/Computers/Index.razor.cs create mode 100644 Marechai/Pages/Computers/Search.razor.cs create mode 100644 Marechai/Pages/Consoles/Index.razor.cs create mode 100644 Marechai/Pages/Consoles/Search.razor.cs create mode 100644 Marechai/Pages/Home/Index.razor.cs create mode 100644 Marechai/Pages/Machines/View.razor.cs diff --git a/Marechai/Pages/Companies/Index.razor b/Marechai/Pages/Companies/Index.razor index f54fb935..75f9ece7 100644 --- a/Marechai/Pages/Companies/Index.razor +++ b/Marechai/Pages/Companies/Index.razor @@ -101,55 +101,3 @@

@L["There are no companies in the database."]

}

- -@code -{ - [Parameter] - public int? CountryId { get; set; } - - [Parameter] - public string StartingCharacter { get; set; } - - List _companies; - string _countryName; - char? _character; - - protected override async Task OnInitializedAsync() - { - _character = null; - if (!string.IsNullOrWhiteSpace(StartingCharacter) && - StartingCharacter.Length == 1) - { - _character = StartingCharacter[0]; - - // ToUpper() - if (_character >= 'a' && - _character <= 'z') - _character -= (char)32; - - - // Check if not letter or number - if (_character < '0' || - (_character > '9' && _character < 'A') || - _character > 'Z') - _character = null; - } - - if (_character.HasValue) - _companies = await Service.GetCompaniesByLetterAsync(_character.Value); - - if (CountryId.HasValue && _companies is null) - { - _countryName = await Service.GetCountryNameAsync(CountryId.Value); - - if (_countryName != null) - { - _companies = await Service.GetCompaniesByCountryAsync(CountryId.Value); - } - else - CountryId = null; - } - - _companies ??= await Service.GetAsync(); - } -} \ No newline at end of file diff --git a/Marechai/Pages/Companies/Index.razor.cs b/Marechai/Pages/Companies/Index.razor.cs new file mode 100644 index 00000000..7752a006 --- /dev/null +++ b/Marechai/Pages/Companies/Index.razor.cs @@ -0,0 +1,60 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Marechai.ViewModels; +using Microsoft.AspNetCore.Components; + +namespace Marechai.Pages.Companies +{ + public partial class Index + { + char? _character; + + List _companies; + string _countryName; + [Parameter] + public int? CountryId { get; set; } + + [Parameter] + public string StartingCharacter { get; set; } + + protected override async Task OnInitializedAsync() + { + _character = null; + + if(!string.IsNullOrWhiteSpace(StartingCharacter) && + StartingCharacter.Length == 1) + { + _character = StartingCharacter[0]; + + // ToUpper() + if(_character >= 'a' && + _character <= 'z') + _character -= (char)32; + + // Check if not letter or number + if(_character < '0' || + (_character > '9' && _character < 'A') || + _character > 'Z') + _character = null; + } + + if(_character.HasValue) + _companies = await Service.GetCompaniesByLetterAsync(_character.Value); + + if(CountryId.HasValue && + _companies is null) + { + _countryName = await Service.GetCountryNameAsync(CountryId.Value); + + if(_countryName != null) + { + _companies = await Service.GetCompaniesByCountryAsync(CountryId.Value); + } + else + CountryId = null; + } + + _companies ??= await Service.GetAsync(); + } + } +} \ No newline at end of file diff --git a/Marechai/Pages/Companies/View.razor b/Marechai/Pages/Companies/View.razor index 4df819db..cfad571e 100644 --- a/Marechai/Pages/Companies/View.razor +++ b/Marechai/Pages/Companies/View.razor @@ -376,56 +376,3 @@ } - -@code -{ - [Parameter] - public int Id { get; set; } - - bool _loaded; - Company _company; - string _carrouselActive; - List _computers; - List _consoles; - string _description; - Company _soldTo; - - public bool ComputersCollapsed { get; set; } = true; - public bool ConsolesCollapsed { get; set; } = true; - - protected override async Task OnInitializedAsync() - { - if(Id <= 0) - { - _loaded = true; - return; - } - - _company = await Service.GetCompanyAsync(Id); - var machines = await Service.GetMachinesAsync(Id); - - _computers = machines.Where(m => m.Type == MachineType.Computer).ToList(); - _consoles = machines.Where(m => m.Type == MachineType.Console).ToList(); - - _description = await Service.GetDescriptionAsync(Id); - _soldTo = await Service.GetSoldToAsync(_company.SoldToId); - - _loaded = true; - } - - private void CollapseComputers() - { - if (_computers.Count == 0) - return; - - ComputersCollapsed = !ComputersCollapsed; - } - - private void CollapseConsoles() - { - if (_consoles.Count == 0) - return; - - ConsolesCollapsed = !ConsolesCollapsed; - } -} diff --git a/Marechai/Pages/Companies/View.razor.cs b/Marechai/Pages/Companies/View.razor.cs new file mode 100644 index 00000000..1fbdd767 --- /dev/null +++ b/Marechai/Pages/Companies/View.razor.cs @@ -0,0 +1,63 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Marechai.Database; +using Marechai.Database.Models; +using Microsoft.AspNetCore.Components; + +namespace Marechai.Pages.Companies +{ + public partial class View + { + string _carrouselActive; + Company _company; + List _computers; + List _consoles; + string _description; + + bool _loaded; + Company _soldTo; + [Parameter] + public int Id { get; set; } + + public bool ComputersCollapsed { get; set; } = true; + public bool ConsolesCollapsed { get; set; } = true; + + protected override async Task OnInitializedAsync() + { + if(Id <= 0) + { + _loaded = true; + + return; + } + + _company = await Service.GetCompanyAsync(Id); + List machines = await Service.GetMachinesAsync(Id); + + _computers = machines.Where(m => m.Type == MachineType.Computer).ToList(); + _consoles = machines.Where(m => m.Type == MachineType.Console).ToList(); + + _description = await Service.GetDescriptionAsync(Id); + _soldTo = await Service.GetSoldToAsync(_company.SoldToId); + + _loaded = true; + } + + void CollapseComputers() + { + if(_computers.Count == 0) + return; + + ComputersCollapsed = !ComputersCollapsed; + } + + void CollapseConsoles() + { + if(_consoles.Count == 0) + return; + + ConsolesCollapsed = !ConsolesCollapsed; + } + } +} \ No newline at end of file diff --git a/Marechai/Pages/Computers/Index.razor b/Marechai/Pages/Computers/Index.razor index ec4de0d2..cf9de626 100644 --- a/Marechai/Pages/Computers/Index.razor +++ b/Marechai/Pages/Computers/Index.razor @@ -242,20 +242,3 @@ } }

- -@code -{ - bool _loaded; - int _computers; - int _minYear; - int _maxYear; - - protected override async Task OnInitializedAsync() - { - _computers = await Service.GetComputersCountAsync(); - _minYear = await Service.GetMinimumYearAsync(); - _maxYear = await Service.GetMaximumYearAsync(); - - _loaded = true; - } -} diff --git a/Marechai/Pages/Computers/Index.razor.cs b/Marechai/Pages/Computers/Index.razor.cs new file mode 100644 index 00000000..e7063944 --- /dev/null +++ b/Marechai/Pages/Computers/Index.razor.cs @@ -0,0 +1,21 @@ +using System.Threading.Tasks; + +namespace Marechai.Pages.Computers +{ + public partial class Index + { + int _computers; + bool _loaded; + int _maxYear; + int _minYear; + + protected override async Task OnInitializedAsync() + { + _computers = await Service.GetComputersCountAsync(); + _minYear = await Service.GetMinimumYearAsync(); + _maxYear = await Service.GetMaximumYearAsync(); + + _loaded = true; + } + } +} \ No newline at end of file diff --git a/Marechai/Pages/Computers/Search.razor b/Marechai/Pages/Computers/Search.razor index aea4f955..e31cbe20 100644 --- a/Marechai/Pages/Computers/Search.razor +++ b/Marechai/Pages/Computers/Search.razor @@ -79,46 +79,3 @@ } }

- -@code -{ - [Parameter] - public int? Year { get; set; } - - [Parameter] - public string StartingCharacter { get; set; } - - List _computers; - char? _character; - - protected override async Task OnInitializedAsync() - { - _character = null; - if (!string.IsNullOrWhiteSpace(StartingCharacter) && - StartingCharacter.Length == 1) - { - _character = StartingCharacter[0]; - - // ToUpper() - if (_character >= 'a' && - _character <= 'z') - _character -= (char)32; - - - // Check if not letter or number - if (_character < '0' || - (_character > '9' && _character < 'A') || - _character > 'Z') - _character = null; - } - - if (_character.HasValue) - _computers = await Service.GetComputersByLetterAsync(_character.Value); - - if (Year.HasValue && - _computers is null) - _computers = await Service.GetComputersByYearAsync(Year.Value); - - _computers ??= await Service.GetComputersAsync(); - } -} \ No newline at end of file diff --git a/Marechai/Pages/Computers/Search.razor.cs b/Marechai/Pages/Computers/Search.razor.cs new file mode 100644 index 00000000..63dcec83 --- /dev/null +++ b/Marechai/Pages/Computers/Search.razor.cs @@ -0,0 +1,50 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Marechai.ViewModels; +using Microsoft.AspNetCore.Components; + +namespace Marechai.Pages.Computers +{ + public partial class Search + { + char? _character; + + List _computers; + [Parameter] + public int? Year { get; set; } + + [Parameter] + public string StartingCharacter { get; set; } + + protected override async Task OnInitializedAsync() + { + _character = null; + + if(!string.IsNullOrWhiteSpace(StartingCharacter) && + StartingCharacter.Length == 1) + { + _character = StartingCharacter[0]; + + // ToUpper() + if(_character >= 'a' && + _character <= 'z') + _character -= (char)32; + + // Check if not letter or number + if(_character < '0' || + (_character > '9' && _character < 'A') || + _character > 'Z') + _character = null; + } + + if(_character.HasValue) + _computers = await Service.GetComputersByLetterAsync(_character.Value); + + if(Year.HasValue && + _computers is null) + _computers = await Service.GetComputersByYearAsync(Year.Value); + + _computers ??= await Service.GetComputersAsync(); + } + } +} \ No newline at end of file diff --git a/Marechai/Pages/Consoles/Index.razor b/Marechai/Pages/Consoles/Index.razor index abfa8564..bb5a6637 100644 --- a/Marechai/Pages/Consoles/Index.razor +++ b/Marechai/Pages/Consoles/Index.razor @@ -242,20 +242,3 @@ } }

- -@code -{ - bool _loaded; - int _consoles; - int _minYear; - int _maxYear; - - protected override async Task OnInitializedAsync() - { - _consoles = await Service.GetConsolesCountAsync(); - _minYear = await Service.GetMinimumYearAsync(); - _maxYear = await Service.GetMaximumYearAsync(); - - _loaded = true; - } -} diff --git a/Marechai/Pages/Consoles/Index.razor.cs b/Marechai/Pages/Consoles/Index.razor.cs new file mode 100644 index 00000000..8f6611f4 --- /dev/null +++ b/Marechai/Pages/Consoles/Index.razor.cs @@ -0,0 +1,21 @@ +using System.Threading.Tasks; + +namespace Marechai.Pages.Consoles +{ + public partial class Index + { + int _consoles; + bool _loaded; + int _maxYear; + int _minYear; + + protected override async Task OnInitializedAsync() + { + _consoles = await Service.GetConsolesCountAsync(); + _minYear = await Service.GetMinimumYearAsync(); + _maxYear = await Service.GetMaximumYearAsync(); + + _loaded = true; + } + } +} \ No newline at end of file diff --git a/Marechai/Pages/Consoles/Search.razor b/Marechai/Pages/Consoles/Search.razor index e0336a89..460d53db 100644 --- a/Marechai/Pages/Consoles/Search.razor +++ b/Marechai/Pages/Consoles/Search.razor @@ -78,47 +78,4 @@

@L["There are no videogame consoles found introduced this year."]

} } -

- -@code -{ - [Parameter] - public int? Year { get; set; } - - [Parameter] - public string StartingCharacter { get; set; } - - List _consoles; - char? _character; - - protected override async Task OnInitializedAsync() - { - _character = null; - if (!string.IsNullOrWhiteSpace(StartingCharacter) && - StartingCharacter.Length == 1) - { - _character = StartingCharacter[0]; - - // ToUpper() - if (_character >= 'a' && - _character <= 'z') - _character -= (char)32; - - - // Check if not letter or number - if (_character < '0' || - (_character > '9' && _character < 'A') || - _character > 'Z') - _character = null; - } - - if (_character.HasValue) - _consoles = await Service.GetConsolesByLetterAsync(_character.Value); - - if (Year.HasValue && - _consoles is null) - _consoles = await Service.GetConsolesByYearAsync(Year.Value); - - _consoles ??= await Service.GetConsolesAsync(); - } -} \ No newline at end of file +

\ No newline at end of file diff --git a/Marechai/Pages/Consoles/Search.razor.cs b/Marechai/Pages/Consoles/Search.razor.cs new file mode 100644 index 00000000..223a2ffb --- /dev/null +++ b/Marechai/Pages/Consoles/Search.razor.cs @@ -0,0 +1,50 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Marechai.ViewModels; +using Microsoft.AspNetCore.Components; + +namespace Marechai.Pages.Consoles +{ + public partial class Search + { + char? _character; + + List _consoles; + [Parameter] + public int? Year { get; set; } + + [Parameter] + public string StartingCharacter { get; set; } + + protected override async Task OnInitializedAsync() + { + _character = null; + + if(!string.IsNullOrWhiteSpace(StartingCharacter) && + StartingCharacter.Length == 1) + { + _character = StartingCharacter[0]; + + // ToUpper() + if(_character >= 'a' && + _character <= 'z') + _character -= (char)32; + + // Check if not letter or number + if(_character < '0' || + (_character > '9' && _character < 'A') || + _character > 'Z') + _character = null; + } + + if(_character.HasValue) + _consoles = await Service.GetConsolesByLetterAsync(_character.Value); + + if(Year.HasValue && + _consoles is null) + _consoles = await Service.GetConsolesByYearAsync(Year.Value); + + _consoles ??= await Service.GetConsolesAsync(); + } + } +} \ No newline at end of file diff --git a/Marechai/Pages/Home/Index.razor b/Marechai/Pages/Home/Index.razor index 99fc710e..8163f410 100644 --- a/Marechai/Pages/Home/Index.razor +++ b/Marechai/Pages/Home/Index.razor @@ -58,13 +58,3 @@
} - -@code -{ - List _news; - - protected override void OnInitialized() - { - _news = @Service.GetNews(); - } -} \ No newline at end of file diff --git a/Marechai/Pages/Home/Index.razor.cs b/Marechai/Pages/Home/Index.razor.cs new file mode 100644 index 00000000..dc25add0 --- /dev/null +++ b/Marechai/Pages/Home/Index.razor.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using Marechai.ViewModels; + +namespace Marechai.Pages.Home +{ + public partial class Index + { + List _news; + + protected override void OnInitialized() => _news = Service.GetNews(); + } +} \ No newline at end of file diff --git a/Marechai/Pages/Machines/View.razor b/Marechai/Pages/Machines/View.razor index 293940a2..b82f6c3c 100644 --- a/Marechai/Pages/Machines/View.razor +++ b/Marechai/Pages/Machines/View.razor @@ -876,29 +876,6 @@ } -@code -{ - [Parameter] - public int Id { get; set; } - - MachineViewModel _machine; - bool _loaded; - bool[] _processorVisible; - bool[] _gpuVisible; - bool[] _soundVisible; - - protected override async Task OnInitializedAsync() - { - _machine = await Service.GetMachine(Id); - - _processorVisible = new bool[_machine.Processors.Count]; - _gpuVisible = new bool[_machine.Gpus.Count]; - _soundVisible = new bool[_machine.SoundSynthesizers.Count]; - - _loaded = true; - } -} -