diff --git a/Marechai.Data/Dtos/BasePhotoViewModel.cs b/Marechai.Data/Dtos/BasePhotoViewModel.cs index dce7e8d6..ca9bd8be 100644 --- a/Marechai.Data/Dtos/BasePhotoViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/BaseScanViewModel.cs b/Marechai.Data/Dtos/BaseScanViewModel.cs index 2862a1f9..610508cb 100644 --- a/Marechai.Data/Dtos/BaseScanViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/BaseViewModel.cs b/Marechai.Data/Dtos/BaseViewModel.cs index 860eb00e..0b6bc770 100644 --- a/Marechai.Data/Dtos/BaseViewModel.cs +++ b/Marechai.Data/Dtos/BaseViewModel.cs @@ -23,7 +23,7 @@ // Copyright © 2003-2021 Natalia Portillo *******************************************************************************/ -namespace Marechai.ViewModels; +namespace Marechai.Data.Dtos; public class BaseViewModel { diff --git a/Marechai.Data/Dtos/BookByMachineFamilyViewModel.cs b/Marechai.Data/Dtos/BookByMachineFamilyViewModel.cs index 21475aa3..77463fab 100644 --- a/Marechai.Data/Dtos/BookByMachineFamilyViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/BookByMachineViewModel.cs b/Marechai.Data/Dtos/BookByMachineViewModel.cs index a37d01d8..324b57c8 100644 --- a/Marechai.Data/Dtos/BookByMachineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/BookScanViewModel.cs b/Marechai.Data/Dtos/BookScanViewModel.cs index bf589c0b..74d5e63a 100644 --- a/Marechai.Data/Dtos/BookScanViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/BookViewModel.cs b/Marechai.Data/Dtos/BookViewModel.cs index 21598ba6..e41e13ac 100644 --- a/Marechai.Data/Dtos/BookViewModel.cs +++ b/Marechai.Data/Dtos/BookViewModel.cs @@ -1,4 +1,4 @@ -namespace Marechai.ViewModels; +namespace Marechai.Data.Dtos; public class BookViewModel : DocumentBaseViewModel { diff --git a/Marechai.Data/Dtos/CompanyByBookViewModel.cs b/Marechai.Data/Dtos/CompanyByBookViewModel.cs index 162c5ab7..ae150289 100644 --- a/Marechai.Data/Dtos/CompanyByBookViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/CompanyByDocumentViewModel.cs b/Marechai.Data/Dtos/CompanyByDocumentViewModel.cs index 839b007b..ce8baff2 100644 --- a/Marechai.Data/Dtos/CompanyByDocumentViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/CompanyByMagazineViewModel.cs b/Marechai.Data/Dtos/CompanyByMagazineViewModel.cs index 7e390c6f..303c11d6 100644 --- a/Marechai.Data/Dtos/CompanyByMagazineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/CompanyBySoftwareFamilyViewModel.cs b/Marechai.Data/Dtos/CompanyBySoftwareFamilyViewModel.cs index 73a011e5..8a94365f 100644 --- a/Marechai.Data/Dtos/CompanyBySoftwareFamilyViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/CompanyBySoftwareVariantViewModel.cs b/Marechai.Data/Dtos/CompanyBySoftwareVariantViewModel.cs index deadb637..d1460b40 100644 --- a/Marechai.Data/Dtos/CompanyBySoftwareVariantViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/CompanyBySoftwareVersionViewModel.cs b/Marechai.Data/Dtos/CompanyBySoftwareVersionViewModel.cs index 576d0e26..758e5b40 100644 --- a/Marechai.Data/Dtos/CompanyBySoftwareVersionViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/CompanyDescriptionViewModel.cs b/Marechai.Data/Dtos/CompanyDescriptionViewModel.cs index a54616c5..c093ad9f 100644 --- a/Marechai.Data/Dtos/CompanyDescriptionViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/CompanyViewModel.cs b/Marechai.Data/Dtos/CompanyViewModel.cs index 41157647..071bf1f4 100644 --- a/Marechai.Data/Dtos/CompanyViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/CurrencyInflationViewModel.cs b/Marechai.Data/Dtos/CurrencyInflationViewModel.cs index 07c47c05..bee90fed 100644 --- a/Marechai.Data/Dtos/CurrencyInflationViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/CurrencyPeggingViewModel.cs b/Marechai.Data/Dtos/CurrencyPeggingViewModel.cs index 135992cb..6c631009 100644 --- a/Marechai.Data/Dtos/CurrencyPeggingViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/DocumentBaseViewModel.cs b/Marechai.Data/Dtos/DocumentBaseViewModel.cs index 641a9913..75897d5b 100644 --- a/Marechai.Data/Dtos/DocumentBaseViewModel.cs +++ b/Marechai.Data/Dtos/DocumentBaseViewModel.cs @@ -1,6 +1,4 @@ -using System; - -namespace Marechai.ViewModels; +namespace Marechai.Data.Dtos; public abstract class DocumentBaseViewModel : BaseViewModel { diff --git a/Marechai.Data/Dtos/DocumentByMachineFamilyViewModel.cs b/Marechai.Data/Dtos/DocumentByMachineFamilyViewModel.cs index 488c19df..a6209dc6 100644 --- a/Marechai.Data/Dtos/DocumentByMachineFamilyViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/DocumentByMachineViewModel.cs b/Marechai.Data/Dtos/DocumentByMachineViewModel.cs index c4ed8998..4295cee0 100644 --- a/Marechai.Data/Dtos/DocumentByMachineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/DocumentCompanyViewModel.cs b/Marechai.Data/Dtos/DocumentCompanyViewModel.cs index d81e36bc..31b7f6a5 100644 --- a/Marechai.Data/Dtos/DocumentCompanyViewModel.cs +++ b/Marechai.Data/Dtos/DocumentCompanyViewModel.cs @@ -25,7 +25,7 @@ using System.ComponentModel; -namespace Marechai.ViewModels; +namespace Marechai.Data.Dtos; public class DocumentCompanyViewModel : BaseViewModel { diff --git a/Marechai.Data/Dtos/DocumentPersonViewModel.cs b/Marechai.Data/Dtos/DocumentPersonViewModel.cs index 1ba4a902..621ce678 100644 --- a/Marechai.Data/Dtos/DocumentPersonViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/DocumentRoleViewModel.cs b/Marechai.Data/Dtos/DocumentRoleViewModel.cs index cd9c9371..0f466146 100644 --- a/Marechai.Data/Dtos/DocumentRoleViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/DocumentScanBaseViewModel.cs b/Marechai.Data/Dtos/DocumentScanBaseViewModel.cs index a7219e3d..4d360b1d 100644 --- a/Marechai.Data/Dtos/DocumentScanBaseViewModel.cs +++ b/Marechai.Data/Dtos/DocumentScanBaseViewModel.cs @@ -25,7 +25,7 @@ using Marechai.Database; -namespace Marechai.ViewModels; +namespace Marechai.Data.Dtos; public class DocumentScanBaseViewModel : BaseScanViewModel { diff --git a/Marechai.Data/Dtos/DocumentScanViewModel.cs b/Marechai.Data/Dtos/DocumentScanViewModel.cs index 32f80270..f9251eee 100644 --- a/Marechai.Data/Dtos/DocumentScanViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/DocumentViewModel.cs b/Marechai.Data/Dtos/DocumentViewModel.cs index e7e3dce8..64483ddd 100644 --- a/Marechai.Data/Dtos/DocumentViewModel.cs +++ b/Marechai.Data/Dtos/DocumentViewModel.cs @@ -1,3 +1,3 @@ -namespace Marechai.ViewModels; +namespace Marechai.Data.Dtos; public class DocumentViewModel : DocumentBaseViewModel {} \ No newline at end of file diff --git a/Marechai.Data/Dtos/DumpViewModel.cs b/Marechai.Data/Dtos/DumpViewModel.cs index 454b6ac8..bd20a2ec 100644 --- a/Marechai.Data/Dtos/DumpViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/GpuByMachineViewModel.cs b/Marechai.Data/Dtos/GpuByMachineViewModel.cs index a783ba4f..45b2cf35 100644 --- a/Marechai.Data/Dtos/GpuByMachineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/GpuViewModel.cs b/Marechai.Data/Dtos/GpuViewModel.cs index 64666d31..89704016 100644 --- a/Marechai.Data/Dtos/GpuViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/InstructionSetExtensionByProcessorViewModel.cs b/Marechai.Data/Dtos/InstructionSetExtensionByProcessorViewModel.cs index 8f8192bc..81d3930a 100644 --- a/Marechai.Data/Dtos/InstructionSetExtensionByProcessorViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/MachineFamilyViewModel.cs b/Marechai.Data/Dtos/MachineFamilyViewModel.cs index b9db598b..778e578f 100644 --- a/Marechai.Data/Dtos/MachineFamilyViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/MachinePhotoViewModel.cs b/Marechai.Data/Dtos/MachinePhotoViewModel.cs index 68d900a0..15b3f81d 100644 --- a/Marechai.Data/Dtos/MachinePhotoViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/MachineViewModel.cs b/Marechai.Data/Dtos/MachineViewModel.cs index e7df43c9..097664e5 100644 --- a/Marechai.Data/Dtos/MachineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/MagazineByMachineFamilyViewModel.cs b/Marechai.Data/Dtos/MagazineByMachineFamilyViewModel.cs index ec9ac081..fedece66 100644 --- a/Marechai.Data/Dtos/MagazineByMachineFamilyViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/MagazineByMachineViewModel.cs b/Marechai.Data/Dtos/MagazineByMachineViewModel.cs index b437caa8..218a1588 100644 --- a/Marechai.Data/Dtos/MagazineByMachineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/MagazineIssueViewModel.cs b/Marechai.Data/Dtos/MagazineIssueViewModel.cs index 83b13a21..13559a56 100644 --- a/Marechai.Data/Dtos/MagazineIssueViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/MagazineScanViewModel.cs b/Marechai.Data/Dtos/MagazineScanViewModel.cs index e17f28b1..cb08ff87 100644 --- a/Marechai.Data/Dtos/MagazineScanViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/MagazineViewModel.cs b/Marechai.Data/Dtos/MagazineViewModel.cs index cf9aaa00..8240fcc7 100644 --- a/Marechai.Data/Dtos/MagazineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/MediaViewModel.cs b/Marechai.Data/Dtos/MediaViewModel.cs index 7c34b881..38e3a3ab 100644 --- a/Marechai.Data/Dtos/MediaViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/MemoryByMachineViewModel.cs b/Marechai.Data/Dtos/MemoryByMachineViewModel.cs index c4e90ea4..5d7c76a0 100644 --- a/Marechai.Data/Dtos/MemoryByMachineViewModel.cs +++ b/Marechai.Data/Dtos/MemoryByMachineViewModel.cs @@ -25,7 +25,7 @@ using Marechai.Database; -namespace Marechai.ViewModels; +namespace Marechai.Data.Dtos; public class MemoryByMachineViewModel : BaseViewModel { diff --git a/Marechai.Data/Dtos/MemoryViewModel.cs b/Marechai.Data/Dtos/MemoryViewModel.cs index 6039742f..d21db66e 100644 --- a/Marechai.Data/Dtos/MemoryViewModel.cs +++ b/Marechai.Data/Dtos/MemoryViewModel.cs @@ -25,7 +25,7 @@ using Marechai.Database; -namespace Marechai.ViewModels; +namespace Marechai.Data.Dtos; public class MemoryViewModel { diff --git a/Marechai.Data/Dtos/NewsViewModel.cs b/Marechai.Data/Dtos/NewsViewModel.cs index e02469e0..f7f5b036 100644 --- a/Marechai.Data/Dtos/NewsViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/PersonByBookViewModel.cs b/Marechai.Data/Dtos/PersonByBookViewModel.cs index 2aa751c9..0c6c0e51 100644 --- a/Marechai.Data/Dtos/PersonByBookViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/PersonByDocumentViewModel.cs b/Marechai.Data/Dtos/PersonByDocumentViewModel.cs index c99b0492..b7dcf867 100644 --- a/Marechai.Data/Dtos/PersonByDocumentViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/PersonByMagazineViewModel.cs b/Marechai.Data/Dtos/PersonByMagazineViewModel.cs index e4ae60f9..5151cd47 100644 --- a/Marechai.Data/Dtos/PersonByMagazineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/PersonViewModel.cs b/Marechai.Data/Dtos/PersonViewModel.cs index bbc521d8..c7a97abe 100644 --- a/Marechai.Data/Dtos/PersonViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/ProcessorByMachineViewModel.cs b/Marechai.Data/Dtos/ProcessorByMachineViewModel.cs index d3e86d8d..f08f1973 100644 --- a/Marechai.Data/Dtos/ProcessorByMachineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/ProcessorViewModel.cs b/Marechai.Data/Dtos/ProcessorViewModel.cs index 9c95cb65..8059209f 100644 --- a/Marechai.Data/Dtos/ProcessorViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/ResolutionByGpuViewModel.cs b/Marechai.Data/Dtos/ResolutionByGpuViewModel.cs index 876675d9..5fd7d1f4 100644 --- a/Marechai.Data/Dtos/ResolutionByGpuViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/ResolutionByScreenViewModel.cs b/Marechai.Data/Dtos/ResolutionByScreenViewModel.cs index d18f11fa..6519b5bf 100644 --- a/Marechai.Data/Dtos/ResolutionByScreenViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/ResolutionViewModel.cs b/Marechai.Data/Dtos/ResolutionViewModel.cs index 9bb4692f..18582c31 100644 --- a/Marechai.Data/Dtos/ResolutionViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/ScreenByMachineViewModel.cs b/Marechai.Data/Dtos/ScreenByMachineViewModel.cs index e8f22888..0635c611 100644 --- a/Marechai.Data/Dtos/ScreenByMachineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/ScreenViewModel.cs b/Marechai.Data/Dtos/ScreenViewModel.cs index 2454fe91..7d1a2e96 100644 --- a/Marechai.Data/Dtos/ScreenViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/SoftwareFamilyViewModel.cs b/Marechai.Data/Dtos/SoftwareFamilyViewModel.cs index 61955768..284d56e5 100644 --- a/Marechai.Data/Dtos/SoftwareFamilyViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/SoftwareVariantViewModel.cs b/Marechai.Data/Dtos/SoftwareVariantViewModel.cs index a46d47b2..0496c18f 100644 --- a/Marechai.Data/Dtos/SoftwareVariantViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/SoftwareVersionViewModel.cs b/Marechai.Data/Dtos/SoftwareVersionViewModel.cs index 77bc5de5..5746d002 100644 --- a/Marechai.Data/Dtos/SoftwareVersionViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/SoundSynthByMachineViewModel.cs b/Marechai.Data/Dtos/SoundSynthByMachineViewModel.cs index fd282543..09726f04 100644 --- a/Marechai.Data/Dtos/SoundSynthByMachineViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/SoundSynthViewModel.cs b/Marechai.Data/Dtos/SoundSynthViewModel.cs index ce2b6f5e..c4d2d6b6 100644 --- a/Marechai.Data/Dtos/SoundSynthViewModel.cs +++ b/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 { diff --git a/Marechai.Data/Dtos/StorageByMachineViewModel.cs b/Marechai.Data/Dtos/StorageByMachineViewModel.cs index 5081ba52..95e25b7c 100644 --- a/Marechai.Data/Dtos/StorageByMachineViewModel.cs +++ b/Marechai.Data/Dtos/StorageByMachineViewModel.cs @@ -25,7 +25,7 @@ using Marechai.Database; -namespace Marechai.ViewModels; +namespace Marechai.Data.Dtos; public class StorageByMachineViewModel : BaseViewModel { diff --git a/Marechai.Data/Dtos/StorageViewModel.cs b/Marechai.Data/Dtos/StorageViewModel.cs index c9d12bae..8788fb42 100644 --- a/Marechai.Data/Dtos/StorageViewModel.cs +++ b/Marechai.Data/Dtos/StorageViewModel.cs @@ -25,7 +25,7 @@ using Marechai.Database; -namespace Marechai.ViewModels; +namespace Marechai.Data.Dtos; public class StorageViewModel { diff --git a/Marechai/Helpers/Exif.cs b/Marechai/Helpers/Exif.cs index c99091ae..ae14eb5f 100644 --- a/Marechai/Helpers/Exif.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Books.razor b/Marechai/Pages/Admin/Books.razor index 4c9765bd..9d5fec52 100644 --- a/Marechai/Pages/Admin/Books.razor +++ b/Marechai/Pages/Admin/Books.razor @@ -26,6 +26,7 @@ } @page "/admin/books" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Books.razor.cs b/Marechai/Pages/Admin/Books.razor.cs index 7f19a3dd..5b5f8b20 100644 --- a/Marechai/Pages/Admin/Books.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Companies.razor b/Marechai/Pages/Admin/Companies.razor index eb579024..2f59b63b 100644 --- a/Marechai/Pages/Admin/Companies.razor +++ b/Marechai/Pages/Admin/Companies.razor @@ -26,6 +26,7 @@ } @page "/admin/companies" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Companies.razor.cs b/Marechai/Pages/Admin/Companies.razor.cs index 4ea029a2..0ced50d6 100644 --- a/Marechai/Pages/Admin/Companies.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/CurrencyInflation.razor b/Marechai/Pages/Admin/CurrencyInflation.razor index 8d9828b0..d7fcf3b8 100644 --- a/Marechai/Pages/Admin/CurrencyInflation.razor +++ b/Marechai/Pages/Admin/CurrencyInflation.razor @@ -26,6 +26,7 @@ } @page "/admin/currency_inflation" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/CurrencyInflation.razor.cs b/Marechai/Pages/Admin/CurrencyInflation.razor.cs index 9422590f..4ee89859 100644 --- a/Marechai/Pages/Admin/CurrencyInflation.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/CurrencyPegging.razor b/Marechai/Pages/Admin/CurrencyPegging.razor index 99270443..386baca1 100644 --- a/Marechai/Pages/Admin/CurrencyPegging.razor +++ b/Marechai/Pages/Admin/CurrencyPegging.razor @@ -26,6 +26,7 @@ } @page "/admin/currency_pegging" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/CurrencyPegging.razor.cs b/Marechai/Pages/Admin/CurrencyPegging.razor.cs index cce7ccc6..c064d374 100644 --- a/Marechai/Pages/Admin/CurrencyPegging.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Book.razor b/Marechai/Pages/Admin/Details/Book.razor index a956d327..c2b07dfa 100644 --- a/Marechai/Pages/Admin/Details/Book.razor +++ b/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 diff --git a/Marechai/Pages/Admin/Details/Book.razor.cs b/Marechai/Pages/Admin/Details/Book.razor.cs index cbcb4ebe..a62eb1f8 100644 --- a/Marechai/Pages/Admin/Details/Book.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Company.razor b/Marechai/Pages/Admin/Details/Company.razor index 4db45951..4e0eb2e7 100644 --- a/Marechai/Pages/Admin/Details/Company.razor +++ b/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 diff --git a/Marechai/Pages/Admin/Details/Company.razor.cs b/Marechai/Pages/Admin/Details/Company.razor.cs index 2916d537..5d27fed5 100644 --- a/Marechai/Pages/Admin/Details/Company.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/CreateMachinePhoto.razor.cs b/Marechai/Pages/Admin/Details/CreateMachinePhoto.razor.cs index 2f8e0993..6231d01a 100644 --- a/Marechai/Pages/Admin/Details/CreateMachinePhoto.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/CurrencyInflation.razor.cs b/Marechai/Pages/Admin/Details/CurrencyInflation.razor.cs index 8350a1d5..17d93e7c 100644 --- a/Marechai/Pages/Admin/Details/CurrencyInflation.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/CurrencyPegging.razor.cs b/Marechai/Pages/Admin/Details/CurrencyPegging.razor.cs index 36fe5b36..ece9bacf 100644 --- a/Marechai/Pages/Admin/Details/CurrencyPegging.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Document.razor b/Marechai/Pages/Admin/Details/Document.razor index 45f1b16f..33400f01 100644 --- a/Marechai/Pages/Admin/Details/Document.razor +++ b/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 diff --git a/Marechai/Pages/Admin/Details/Document.razor.cs b/Marechai/Pages/Admin/Details/Document.razor.cs index 90114bae..7de9484a 100644 --- a/Marechai/Pages/Admin/Details/Document.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/DocumentCompany.razor b/Marechai/Pages/Admin/Details/DocumentCompany.razor index 4f206339..e7b32983 100644 --- a/Marechai/Pages/Admin/Details/DocumentCompany.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/DocumentCompany.razor.cs b/Marechai/Pages/Admin/Details/DocumentCompany.razor.cs index e567718c..4cd4b9eb 100644 --- a/Marechai/Pages/Admin/Details/DocumentCompany.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/DocumentPerson.razor b/Marechai/Pages/Admin/Details/DocumentPerson.razor index d53487e5..278bdcf3 100644 --- a/Marechai/Pages/Admin/Details/DocumentPerson.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/DocumentPerson.razor.cs b/Marechai/Pages/Admin/Details/DocumentPerson.razor.cs index a1fa94fc..64f798e1 100644 --- a/Marechai/Pages/Admin/Details/DocumentPerson.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Dump.razor b/Marechai/Pages/Admin/Details/Dump.razor index 6c84f1f7..ff49d25a 100644 --- a/Marechai/Pages/Admin/Details/Dump.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/Dump.razor.cs b/Marechai/Pages/Admin/Details/Dump.razor.cs index ee6a49f5..96139533 100644 --- a/Marechai/Pages/Admin/Details/Dump.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Gpu.razor b/Marechai/Pages/Admin/Details/Gpu.razor index 1010cba8..9789ce28 100644 --- a/Marechai/Pages/Admin/Details/Gpu.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/Gpu.razor.cs b/Marechai/Pages/Admin/Details/Gpu.razor.cs index c2d80b04..63a309e4 100644 --- a/Marechai/Pages/Admin/Details/Gpu.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Machine.razor b/Marechai/Pages/Admin/Details/Machine.razor index a701f5dd..4fa8e938 100644 --- a/Marechai/Pages/Admin/Details/Machine.razor +++ b/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 diff --git a/Marechai/Pages/Admin/Details/Machine.razor.cs b/Marechai/Pages/Admin/Details/Machine.razor.cs index 0ecb0da3..3e4ba840 100644 --- a/Marechai/Pages/Admin/Details/Machine.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/MachineFamily.razor b/Marechai/Pages/Admin/Details/MachineFamily.razor index c537dab5..7144b8dd 100644 --- a/Marechai/Pages/Admin/Details/MachineFamily.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/MachineFamily.razor.cs b/Marechai/Pages/Admin/Details/MachineFamily.razor.cs index 57bf5a15..5cc6cef1 100644 --- a/Marechai/Pages/Admin/Details/MachineFamily.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/MachinePhoto.razor.cs b/Marechai/Pages/Admin/Details/MachinePhoto.razor.cs index b261e411..c6f05eab 100644 --- a/Marechai/Pages/Admin/Details/MachinePhoto.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Magazine.razor b/Marechai/Pages/Admin/Details/Magazine.razor index 44b6d7ec..5524bd7f 100644 --- a/Marechai/Pages/Admin/Details/Magazine.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/Magazine.razor.cs b/Marechai/Pages/Admin/Details/Magazine.razor.cs index d7090ca3..88eb7497 100644 --- a/Marechai/Pages/Admin/Details/Magazine.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/MagazineIssue.razor b/Marechai/Pages/Admin/Details/MagazineIssue.razor index c69566e0..641d2fb0 100644 --- a/Marechai/Pages/Admin/Details/MagazineIssue.razor +++ b/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 diff --git a/Marechai/Pages/Admin/Details/MagazineIssue.razor.cs b/Marechai/Pages/Admin/Details/MagazineIssue.razor.cs index da9e5e4c..7d84adfc 100644 --- a/Marechai/Pages/Admin/Details/MagazineIssue.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Person.razor.cs b/Marechai/Pages/Admin/Details/Person.razor.cs index fba82168..0a032c62 100644 --- a/Marechai/Pages/Admin/Details/Person.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Processor.razor b/Marechai/Pages/Admin/Details/Processor.razor index b8624552..018d0272 100644 --- a/Marechai/Pages/Admin/Details/Processor.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/Processor.razor.cs b/Marechai/Pages/Admin/Details/Processor.razor.cs index 973dc4b3..09c9821c 100644 --- a/Marechai/Pages/Admin/Details/Processor.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Resolution.razor.cs b/Marechai/Pages/Admin/Details/Resolution.razor.cs index 547c53cb..0e9ccd5b 100644 --- a/Marechai/Pages/Admin/Details/Resolution.razor.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Screen.razor b/Marechai/Pages/Admin/Details/Screen.razor index 1e01ee1b..caef7055 100644 --- a/Marechai/Pages/Admin/Details/Screen.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/Screen.razor.cs b/Marechai/Pages/Admin/Details/Screen.razor.cs index 9c0f9632..bd959053 100644 --- a/Marechai/Pages/Admin/Details/Screen.razor.cs +++ b/Marechai/Pages/Admin/Details/Screen.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; diff --git a/Marechai/Pages/Admin/Details/SoftwareFamily.razor b/Marechai/Pages/Admin/Details/SoftwareFamily.razor index daeb279f..31ab58a3 100644 --- a/Marechai/Pages/Admin/Details/SoftwareFamily.razor +++ b/Marechai/Pages/Admin/Details/SoftwareFamily.razor @@ -28,6 +28,7 @@ @page "/admin/software_families/details/{Id:long}" @page "/admin/software_families/edit/{Id:long}" @page "/admin/software_families/create" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs b/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs index e41fb8ab..c3635858 100644 --- a/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs +++ b/Marechai/Pages/Admin/Details/SoftwareFamily.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; diff --git a/Marechai/Pages/Admin/Details/SoftwareVariant.razor b/Marechai/Pages/Admin/Details/SoftwareVariant.razor index dfea9536..65a26ea8 100644 --- a/Marechai/Pages/Admin/Details/SoftwareVariant.razor +++ b/Marechai/Pages/Admin/Details/SoftwareVariant.razor @@ -28,6 +28,7 @@ @page "/admin/software_variants/details/{Id:long}" @page "/admin/software_variants/edit/{Id:long}" @page "/admin/software_variants/create" +@using Marechai.Data.Dtos @using Marechai.Database @using Marechai.Database.Models @inherits OwningComponentBase diff --git a/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs b/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs index 5545df66..59c35da3 100644 --- a/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs +++ b/Marechai/Pages/Admin/Details/SoftwareVariant.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; diff --git a/Marechai/Pages/Admin/Details/SoftwareVersion.razor b/Marechai/Pages/Admin/Details/SoftwareVersion.razor index 3c8b1745..4c9167c1 100644 --- a/Marechai/Pages/Admin/Details/SoftwareVersion.razor +++ b/Marechai/Pages/Admin/Details/SoftwareVersion.razor @@ -28,6 +28,7 @@ @page "/admin/software_versions/details/{Id:long}" @page "/admin/software_versions/edit/{Id:long}" @page "/admin/software_versions/create" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs b/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs index 4cf44cae..7e6882d4 100644 --- a/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs +++ b/Marechai/Pages/Admin/Details/SoftwareVersion.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; diff --git a/Marechai/Pages/Admin/Details/SoundSynth.razor b/Marechai/Pages/Admin/Details/SoundSynth.razor index 3bd532d2..6300d379 100644 --- a/Marechai/Pages/Admin/Details/SoundSynth.razor +++ b/Marechai/Pages/Admin/Details/SoundSynth.razor @@ -28,6 +28,7 @@ @page "/admin/sound_synths/details/{Id:int}" @page "/admin/sound_synths/edit/{Id:int}" @page "/admin/sound_synths/create" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/SoundSynth.razor.cs b/Marechai/Pages/Admin/Details/SoundSynth.razor.cs index 3422e3e5..17cc4f71 100644 --- a/Marechai/Pages/Admin/Details/SoundSynth.razor.cs +++ b/Marechai/Pages/Admin/Details/SoundSynth.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; diff --git a/Marechai/Pages/Admin/DocumentCompanies.razor b/Marechai/Pages/Admin/DocumentCompanies.razor index 29067c54..d18222f7 100644 --- a/Marechai/Pages/Admin/DocumentCompanies.razor +++ b/Marechai/Pages/Admin/DocumentCompanies.razor @@ -26,6 +26,7 @@ } @page "/admin/document_companies" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/DocumentCompanies.razor.cs b/Marechai/Pages/Admin/DocumentCompanies.razor.cs index c1d018f4..0bd41601 100644 --- a/Marechai/Pages/Admin/DocumentCompanies.razor.cs +++ b/Marechai/Pages/Admin/DocumentCompanies.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; diff --git a/Marechai/Pages/Admin/DocumentPeople.razor b/Marechai/Pages/Admin/DocumentPeople.razor index 8307ac02..a59dea74 100644 --- a/Marechai/Pages/Admin/DocumentPeople.razor +++ b/Marechai/Pages/Admin/DocumentPeople.razor @@ -26,6 +26,7 @@ } @page "/admin/document_people" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/DocumentPeople.razor.cs b/Marechai/Pages/Admin/DocumentPeople.razor.cs index 84b7fee5..1c9a7e3b 100644 --- a/Marechai/Pages/Admin/DocumentPeople.razor.cs +++ b/Marechai/Pages/Admin/DocumentPeople.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; diff --git a/Marechai/Pages/Admin/Documents.razor b/Marechai/Pages/Admin/Documents.razor index d45d075f..860b38ac 100644 --- a/Marechai/Pages/Admin/Documents.razor +++ b/Marechai/Pages/Admin/Documents.razor @@ -26,6 +26,7 @@ } @page "/admin/documents" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Documents.razor.cs b/Marechai/Pages/Admin/Documents.razor.cs index a590e3d8..1eba9db1 100644 --- a/Marechai/Pages/Admin/Documents.razor.cs +++ b/Marechai/Pages/Admin/Documents.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; diff --git a/Marechai/Pages/Admin/Dumps.razor b/Marechai/Pages/Admin/Dumps.razor index 958abd3c..9c658309 100644 --- a/Marechai/Pages/Admin/Dumps.razor +++ b/Marechai/Pages/Admin/Dumps.razor @@ -26,6 +26,7 @@ } @page "/admin/dumps" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Dumps.razor.cs b/Marechai/Pages/Admin/Dumps.razor.cs index 5e357c50..0afaf8c9 100644 --- a/Marechai/Pages/Admin/Dumps.razor.cs +++ b/Marechai/Pages/Admin/Dumps.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; diff --git a/Marechai/Pages/Admin/Gpus.razor b/Marechai/Pages/Admin/Gpus.razor index b6503eb2..2fcbd1e8 100644 --- a/Marechai/Pages/Admin/Gpus.razor +++ b/Marechai/Pages/Admin/Gpus.razor @@ -26,6 +26,7 @@ } @page "/admin/gpus" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Gpus.razor.cs b/Marechai/Pages/Admin/Gpus.razor.cs index e4d4177b..e4a55a52 100644 --- a/Marechai/Pages/Admin/Gpus.razor.cs +++ b/Marechai/Pages/Admin/Gpus.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; diff --git a/Marechai/Pages/Admin/MachineFamilies.razor b/Marechai/Pages/Admin/MachineFamilies.razor index 44a7d61b..3ac3c107 100644 --- a/Marechai/Pages/Admin/MachineFamilies.razor +++ b/Marechai/Pages/Admin/MachineFamilies.razor @@ -26,6 +26,7 @@ } @page "/admin/machine_families" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/MachineFamilies.razor.cs b/Marechai/Pages/Admin/MachineFamilies.razor.cs index e86e9602..9e649cc8 100644 --- a/Marechai/Pages/Admin/MachineFamilies.razor.cs +++ b/Marechai/Pages/Admin/MachineFamilies.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; diff --git a/Marechai/Pages/Admin/Machines.razor b/Marechai/Pages/Admin/Machines.razor index e2fa9ef0..3435d215 100644 --- a/Marechai/Pages/Admin/Machines.razor +++ b/Marechai/Pages/Admin/Machines.razor @@ -26,6 +26,7 @@ } @page "/admin/machines" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Machines.razor.cs b/Marechai/Pages/Admin/Machines.razor.cs index 679341b2..1a37c341 100644 --- a/Marechai/Pages/Admin/Machines.razor.cs +++ b/Marechai/Pages/Admin/Machines.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; diff --git a/Marechai/Pages/Admin/MagazineIssues.razor b/Marechai/Pages/Admin/MagazineIssues.razor index 1df2cd07..aab38968 100644 --- a/Marechai/Pages/Admin/MagazineIssues.razor +++ b/Marechai/Pages/Admin/MagazineIssues.razor @@ -26,6 +26,7 @@ } @page "/admin/magazine_issues" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/MagazineIssues.razor.cs b/Marechai/Pages/Admin/MagazineIssues.razor.cs index da824303..025e94d8 100644 --- a/Marechai/Pages/Admin/MagazineIssues.razor.cs +++ b/Marechai/Pages/Admin/MagazineIssues.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; diff --git a/Marechai/Pages/Admin/Magazines.razor b/Marechai/Pages/Admin/Magazines.razor index 2ad13ca0..5e183e11 100644 --- a/Marechai/Pages/Admin/Magazines.razor +++ b/Marechai/Pages/Admin/Magazines.razor @@ -26,6 +26,7 @@ } @page "/admin/magazines" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Magazines.razor.cs b/Marechai/Pages/Admin/Magazines.razor.cs index 2ec701a0..874c557f 100644 --- a/Marechai/Pages/Admin/Magazines.razor.cs +++ b/Marechai/Pages/Admin/Magazines.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; diff --git a/Marechai/Pages/Admin/News.razor b/Marechai/Pages/Admin/News.razor index 84e808d9..25515ca8 100644 --- a/Marechai/Pages/Admin/News.razor +++ b/Marechai/Pages/Admin/News.razor @@ -26,6 +26,7 @@ } @page "/admin/news" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/News.razor.cs b/Marechai/Pages/Admin/News.razor.cs index 125db1a2..4ce30231 100644 --- a/Marechai/Pages/Admin/News.razor.cs +++ b/Marechai/Pages/Admin/News.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; diff --git a/Marechai/Pages/Admin/People.razor b/Marechai/Pages/Admin/People.razor index 939f825c..8b6a9460 100644 --- a/Marechai/Pages/Admin/People.razor +++ b/Marechai/Pages/Admin/People.razor @@ -26,6 +26,7 @@ } @page "/admin/people" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/People.razor.cs b/Marechai/Pages/Admin/People.razor.cs index eb65b608..f33721dc 100644 --- a/Marechai/Pages/Admin/People.razor.cs +++ b/Marechai/Pages/Admin/People.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; diff --git a/Marechai/Pages/Admin/Processors.razor b/Marechai/Pages/Admin/Processors.razor index c372fcac..a691abbc 100644 --- a/Marechai/Pages/Admin/Processors.razor +++ b/Marechai/Pages/Admin/Processors.razor @@ -26,6 +26,7 @@ } @page "/admin/processors" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Processors.razor.cs b/Marechai/Pages/Admin/Processors.razor.cs index c0faa292..969f2cc9 100644 --- a/Marechai/Pages/Admin/Processors.razor.cs +++ b/Marechai/Pages/Admin/Processors.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; diff --git a/Marechai/Pages/Admin/Resolutions.razor b/Marechai/Pages/Admin/Resolutions.razor index 385eb6c3..e507c419 100644 --- a/Marechai/Pages/Admin/Resolutions.razor +++ b/Marechai/Pages/Admin/Resolutions.razor @@ -26,6 +26,7 @@ } @page "/admin/resolutions" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Resolutions.razor.cs b/Marechai/Pages/Admin/Resolutions.razor.cs index e782c317..9377720f 100644 --- a/Marechai/Pages/Admin/Resolutions.razor.cs +++ b/Marechai/Pages/Admin/Resolutions.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; diff --git a/Marechai/Pages/Admin/Screens.razor b/Marechai/Pages/Admin/Screens.razor index c7d86f51..489eed7a 100644 --- a/Marechai/Pages/Admin/Screens.razor +++ b/Marechai/Pages/Admin/Screens.razor @@ -26,6 +26,7 @@ } @page "/admin/screens" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Screens.razor.cs b/Marechai/Pages/Admin/Screens.razor.cs index 51541673..1ddbe012 100644 --- a/Marechai/Pages/Admin/Screens.razor.cs +++ b/Marechai/Pages/Admin/Screens.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; diff --git a/Marechai/Pages/Admin/SoftwareFamilies.razor b/Marechai/Pages/Admin/SoftwareFamilies.razor index 182d0b99..55feb5e5 100644 --- a/Marechai/Pages/Admin/SoftwareFamilies.razor +++ b/Marechai/Pages/Admin/SoftwareFamilies.razor @@ -26,6 +26,7 @@ } @page "/admin/software_families" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/SoftwareFamilies.razor.cs b/Marechai/Pages/Admin/SoftwareFamilies.razor.cs index 0ff7db4a..e1e2b982 100644 --- a/Marechai/Pages/Admin/SoftwareFamilies.razor.cs +++ b/Marechai/Pages/Admin/SoftwareFamilies.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; diff --git a/Marechai/Pages/Admin/SoftwareVariants.razor b/Marechai/Pages/Admin/SoftwareVariants.razor index c8f0188c..2600b331 100644 --- a/Marechai/Pages/Admin/SoftwareVariants.razor +++ b/Marechai/Pages/Admin/SoftwareVariants.razor @@ -26,6 +26,7 @@ } @page "/admin/software_variants" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/SoftwareVariants.razor.cs b/Marechai/Pages/Admin/SoftwareVariants.razor.cs index 18508164..328dd3d2 100644 --- a/Marechai/Pages/Admin/SoftwareVariants.razor.cs +++ b/Marechai/Pages/Admin/SoftwareVariants.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; diff --git a/Marechai/Pages/Admin/SoftwareVersions.razor b/Marechai/Pages/Admin/SoftwareVersions.razor index 2da5a622..0e9f420a 100644 --- a/Marechai/Pages/Admin/SoftwareVersions.razor +++ b/Marechai/Pages/Admin/SoftwareVersions.razor @@ -26,6 +26,7 @@ } @page "/admin/software_versions" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/SoftwareVersions.razor.cs b/Marechai/Pages/Admin/SoftwareVersions.razor.cs index a26307f3..225744de 100644 --- a/Marechai/Pages/Admin/SoftwareVersions.razor.cs +++ b/Marechai/Pages/Admin/SoftwareVersions.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; diff --git a/Marechai/Pages/Admin/SoundSynths.razor b/Marechai/Pages/Admin/SoundSynths.razor index 30e35cf9..a28562b5 100644 --- a/Marechai/Pages/Admin/SoundSynths.razor +++ b/Marechai/Pages/Admin/SoundSynths.razor @@ -26,6 +26,7 @@ } @page "/admin/sound_synths" +@using Marechai.Data.Dtos @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/SoundSynths.razor.cs b/Marechai/Pages/Admin/SoundSynths.razor.cs index 9d0856a6..a4a44965 100644 --- a/Marechai/Pages/Admin/SoundSynths.razor.cs +++ b/Marechai/Pages/Admin/SoundSynths.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; diff --git a/Marechai/Pages/Companies/Index.razor b/Marechai/Pages/Companies/Index.razor index 5c70dc03..282d96e6 100644 --- a/Marechai/Pages/Companies/Index.razor +++ b/Marechai/Pages/Companies/Index.razor @@ -28,6 +28,7 @@ @page "/companies" @page "/companies/country/{CountryId:int}" @page "/companies/{StartingCharacter}" +@using Marechai.Data.Dtos @inherits OwningComponentBase @inject IStringLocalizer L @inject IWebHostEnvironment Host diff --git a/Marechai/Pages/Companies/Index.razor.cs b/Marechai/Pages/Companies/Index.razor.cs index d0356f89..365f9077 100644 --- a/Marechai/Pages/Companies/Index.razor.cs +++ b/Marechai/Pages/Companies/Index.razor.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Marechai.ViewModels; +using Marechai.Data.Dtos; using Microsoft.AspNetCore.Components; namespace Marechai.Pages.Companies; diff --git a/Marechai/Pages/Companies/View.razor.cs b/Marechai/Pages/Companies/View.razor.cs index 948acb6c..2b6a335b 100644 --- a/Marechai/Pages/Companies/View.razor.cs +++ b/Marechai/Pages/Companies/View.razor.cs @@ -27,9 +27,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.AspNetCore.Components; namespace Marechai.Pages.Companies; diff --git a/Marechai/Pages/Computers/Search.razor b/Marechai/Pages/Computers/Search.razor index a43647e6..7966d460 100644 --- a/Marechai/Pages/Computers/Search.razor +++ b/Marechai/Pages/Computers/Search.razor @@ -28,6 +28,7 @@ @page "/computers/all" @page "/computers/year/{Year:int}" @page "/computers/{StartingCharacter}" +@using Marechai.Data.Dtos @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Computers/Search.razor.cs b/Marechai/Pages/Computers/Search.razor.cs index bc22737b..381a17e5 100644 --- a/Marechai/Pages/Computers/Search.razor.cs +++ b/Marechai/Pages/Computers/Search.razor.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Marechai.ViewModels; +using Marechai.Data.Dtos; using Microsoft.AspNetCore.Components; namespace Marechai.Pages.Computers; diff --git a/Marechai/Pages/Consoles/Search.razor b/Marechai/Pages/Consoles/Search.razor index 1bd86172..c816920d 100644 --- a/Marechai/Pages/Consoles/Search.razor +++ b/Marechai/Pages/Consoles/Search.razor @@ -28,6 +28,7 @@ @page "/consoles/all" @page "/consoles/year/{Year:int}" @page "/consoles/{StartingCharacter}" +@using Marechai.Data.Dtos @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Consoles/Search.razor.cs b/Marechai/Pages/Consoles/Search.razor.cs index 161d3211..8dee30eb 100644 --- a/Marechai/Pages/Consoles/Search.razor.cs +++ b/Marechai/Pages/Consoles/Search.razor.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Marechai.ViewModels; +using Marechai.Data.Dtos; using Microsoft.AspNetCore.Components; namespace Marechai.Pages.Consoles; diff --git a/Marechai/Pages/Home/Index.razor b/Marechai/Pages/Home/Index.razor index caadefda..c86942a2 100644 --- a/Marechai/Pages/Home/Index.razor +++ b/Marechai/Pages/Home/Index.razor @@ -25,6 +25,7 @@ *******************************************************************************/ } @page "/" +@using Marechai.Data.Dtos @inherits OwningComponentBase @inject IStringLocalizer L

@L["News"]

diff --git a/Marechai/Pages/Home/Index.razor.cs b/Marechai/Pages/Home/Index.razor.cs index 5cba7e28..85d5de46 100644 --- a/Marechai/Pages/Home/Index.razor.cs +++ b/Marechai/Pages/Home/Index.razor.cs @@ -24,7 +24,7 @@ *******************************************************************************/ using System.Collections.Generic; -using Marechai.ViewModels; +using Marechai.Data.Dtos; namespace Marechai.Pages.Home; diff --git a/Marechai/Pages/Machines/View.razor b/Marechai/Pages/Machines/View.razor index 39930ae6..fac6f3fe 100644 --- a/Marechai/Pages/Machines/View.razor +++ b/Marechai/Pages/Machines/View.razor @@ -27,6 +27,7 @@ } @page "/machine/{Id:int}" +@using Marechai.Data.Dtos @using Marechai.Database @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Machines/View.razor.cs b/Marechai/Pages/Machines/View.razor.cs index dd56255f..3a6fa8ea 100644 --- a/Marechai/Pages/Machines/View.razor.cs +++ b/Marechai/Pages/Machines/View.razor.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Marechai.ViewModels; +using Marechai.Data.Dtos; using Microsoft.AspNetCore.Components; namespace Marechai.Pages.Machines; diff --git a/Marechai/Services/BookScansService.cs b/Marechai/Services/BookScansService.cs index 067afd9e..dff2bd4a 100644 --- a/Marechai/Services/BookScansService.cs +++ b/Marechai/Services/BookScansService.cs @@ -27,8 +27,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/BooksByMachineFamilyService.cs b/Marechai/Services/BooksByMachineFamilyService.cs index ee8df1ef..76e46f70 100644 --- a/Marechai/Services/BooksByMachineFamilyService.cs +++ b/Marechai/Services/BooksByMachineFamilyService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/BooksByMachineService.cs b/Marechai/Services/BooksByMachineService.cs index 2c8250a3..32fdfe92 100644 --- a/Marechai/Services/BooksByMachineService.cs +++ b/Marechai/Services/BooksByMachineService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/BooksService.cs b/Marechai/Services/BooksService.cs index 5a85ce1a..7d250c5c 100644 --- a/Marechai/Services/BooksService.cs +++ b/Marechai/Services/BooksService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/CompaniesByBookService.cs b/Marechai/Services/CompaniesByBookService.cs index 371c3277..cbe9655c 100644 --- a/Marechai/Services/CompaniesByBookService.cs +++ b/Marechai/Services/CompaniesByBookService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/CompaniesByDocumentService.cs b/Marechai/Services/CompaniesByDocumentService.cs index 71038a74..8646c217 100644 --- a/Marechai/Services/CompaniesByDocumentService.cs +++ b/Marechai/Services/CompaniesByDocumentService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/CompaniesByMagazineService.cs b/Marechai/Services/CompaniesByMagazineService.cs index 24ad39a9..411e050f 100644 --- a/Marechai/Services/CompaniesByMagazineService.cs +++ b/Marechai/Services/CompaniesByMagazineService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/CompaniesBySoftwareFamilyService.cs b/Marechai/Services/CompaniesBySoftwareFamilyService.cs index a4fb6f0b..c5738cd6 100644 --- a/Marechai/Services/CompaniesBySoftwareFamilyService.cs +++ b/Marechai/Services/CompaniesBySoftwareFamilyService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/CompaniesBySoftwareVariantService.cs b/Marechai/Services/CompaniesBySoftwareVariantService.cs index 237d5006..697e4eab 100644 --- a/Marechai/Services/CompaniesBySoftwareVariantService.cs +++ b/Marechai/Services/CompaniesBySoftwareVariantService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/CompaniesBySoftwareVersionService.cs b/Marechai/Services/CompaniesBySoftwareVersionService.cs index e8b083eb..69cc1aa3 100644 --- a/Marechai/Services/CompaniesBySoftwareVersionService.cs +++ b/Marechai/Services/CompaniesBySoftwareVersionService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/CompaniesService.cs b/Marechai/Services/CompaniesService.cs index e66a8856..65cf4fb2 100644 --- a/Marechai/Services/CompaniesService.cs +++ b/Marechai/Services/CompaniesService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Localization; diff --git a/Marechai/Services/ComputersService.cs b/Marechai/Services/ComputersService.cs index f64767af..2cc59a30 100644 --- a/Marechai/Services/ComputersService.cs +++ b/Marechai/Services/ComputersService.cs @@ -26,9 +26,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/ConsolesService.cs b/Marechai/Services/ConsolesService.cs index 1424b504..2f57c38f 100644 --- a/Marechai/Services/ConsolesService.cs +++ b/Marechai/Services/ConsolesService.cs @@ -26,9 +26,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/CurrencyInflationService.cs b/Marechai/Services/CurrencyInflationService.cs index 2c689dec..8ff31caa 100644 --- a/Marechai/Services/CurrencyInflationService.cs +++ b/Marechai/Services/CurrencyInflationService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/CurrencyPeggingService.cs b/Marechai/Services/CurrencyPeggingService.cs index 3050ce2a..f6c6916d 100644 --- a/Marechai/Services/CurrencyPeggingService.cs +++ b/Marechai/Services/CurrencyPeggingService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/DocumentCompaniesService.cs b/Marechai/Services/DocumentCompaniesService.cs index 67800056..5da96380 100644 --- a/Marechai/Services/DocumentCompaniesService.cs +++ b/Marechai/Services/DocumentCompaniesService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/DocumentPeopleService.cs b/Marechai/Services/DocumentPeopleService.cs index 82bd3fa9..d1768489 100644 --- a/Marechai/Services/DocumentPeopleService.cs +++ b/Marechai/Services/DocumentPeopleService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/DocumentRolesService.cs b/Marechai/Services/DocumentRolesService.cs index 6cff6acc..9b0c439b 100644 --- a/Marechai/Services/DocumentRolesService.cs +++ b/Marechai/Services/DocumentRolesService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/DocumentScansService.cs b/Marechai/Services/DocumentScansService.cs index 12147575..b17ce23e 100644 --- a/Marechai/Services/DocumentScansService.cs +++ b/Marechai/Services/DocumentScansService.cs @@ -27,8 +27,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/DocumentsByMachineFamilyService.cs b/Marechai/Services/DocumentsByMachineFamilyService.cs index 72f1d709..d1b7a551 100644 --- a/Marechai/Services/DocumentsByMachineFamilyService.cs +++ b/Marechai/Services/DocumentsByMachineFamilyService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/DocumentsByMachineService.cs b/Marechai/Services/DocumentsByMachineService.cs index de144706..60a2b1a2 100644 --- a/Marechai/Services/DocumentsByMachineService.cs +++ b/Marechai/Services/DocumentsByMachineService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/DocumentsService.cs b/Marechai/Services/DocumentsService.cs index 67798718..48855c3e 100644 --- a/Marechai/Services/DocumentsService.cs +++ b/Marechai/Services/DocumentsService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/DumpsService.cs b/Marechai/Services/DumpsService.cs index 1f8f6159..c016be90 100644 --- a/Marechai/Services/DumpsService.cs +++ b/Marechai/Services/DumpsService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/GpusByMachineService.cs b/Marechai/Services/GpusByMachineService.cs index f5a56f24..17915afb 100644 --- a/Marechai/Services/GpusByMachineService.cs +++ b/Marechai/Services/GpusByMachineService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/GpusService.cs b/Marechai/Services/GpusService.cs index b805aa33..9aca1f83 100644 --- a/Marechai/Services/GpusService.cs +++ b/Marechai/Services/GpusService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/InstructionSetExtensionsByProcessorService.cs b/Marechai/Services/InstructionSetExtensionsByProcessorService.cs index aa0d2ffc..fc26e88d 100644 --- a/Marechai/Services/InstructionSetExtensionsByProcessorService.cs +++ b/Marechai/Services/InstructionSetExtensionsByProcessorService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/MachineFamiliesService.cs b/Marechai/Services/MachineFamiliesService.cs index 5705db22..7288d162 100644 --- a/Marechai/Services/MachineFamiliesService.cs +++ b/Marechai/Services/MachineFamiliesService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/MachinePhotosService.cs b/Marechai/Services/MachinePhotosService.cs index e34489c6..024e440a 100644 --- a/Marechai/Services/MachinePhotosService.cs +++ b/Marechai/Services/MachinePhotosService.cs @@ -27,8 +27,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/MachinesService.cs b/Marechai/Services/MachinesService.cs index 3ddcced5..b89df449 100644 --- a/Marechai/Services/MachinesService.cs +++ b/Marechai/Services/MachinesService.cs @@ -27,9 +27,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Localization; diff --git a/Marechai/Services/MagazineIssuesService.cs b/Marechai/Services/MagazineIssuesService.cs index ee74237b..527a0927 100644 --- a/Marechai/Services/MagazineIssuesService.cs +++ b/Marechai/Services/MagazineIssuesService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/MagazineScansService.cs b/Marechai/Services/MagazineScansService.cs index 25c3f4ff..38f24f1f 100644 --- a/Marechai/Services/MagazineScansService.cs +++ b/Marechai/Services/MagazineScansService.cs @@ -27,8 +27,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/MagazinesByMachineFamilyService.cs b/Marechai/Services/MagazinesByMachineFamilyService.cs index 7d91caf3..8b67fecc 100644 --- a/Marechai/Services/MagazinesByMachineFamilyService.cs +++ b/Marechai/Services/MagazinesByMachineFamilyService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/MagazinesByMachineService.cs b/Marechai/Services/MagazinesByMachineService.cs index 38c5d3ae..d67a809e 100644 --- a/Marechai/Services/MagazinesByMachineService.cs +++ b/Marechai/Services/MagazinesByMachineService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/MagazinesService.cs b/Marechai/Services/MagazinesService.cs index d23d398d..fd43caab 100644 --- a/Marechai/Services/MagazinesService.cs +++ b/Marechai/Services/MagazinesService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/MediaService.cs b/Marechai/Services/MediaService.cs index 93dcba34..2e503612 100644 --- a/Marechai/Services/MediaService.cs +++ b/Marechai/Services/MediaService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/MemoriesByMachineService.cs b/Marechai/Services/MemoriesByMachineService.cs index 82f6c51a..187a1e69 100644 --- a/Marechai/Services/MemoriesByMachineService.cs +++ b/Marechai/Services/MemoriesByMachineService.cs @@ -26,9 +26,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/NewsService.cs b/Marechai/Services/NewsService.cs index ce5c122e..f4637a2e 100644 --- a/Marechai/Services/NewsService.cs +++ b/Marechai/Services/NewsService.cs @@ -26,9 +26,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Localization; diff --git a/Marechai/Services/PeopleByBookService.cs b/Marechai/Services/PeopleByBookService.cs index 3ce36f51..596ae2a1 100644 --- a/Marechai/Services/PeopleByBookService.cs +++ b/Marechai/Services/PeopleByBookService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/PeopleByDocumentService.cs b/Marechai/Services/PeopleByDocumentService.cs index 2b855160..0b2ed444 100644 --- a/Marechai/Services/PeopleByDocumentService.cs +++ b/Marechai/Services/PeopleByDocumentService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/PeopleByMagazineService.cs b/Marechai/Services/PeopleByMagazineService.cs index 4d15b319..09cf71c4 100644 --- a/Marechai/Services/PeopleByMagazineService.cs +++ b/Marechai/Services/PeopleByMagazineService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/PeopleService.cs b/Marechai/Services/PeopleService.cs index 2bc7ac33..612ce390 100644 --- a/Marechai/Services/PeopleService.cs +++ b/Marechai/Services/PeopleService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/ProcessorsByMachineService.cs b/Marechai/Services/ProcessorsByMachineService.cs index 6b0b97ab..ce1b02bf 100644 --- a/Marechai/Services/ProcessorsByMachineService.cs +++ b/Marechai/Services/ProcessorsByMachineService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/ProcessorsService.cs b/Marechai/Services/ProcessorsService.cs index babcb9b4..7c7923cb 100644 --- a/Marechai/Services/ProcessorsService.cs +++ b/Marechai/Services/ProcessorsService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/ResolutionsByGpuService.cs b/Marechai/Services/ResolutionsByGpuService.cs index 456d0ff4..94ec6d66 100644 --- a/Marechai/Services/ResolutionsByGpuService.cs +++ b/Marechai/Services/ResolutionsByGpuService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/ResolutionsByScreenService.cs b/Marechai/Services/ResolutionsByScreenService.cs index 0b87b2d0..92bd87ae 100644 --- a/Marechai/Services/ResolutionsByScreenService.cs +++ b/Marechai/Services/ResolutionsByScreenService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/ResolutionsService.cs b/Marechai/Services/ResolutionsService.cs index 837c6161..c0a4cdf8 100644 --- a/Marechai/Services/ResolutionsService.cs +++ b/Marechai/Services/ResolutionsService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/ScreensByMachineService.cs b/Marechai/Services/ScreensByMachineService.cs index a2b51a31..f3a774f1 100644 --- a/Marechai/Services/ScreensByMachineService.cs +++ b/Marechai/Services/ScreensByMachineService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/ScreensService.cs b/Marechai/Services/ScreensService.cs index 5115d94c..07a008ae 100644 --- a/Marechai/Services/ScreensService.cs +++ b/Marechai/Services/ScreensService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/SoftwareFamiliesService.cs b/Marechai/Services/SoftwareFamiliesService.cs index 0b391358..a606975c 100644 --- a/Marechai/Services/SoftwareFamiliesService.cs +++ b/Marechai/Services/SoftwareFamiliesService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/SoftwareVariantsService.cs b/Marechai/Services/SoftwareVariantsService.cs index f903c27f..a4484c6b 100644 --- a/Marechai/Services/SoftwareVariantsService.cs +++ b/Marechai/Services/SoftwareVariantsService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/SoftwareVersionsService.cs b/Marechai/Services/SoftwareVersionsService.cs index 64630240..496a8d9d 100644 --- a/Marechai/Services/SoftwareVersionsService.cs +++ b/Marechai/Services/SoftwareVersionsService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/SoundSynthsByMachineService.cs b/Marechai/Services/SoundSynthsByMachineService.cs index 2e04ac81..d60b3224 100644 --- a/Marechai/Services/SoundSynthsByMachineService.cs +++ b/Marechai/Services/SoundSynthsByMachineService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/SoundSynthsService.cs b/Marechai/Services/SoundSynthsService.cs index 8aab3200..c18b63d2 100644 --- a/Marechai/Services/SoundSynthsService.cs +++ b/Marechai/Services/SoundSynthsService.cs @@ -26,8 +26,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/Services/StorageByMachineService.cs b/Marechai/Services/StorageByMachineService.cs index c2d512d6..3602f962 100644 --- a/Marechai/Services/StorageByMachineService.cs +++ b/Marechai/Services/StorageByMachineService.cs @@ -26,9 +26,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Marechai.Data.Dtos; using Marechai.Database; using Marechai.Database.Models; -using Marechai.ViewModels; using Microsoft.EntityFrameworkCore; namespace Marechai.Services; diff --git a/Marechai/_Imports.razor b/Marechai/_Imports.razor index 49c105a0..5def91e3 100644 --- a/Marechai/_Imports.razor +++ b/Marechai/_Imports.razor @@ -10,7 +10,6 @@ @using Marechai @using Marechai.Shared @using Marechai.Services -@using Marechai.ViewModels @using Microsoft.Extensions.Localization @using System.IO @using Blazorise