From 71bd3a8d6aa6acd4d683d91a1c9e0a34ab55dfbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Vesel=C3=BD?= Date: Fri, 3 Apr 2020 23:18:33 +0200 Subject: [PATCH] Namespace fix (#335) --- Oqtane.Client/App.razor | 3 ++- .../Modules/Admin/Dashboard/Index.razor | 1 + Oqtane.Client/Modules/Admin/Error/Index.razor | 1 + Oqtane.Client/Modules/Admin/Files/Add.razor | 1 + Oqtane.Client/Modules/Admin/Files/Edit.razor | 1 + Oqtane.Client/Modules/Admin/Files/Index.razor | 1 + Oqtane.Client/Modules/Admin/Jobs/Add.razor | 1 + Oqtane.Client/Modules/Admin/Jobs/Edit.razor | 1 + Oqtane.Client/Modules/Admin/Jobs/Index.razor | 1 + Oqtane.Client/Modules/Admin/Jobs/Log.razor | 1 + Oqtane.Client/Modules/Admin/Login/Index.razor | 1 + Oqtane.Client/Modules/Admin/Logs/Detail.razor | 1 + Oqtane.Client/Modules/Admin/Logs/Index.razor | 1 + .../Modules/Admin/ModuleCreator/Index.razor | 1 + .../Modules/Admin/ModuleDefinitions/Add.razor | 1 + .../Admin/ModuleDefinitions/Edit.razor | 1 + .../Admin/ModuleDefinitions/Index.razor | 1 + .../Modules/Admin/Modules/Export.razor | 1 + .../Modules/Admin/Modules/Import.razor | 1 + .../Modules/Admin/Modules/Settings.razor | 1 + Oqtane.Client/Modules/Admin/Pages/Add.razor | 1 + Oqtane.Client/Modules/Admin/Pages/Edit.razor | 1 + Oqtane.Client/Modules/Admin/Pages/Index.razor | 1 + .../Modules/Admin/Profiles/Edit.razor | 1 + .../Modules/Admin/Profiles/Index.razor | 1 + .../Modules/Admin/RecycleBin/Index.razor | 1 + .../Modules/Admin/Register/Index.razor | 1 + Oqtane.Client/Modules/Admin/Reset/Index.razor | 1 + Oqtane.Client/Modules/Admin/Roles/Add.razor | 1 + Oqtane.Client/Modules/Admin/Roles/Edit.razor | 1 + Oqtane.Client/Modules/Admin/Roles/Index.razor | 1 + Oqtane.Client/Modules/Admin/Site/Index.razor | 1 + Oqtane.Client/Modules/Admin/Sites/Add.razor | 1 + Oqtane.Client/Modules/Admin/Sites/Edit.razor | 1 + Oqtane.Client/Modules/Admin/Sites/Index.razor | 1 + Oqtane.Client/Modules/Admin/Sql/Index.razor | 1 + Oqtane.Client/Modules/Admin/Tenants/Add.razor | 1 + .../Modules/Admin/Tenants/Edit.razor | 1 + .../Modules/Admin/Tenants/Index.razor | 1 + Oqtane.Client/Modules/Admin/Themes/Add.razor | 1 + .../Modules/Admin/Themes/Index.razor | 1 + .../Modules/Admin/Upgrade/Index.razor | 1 + .../Modules/Admin/UserProfile/Add.razor | 1 + .../Modules/Admin/UserProfile/Index.razor | 1 + .../Modules/Admin/UserProfile/View.razor | 1 + Oqtane.Client/Modules/Admin/Users/Add.razor | 1 + Oqtane.Client/Modules/Admin/Users/Edit.razor | 1 + Oqtane.Client/Modules/Admin/Users/Index.razor | 1 + Oqtane.Client/Modules/Admin/Users/Roles.razor | 1 + .../Modules/Controls/ActionDialog.razor | 1 + .../Modules/Controls/ActionLink.razor | 1 + Oqtane.Client/Modules/HtmlText/Edit.razor | 4 ++-- Oqtane.Client/Modules/HtmlText/Index.razor | 1 - .../HtmlText/Services/HtmlTextService.cs | 2 +- .../HtmlText/Services/IHtmlTextService.cs | 2 +- Oqtane.Client/Modules/IModuleControl.cs | 3 ++- Oqtane.Client/Modules/ModuleBase.cs | 1 + Oqtane.Client/Modules/Weather/Index.razor | 3 ++- .../Modules/Weather/Models/WeatherForecast.cs | 2 +- .../Services/IWeatherForecastService.cs | 1 + .../Services/WeatherForecastService.cs | 1 + Oqtane.Client/Program.cs | 23 +++++++++++-------- Oqtane.Client/Services/AliasService.cs | 1 + Oqtane.Client/Services/FileService.cs | 1 + Oqtane.Client/Services/FolderService.cs | 1 + Oqtane.Client/Services/InstallationService.cs | 1 + .../Services/Interfaces/IAliasService.cs | 6 ++--- .../Services/Interfaces/IFileService.cs | 6 ++--- .../Services/Interfaces/IFolderService.cs | 6 ++--- .../Interfaces/IInstallationService.cs | 6 ++--- .../Services/Interfaces/IJobLogService.cs | 6 ++--- .../Services/Interfaces/IJobService.cs | 6 ++--- .../Services/Interfaces/ILogService.cs | 8 +++---- .../Interfaces/IModuleDefinitionService.cs | 8 +++---- .../Services/Interfaces/IModuleService.cs | 6 ++--- .../Interfaces/INotificationService.cs | 6 ++--- .../Services/Interfaces/IPackageService.cs | 6 ++--- .../Services/Interfaces/IPageModuleService.cs | 6 ++--- .../Services/Interfaces/IPageService.cs | 6 ++--- .../Services/Interfaces/IProfileService.cs | 6 ++--- .../Services/Interfaces/IRoleService.cs | 6 ++--- .../Services/Interfaces/ISettingService.cs | 6 ++--- .../Services/Interfaces/ISiteService.cs | 6 ++--- .../Interfaces/ISiteTemplateService.cs | 6 ++--- .../Services/Interfaces/ISqlService.cs | 6 ++--- .../Services/Interfaces/ITenantService.cs | 6 ++--- .../Services/Interfaces/IThemeService.cs | 6 ++--- .../Services/Interfaces/IUserRoleService.cs | 6 ++--- .../Services/Interfaces/IUserService.cs | 6 ++--- Oqtane.Client/Services/JobLogService.cs | 1 + Oqtane.Client/Services/JobService.cs | 1 + Oqtane.Client/Services/LogService.cs | 1 + .../Services/ModuleDefinitionService.cs | 1 + Oqtane.Client/Services/ModuleService.cs | 1 + Oqtane.Client/Services/NotificationService.cs | 1 + Oqtane.Client/Services/PackageService.cs | 1 + Oqtane.Client/Services/PageModuleService.cs | 1 + Oqtane.Client/Services/PageService.cs | 1 + Oqtane.Client/Services/ProfileService.cs | 1 + Oqtane.Client/Services/RoleService.cs | 1 + Oqtane.Client/Services/SettingService.cs | 1 + Oqtane.Client/Services/SiteService.cs | 1 + Oqtane.Client/Services/SiteTemplateService.cs | 1 + Oqtane.Client/Services/SqlService.cs | 1 + Oqtane.Client/Services/TenantService.cs | 1 + Oqtane.Client/Services/ThemeService.cs | 1 + Oqtane.Client/Services/UserRoleService.cs | 1 + Oqtane.Client/Services/UserService.cs | 1 + Oqtane.Client/UI/Pane.razor | 3 ++- Oqtane.Client/_Imports.razor | 3 ++- Oqtane.Server/Controllers/AliasController.cs | 1 + Oqtane.Server/Controllers/FileController.cs | 1 + Oqtane.Server/Controllers/FolderController.cs | 1 + Oqtane.Server/Controllers/JobController.cs | 1 + Oqtane.Server/Controllers/JobLogController.cs | 1 + Oqtane.Server/Controllers/LogController.cs | 1 + Oqtane.Server/Controllers/ModuleController.cs | 1 + .../Controllers/ModuleDefinitionController.cs | 2 ++ .../Controllers/NotificationController.cs | 1 + Oqtane.Server/Controllers/PageController.cs | 1 + .../Controllers/PageModuleController.cs | 1 + .../Controllers/ProfileController.cs | 1 + Oqtane.Server/Controllers/RoleController.cs | 1 + .../Controllers/SettingController.cs | 1 + Oqtane.Server/Controllers/SiteController.cs | 1 + .../Controllers/SiteTemplateController.cs | 1 + Oqtane.Server/Controllers/SqlController.cs | 1 + Oqtane.Server/Controllers/TenantController.cs | 1 + Oqtane.Server/Controllers/ThemeController.cs | 1 + Oqtane.Server/Controllers/UserController.cs | 1 + .../Controllers/UserRoleController.cs | 1 + .../OqtaneServiceCollectionExtensions.cs | 4 ++++ .../Infrastructure/DatabaseManager.cs | 2 ++ .../Infrastructure/Jobs/HostedServiceBase.cs | 4 ++-- .../Infrastructure/Jobs/NotificationJob.cs | 4 ++-- Oqtane.Server/Infrastructure/LogManager.cs | 1 + .../SiteTemplates/DefaultSiteTemplate.cs | 10 ++++---- Oqtane.Server/Infrastructure/SyncManager.cs | 1 + .../Controllers/HtmlTextController.cs | 2 +- .../HtmlText/Manager/HtmlTextManager.cs | 2 +- .../HtmlText/Repository/HtmlTextContext.cs | 6 ++++- .../HtmlText/Repository/HtmlTextRepository.cs | 4 +++- .../Repository/IHtmlTextRepository.cs | 2 +- Oqtane.Server/Pages/Login.cshtml | 2 +- Oqtane.Server/Program.cs | 11 ++++----- Oqtane.Server/Repository/AliasRepository.cs | 2 ++ .../Repository/Context/DBContextBase.cs | 4 +++- .../Repository/Context/InstallationContext.cs | 5 ++-- .../Repository/Context/MasterDBContext.cs | 3 ++- .../Repository/Context/TenantDBContext.cs | 3 ++- Oqtane.Server/Repository/FileRepository.cs | 2 ++ Oqtane.Server/Repository/FolderRepository.cs | 2 ++ .../Repository/Interfaces/IAliasRepository.cs | 2 +- .../Repository/Interfaces/IFileRepository.cs | 2 +- .../Interfaces/IFolderRepository.cs | 2 +- .../Interfaces/IJobLogRepository.cs | 2 +- .../Repository/Interfaces/IJobRepository.cs | 2 +- .../Repository/Interfaces/ILogRepository.cs | 2 +- .../Interfaces/IModuleDefinitionRepository.cs | 2 +- .../Interfaces/IModuleRepository.cs | 2 +- .../Interfaces/INotificationRepository.cs | 2 +- .../Interfaces/IPageModuleRepository.cs | 2 +- .../Repository/Interfaces/IPageRepository.cs | 2 +- .../Interfaces/IPermissionRepository.cs | 2 +- .../Interfaces/IProfileRepository.cs | 2 +- .../Repository/Interfaces/IRoleRepository.cs | 2 +- .../Interfaces/ISettingRepository.cs | 2 +- .../Repository/Interfaces/ISiteRepository.cs | 2 +- .../Interfaces/ISiteTemplateRepository.cs | 2 +- .../Repository/Interfaces/ISqlRepository.cs | 2 +- .../Interfaces/ITenantRepository.cs | 2 +- .../Repository/Interfaces/ITenantResolver.cs | 2 +- .../Repository/Interfaces/IThemeRepository.cs | 2 +- .../Repository/Interfaces/IUserRepository.cs | 2 +- .../Interfaces/IUserRoleRepository.cs | 2 +- Oqtane.Server/Repository/JobLogRepository.cs | 2 ++ Oqtane.Server/Repository/JobRepository.cs | 2 ++ Oqtane.Server/Repository/LogRepository.cs | 2 ++ .../Repository/ModuleDefinitionRepository.cs | 2 ++ Oqtane.Server/Repository/ModuleRepository.cs | 2 ++ .../Repository/NotificationRepository.cs | 2 ++ .../Repository/PageModuleRepository.cs | 2 ++ Oqtane.Server/Repository/PageRepository.cs | 2 ++ .../Repository/PermissionRepository.cs | 2 ++ Oqtane.Server/Repository/ProfileRepository.cs | 2 ++ Oqtane.Server/Repository/RoleRepository.cs | 2 ++ Oqtane.Server/Repository/SettingRepository.cs | 2 ++ Oqtane.Server/Repository/SiteRepository.cs | 2 ++ .../Repository/SiteTemplateRepository.cs | 1 + Oqtane.Server/Repository/SqlRepository.cs | 1 + Oqtane.Server/Repository/TenantRepository.cs | 2 ++ Oqtane.Server/Repository/TenantResolver.cs | 1 + Oqtane.Server/Repository/ThemeRepository.cs | 1 + Oqtane.Server/Repository/UserRepository.cs | 2 ++ .../Repository/UserRoleRepository.cs | 2 ++ .../Security/ClaimsPrincipalFactory.cs | 1 + Oqtane.Server/Security/UserPermissions.cs | 1 + Oqtane.Server/Startup.cs | 3 +++ Oqtane.Server/appsettings.json | 4 ++-- Oqtane.Shared/Enums/LogLevel.cs | 2 +- Oqtane.Shared/Enums/SecurityAccessLevel.cs | 2 +- Oqtane.Shared/Interfaces/IAuditable.cs | 2 +- Oqtane.Shared/Interfaces/IDeletable.cs | 2 +- Oqtane.Shared/Interfaces/IService.cs | 2 +- Oqtane.Shared/Models/Alias.cs | 1 + Oqtane.Shared/Models/File.cs | 1 + Oqtane.Shared/Models/Folder.cs | 1 + Oqtane.Shared/Models/Job.cs | 1 + Oqtane.Shared/Models/Module.cs | 2 ++ Oqtane.Shared/Models/ModuleDefinition.cs | 1 + Oqtane.Shared/Models/Notification.cs | 1 + Oqtane.Shared/Models/Page.cs | 1 + Oqtane.Shared/Models/PageModule.cs | 1 + Oqtane.Shared/Models/Permission.cs | 1 + Oqtane.Shared/Models/Profile.cs | 1 + Oqtane.Shared/Models/Role.cs | 1 + Oqtane.Shared/Models/Setting.cs | 1 + Oqtane.Shared/Models/Site.cs | 1 + Oqtane.Shared/Models/Tenant.cs | 1 + Oqtane.Shared/Models/User.cs | 1 + Oqtane.Shared/Models/UserRole.cs | 1 + .../Modules/Models/HtmlText/HtmlTextInfo.cs | 5 ++-- Oqtane.Upgrade/Program.cs | 2 +- 223 files changed, 338 insertions(+), 153 deletions(-) diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor index 3d13adff..00ab86b3 100644 --- a/Oqtane.Client/App.razor +++ b/Oqtane.Client/App.razor @@ -1,4 +1,5 @@ -@inject IInstallationService InstallationService +@using Oqtane.Services.Interfaces +@inject IInstallationService InstallationService @if (_initialized) { diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor index 7e3004fb..bb83de5e 100644 --- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor +++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Dashboard +@using Oqtane.Enums @inherits ModuleBase @inject IPageService PageService @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Error/Index.razor b/Oqtane.Client/Modules/Admin/Error/Index.razor index 9e0df574..43a4c9a0 100644 --- a/Oqtane.Client/Modules/Admin/Error/Index.razor +++ b/Oqtane.Client/Modules/Admin/Error/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Error +@using Oqtane.Enums @inherits ModuleBase @inject IModuleService ModuleService diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor index 182f08f7..b8daae66 100644 --- a/Oqtane.Client/Modules/Admin/Files/Add.razor +++ b/Oqtane.Client/Modules/Admin/Files/Add.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Files +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFileService FileService diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor index 167c0b3c..e7e49e7c 100644 --- a/Oqtane.Client/Modules/Admin/Files/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Files +@using Oqtane.Enums @inherits ModuleBase @inject IFolderService FolderService @inject NavigationManager NavigationManager diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor index d92e0994..610d9d99 100644 --- a/Oqtane.Client/Modules/Admin/Files/Index.razor +++ b/Oqtane.Client/Modules/Admin/Files/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Files +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFolderService FolderService diff --git a/Oqtane.Client/Modules/Admin/Jobs/Add.razor b/Oqtane.Client/Modules/Admin/Jobs/Add.razor index 4775f8a0..ee2b440a 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Add.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Add.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Jobs +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IJobService JobService diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor index 5339a226..d4a2f624 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Jobs +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IJobService JobService diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor index f15c50df..9ccab6e7 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Jobs +@using Oqtane.Enums @inherits ModuleBase @inject IJobService JobService diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor index 9efc1486..fc466aa5 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Jobs +@using Oqtane.Enums @inherits ModuleBase @inject IJobLogService JobLogService diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor index 098ebcb4..70922950 100644 --- a/Oqtane.Client/Modules/Admin/Login/Index.razor +++ b/Oqtane.Client/Modules/Admin/Login/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Login +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IJSRuntime JsRuntime diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor index 2f9c054d..1d4fd33c 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor @@ -1,5 +1,6 @@ @namespace Oqtane.Modules.Admin.Logs @using System.Globalization +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ILogService LogService diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor index e87450bd..b51a4bc1 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Logs +@using Oqtane.Enums @inherits ModuleBase @inject ILogService LogService diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor index b1d72ce0..7dcb0ee7 100644 --- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.ModuleCreator +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IModuleDefinitionService ModuleDefinitionService diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor index a342297b..6158f7b4 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.ModuleDefinitions +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFileService FileService diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index 732d7d5c..f9fb24a9 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.ModuleDefinitions +@using Oqtane.Enums @inherits ModuleBase @inject IModuleDefinitionService ModuleDefinitionService @inject NavigationManager NavigationManager diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index d348ddb4..06793559 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.ModuleDefinitions +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IModuleDefinitionService ModuleDefinitionService diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor index 77c0ba53..b797755c 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Export.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Export.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Modules +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IModuleService ModuleService diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor index 2a4d3aa0..95d99999 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Import.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Import.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Modules +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IModuleService ModuleService diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor index a98d015e..ee10e2cd 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Modules +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IThemeService ThemeService diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index 483cc107..e1ec4aad 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Pages +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IPageService PageService diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index 2b13870e..6624c9fe 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Pages +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IPageService PageService diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor index b53f3811..005f85ea 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Index.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Pages +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IPageService PageService diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor index bcfd2d3f..a3c7fb4b 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Profiles +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IProfileService ProfileService diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor index e3cefdaa..dedcc2c3 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Profiles +@using Oqtane.Enums @inherits ModuleBase @inject IProfileService ProfileService diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor index d3955307..d10240ae 100644 --- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor +++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.RecycleBin +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IPageModuleService PageModuleService diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor index f358d905..ba85ef58 100644 --- a/Oqtane.Client/Modules/Admin/Register/Index.razor +++ b/Oqtane.Client/Modules/Admin/Register/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Register +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Reset/Index.razor b/Oqtane.Client/Modules/Admin/Reset/Index.razor index b6e4eb66..8b309a16 100644 --- a/Oqtane.Client/Modules/Admin/Reset/Index.razor +++ b/Oqtane.Client/Modules/Admin/Reset/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Reset +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor index 34e93e2d..7637d0b1 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Add.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Roles +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IRoleService RoleService diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor index 4b0dd0e0..e82050e6 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Roles +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IRoleService RoleService diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor index 0acfa614..9e329c0c 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Roles +@using Oqtane.Enums @inherits ModuleBase @inject IRoleService RoleService diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index b20ccd1d..b734013a 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Site +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ISiteService SiteService diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index 0bb51513..f91abfe9 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Sites +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Sites/Edit.razor b/Oqtane.Client/Modules/Admin/Sites/Edit.razor index 838615ee..414fc10b 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Edit.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Sites +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ISiteService SiteService diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor index 978f7ad3..00c5dabc 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Sites +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IAliasService AliasService diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor index 4899301c..54bab14d 100644 --- a/Oqtane.Client/Modules/Admin/Sql/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Sql +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Tenants/Add.razor b/Oqtane.Client/Modules/Admin/Tenants/Add.razor index 962b9e4c..9b8020c7 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Add.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Add.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Tenants +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor index 56f3fe20..8d24fec6 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Tenants +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor index 018c1f68..1c333833 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Tenants +@using Oqtane.Enums @inherits ModuleBase @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index d78ab5e5..9c1ee9bf 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Themes +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFileService FileService diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor index 4a3113b6..287b46f1 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Themes +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IThemeService ThemeService diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor index 5d55b6aa..ea80e420 100644 --- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor +++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Upgrade +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFileService FileService diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor index 6cf41e3f..967a62b4 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.UserProfile +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserRoleService UserRoleService diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor index 6711617a..38ee0ac8 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.UserProfile +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor index 07140f63..61a9920c 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.UserProfile +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserRoleService UserRoleService diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor index 561185f6..a339b3df 100644 --- a/Oqtane.Client/Modules/Admin/Users/Add.razor +++ b/Oqtane.Client/Modules/Admin/Users/Add.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Users +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor index a0b8370b..ba041d7d 100644 --- a/Oqtane.Client/Modules/Admin/Users/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Users +@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index a9d4366f..0abeb865 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Users +@using Oqtane.Enums @inherits ModuleBase @inject IUserRoleService UserRoleService @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index fa84b46d..22453aa0 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Users +@using Oqtane.Enums @inherits ModuleBase @inject IRoleService RoleService @inject IUserRoleService UserRoleService diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor index 08b2d77d..310abc06 100644 --- a/Oqtane.Client/Modules/Controls/ActionDialog.razor +++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Controls +@using Oqtane.Enums @inherits ModuleBase @if (_visible) diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor index cf588579..887f1b2f 100644 --- a/Oqtane.Client/Modules/Controls/ActionLink.razor +++ b/Oqtane.Client/Modules/Controls/ActionLink.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Controls +@using Oqtane.Enums @inherits ModuleBase @inject IUserService UserService diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor index 41c55192..e90603d9 100644 --- a/Oqtane.Client/Modules/HtmlText/Edit.razor +++ b/Oqtane.Client/Modules/HtmlText/Edit.razor @@ -1,6 +1,6 @@ @using Oqtane.Modules.HtmlText.Services -@using Oqtane.Modules.HtmlText.Models -@using Oqtane.Modules.Controls +@using Oqtane.Modules.Models.HtmlText +@using Oqtane.Enums @namespace Oqtane.Modules.HtmlText @inherits ModuleBase @inject NavigationManager NavigationManager diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor index 47bf0b61..3e5c35d6 100644 --- a/Oqtane.Client/Modules/HtmlText/Index.razor +++ b/Oqtane.Client/Modules/HtmlText/Index.razor @@ -1,5 +1,4 @@ @using Oqtane.Modules.HtmlText.Services -@using Oqtane.Modules.HtmlText.Models @namespace Oqtane.Modules.HtmlText @inherits ModuleBase @inject NavigationManager NavigationManager diff --git a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs index 1b3a7834..cfbe8a7f 100644 --- a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs +++ b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using Oqtane.Modules.HtmlText.Models; +using Oqtane.Modules.Models.HtmlText; using Oqtane.Services; using Oqtane.Shared; diff --git a/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs index 6ce1d646..246612a4 100644 --- a/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs +++ b/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Modules.HtmlText.Models; +using Oqtane.Modules.Models.HtmlText; namespace Oqtane.Modules.HtmlText.Services { diff --git a/Oqtane.Client/Modules/IModuleControl.cs b/Oqtane.Client/Modules/IModuleControl.cs index c4f2fdee..4fb55d7b 100644 --- a/Oqtane.Client/Modules/IModuleControl.cs +++ b/Oqtane.Client/Modules/IModuleControl.cs @@ -1,4 +1,5 @@ -using Oqtane.Shared; +using Oqtane.Enums; +using Oqtane.Shared; namespace Oqtane.Modules { diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs index 1fa56c65..db39b87d 100644 --- a/Oqtane.Client/Modules/ModuleBase.cs +++ b/Oqtane.Client/Modules/ModuleBase.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using Oqtane.Services; using System; using Oqtane.Enums; +using Oqtane.Services.Interfaces; using Oqtane.UI; namespace Oqtane.Modules diff --git a/Oqtane.Client/Modules/Weather/Index.razor b/Oqtane.Client/Modules/Weather/Index.razor index 2d20ff38..ae440590 100644 --- a/Oqtane.Client/Modules/Weather/Index.razor +++ b/Oqtane.Client/Modules/Weather/Index.razor @@ -1,4 +1,5 @@ @using Oqtane.Modules.Weather.Services +@using Oqtane.Modules.Weather.Models @namespace Oqtane.Modules.Weather @inherits ModuleBase @@ -39,4 +40,4 @@ else WeatherForecastService forecastservice = new WeatherForecastService(); forecasts = await forecastservice.GetForecastAsync(DateTime.UtcNow); } -} \ No newline at end of file +} diff --git a/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs b/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs index 7e02ea8a..ea5e7156 100644 --- a/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs +++ b/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs @@ -1,6 +1,6 @@ using System; -namespace Oqtane.Modules.Weather +namespace Oqtane.Modules.Weather.Models { public class WeatherForecast { diff --git a/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs b/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs index 743848fb..2b6b9621 100644 --- a/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs +++ b/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using Oqtane.Modules.Weather.Models; namespace Oqtane.Modules.Weather.Services { diff --git a/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs b/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs index e6ad13d9..1fde0100 100644 --- a/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs +++ b/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs @@ -2,6 +2,7 @@ using Oqtane.Modules; using System; using System.Linq; using System.Threading.Tasks; +using Oqtane.Modules.Weather.Models; namespace Oqtane.Modules.Weather.Services { diff --git a/Oqtane.Client/Program.cs b/Oqtane.Client/Program.cs index 4172834b..3563396e 100644 --- a/Oqtane.Client/Program.cs +++ b/Oqtane.Client/Program.cs @@ -1,16 +1,19 @@ -using Microsoft.AspNetCore.Components.WebAssembly.Hosting; -using Microsoft.Extensions.DependencyInjection; -using System.Threading.Tasks; -using Oqtane.Services; -using System.Reflection; -using System; +using System; using System.Linq; -using Oqtane.Modules; -using Oqtane.Shared; -using Oqtane.Providers; +using System.Reflection; +using System.Threading.Tasks; using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using Microsoft.Extensions.DependencyInjection; +using Oqtane.Interfaces; +using Oqtane.Models; +using Oqtane.Modules; +using Oqtane.Providers; +using Oqtane.Services; +using Oqtane.Services.Interfaces; +using Oqtane.Shared; -namespace Oqtane.Client +namespace Oqtane { public class Program { diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs index d7fdf3e6..8c3c2fa7 100644 --- a/Oqtane.Client/Services/AliasService.cs +++ b/Oqtane.Client/Services/AliasService.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using Oqtane.Shared; using System.Net; using System; +using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs index 3a875ac4..d4714d6f 100644 --- a/Oqtane.Client/Services/FileService.cs +++ b/Oqtane.Client/Services/FileService.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using Oqtane.Models; +using Oqtane.Services.Interfaces; using Oqtane.Shared; using Oqtane.UI; diff --git a/Oqtane.Client/Services/FolderService.cs b/Oqtane.Client/Services/FolderService.cs index 642aeafa..44522474 100644 --- a/Oqtane.Client/Services/FolderService.cs +++ b/Oqtane.Client/Services/FolderService.cs @@ -8,6 +8,7 @@ using Oqtane.Shared; using System; using System.Diagnostics.CodeAnalysis; using System.Net; +using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs index 40da3010..014aa436 100644 --- a/Oqtane.Client/Services/InstallationService.cs +++ b/Oqtane.Client/Services/InstallationService.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using System.Net.Http; using Microsoft.AspNetCore.Components; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/Interfaces/IAliasService.cs b/Oqtane.Client/Services/Interfaces/IAliasService.cs index f15356f1..2bd39d7e 100644 --- a/Oqtane.Client/Services/Interfaces/IAliasService.cs +++ b/Oqtane.Client/Services/Interfaces/IAliasService.cs @@ -1,9 +1,9 @@ -using Oqtane.Models; -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IAliasService { diff --git a/Oqtane.Client/Services/Interfaces/IFileService.cs b/Oqtane.Client/Services/Interfaces/IFileService.cs index 7e10f4fd..925f699d 100644 --- a/Oqtane.Client/Services/Interfaces/IFileService.cs +++ b/Oqtane.Client/Services/Interfaces/IFileService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IFileService { diff --git a/Oqtane.Client/Services/Interfaces/IFolderService.cs b/Oqtane.Client/Services/Interfaces/IFolderService.cs index 34edb609..9e70b690 100644 --- a/Oqtane.Client/Services/Interfaces/IFolderService.cs +++ b/Oqtane.Client/Services/Interfaces/IFolderService.cs @@ -1,9 +1,9 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IFolderService { diff --git a/Oqtane.Client/Services/Interfaces/IInstallationService.cs b/Oqtane.Client/Services/Interfaces/IInstallationService.cs index c9eeaca8..0485bdec 100644 --- a/Oqtane.Client/Services/Interfaces/IInstallationService.cs +++ b/Oqtane.Client/Services/Interfaces/IInstallationService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Threading.Tasks; +using System.Threading.Tasks; +using Oqtane.Models; using Oqtane.Shared; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IInstallationService { diff --git a/Oqtane.Client/Services/Interfaces/IJobLogService.cs b/Oqtane.Client/Services/Interfaces/IJobLogService.cs index 015d83f0..70d0da46 100644 --- a/Oqtane.Client/Services/Interfaces/IJobLogService.cs +++ b/Oqtane.Client/Services/Interfaces/IJobLogService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IJobLogService { diff --git a/Oqtane.Client/Services/Interfaces/IJobService.cs b/Oqtane.Client/Services/Interfaces/IJobService.cs index d6f0decf..8e56454f 100644 --- a/Oqtane.Client/Services/Interfaces/IJobService.cs +++ b/Oqtane.Client/Services/Interfaces/IJobService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IJobService { diff --git a/Oqtane.Client/Services/Interfaces/ILogService.cs b/Oqtane.Client/Services/Interfaces/ILogService.cs index 30867c72..cdcdd26a 100644 --- a/Oqtane.Client/Services/Interfaces/ILogService.cs +++ b/Oqtane.Client/Services/Interfaces/ILogService.cs @@ -1,11 +1,11 @@ -using Oqtane.Models; -using Oqtane.Shared; -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; using Oqtane.Enums; +using Oqtane.Models; +using Oqtane.Shared; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface ILogService { diff --git a/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs b/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs index 8560c661..88417a29 100644 --- a/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs +++ b/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs @@ -1,9 +1,9 @@ -using Oqtane.Models; -using Oqtane.UI; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; +using Oqtane.UI; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IModuleDefinitionService { diff --git a/Oqtane.Client/Services/Interfaces/IModuleService.cs b/Oqtane.Client/Services/Interfaces/IModuleService.cs index 27f11dff..ad85a26f 100644 --- a/Oqtane.Client/Services/Interfaces/IModuleService.cs +++ b/Oqtane.Client/Services/Interfaces/IModuleService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IModuleService { diff --git a/Oqtane.Client/Services/Interfaces/INotificationService.cs b/Oqtane.Client/Services/Interfaces/INotificationService.cs index bd52b7d0..bc479803 100644 --- a/Oqtane.Client/Services/Interfaces/INotificationService.cs +++ b/Oqtane.Client/Services/Interfaces/INotificationService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface INotificationService { diff --git a/Oqtane.Client/Services/Interfaces/IPackageService.cs b/Oqtane.Client/Services/Interfaces/IPackageService.cs index eeb243c1..a1e69541 100644 --- a/Oqtane.Client/Services/Interfaces/IPackageService.cs +++ b/Oqtane.Client/Services/Interfaces/IPackageService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IPackageService { diff --git a/Oqtane.Client/Services/Interfaces/IPageModuleService.cs b/Oqtane.Client/Services/Interfaces/IPageModuleService.cs index f51c56a8..3cae8abc 100644 --- a/Oqtane.Client/Services/Interfaces/IPageModuleService.cs +++ b/Oqtane.Client/Services/Interfaces/IPageModuleService.cs @@ -1,7 +1,7 @@ -using Oqtane.Models; -using System.Threading.Tasks; +using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IPageModuleService { diff --git a/Oqtane.Client/Services/Interfaces/IPageService.cs b/Oqtane.Client/Services/Interfaces/IPageService.cs index 60f1d86e..4cd8dd69 100644 --- a/Oqtane.Client/Services/Interfaces/IPageService.cs +++ b/Oqtane.Client/Services/Interfaces/IPageService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IPageService { diff --git a/Oqtane.Client/Services/Interfaces/IProfileService.cs b/Oqtane.Client/Services/Interfaces/IProfileService.cs index cc079f3c..83fd6c5d 100644 --- a/Oqtane.Client/Services/Interfaces/IProfileService.cs +++ b/Oqtane.Client/Services/Interfaces/IProfileService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IProfileService { diff --git a/Oqtane.Client/Services/Interfaces/IRoleService.cs b/Oqtane.Client/Services/Interfaces/IRoleService.cs index 23ae0d05..90373202 100644 --- a/Oqtane.Client/Services/Interfaces/IRoleService.cs +++ b/Oqtane.Client/Services/Interfaces/IRoleService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IRoleService { diff --git a/Oqtane.Client/Services/Interfaces/ISettingService.cs b/Oqtane.Client/Services/Interfaces/ISettingService.cs index f7c06591..9c128612 100644 --- a/Oqtane.Client/Services/Interfaces/ISettingService.cs +++ b/Oqtane.Client/Services/Interfaces/ISettingService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface ISettingService { diff --git a/Oqtane.Client/Services/Interfaces/ISiteService.cs b/Oqtane.Client/Services/Interfaces/ISiteService.cs index 32ca6926..0ca7847c 100644 --- a/Oqtane.Client/Services/Interfaces/ISiteService.cs +++ b/Oqtane.Client/Services/Interfaces/ISiteService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface ISiteService { diff --git a/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs b/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs index abb9a6c1..5993b7f8 100644 --- a/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs +++ b/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface ISiteTemplateService { diff --git a/Oqtane.Client/Services/Interfaces/ISqlService.cs b/Oqtane.Client/Services/Interfaces/ISqlService.cs index f563a795..5c7127ee 100644 --- a/Oqtane.Client/Services/Interfaces/ISqlService.cs +++ b/Oqtane.Client/Services/Interfaces/ISqlService.cs @@ -1,7 +1,7 @@ -using Oqtane.Models; -using System.Threading.Tasks; +using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface ISqlService { diff --git a/Oqtane.Client/Services/Interfaces/ITenantService.cs b/Oqtane.Client/Services/Interfaces/ITenantService.cs index 24bdd79b..0b863bab 100644 --- a/Oqtane.Client/Services/Interfaces/ITenantService.cs +++ b/Oqtane.Client/Services/Interfaces/ITenantService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface ITenantService { diff --git a/Oqtane.Client/Services/Interfaces/IThemeService.cs b/Oqtane.Client/Services/Interfaces/IThemeService.cs index 8756042b..36e25e9f 100644 --- a/Oqtane.Client/Services/Interfaces/IThemeService.cs +++ b/Oqtane.Client/Services/Interfaces/IThemeService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IThemeService { diff --git a/Oqtane.Client/Services/Interfaces/IUserRoleService.cs b/Oqtane.Client/Services/Interfaces/IUserRoleService.cs index 25cb9ab4..55d553db 100644 --- a/Oqtane.Client/Services/Interfaces/IUserRoleService.cs +++ b/Oqtane.Client/Services/Interfaces/IUserRoleService.cs @@ -1,8 +1,8 @@ -using Oqtane.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IUserRoleService { diff --git a/Oqtane.Client/Services/Interfaces/IUserService.cs b/Oqtane.Client/Services/Interfaces/IUserService.cs index 0a18b23d..9eba77b3 100644 --- a/Oqtane.Client/Services/Interfaces/IUserService.cs +++ b/Oqtane.Client/Services/Interfaces/IUserService.cs @@ -1,7 +1,7 @@ -using Oqtane.Models; -using System.Threading.Tasks; +using System.Threading.Tasks; +using Oqtane.Models; -namespace Oqtane.Services +namespace Oqtane.Services.Interfaces { public interface IUserService { diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs index f564f46c..4cb22566 100644 --- a/Oqtane.Client/Services/JobLogService.cs +++ b/Oqtane.Client/Services/JobLogService.cs @@ -4,6 +4,7 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/JobService.cs b/Oqtane.Client/Services/JobService.cs index b06b2fd7..3903a375 100644 --- a/Oqtane.Client/Services/JobService.cs +++ b/Oqtane.Client/Services/JobService.cs @@ -4,6 +4,7 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/LogService.cs b/Oqtane.Client/Services/LogService.cs index a679ee3d..d278fbd7 100644 --- a/Oqtane.Client/Services/LogService.cs +++ b/Oqtane.Client/Services/LogService.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using Oqtane.Enums; using Oqtane.Models; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/ModuleDefinitionService.cs b/Oqtane.Client/Services/ModuleDefinitionService.cs index 119aa9dd..f0aa9818 100644 --- a/Oqtane.Client/Services/ModuleDefinitionService.cs +++ b/Oqtane.Client/Services/ModuleDefinitionService.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using System; using System.Reflection; +using Oqtane.Services.Interfaces; using Oqtane.Shared; using Oqtane.UI; diff --git a/Oqtane.Client/Services/ModuleService.cs b/Oqtane.Client/Services/ModuleService.cs index c78403e4..4408fbd2 100644 --- a/Oqtane.Client/Services/ModuleService.cs +++ b/Oqtane.Client/Services/ModuleService.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/NotificationService.cs b/Oqtane.Client/Services/NotificationService.cs index 6239ca8a..7eb28b28 100644 --- a/Oqtane.Client/Services/NotificationService.cs +++ b/Oqtane.Client/Services/NotificationService.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Components; using Oqtane.Shared; using System.Collections.Generic; using System.Linq; +using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/PackageService.cs b/Oqtane.Client/Services/PackageService.cs index 952ea4cb..117ec952 100644 --- a/Oqtane.Client/Services/PackageService.cs +++ b/Oqtane.Client/Services/PackageService.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using Oqtane.Shared; using System.Linq; +using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/PageModuleService.cs b/Oqtane.Client/Services/PageModuleService.cs index 11fece8c..a2ae4b6c 100644 --- a/Oqtane.Client/Services/PageModuleService.cs +++ b/Oqtane.Client/Services/PageModuleService.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs index 6cc832c7..c191f1e0 100644 --- a/Oqtane.Client/Services/PageService.cs +++ b/Oqtane.Client/Services/PageService.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using Oqtane.Shared; using System; using System.Net; +using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/ProfileService.cs b/Oqtane.Client/Services/ProfileService.cs index 4ceb4cac..0f0fca14 100644 --- a/Oqtane.Client/Services/ProfileService.cs +++ b/Oqtane.Client/Services/ProfileService.cs @@ -4,6 +4,7 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs index 708f0721..614293af 100644 --- a/Oqtane.Client/Services/RoleService.cs +++ b/Oqtane.Client/Services/RoleService.cs @@ -4,6 +4,7 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs index 22ac7fc4..7082bf89 100644 --- a/Oqtane.Client/Services/SettingService.cs +++ b/Oqtane.Client/Services/SettingService.cs @@ -4,6 +4,7 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/SiteService.cs b/Oqtane.Client/Services/SiteService.cs index ce4a379c..eab64ad1 100644 --- a/Oqtane.Client/Services/SiteService.cs +++ b/Oqtane.Client/Services/SiteService.cs @@ -4,6 +4,7 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/SiteTemplateService.cs b/Oqtane.Client/Services/SiteTemplateService.cs index 410f2abc..48cff86c 100644 --- a/Oqtane.Client/Services/SiteTemplateService.cs +++ b/Oqtane.Client/Services/SiteTemplateService.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/SqlService.cs b/Oqtane.Client/Services/SqlService.cs index 52371df8..0f1440ea 100644 --- a/Oqtane.Client/Services/SqlService.cs +++ b/Oqtane.Client/Services/SqlService.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Components; using Oqtane.Shared; using System.Collections.Generic; using System.Linq; +using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs index d325fd91..14f7c277 100644 --- a/Oqtane.Client/Services/TenantService.cs +++ b/Oqtane.Client/Services/TenantService.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Components; using Oqtane.Shared; using System.Collections.Generic; using System.Linq; +using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/ThemeService.cs b/Oqtane.Client/Services/ThemeService.cs index e872aae1..0f633501 100644 --- a/Oqtane.Client/Services/ThemeService.cs +++ b/Oqtane.Client/Services/ThemeService.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using System.Reflection; using System; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/UserRoleService.cs b/Oqtane.Client/Services/UserRoleService.cs index 66e9feb9..137462ca 100644 --- a/Oqtane.Client/Services/UserRoleService.cs +++ b/Oqtane.Client/Services/UserRoleService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs index d81077ff..ac306e8e 100644 --- a/Oqtane.Client/Services/UserService.cs +++ b/Oqtane.Client/Services/UserService.cs @@ -3,6 +3,7 @@ using Oqtane.Models; using System.Net.Http; using Microsoft.AspNetCore.Components; using System.Threading.Tasks; +using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor index 9d0c7dd4..5ed6e109 100644 --- a/Oqtane.Client/UI/Pane.razor +++ b/Oqtane.Client/UI/Pane.razor @@ -1,4 +1,5 @@ -@namespace Oqtane.UI +@using Oqtane.Enums +@namespace Oqtane.UI @inject IUserService UserService @inject IModuleService ModuleService @inject IModuleDefinitionService ModuleDefinitionService diff --git a/Oqtane.Client/_Imports.razor b/Oqtane.Client/_Imports.razor index 22d11669..1c87349b 100644 --- a/Oqtane.Client/_Imports.razor +++ b/Oqtane.Client/_Imports.razor @@ -14,7 +14,8 @@ @using Oqtane.Providers @using Oqtane.Security @using Oqtane.Services +@using Oqtane.Services.Interfaces @using Oqtane.Shared @using Oqtane.Themes @using Oqtane.Themes.Controls -@using Oqtane.UI \ No newline at end of file +@using Oqtane.UI diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs index 47f2d0a9..922c71de 100644 --- a/Oqtane.Server/Controllers/AliasController.cs +++ b/Oqtane.Server/Controllers/AliasController.cs @@ -10,6 +10,7 @@ using System.Globalization; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index ad85e6c2..5a5da650 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -16,6 +16,7 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; // ReSharper disable StringIndexOfIsCultureSpecific.1 diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index 1a2fdb2f..c2b22fc4 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -8,6 +8,7 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; using Oqtane.Security; namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs index 838a62fb..6db3404e 100644 --- a/Oqtane.Server/Controllers/JobController.cs +++ b/Oqtane.Server/Controllers/JobController.cs @@ -9,6 +9,7 @@ using Microsoft.Extensions.DependencyInjection; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs index f2a506d5..e1f766a2 100644 --- a/Oqtane.Server/Controllers/JobLogController.cs +++ b/Oqtane.Server/Controllers/JobLogController.cs @@ -6,6 +6,7 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/LogController.cs b/Oqtane.Server/Controllers/LogController.cs index d59b9411..575ee6c8 100644 --- a/Oqtane.Server/Controllers/LogController.cs +++ b/Oqtane.Server/Controllers/LogController.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Authorization; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs index 348f973e..fe2064d8 100644 --- a/Oqtane.Server/Controllers/ModuleController.cs +++ b/Oqtane.Server/Controllers/ModuleController.cs @@ -7,6 +7,7 @@ using System.Linq; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; using Oqtane.Security; namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index 5e4659ce..1d7cd5ad 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -12,6 +12,8 @@ using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; using Oqtane.Security; using System; +using Oqtane.Repository.Interfaces; + // ReSharper disable StringIndexOfIsCultureSpecific.1 namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/NotificationController.cs b/Oqtane.Server/Controllers/NotificationController.cs index 47f0f85f..33c2a70f 100644 --- a/Oqtane.Server/Controllers/NotificationController.cs +++ b/Oqtane.Server/Controllers/NotificationController.cs @@ -6,6 +6,7 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; using Oqtane.Security; namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index 607ceaef..7e73dd6a 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -9,6 +9,7 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs index c6149cbd..057efe0e 100644 --- a/Oqtane.Server/Controllers/PageModuleController.cs +++ b/Oqtane.Server/Controllers/PageModuleController.cs @@ -7,6 +7,7 @@ using System.Linq; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; using Oqtane.Security; namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs index 1a3c0f40..21b5621d 100644 --- a/Oqtane.Server/Controllers/ProfileController.cs +++ b/Oqtane.Server/Controllers/ProfileController.cs @@ -6,6 +6,7 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index 61f58f4a..84ff016f 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -6,6 +6,7 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs index 4c551098..0ccc0e6a 100644 --- a/Oqtane.Server/Controllers/SettingController.cs +++ b/Oqtane.Server/Controllers/SettingController.cs @@ -7,6 +7,7 @@ using System.Linq; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs index a8db1073..afa80966 100644 --- a/Oqtane.Server/Controllers/SiteController.cs +++ b/Oqtane.Server/Controllers/SiteController.cs @@ -7,6 +7,7 @@ using System.Linq; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/SiteTemplateController.cs b/Oqtane.Server/Controllers/SiteTemplateController.cs index c74e69a4..c560d45e 100644 --- a/Oqtane.Server/Controllers/SiteTemplateController.cs +++ b/Oqtane.Server/Controllers/SiteTemplateController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Oqtane.Models; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/SqlController.cs b/Oqtane.Server/Controllers/SqlController.cs index 1ec75d19..21c0e6fb 100644 --- a/Oqtane.Server/Controllers/SqlController.cs +++ b/Oqtane.Server/Controllers/SqlController.cs @@ -11,6 +11,7 @@ using System.Data; using System.Dynamic; using Newtonsoft.Json; using System; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs index 83f84355..feb31480 100644 --- a/Oqtane.Server/Controllers/TenantController.cs +++ b/Oqtane.Server/Controllers/TenantController.cs @@ -6,6 +6,7 @@ using Oqtane.Enums; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs index 5fadf164..72eb2bb3 100644 --- a/Oqtane.Server/Controllers/ThemeController.cs +++ b/Oqtane.Server/Controllers/ThemeController.cs @@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Hosting; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; // ReSharper disable StringIndexOfIsCultureSpecific.1 diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index d2bc94db..4cd74157 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -13,6 +13,7 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index fa3d2d6c..fcfc7665 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -6,6 +6,7 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs index aef47901..e16ba3fb 100644 --- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs @@ -6,7 +6,11 @@ using System.Reflection; using System.Runtime.Loader; using Microsoft.Extensions.Hosting; using Oqtane.Infrastructure; +using Oqtane.Infrastructure.Jobs; +using Oqtane.Interfaces; +using Oqtane.Models; using Oqtane.Modules; +using File = System.IO.File; // ReSharper disable once CheckNamespace namespace Microsoft.Extensions.DependencyInjection diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 2d23f219..46f7b1f7 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -15,6 +15,8 @@ using Oqtane.Controllers; using Oqtane.Extensions; using Oqtane.Models; using Oqtane.Repository; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; using File = System.IO.File; diff --git a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs index 35b8b0a9..fdc562ad 100644 --- a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs +++ b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs @@ -6,10 +6,10 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Oqtane.Models; -using Oqtane.Repository; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; -namespace Oqtane.Infrastructure +namespace Oqtane.Infrastructure.Jobs { public abstract class HostedServiceBase : IHostedService, IDisposable { diff --git a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs index bd667486..8b2e0a55 100644 --- a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs +++ b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs @@ -5,10 +5,10 @@ using System.Net; using System.Net.Mail; using Microsoft.Extensions.DependencyInjection; using Oqtane.Models; -using Oqtane.Repository; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; -namespace Oqtane.Infrastructure +namespace Oqtane.Infrastructure.Jobs { public class NotificationJob : HostedServiceBase { diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 47101016..e42c83c3 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; using Oqtane.Security; // ReSharper disable StringIndexOfIsCultureSpecific.2 // ReSharper disable StringIndexOfIsCultureSpecific.1 diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index 45d61327..89b03b6f 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -1,11 +1,11 @@ -using Oqtane.Models; -using Oqtane.Infrastructure.Interfaces; -using System.Collections.Generic; -using Oqtane.Repository; +using System.Collections.Generic; using Microsoft.AspNetCore.Hosting; +using Oqtane.Infrastructure.Interfaces; +using Oqtane.Models; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; -namespace Oqtane.SiteTemplates +namespace Oqtane.Infrastructure.SiteTemplates { public class DefaultSiteTemplate : ISiteTemplate { diff --git a/Oqtane.Server/Infrastructure/SyncManager.cs b/Oqtane.Server/Infrastructure/SyncManager.cs index 7828bbc3..676f123d 100644 --- a/Oqtane.Server/Infrastructure/SyncManager.cs +++ b/Oqtane.Server/Infrastructure/SyncManager.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Infrastructure { diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs index 01eb92cf..fea49e28 100644 --- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs +++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization; -using Oqtane.Modules.HtmlText.Models; using Oqtane.Modules.HtmlText.Repository; using Microsoft.AspNetCore.Http; using Oqtane.Shared; @@ -8,6 +7,7 @@ using System; using System.Collections.Generic; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; +using Oqtane.Modules.Models.HtmlText; namespace Oqtane.Modules.HtmlText.Controllers { diff --git a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs index f37ac523..a7f6082a 100644 --- a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs +++ b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs @@ -1,7 +1,7 @@ using Oqtane.Models; -using Oqtane.Modules.HtmlText.Models; using Oqtane.Modules.HtmlText.Repository; using System.Net; +using Oqtane.Modules.Models.HtmlText; namespace Oqtane.Modules.HtmlText.Manager { diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs index 70cd2065..c2efd6a5 100644 --- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs +++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs @@ -1,7 +1,11 @@ using Microsoft.EntityFrameworkCore; -using Oqtane.Modules.HtmlText.Models; using Oqtane.Repository; using Microsoft.AspNetCore.Http; +using Oqtane.Interfaces; +using Oqtane.Models; +using Oqtane.Modules.Models.HtmlText; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Modules.HtmlText.Repository { diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs index c97b0de7..8163f82d 100644 --- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs +++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs @@ -1,6 +1,8 @@ using Microsoft.EntityFrameworkCore; using System.Linq; -using Oqtane.Modules.HtmlText.Models; +using Oqtane.Interfaces; +using Oqtane.Models; +using Oqtane.Modules.Models.HtmlText; namespace Oqtane.Modules.HtmlText.Repository { diff --git a/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs b/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs index cbe5d0e4..ff7bd6b8 100644 --- a/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs +++ b/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs @@ -1,4 +1,4 @@ -using Oqtane.Modules.HtmlText.Models; +using Oqtane.Modules.Models.HtmlText; namespace Oqtane.Modules.HtmlText.Repository { diff --git a/Oqtane.Server/Pages/Login.cshtml b/Oqtane.Server/Pages/Login.cshtml index f2eab15f..44d794dc 100644 --- a/Oqtane.Server/Pages/Login.cshtml +++ b/Oqtane.Server/Pages/Login.cshtml @@ -1,3 +1,3 @@ @page "/pages/login" -@namespace Oqtane.Pages +@namespace Oqtane.Pages @model Oqtane.Pages.LoginModel diff --git a/Oqtane.Server/Program.cs b/Oqtane.Server/Program.cs index e46805e6..613f1271 100644 --- a/Oqtane.Server/Program.cs +++ b/Oqtane.Server/Program.cs @@ -1,13 +1,10 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; -// DO NOT REMOVE - needed for client-side Blazor -using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; -using Microsoft.AspNetCore; using Microsoft.Extensions.DependencyInjection; -using Oqtane.Infrastructure; +using Oqtane.Infrastructure; // DO NOT REMOVE - needed for client-side Blazor -namespace Oqtane.Server +namespace Oqtane { public class Program { diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs index ccb26681..08220ff4 100644 --- a/Oqtane.Server/Repository/AliasRepository.cs +++ b/Oqtane.Server/Repository/AliasRepository.cs @@ -4,6 +4,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs index 247006bd..f0804065 100644 --- a/Oqtane.Server/Repository/Context/DBContextBase.cs +++ b/Oqtane.Server/Repository/Context/DBContextBase.cs @@ -4,9 +4,11 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; +using Oqtane.Interfaces; using Oqtane.Models; +using Oqtane.Repository.Interfaces; -namespace Oqtane.Repository +namespace Oqtane.Repository.Context { public class DBContextBase : IdentityUserContext { diff --git a/Oqtane.Server/Repository/Context/InstallationContext.cs b/Oqtane.Server/Repository/Context/InstallationContext.cs index 7b971a16..618fee17 100644 --- a/Oqtane.Server/Repository/Context/InstallationContext.cs +++ b/Oqtane.Server/Repository/Context/InstallationContext.cs @@ -1,8 +1,7 @@ -using System.Diagnostics.CodeAnalysis; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Context { public class InstallationContext : DbContext diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs index 65312819..cb6a75c6 100644 --- a/Oqtane.Server/Repository/Context/MasterDBContext.cs +++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs @@ -2,9 +2,10 @@ using System.Linq; using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; +using Oqtane.Interfaces; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Context { public class MasterDBContext : DbContext { diff --git a/Oqtane.Server/Repository/Context/TenantDBContext.cs b/Oqtane.Server/Repository/Context/TenantDBContext.cs index be085b20..e865a11e 100644 --- a/Oqtane.Server/Repository/Context/TenantDBContext.cs +++ b/Oqtane.Server/Repository/Context/TenantDBContext.cs @@ -1,8 +1,9 @@ using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Interfaces; -namespace Oqtane.Repository +namespace Oqtane.Repository.Context { public class TenantDBContext : DBContextBase { diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs index a74f2ce9..0939fc41 100644 --- a/Oqtane.Server/Repository/FileRepository.cs +++ b/Oqtane.Server/Repository/FileRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs index c83fa215..50a1b750 100644 --- a/Oqtane.Server/Repository/FolderRepository.cs +++ b/Oqtane.Server/Repository/FolderRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs b/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs index 4f258307..87908391 100644 --- a/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IAliasRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IFileRepository.cs b/Oqtane.Server/Repository/Interfaces/IFileRepository.cs index 19715187..8109595d 100644 --- a/Oqtane.Server/Repository/Interfaces/IFileRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IFileRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IFileRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs b/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs index 65256184..85105ddb 100644 --- a/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IFolderRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs b/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs index d5858da5..167c34fc 100644 --- a/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IJobLogRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IJobRepository.cs b/Oqtane.Server/Repository/Interfaces/IJobRepository.cs index 12be85c1..88bfbfdb 100644 --- a/Oqtane.Server/Repository/Interfaces/IJobRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IJobRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IJobRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ILogRepository.cs b/Oqtane.Server/Repository/Interfaces/ILogRepository.cs index 27752a03..7ca86392 100644 --- a/Oqtane.Server/Repository/Interfaces/ILogRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ILogRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface ILogRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs index 32c59549..ca711dc1 100644 --- a/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IModuleDefinitionRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs index 2ef4185d..2e108a9b 100644 --- a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IModuleRepository { diff --git a/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs b/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs index ef53bc3a..bf7dbdbd 100644 --- a/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface INotificationRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs index 181fb629..3efea416 100644 --- a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IPageModuleRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageRepository.cs index 6db92dba..66a213a6 100644 --- a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IPageRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IPageRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs index 5be9bb50..00347d88 100644 --- a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IPermissionRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs b/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs index c9b4f34b..9e0d6edb 100644 --- a/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IProfileRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs index 35f9315f..b9c0bc65 100644 --- a/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IRoleRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs index 976519fb..64301777 100644 --- a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface ISettingRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs b/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs index 5e05dccf..da470601 100644 --- a/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface ISiteRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs b/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs index 659226ff..7202cb94 100644 --- a/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface ISiteTemplateRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs b/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs index 4bd04e91..3b2d9f29 100644 --- a/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs @@ -1,7 +1,7 @@ using System.Data.SqlClient; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface ISqlRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs b/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs index 5993eb63..790f83b7 100644 --- a/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface ITenantRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs b/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs index 95e916f7..2ee51aed 100644 --- a/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs +++ b/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs @@ -1,6 +1,6 @@ using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface ITenantResolver { diff --git a/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs b/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs index 90afa3bd..595f752f 100644 --- a/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IThemeRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IUserRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRepository.cs index be646e56..be389cfe 100644 --- a/Oqtane.Server/Repository/Interfaces/IUserRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IUserRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IUserRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs index c46a0e50..ad7fba60 100644 --- a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository +namespace Oqtane.Repository.Interfaces { public interface IUserRoleRepository { diff --git a/Oqtane.Server/Repository/JobLogRepository.cs b/Oqtane.Server/Repository/JobLogRepository.cs index 440a483d..11db1cf2 100644 --- a/Oqtane.Server/Repository/JobLogRepository.cs +++ b/Oqtane.Server/Repository/JobLogRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/JobRepository.cs b/Oqtane.Server/Repository/JobRepository.cs index cbe51c19..d30f482d 100644 --- a/Oqtane.Server/Repository/JobRepository.cs +++ b/Oqtane.Server/Repository/JobRepository.cs @@ -4,6 +4,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/LogRepository.cs b/Oqtane.Server/Repository/LogRepository.cs index 1bcbc2be..a76ebbd0 100644 --- a/Oqtane.Server/Repository/LogRepository.cs +++ b/Oqtane.Server/Repository/LogRepository.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; using System.Linq; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index db4a8339..a81a2363 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -5,6 +5,8 @@ using System.Reflection; using Microsoft.Extensions.Caching.Memory; using Oqtane.Models; using Oqtane.Modules; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs index 18d9df3b..e6e6e44a 100644 --- a/Oqtane.Server/Repository/ModuleRepository.cs +++ b/Oqtane.Server/Repository/ModuleRepository.cs @@ -7,6 +7,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Oqtane.Models; using Oqtane.Modules; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; using Module = Oqtane.Models.Module; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/NotificationRepository.cs b/Oqtane.Server/Repository/NotificationRepository.cs index 8f34ff50..172c7364 100644 --- a/Oqtane.Server/Repository/NotificationRepository.cs +++ b/Oqtane.Server/Repository/NotificationRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs index ee85270d..83524786 100644 --- a/Oqtane.Server/Repository/PageModuleRepository.cs +++ b/Oqtane.Server/Repository/PageModuleRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs index 9e106e74..049c0090 100644 --- a/Oqtane.Server/Repository/PageRepository.cs +++ b/Oqtane.Server/Repository/PageRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs index fd9670d3..cb84c4c1 100644 --- a/Oqtane.Server/Repository/PermissionRepository.cs +++ b/Oqtane.Server/Repository/PermissionRepository.cs @@ -5,6 +5,8 @@ using System.Text; using System.Text.Json; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/ProfileRepository.cs b/Oqtane.Server/Repository/ProfileRepository.cs index 8577ea78..542ec07e 100644 --- a/Oqtane.Server/Repository/ProfileRepository.cs +++ b/Oqtane.Server/Repository/ProfileRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs index 2814d7e0..fb2c830f 100644 --- a/Oqtane.Server/Repository/RoleRepository.cs +++ b/Oqtane.Server/Repository/RoleRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/SettingRepository.cs b/Oqtane.Server/Repository/SettingRepository.cs index 30b7f676..e3744cfe 100644 --- a/Oqtane.Server/Repository/SettingRepository.cs +++ b/Oqtane.Server/Repository/SettingRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index a2f7e33d..adebe718 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -8,6 +8,8 @@ using Microsoft.Extensions.DependencyInjection; using Oqtane.Infrastructure.Interfaces; using Oqtane.Models; using Oqtane.Modules; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; using Module = Oqtane.Models.Module; diff --git a/Oqtane.Server/Repository/SiteTemplateRepository.cs b/Oqtane.Server/Repository/SiteTemplateRepository.cs index c88934fd..93123a85 100644 --- a/Oqtane.Server/Repository/SiteTemplateRepository.cs +++ b/Oqtane.Server/Repository/SiteTemplateRepository.cs @@ -5,6 +5,7 @@ using System.Reflection; using Microsoft.Extensions.DependencyInjection; using Oqtane.Infrastructure.Interfaces; using Oqtane.Models; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/SqlRepository.cs b/Oqtane.Server/Repository/SqlRepository.cs index c9bdf734..a7fef59c 100644 --- a/Oqtane.Server/Repository/SqlRepository.cs +++ b/Oqtane.Server/Repository/SqlRepository.cs @@ -2,6 +2,7 @@ using System.Data; using System.Data.SqlClient; using Oqtane.Models; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/TenantRepository.cs b/Oqtane.Server/Repository/TenantRepository.cs index 6c22ba75..94813ab8 100644 --- a/Oqtane.Server/Repository/TenantRepository.cs +++ b/Oqtane.Server/Repository/TenantRepository.cs @@ -4,6 +4,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/TenantResolver.cs b/Oqtane.Server/Repository/TenantResolver.cs index 8a5b85c4..451c2b21 100644 --- a/Oqtane.Server/Repository/TenantResolver.cs +++ b/Oqtane.Server/Repository/TenantResolver.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Http; using Oqtane.Models; +using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/ThemeRepository.cs b/Oqtane.Server/Repository/ThemeRepository.cs index 3bb3f7e9..0ec55b2e 100644 --- a/Oqtane.Server/Repository/ThemeRepository.cs +++ b/Oqtane.Server/Repository/ThemeRepository.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Oqtane.Models; +using Oqtane.Repository.Interfaces; using Oqtane.Themes; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/UserRepository.cs b/Oqtane.Server/Repository/UserRepository.cs index a9e51afe..cd1e3c77 100644 --- a/Oqtane.Server/Repository/UserRepository.cs +++ b/Oqtane.Server/Repository/UserRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs index 79f8a629..90c98ea7 100644 --- a/Oqtane.Server/Repository/UserRoleRepository.cs +++ b/Oqtane.Server/Repository/UserRoleRepository.cs @@ -2,6 +2,8 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Security/ClaimsPrincipalFactory.cs b/Oqtane.Server/Security/ClaimsPrincipalFactory.cs index 1e945938..c279b0b5 100644 --- a/Oqtane.Server/Security/ClaimsPrincipalFactory.cs +++ b/Oqtane.Server/Security/ClaimsPrincipalFactory.cs @@ -7,6 +7,7 @@ using Oqtane.Shared; using System.Collections.Generic; using System.Linq; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Security { diff --git a/Oqtane.Server/Security/UserPermissions.cs b/Oqtane.Server/Security/UserPermissions.cs index 72108b5d..8e0e56af 100644 --- a/Oqtane.Server/Security/UserPermissions.cs +++ b/Oqtane.Server/Security/UserPermissions.cs @@ -3,6 +3,7 @@ using Oqtane.Models; using System.Linq; using System.Security.Claims; using Oqtane.Repository; +using Oqtane.Repository.Interfaces; namespace Oqtane.Security { diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs index 46b5e697..e1ce6d62 100644 --- a/Oqtane.Server/Startup.cs +++ b/Oqtane.Server/Startup.cs @@ -17,8 +17,11 @@ using Microsoft.OpenApi.Models; using Oqtane.Infrastructure; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; +using Oqtane.Repository.Context; +using Oqtane.Repository.Interfaces; using Oqtane.Security; using Oqtane.Services; +using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json index a3352489..3432b151 100644 --- a/Oqtane.Server/appsettings.json +++ b/Oqtane.Server/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "DefaultConnection": "" + "DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;AttachDbFilename=W:\\Oqtane\\oqtane.framework\\Oqtane.Server\\Data\\Oqtane-202004031921.mdf;Initial Catalog=Oqtane-202004031921;Integrated Security=SSPI;" }, "Installation": { "DefaultAlias": "", @@ -12,4 +12,4 @@ "DefaultLayout": "", "DefaultContainer": "" } -} +} \ No newline at end of file diff --git a/Oqtane.Shared/Enums/LogLevel.cs b/Oqtane.Shared/Enums/LogLevel.cs index f772157e..ac02c377 100644 --- a/Oqtane.Shared/Enums/LogLevel.cs +++ b/Oqtane.Shared/Enums/LogLevel.cs @@ -1,4 +1,4 @@ -namespace Oqtane.Shared +namespace Oqtane.Enums { public enum LogLevel { diff --git a/Oqtane.Shared/Enums/SecurityAccessLevel.cs b/Oqtane.Shared/Enums/SecurityAccessLevel.cs index 7b993b60..f82f2e42 100644 --- a/Oqtane.Shared/Enums/SecurityAccessLevel.cs +++ b/Oqtane.Shared/Enums/SecurityAccessLevel.cs @@ -1,4 +1,4 @@ -namespace Oqtane.Shared +namespace Oqtane.Enums { public enum SecurityAccessLevel { diff --git a/Oqtane.Shared/Interfaces/IAuditable.cs b/Oqtane.Shared/Interfaces/IAuditable.cs index 83cd1c1f..bb961087 100644 --- a/Oqtane.Shared/Interfaces/IAuditable.cs +++ b/Oqtane.Shared/Interfaces/IAuditable.cs @@ -1,6 +1,6 @@ using System; -namespace Oqtane.Models +namespace Oqtane.Interfaces { public interface IAuditable { diff --git a/Oqtane.Shared/Interfaces/IDeletable.cs b/Oqtane.Shared/Interfaces/IDeletable.cs index 7880f8ff..da854e61 100644 --- a/Oqtane.Shared/Interfaces/IDeletable.cs +++ b/Oqtane.Shared/Interfaces/IDeletable.cs @@ -1,6 +1,6 @@ using System; -namespace Oqtane.Models +namespace Oqtane.Interfaces { public interface IDeletable { diff --git a/Oqtane.Shared/Interfaces/IService.cs b/Oqtane.Shared/Interfaces/IService.cs index b7330d81..4fbd91d0 100644 --- a/Oqtane.Shared/Interfaces/IService.cs +++ b/Oqtane.Shared/Interfaces/IService.cs @@ -1,4 +1,4 @@ -namespace Oqtane.Modules +namespace Oqtane.Interfaces { public interface IService { diff --git a/Oqtane.Shared/Models/Alias.cs b/Oqtane.Shared/Models/Alias.cs index 5e54e382..a2d34872 100644 --- a/Oqtane.Shared/Models/Alias.cs +++ b/Oqtane.Shared/Models/Alias.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/File.cs b/Oqtane.Shared/Models/File.cs index ae20fa11..e4aa47cf 100644 --- a/Oqtane.Shared/Models/File.cs +++ b/Oqtane.Shared/Models/File.cs @@ -1,4 +1,5 @@ using System; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Folder.cs b/Oqtane.Shared/Models/Folder.cs index 5f04f4bb..23acb72f 100644 --- a/Oqtane.Shared/Models/Folder.cs +++ b/Oqtane.Shared/Models/Folder.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel.DataAnnotations.Schema; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Job.cs b/Oqtane.Shared/Models/Job.cs index 2d1f40fc..6a048bed 100644 --- a/Oqtane.Shared/Models/Job.cs +++ b/Oqtane.Shared/Models/Job.cs @@ -1,4 +1,5 @@ using System; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Module.cs b/Oqtane.Shared/Models/Module.cs index 927377a0..e51ffc55 100644 --- a/Oqtane.Shared/Models/Module.cs +++ b/Oqtane.Shared/Models/Module.cs @@ -1,6 +1,8 @@ using Oqtane.Shared; using System; using System.ComponentModel.DataAnnotations.Schema; +using Oqtane.Enums; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/ModuleDefinition.cs b/Oqtane.Shared/Models/ModuleDefinition.cs index 35a27840..beafe72e 100644 --- a/Oqtane.Shared/Models/ModuleDefinition.cs +++ b/Oqtane.Shared/Models/ModuleDefinition.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel.DataAnnotations.Schema; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Notification.cs b/Oqtane.Shared/Models/Notification.cs index 0d804e41..f7b192f9 100644 --- a/Oqtane.Shared/Models/Notification.cs +++ b/Oqtane.Shared/Models/Notification.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel.DataAnnotations.Schema; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Page.cs b/Oqtane.Shared/Models/Page.cs index f1268875..ec1a6d1c 100644 --- a/Oqtane.Shared/Models/Page.cs +++ b/Oqtane.Shared/Models/Page.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel.DataAnnotations.Schema; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/PageModule.cs b/Oqtane.Shared/Models/PageModule.cs index 7812861a..3e9d1f2a 100644 --- a/Oqtane.Shared/Models/PageModule.cs +++ b/Oqtane.Shared/Models/PageModule.cs @@ -1,4 +1,5 @@ using System; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Permission.cs b/Oqtane.Shared/Models/Permission.cs index aff910f4..30ed4bbd 100644 --- a/Oqtane.Shared/Models/Permission.cs +++ b/Oqtane.Shared/Models/Permission.cs @@ -1,4 +1,5 @@ using System; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Profile.cs b/Oqtane.Shared/Models/Profile.cs index 11ecec07..e6835f6d 100644 --- a/Oqtane.Shared/Models/Profile.cs +++ b/Oqtane.Shared/Models/Profile.cs @@ -1,4 +1,5 @@ using System; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Role.cs b/Oqtane.Shared/Models/Role.cs index c9a316b5..f0c560bd 100644 --- a/Oqtane.Shared/Models/Role.cs +++ b/Oqtane.Shared/Models/Role.cs @@ -1,4 +1,5 @@ using System; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Setting.cs b/Oqtane.Shared/Models/Setting.cs index d7742c84..a030915c 100644 --- a/Oqtane.Shared/Models/Setting.cs +++ b/Oqtane.Shared/Models/Setting.cs @@ -1,4 +1,5 @@ using System; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Site.cs b/Oqtane.Shared/Models/Site.cs index 4b6b7f86..e785fe17 100644 --- a/Oqtane.Shared/Models/Site.cs +++ b/Oqtane.Shared/Models/Site.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel.DataAnnotations.Schema; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Tenant.cs b/Oqtane.Shared/Models/Tenant.cs index 3f0a518a..40135ce6 100644 --- a/Oqtane.Shared/Models/Tenant.cs +++ b/Oqtane.Shared/Models/Tenant.cs @@ -1,4 +1,5 @@ using System; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/User.cs b/Oqtane.Shared/Models/User.cs index e74deef2..0c8db2eb 100644 --- a/Oqtane.Shared/Models/User.cs +++ b/Oqtane.Shared/Models/User.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel.DataAnnotations.Schema; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/UserRole.cs b/Oqtane.Shared/Models/UserRole.cs index 556a31a8..b3771125 100644 --- a/Oqtane.Shared/Models/UserRole.cs +++ b/Oqtane.Shared/Models/UserRole.cs @@ -1,4 +1,5 @@ using System; +using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Modules/Models/HtmlText/HtmlTextInfo.cs b/Oqtane.Shared/Modules/Models/HtmlText/HtmlTextInfo.cs index e51a41fd..8876b097 100644 --- a/Oqtane.Shared/Modules/Models/HtmlText/HtmlTextInfo.cs +++ b/Oqtane.Shared/Modules/Models/HtmlText/HtmlTextInfo.cs @@ -1,9 +1,10 @@ using System; -using Oqtane.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Oqtane.Interfaces; +using Oqtane.Models; -namespace Oqtane.Modules.HtmlText.Models +namespace Oqtane.Modules.Models.HtmlText { [Table("HtmlText")] public class HtmlTextInfo : IAuditable diff --git a/Oqtane.Upgrade/Program.cs b/Oqtane.Upgrade/Program.cs index 8aa70d3b..517a6072 100644 --- a/Oqtane.Upgrade/Program.cs +++ b/Oqtane.Upgrade/Program.cs @@ -4,7 +4,7 @@ using System.IO.Compression; using System.Reflection; using System.Threading; -namespace Oqtane.Upgrade +namespace Oqtane { class Program {