Namespace Fix undo (#340)

2020-04-04 20:06:24 +02:00
parent a650f3847d
commit 5af6f7a52d
222 changed files with 150 additions and 335 deletions
--- a/Oqtane.Client/Services/AliasService.cs
+++ b/Oqtane.Client/Services/AliasService.cs
@ -7,7 +7,6 @@ using System.Collections.Generic;
 using Oqtane.Shared;
 using System.Net;
 using System;
-using Oqtane.Services.Interfaces;

 namespace Oqtane.Services
 {
--- a/Oqtane.Client/Services/FileService.cs
+++ b/Oqtane.Client/Services/FileService.cs
@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using Oqtane.Models;
-using Oqtane.Services.Interfaces;
 using Oqtane.Shared;
 using Oqtane.UI;

--- a/Oqtane.Client/Services/FolderService.cs
+++ b/Oqtane.Client/Services/FolderService.cs
@ -8,7 +8,6 @@ using Oqtane.Shared;
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
-using Oqtane.Services.Interfaces;

 namespace Oqtane.Services
 {
--- a/Oqtane.Client/Services/InstallationService.cs
+++ b/Oqtane.Client/Services/InstallationService.cs
@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using System.Net.Http;
 using Microsoft.AspNetCore.Components;
-using Oqtane.Services.Interfaces;
 using Oqtane.Shared;

 namespace Oqtane.Services
--- a/Oqtane.Client/Services/Interfaces/IAliasService.cs
+++ b/Oqtane.Client/Services/Interfaces/IAliasService.cs
@ -1,9 +1,9 @@
-using System;
+using Oqtane.Models;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IAliasService
    {
--- a/Oqtane.Client/Services/Interfaces/IFileService.cs
+++ b/Oqtane.Client/Services/Interfaces/IFileService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IFileService
    {
--- a/Oqtane.Client/Services/Interfaces/IFolderService.cs
+++ b/Oqtane.Client/Services/Interfaces/IFolderService.cs
@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IFolderService
    {
--- a/Oqtane.Client/Services/Interfaces/IInstallationService.cs
+++ b/Oqtane.Client/Services/Interfaces/IInstallationService.cs
@ -1,8 +1,8 @@
-using System.Threading.Tasks;
-using Oqtane.Models;
+using Oqtane.Models;
+using System.Threading.Tasks;
 using Oqtane.Shared;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IInstallationService
    {
--- a/Oqtane.Client/Services/Interfaces/IJobLogService.cs
+++ b/Oqtane.Client/Services/Interfaces/IJobLogService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IJobLogService
    {
--- a/Oqtane.Client/Services/Interfaces/IJobService.cs
+++ b/Oqtane.Client/Services/Interfaces/IJobService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IJobService
    {
--- a/Oqtane.Client/Services/Interfaces/ILogService.cs
+++ b/Oqtane.Client/Services/Interfaces/ILogService.cs
@ -1,11 +1,11 @@
-using System;
+using Oqtane.Models;
+using Oqtane.Shared;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Oqtane.Enums;
-using Oqtane.Models;
-using Oqtane.Shared;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface ILogService
    {
--- a/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs
+++ b/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs
@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Oqtane.Models;
+using Oqtane.Models;
 using Oqtane.UI;
+using System.Collections.Generic;
+using System.Threading.Tasks;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IModuleDefinitionService
    {
--- a/Oqtane.Client/Services/Interfaces/IModuleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IModuleService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IModuleService
    {
--- a/Oqtane.Client/Services/Interfaces/INotificationService.cs
+++ b/Oqtane.Client/Services/Interfaces/INotificationService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface INotificationService
    {
--- a/Oqtane.Client/Services/Interfaces/IPackageService.cs
+++ b/Oqtane.Client/Services/Interfaces/IPackageService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IPackageService
    {
--- a/Oqtane.Client/Services/Interfaces/IPageModuleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IPageModuleService.cs
@ -1,7 +1,7 @@
-using System.Threading.Tasks;
-using Oqtane.Models;
+using Oqtane.Models;
+using System.Threading.Tasks;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IPageModuleService
    {
--- a/Oqtane.Client/Services/Interfaces/IPageService.cs
+++ b/Oqtane.Client/Services/Interfaces/IPageService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IPageService
    {
--- a/Oqtane.Client/Services/Interfaces/IProfileService.cs
+++ b/Oqtane.Client/Services/Interfaces/IProfileService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IProfileService
    {
--- a/Oqtane.Client/Services/Interfaces/IRoleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IRoleService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IRoleService
    {
--- a/Oqtane.Client/Services/Interfaces/ISettingService.cs
+++ b/Oqtane.Client/Services/Interfaces/ISettingService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface ISettingService
    {
--- a/Oqtane.Client/Services/Interfaces/ISiteService.cs
+++ b/Oqtane.Client/Services/Interfaces/ISiteService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface ISiteService
    {
--- a/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs
+++ b/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface ISiteTemplateService
    {
--- a/Oqtane.Client/Services/Interfaces/ISqlService.cs
+++ b/Oqtane.Client/Services/Interfaces/ISqlService.cs
@ -1,7 +1,7 @@
-using System.Threading.Tasks;
-using Oqtane.Models;
+using Oqtane.Models;
+using System.Threading.Tasks;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface ISqlService
    {
--- a/Oqtane.Client/Services/Interfaces/ITenantService.cs
+++ b/Oqtane.Client/Services/Interfaces/ITenantService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface ITenantService
    {
--- a/Oqtane.Client/Services/Interfaces/IThemeService.cs
+++ b/Oqtane.Client/Services/Interfaces/IThemeService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IThemeService
    {
--- a/Oqtane.Client/Services/Interfaces/IUserRoleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IUserRoleService.cs
@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Models;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IUserRoleService
    {
--- a/Oqtane.Client/Services/Interfaces/IUserService.cs
+++ b/Oqtane.Client/Services/Interfaces/IUserService.cs
@ -1,7 +1,7 @@
-using System.Threading.Tasks;
-using Oqtane.Models;
+using Oqtane.Models;
+using System.Threading.Tasks;

-namespace Oqtane.Services.Interfaces
+namespace Oqtane.Services
 {
    public interface IUserService
    {
--- a/Oqtane.Client/Services/JobLogService.cs
+++ b/Oqtane.Client/Services/JobLogService.cs
@ -4,7 +4,6 @@ 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
--- a/Oqtane.Client/Services/JobService.cs
+++ b/Oqtane.Client/Services/JobService.cs
@ -4,7 +4,6 @@ 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
--- a/Oqtane.Client/Services/LogService.cs
+++ b/Oqtane.Client/Services/LogService.cs
@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Oqtane.Enums;
 using Oqtane.Models;
-using Oqtane.Services.Interfaces;
 using Oqtane.Shared;

 namespace Oqtane.Services
--- a/Oqtane.Client/Services/ModuleDefinitionService.cs
+++ b/Oqtane.Client/Services/ModuleDefinitionService.cs
@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using System;
 using System.Reflection;
-using Oqtane.Services.Interfaces;
 using Oqtane.Shared;
 using Oqtane.UI;

--- a/Oqtane.Client/Services/ModuleService.cs
+++ b/Oqtane.Client/Services/ModuleService.cs
@ -4,7 +4,6 @@ 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
--- a/Oqtane.Client/Services/NotificationService.cs
+++ b/Oqtane.Client/Services/NotificationService.cs
@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Components;
 using Oqtane.Shared;
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Services.Interfaces;

 namespace Oqtane.Services
 {
--- a/Oqtane.Client/Services/PackageService.cs
+++ b/Oqtane.Client/Services/PackageService.cs
@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Oqtane.Shared;
 using System.Linq;
-using Oqtane.Services.Interfaces;

 namespace Oqtane.Services
 {
--- a/Oqtane.Client/Services/PageModuleService.cs
+++ b/Oqtane.Client/Services/PageModuleService.cs
@ -2,7 +2,6 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using Oqtane.Services.Interfaces;
 using Oqtane.Shared;

 namespace Oqtane.Services
--- a/Oqtane.Client/Services/PageService.cs
+++ b/Oqtane.Client/Services/PageService.cs
@ -7,7 +7,6 @@ using System.Collections.Generic;
 using Oqtane.Shared;
 using System;
 using System.Net;
-using Oqtane.Services.Interfaces;

 namespace Oqtane.Services
 {
--- a/Oqtane.Client/Services/ProfileService.cs
+++ b/Oqtane.Client/Services/ProfileService.cs
@ -4,7 +4,6 @@ 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
--- a/Oqtane.Client/Services/RoleService.cs
+++ b/Oqtane.Client/Services/RoleService.cs
@ -4,7 +4,6 @@ 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
--- a/Oqtane.Client/Services/SettingService.cs
+++ b/Oqtane.Client/Services/SettingService.cs
@ -4,7 +4,6 @@ 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
--- a/Oqtane.Client/Services/SiteService.cs
+++ b/Oqtane.Client/Services/SiteService.cs
@ -4,7 +4,6 @@ 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
--- a/Oqtane.Client/Services/SiteTemplateService.cs
+++ b/Oqtane.Client/Services/SiteTemplateService.cs
@ -4,7 +4,6 @@ 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
--- a/Oqtane.Client/Services/SqlService.cs
+++ b/Oqtane.Client/Services/SqlService.cs
@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Components;
 using Oqtane.Shared;
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Services.Interfaces;

 namespace Oqtane.Services
 {
--- a/Oqtane.Client/Services/TenantService.cs
+++ b/Oqtane.Client/Services/TenantService.cs
@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Components;
 using Oqtane.Shared;
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Services.Interfaces;

 namespace Oqtane.Services
 {
--- a/Oqtane.Client/Services/ThemeService.cs
+++ b/Oqtane.Client/Services/ThemeService.cs
@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using System.Reflection;
 using System;
-using Oqtane.Services.Interfaces;
 using Oqtane.Shared;

 namespace Oqtane.Services
--- a/Oqtane.Client/Services/UserRoleService.cs
+++ b/Oqtane.Client/Services/UserRoleService.cs
@ -3,7 +3,6 @@ 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
--- a/Oqtane.Client/Services/UserService.cs
+++ b/Oqtane.Client/Services/UserService.cs
@ -3,7 +3,6 @@ using Oqtane.Models;
 using System.Net.Http;
 using Microsoft.AspNetCore.Components;
 using System.Threading.Tasks;
-using Oqtane.Services.Interfaces;

 namespace Oqtane.Services
 {