Refactor viewmodels to use new namespace structure

Marechai.Data/Dtos/BasePhotoViewModel.cs

@@ -23,10 +23,9 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class BasePhotoViewModel : BaseViewModel<Guid>
 {

Marechai.Data/Dtos/BaseScanViewModel.cs

@@ -23,10 +23,9 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class BaseScanViewModel : BaseViewModel<Guid>
 {

Marechai.Data/Dtos/BaseViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class BaseViewModel<TKey>
 {

Marechai.Data/Dtos/BookByMachineFamilyViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class BookByMachineFamilyViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/BookByMachineViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class BookByMachineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/BookScanViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class BookScanViewModel : DocumentScanBaseViewModel
 {

Marechai.Data/Dtos/BookViewModel.cs

@@ -1,4 +1,4 @@
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class BookViewModel : DocumentBaseViewModel
 {

Marechai.Data/Dtos/CompanyByBookViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class CompanyByBookViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/CompanyByDocumentViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class CompanyByDocumentViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/CompanyByMagazineViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class CompanyByMagazineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/CompanyBySoftwareFamilyViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class CompanyBySoftwareFamilyViewModel : BaseViewModel<ulong>
 {

Marechai.Data/Dtos/CompanyBySoftwareVariantViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class CompanyBySoftwareVariantViewModel : BaseViewModel<ulong>
 {

Marechai.Data/Dtos/CompanyBySoftwareVersionViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class CompanyBySoftwareVersionViewModel : BaseViewModel<ulong>
 {

Marechai.Data/Dtos/CompanyDescriptionViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class CompanyDescriptionViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/CompanyViewModel.cs

@@ -23,10 +23,9 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class CompanyViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/CurrencyInflationViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class CurrencyInflationViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/CurrencyPeggingViewModel.cs

@@ -23,9 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class CurrencyPeggingViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/DocumentBaseViewModel.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public abstract class DocumentBaseViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/DocumentByMachineFamilyViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class DocumentByMachineFamilyViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/DocumentByMachineViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class DocumentByMachineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/DocumentCompanyViewModel.cs

@@ -25,7 +25,7 @@
 
 using System.ComponentModel;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class DocumentCompanyViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/DocumentPersonViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class DocumentPersonViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/DocumentRoleViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class DocumentRoleViewModel : BaseViewModel<string>
 {

Marechai.Data/Dtos/DocumentScanBaseViewModel.cs

@@ -25,7 +25,7 @@
 
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class DocumentScanBaseViewModel : BaseScanViewModel
 {

Marechai.Data/Dtos/DocumentScanViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class DocumentScanViewModel : DocumentScanBaseViewModel
 {

Marechai.Data/Dtos/DocumentViewModel.cs

@@ -1,3 +1,3 @@
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class DocumentViewModel : DocumentBaseViewModel {}

Marechai.Data/Dtos/DumpViewModel.cs

@@ -23,9 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class DumpViewModel : BaseViewModel<ulong>
 {

Marechai.Data/Dtos/GpuByMachineViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class GpuByMachineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/GpuViewModel.cs

@@ -23,9 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class GpuViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/InstructionSetExtensionByProcessorViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class InstructionSetExtensionByProcessorViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/MachineFamilyViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MachineFamilyViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/MachinePhotoViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MachinePhotoViewModel : BasePhotoViewModel
 {

Marechai.Data/Dtos/MachineViewModel.cs

@@ -23,11 +23,9 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MachineViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/MagazineByMachineFamilyViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MagazineByMachineFamilyViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/MagazineByMachineViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MagazineByMachineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/MagazineIssueViewModel.cs

@@ -23,9 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MagazineIssueViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/MagazineScanViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MagazineScanViewModel : DocumentScanBaseViewModel
 {

Marechai.Data/Dtos/MagazineViewModel.cs

@@ -23,9 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MagazineViewModel : DocumentBaseViewModel
 {

Marechai.Data/Dtos/MediaViewModel.cs

@@ -27,7 +27,7 @@ using Aaru.CommonTypes;
 using Marechai.Database;
 using Marechai.Database.Models;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MediaViewModel : BaseViewModel<ulong>
 {

Marechai.Data/Dtos/MemoryByMachineViewModel.cs

@@ -25,7 +25,7 @@
 
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MemoryByMachineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/MemoryViewModel.cs

@@ -25,7 +25,7 @@
 
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class MemoryViewModel
 {

Marechai.Data/Dtos/NewsViewModel.cs

@@ -23,10 +23,9 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public sealed class NewsViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/PersonByBookViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class PersonByBookViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/PersonByDocumentViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class PersonByDocumentViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/PersonByMagazineViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class PersonByMagazineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/PersonViewModel.cs

@@ -23,9 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class PersonViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/ProcessorByMachineViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class ProcessorByMachineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/ProcessorViewModel.cs

@@ -23,10 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-using System.Collections.Generic;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class ProcessorViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/ResolutionByGpuViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class ResolutionByGpuViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/ResolutionByScreenViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class ResolutionByScreenViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/ResolutionViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class ResolutionViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/ScreenByMachineViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class ScreenByMachineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/ScreenViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class ScreenViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/SoftwareFamilyViewModel.cs

@@ -23,9 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class SoftwareFamilyViewModel : BaseViewModel<ulong>
 {

Marechai.Data/Dtos/SoftwareVariantViewModel.cs

@@ -23,10 +23,9 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class SoftwareVariantViewModel : BaseViewModel<ulong>
 {

Marechai.Data/Dtos/SoftwareVersionViewModel.cs

@@ -23,9 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class SoftwareVersionViewModel : BaseViewModel<ulong>
 {

Marechai.Data/Dtos/SoundSynthByMachineViewModel.cs

@@ -23,7 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class SoundSynthByMachineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/SoundSynthViewModel.cs

@@ -23,9 +23,7 @@
 // Copyright © 2003-2021 Natalia Portillo
 *******************************************************************************/
 
-using System;
-
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class SoundSynthViewModel : BaseViewModel<int>
 {

Marechai.Data/Dtos/StorageByMachineViewModel.cs

@@ -25,7 +25,7 @@
 
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class StorageByMachineViewModel : BaseViewModel<long>
 {

Marechai.Data/Dtos/StorageViewModel.cs

@@ -25,7 +25,7 @@
 
 using Marechai.Database;
 
-namespace Marechai.ViewModels;
+namespace Marechai.Data.Dtos;
 
 public class StorageViewModel
 {

Marechai/Helpers/Exif.cs

@@ -28,8 +28,8 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Marechai.Data.Dtos;
 using Marechai.Database;
-using Marechai.ViewModels;
 
 namespace Marechai.Helpers;
 

Marechai/Pages/Admin/Books.razor

@@ -26,6 +26,7 @@
 }
 
 @page "/admin/books"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<BooksService>
 @inject IStringLocalizer<BooksService> L

Marechai/Pages/Admin/Books.razor.cs

@@ -27,7 +27,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
-using Marechai.ViewModels;
+using Marechai.Data.Dtos;
 using Microsoft.AspNetCore.Components.Authorization;
 
 namespace Marechai.Pages.Admin;

Marechai/Pages/Admin/Companies.razor

@@ -26,6 +26,7 @@
 }
 
 @page "/admin/companies"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<CompaniesService>
 @inject IStringLocalizer<CompaniesService> L

Marechai/Pages/Admin/Companies.razor.cs

@@ -27,7 +27,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
-using Marechai.ViewModels;
+using Marechai.Data.Dtos;
 using Microsoft.AspNetCore.Components.Authorization;
 
 namespace Marechai.Pages.Admin;

Marechai/Pages/Admin/CurrencyInflation.razor

@@ -26,6 +26,7 @@
 }
 
 @page "/admin/currency_inflation"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<CurrencyInflationService>
 @inject IStringLocalizer<CurrencyInflationService> L

Marechai/Pages/Admin/CurrencyInflation.razor.cs

@@ -27,7 +27,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
-using Marechai.ViewModels;
+using Marechai.Data.Dtos;
 using Microsoft.AspNetCore.Components.Authorization;
 
 namespace Marechai.Pages.Admin;

Marechai/Pages/Admin/CurrencyPegging.razor

@@ -26,6 +26,7 @@
 }
 
 @page "/admin/currency_pegging"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<CurrencyPeggingService>
 @inject IStringLocalizer<CurrencyPeggingService> L

Marechai/Pages/Admin/CurrencyPegging.razor.cs

@@ -27,7 +27,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
-using Marechai.ViewModels;
+using Marechai.Data.Dtos;
 using Microsoft.AspNetCore.Components.Authorization;
 
 namespace Marechai.Pages.Admin;

Marechai/Pages/Admin/Details/Book.razor

@@ -28,6 +28,7 @@
 @page "/admin/books/details/{Id:long}"
 @page "/admin/books/edit/{Id:long}"
 @page "/admin/books/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database
 @using Marechai.Database.Models
 @inherits OwningComponentBase<BooksService>

Marechai/Pages/Admin/Details/Book.razor.cs

@@ -32,11 +32,11 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database;
 using Marechai.Database.Models;
 using Marechai.Helpers;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Tewr.Blazor.FileReader;

Marechai/Pages/Admin/Details/Company.razor

@@ -28,6 +28,7 @@
 @page "/admin/companies/details/{Id:int}"
 @page "/admin/companies/edit/{Id:int}"
 @page "/admin/companies/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database
 @using Marechai.Database.Models
 @inherits OwningComponentBase<CompaniesService>

Marechai/Pages/Admin/Details/Company.razor.cs

@@ -30,11 +30,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database;
 using Marechai.Database.Models;
 using Marechai.Helpers;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Markdig;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;

Marechai/Pages/Admin/Details/CreateMachinePhoto.razor.cs

@@ -32,9 +32,9 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Helpers;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Tewr.Blazor.FileReader;

Marechai/Pages/Admin/Details/CurrencyInflation.razor.cs

@@ -27,8 +27,8 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database.Models;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/CurrencyPegging.razor.cs

@@ -27,8 +27,8 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database.Models;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/Document.razor

@@ -28,6 +28,7 @@
 @page "/admin/documents/details/{Id:long}"
 @page "/admin/documents/edit/{Id:long}"
 @page "/admin/documents/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database
 @using Marechai.Database.Models
 @inherits OwningComponentBase<DocumentsService>

Marechai/Pages/Admin/Details/Document.razor.cs

@@ -32,11 +32,11 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database;
 using Marechai.Database.Models;
 using Marechai.Helpers;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Tewr.Blazor.FileReader;

Marechai/Pages/Admin/Details/DocumentCompany.razor

@@ -28,6 +28,7 @@
 @page "/admin/document_companies/details/{Id:int}"
 @page "/admin/document_companies/edit/{Id:int}"
 @page "/admin/document_companies/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<DocumentCompaniesService>
 @inject IStringLocalizer<DocumentCompaniesService> L

Marechai/Pages/Admin/Details/DocumentCompany.razor.cs

@@ -27,8 +27,8 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/DocumentPerson.razor

@@ -28,6 +28,7 @@
 @page "/admin/document_people/details/{Id:int}"
 @page "/admin/document_people/edit/{Id:int}"
 @page "/admin/document_people/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<DocumentPeopleService>
 @inject IStringLocalizer<DocumentPeopleService> L

Marechai/Pages/Admin/Details/DocumentPerson.razor.cs

@@ -27,8 +27,8 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/Dump.razor

@@ -28,6 +28,7 @@
 @page "/admin/dumps/details/{Id:long}"
 @page "/admin/dumps/edit/{Id:long}"
 @page "/admin/dumps/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<DumpsService>
 @inject IStringLocalizer<DumpsService> L

Marechai/Pages/Admin/Details/Dump.razor.cs

@@ -28,9 +28,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database.Models;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/Gpu.razor

@@ -28,6 +28,7 @@
 @page "/admin/gpus/details/{Id:int}"
 @page "/admin/gpus/edit/{Id:int}"
 @page "/admin/gpus/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<GpusService>
 @inject IStringLocalizer<GpusService> L

Marechai/Pages/Admin/Details/Gpu.razor.cs

@@ -28,8 +28,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/Machine.razor

@@ -28,6 +28,7 @@
 @page "/admin/machines/details/{Id:int}"
 @page "/admin/machines/edit/{Id:int}"
 @page "/admin/machines/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database
 @using Marechai.Database.Models
 @inherits OwningComponentBase<MachinesService>

Marechai/Pages/Admin/Details/Machine.razor.cs

@@ -28,9 +28,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/MachineFamily.razor

@@ -28,6 +28,7 @@
 @page "/admin/machine_families/details/{Id:int}"
 @page "/admin/machine_families/edit/{Id:int}"
 @page "/admin/machine_families/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<MachineFamiliesService>
 @inject IStringLocalizer<MachineFamiliesService> L

Marechai/Pages/Admin/Details/MachineFamily.razor.cs

@@ -27,8 +27,8 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/MachinePhoto.razor.cs

@@ -27,10 +27,10 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database;
 using Marechai.Database.Models;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Orientation = Marechai.Database.Orientation;

Marechai/Pages/Admin/Details/Magazine.razor

@@ -28,6 +28,7 @@
 @page "/admin/magazines/details/{Id:long}"
 @page "/admin/magazines/edit/{Id:long}"
 @page "/admin/magazines/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<MagazinesService>
 @inject IStringLocalizer<MagazinesService> L

Marechai/Pages/Admin/Details/Magazine.razor.cs

@@ -28,9 +28,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database.Models;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/MagazineIssue.razor

@@ -28,6 +28,7 @@
 @page "/admin/magazine_issues/details/{Id:long}"
 @page "/admin/magazine_issues/edit/{Id:long}"
 @page "/admin/magazine_issues/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database
 @using Marechai.Database.Models
 @inherits OwningComponentBase<MagazineIssuesService>

Marechai/Pages/Admin/Details/MagazineIssue.razor.cs

@@ -32,11 +32,11 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database;
 using Marechai.Database.Models;
 using Marechai.Helpers;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Tewr.Blazor.FileReader;

Marechai/Pages/Admin/Details/Person.razor.cs

@@ -27,9 +27,9 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Database.Models;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/Processor.razor

@@ -28,6 +28,7 @@
 @page "/admin/processors/details/{Id:int}"
 @page "/admin/processors/edit/{Id:int}"
 @page "/admin/processors/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<ProcessorsService>
 @inject IStringLocalizer<ProcessorsService>        L

Marechai/Pages/Admin/Details/Processor.razor.cs

@@ -28,8 +28,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/Resolution.razor.cs

@@ -26,8 +26,8 @@
 using System;
 using System.Threading.Tasks;
 using Blazorise;
+using Marechai.Data.Dtos;
 using Marechai.Shared;
-using Marechai.ViewModels;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 

Marechai/Pages/Admin/Details/Screen.razor

@@ -28,6 +28,7 @@
 @page "/admin/screens/details/{Id:int}"
 @page "/admin/screens/edit/{Id:int}"
 @page "/admin/screens/create"
+@using Marechai.Data.Dtos
 @using Marechai.Database.Models
 @inherits OwningComponentBase<ScreensService>
 @inject IStringLocalizer<ScreensService> L