From 3af2ca016848320e0a7305c91559955ae65f5f30 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Tue, 24 Sep 2019 17:26:14 -0400 Subject: [PATCH] utilize _Imports.razor to simplify module declarations --- Oqtane.Client/App.razor | 5 +-- .../Modules/Admin/Dashboard/Index.razor | 8 +--- Oqtane.Client/Modules/Admin/Login/Index.razor | 11 +---- .../Modules/Admin/ModuleDefinitions/Add.razor | 8 +--- .../Admin/ModuleDefinitions/Edit.razor | 10 +---- .../Admin/ModuleDefinitions/Index.razor | 7 +--- .../Modules/Admin/ModuleSettings/Index.razor | 10 +---- Oqtane.Client/Modules/Admin/Pages/Add.razor | 10 +---- .../Modules/Admin/Pages/Delete.razor | 10 +---- Oqtane.Client/Modules/Admin/Pages/Edit.razor | 10 +---- Oqtane.Client/Modules/Admin/Pages/Index.razor | 8 +--- .../Modules/Admin/Profile/Index.razor | 8 +--- .../Modules/Admin/Register/Index.razor | 7 +--- Oqtane.Client/Modules/Admin/Roles/Index.razor | 7 +--- Oqtane.Client/Modules/Admin/Sites/Add.razor | 9 +--- Oqtane.Client/Modules/Admin/Sites/Index.razor | 7 +--- Oqtane.Client/Modules/Admin/Tenants/Add.razor | 9 +--- .../Modules/Admin/Tenants/Index.razor | 7 +--- Oqtane.Client/Modules/Admin/Themes/Add.razor | 8 +--- .../Modules/Admin/Themes/Index.razor | 7 +--- Oqtane.Client/Modules/Admin/Users/Index.razor | 8 +--- .../Modules/Controls/ActionLink.razor | 8 +--- .../Modules/Controls/AuditInfo.razor | 4 +- .../Modules/Controls/FileUpload.razor | 3 +- .../Modules/Controls/ModuleMessage.razor | 4 +- Oqtane.Client/Modules/Controls/Pager.razor | 4 +- .../Modules/Controls/PermissionGrid.razor | 8 +--- .../Modules/Controls/TriStateCheckBox.razor | 3 +- Oqtane.Client/Modules/Counter/Index.razor | 2 - Oqtane.Client/Modules/Counter/Module.cs | 3 +- Oqtane.Client/Modules/HelloWorld/Index.razor | 42 ------------------- Oqtane.Client/Modules/HtmlText/Edit.razor | 8 +--- Oqtane.Client/Modules/HtmlText/Index.razor | 7 +--- Oqtane.Client/Modules/HtmlText/Module.cs | 3 +- Oqtane.Client/Modules/Weather/Index.razor | 2 - Oqtane.Client/Modules/Weather/Module.cs | 3 +- Oqtane.Client/Shared/ContainerBuilder.razor | 5 +-- Oqtane.Client/Shared/Installer.razor | 6 +-- Oqtane.Client/Shared/Interop.cs | 1 - Oqtane.Client/Shared/ModuleInstance.razor | 5 +-- Oqtane.Client/Shared/Pane.razor | 9 +--- Oqtane.Client/Shared/PaneLayout.razor | 4 +- Oqtane.Client/Shared/SiteRouter.razor | 12 +----- Oqtane.Client/Shared/ThemeBuilder.razor | 5 +-- Oqtane.Client/Themes/AdminContainer.razor | 4 +- .../Themes/Controls/ControlPanel.razor | 9 +--- Oqtane.Client/Themes/Controls/Login.razor | 9 +--- Oqtane.Client/Themes/Controls/Logo.razor | 4 +- Oqtane.Client/Themes/Controls/Menu.razor | 8 +--- .../Themes/Controls/ModuleActions.razor | 8 +--- .../Themes/Controls/ModuleTitle.razor | 4 +- .../{Profile.razor => UserProfile.razor} | 5 +-- Oqtane.Client/Themes/DefaultContainer.razor | 4 +- Oqtane.Client/Themes/Theme1/Container1.razor | 5 +-- Oqtane.Client/Themes/Theme1/Theme1.razor | 7 +--- Oqtane.Client/Themes/Theme2/Container2.razor | 5 +-- Oqtane.Client/Themes/Theme2/Theme2.razor | 7 +--- .../Themes/Theme3/HorizontalLayout.razor | 4 +- Oqtane.Client/Themes/Theme3/Theme3.razor | 7 +--- .../Themes/Theme3/VerticalLayout.razor | 4 +- Oqtane.Client/_Imports.razor | 19 +++++++++ Oqtane.Client/wwwroot/css/site.css | 5 +-- .../Repository/Context/DBContextBase.cs | 2 +- .../Repository/ModuleDefinitionRepository.cs | 10 +++++ Oqtane.Server/wwwroot/css/site.css | 2 +- 65 files changed, 92 insertions(+), 365 deletions(-) delete mode 100644 Oqtane.Client/Modules/HelloWorld/Index.razor rename Oqtane.Client/Themes/Controls/{Profile.razor => UserProfile.razor} (81%) create mode 100644 Oqtane.Client/_Imports.razor diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor index 91b327ce..0723e1e7 100644 --- a/Oqtane.Client/App.razor +++ b/Oqtane.Client/App.razor @@ -1,7 +1,4 @@ -@using Microsoft.AspNetCore.Components.Authorization -@using Oqtane.Shared -@using Oqtane.Services -@inject IInstallationService InstallationService +@inject IInstallationService InstallationService @if (Initialized) { diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor index ec2be216..b7084f19 100644 --- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor +++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor @@ -1,10 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Microsoft.AspNetCore.Components.Routing -@using Oqtane.Modules -@using Oqtane.Services -@using Oqtane.Models; -@using Oqtane.Security -@namespace Oqtane.Modules.Admin.Dashboard +@namespace Oqtane.Modules.Admin.Dashboard @inherits ModuleBase @inject IPageService PageService @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor index 06157646..21e66851 100644 --- a/Oqtane.Client/Modules/Admin/Login/Index.razor +++ b/Oqtane.Client/Modules/Admin/Login/Index.razor @@ -1,13 +1,4 @@ -@using Microsoft.AspNetCore.Components.Authorization -@using Microsoft.AspNetCore.Components.Web -@using Microsoft.AspNetCore.Components.Routing -@using Oqtane.Modules -@using Microsoft.JSInterop -@using Oqtane.Models -@using Oqtane.Services -@using Oqtane.Providers -@using Oqtane.Shared -@namespace Oqtane.Modules.Admin.Login +@namespace Oqtane.Modules.Admin.Login @inherits ModuleBase @inject NavigationManager NavigationManager @inject IJSRuntime jsRuntime diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor index b9a6ea41..d5a7cdfe 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor @@ -1,10 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules.Controls -@using Oqtane.Modules -@using Oqtane.Services -@using Oqtane.Shared -@namespace Oqtane.Modules.Admin.ModuleDefinitions +@namespace Oqtane.Modules.Admin.ModuleDefinitions @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 d14c0647..461d7bd5 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -1,12 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules.Controls -@using Oqtane.Models -@using Oqtane.Services -@using Oqtane.Modules -@using Oqtane.Shared -@using Oqtane.Security -@namespace Oqtane.Modules.Admin.ModuleDefinitions +@namespace Oqtane.Modules.Admin.ModuleDefinitions @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 5bc1eac1..db5b8c54 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -1,9 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Services -@using Oqtane.Models -@using Oqtane.Modules -@using Oqtane.Modules.Controls -@namespace Oqtane.Modules.Admin.ModuleDefinitions +@namespace Oqtane.Modules.Admin.ModuleDefinitions @inherits ModuleBase @inject IModuleDefinitionService ModuleDefinitionService diff --git a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor index 469c9499..0ad49710 100644 --- a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor @@ -1,12 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Services -@using Oqtane.Models -@using Oqtane.Modules -@using Oqtane.Shared -@using Oqtane.Security -@using Oqtane.Modules.Controls -@namespace Oqtane.Modules.Admin.ModuleSettings +@namespace Oqtane.Modules.Admin.ModuleSettings @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 36e6a20d..0e413bec 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -1,12 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules.Controls -@using Oqtane.Models -@using Oqtane.Services -@using Oqtane.Modules -@using Oqtane.Shared -@using Oqtane.Security -@namespace Oqtane.Modules.Admin.Pages +@namespace Oqtane.Modules.Admin.Pages @inherits ModuleBase @inject NavigationManager NavigationManager @inject IPageService PageService diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor index 7a4fc272..1372a997 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor @@ -1,12 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules.Controls -@using Oqtane.Models -@using Oqtane.Services -@using Oqtane.Modules -@using Oqtane.Shared -@using Oqtane.Security -@namespace Oqtane.Modules.Admin.Pages +@namespace Oqtane.Modules.Admin.Pages @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 a7b52c2b..0eb64d17 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -1,12 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules.Controls -@using Oqtane.Models -@using Oqtane.Services -@using Oqtane.Modules -@using Oqtane.Shared -@using Oqtane.Security -@namespace Oqtane.Modules.Admin.Pages +@namespace Oqtane.Modules.Admin.Pages @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 ce6c13ca..fcb98b6a 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Index.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor @@ -1,10 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules.Controls -@using Oqtane.Services -@using Oqtane.Models -@using Oqtane.Modules -@using Oqtane.Shared -@namespace Oqtane.Modules.Admin.Pages +@namespace Oqtane.Modules.Admin.Pages @inherits ModuleBase @if (PageState.Pages != null) diff --git a/Oqtane.Client/Modules/Admin/Profile/Index.razor b/Oqtane.Client/Modules/Admin/Profile/Index.razor index dc89e517..52bc2fe3 100644 --- a/Oqtane.Client/Modules/Admin/Profile/Index.razor +++ b/Oqtane.Client/Modules/Admin/Profile/Index.razor @@ -1,10 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules.Controls -@using Oqtane.Modules -@using Oqtane.Models -@using Oqtane.Services -@namespace Oqtane.Modules.Admin.Profile +@namespace Oqtane.Modules.Admin.Profile @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor index 54e5640e..caceddfc 100644 --- a/Oqtane.Client/Modules/Admin/Register/Index.razor +++ b/Oqtane.Client/Modules/Admin/Register/Index.razor @@ -1,9 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules -@using Oqtane.Models -@using Oqtane.Services -@namespace Oqtane.Modules.Admin.Register +@namespace Oqtane.Modules.Admin.Register @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor index ac5deb59..e3b65f3e 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor @@ -1,9 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Services -@using Oqtane.Models -@using Oqtane.Modules -@using Oqtane.Modules.Controls -@namespace Oqtane.Modules.Admin.Roles +@namespace Oqtane.Modules.Admin.Roles @inherits ModuleBase @inject IRoleService RoleService diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index 62cec359..159753a3 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -1,11 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Models -@using Oqtane.Services -@using Oqtane.Modules -@using Oqtane.Shared -@using Oqtane.Security -@namespace Oqtane.Modules.Admin.Sites +@namespace Oqtane.Modules.Admin.Sites @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor index aa75fb4c..214497c4 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor @@ -1,9 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Services -@using Oqtane.Models -@using Oqtane.Modules -@using Oqtane.Modules.Controls -@namespace Oqtane.Modules.Admin.Sites +@namespace Oqtane.Modules.Admin.Sites @inherits ModuleBase @inject ISiteService SiteService diff --git a/Oqtane.Client/Modules/Admin/Tenants/Add.razor b/Oqtane.Client/Modules/Admin/Tenants/Add.razor index 50a2e0bd..9178d2b5 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Add.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Add.razor @@ -1,11 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Models -@using Oqtane.Services -@using Oqtane.Modules -@using Oqtane.Shared -@using Oqtane.Security -@namespace Oqtane.Modules.Admin.Tenants +@namespace Oqtane.Modules.Admin.Tenants @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 1f1f618e..e173788c 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor @@ -1,9 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Services -@using Oqtane.Models -@using Oqtane.Modules -@using Oqtane.Modules.Controls -@namespace Oqtane.Modules.Admin.Tenants +@namespace Oqtane.Modules.Admin.Tenants @inherits ModuleBase @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index 6e9d80c5..03093f16 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -1,10 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules.Controls -@using Oqtane.Modules -@using Oqtane.Services -@using Oqtane.Shared -@namespace Oqtane.Modules.Admin.Themes +@namespace Oqtane.Modules.Admin.Themes @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 d1c188fb..47849695 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -1,9 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Services -@using Oqtane.Models -@using Oqtane.Modules -@using Oqtane.Modules.Controls -@namespace Oqtane.Modules.Admin.Themes +@namespace Oqtane.Modules.Admin.Themes @inherits ModuleBase @inject IThemeService ThemeService diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index bc0cf117..77b2d7bc 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -1,10 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Services -@using Oqtane.Models -@using Oqtane.Modules -@using Oqtane.Modules.Controls -@using Oqtane.Shared -@namespace Oqtane.Modules.Admin.Users +@namespace Oqtane.Modules.Admin.Users @inherits ModuleBase @inject IUserRoleService UserRoleService diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor index 498ea8e7..1d5b6edd 100644 --- a/Oqtane.Client/Modules/Controls/ActionLink.razor +++ b/Oqtane.Client/Modules/Controls/ActionLink.razor @@ -1,10 +1,4 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules -@using Oqtane.Services -@using Oqtane.Shared -@using Oqtane.Security -@namespace Oqtane.Modules.Controls +@namespace Oqtane.Modules.Controls @inherits ModuleBase @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor index f83705a7..4840dc54 100644 --- a/Oqtane.Client/Modules/Controls/AuditInfo.razor +++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor @@ -1,6 +1,4 @@ -@using Oqtane.Modules -@using Microsoft.AspNetCore.Components.Web -@namespace Oqtane.Modules.Controls +@namespace Oqtane.Modules.Controls @inherits ModuleBase @if (text != "") diff --git a/Oqtane.Client/Modules/Controls/FileUpload.razor b/Oqtane.Client/Modules/Controls/FileUpload.razor index 626673a2..6f19a0f5 100644 --- a/Oqtane.Client/Modules/Controls/FileUpload.razor +++ b/Oqtane.Client/Modules/Controls/FileUpload.razor @@ -1,5 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@namespace Oqtane.Modules.Controls +@namespace Oqtane.Modules.Controls @if (multiple) { diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor index 5b088b43..283b890a 100644 --- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor +++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor @@ -1,6 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules -@namespace Oqtane.Modules.Controls +@namespace Oqtane.Modules.Controls @inherits ModuleBase @if (Message != "") diff --git a/Oqtane.Client/Modules/Controls/Pager.razor b/Oqtane.Client/Modules/Controls/Pager.razor index aec5efb3..82396626 100644 --- a/Oqtane.Client/Modules/Controls/Pager.razor +++ b/Oqtane.Client/Modules/Controls/Pager.razor @@ -1,6 +1,4 @@ -@using Oqtane.Modules -@using Microsoft.AspNetCore.Components.Web -@namespace Oqtane.Modules.Controls +@namespace Oqtane.Modules.Controls @inherits ModuleBase @typeparam TableItem diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor index 2395bf98..2345eb37 100644 --- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor +++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor @@ -1,10 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Services -@using Oqtane.Modules -@using Oqtane.Models -@using Oqtane.Security -@using Oqtane.Shared -@namespace Oqtane.Modules.Controls +@namespace Oqtane.Modules.Controls @inherits ModuleBase @inject IRoleService RoleService @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor index b411d723..c8881f3f 100644 --- a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor +++ b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor @@ -1,5 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@namespace Oqtane.Modules.Controls +@namespace Oqtane.Modules.Controls diff --git a/Oqtane.Client/Modules/Counter/Index.razor b/Oqtane.Client/Modules/Counter/Index.razor index 9b8dd4b3..b511cfc0 100644 --- a/Oqtane.Client/Modules/Counter/Index.razor +++ b/Oqtane.Client/Modules/Counter/Index.razor @@ -1,5 +1,3 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules @namespace Oqtane.Modules.Counter @inherits ModuleBase Current count: @currentCount diff --git a/Oqtane.Client/Modules/Counter/Module.cs b/Oqtane.Client/Modules/Counter/Module.cs index 972e366f..5f509ae2 100644 --- a/Oqtane.Client/Modules/Counter/Module.cs +++ b/Oqtane.Client/Modules/Counter/Module.cs @@ -1,5 +1,4 @@ -using Oqtane.Modules; -using System.Collections.Generic; +using System.Collections.Generic; namespace Oqtane.Modules.Counter { diff --git a/Oqtane.Client/Modules/HelloWorld/Index.razor b/Oqtane.Client/Modules/HelloWorld/Index.razor deleted file mode 100644 index 8c115251..00000000 --- a/Oqtane.Client/Modules/HelloWorld/Index.razor +++ /dev/null @@ -1,42 +0,0 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules -@using Oqtane.Services -@namespace Oqtane.Modules.HelloWorld -@inherits ModuleBase -@inject ISettingService SettingService - -
-
- -
-
- -
- -
- @if (!string.IsNullOrEmpty(url)) - { -
- - } -
-
- -@code { - string url = ""; - - protected override async Task OnInitializedAsync() - { - Dictionary settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId); - url = SettingService.GetSetting(settings, "url", ""); - } - - private async Task Save() - { - Dictionary settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId); - SettingService.SetSetting(settings, "url", url); - await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId); - StateHasChanged(); - } - -} diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor index aa3a20ae..f8a993b6 100644 --- a/Oqtane.Client/Modules/HtmlText/Edit.razor +++ b/Oqtane.Client/Modules/HtmlText/Edit.razor @@ -1,11 +1,5 @@ -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules -@using Oqtane.Modules.Controls -@using Oqtane.Modules.HtmlText.Services +@using Oqtane.Modules.HtmlText.Services @using Oqtane.Modules.HtmlText.Models -@using System.Net.Http; -@using Oqtane.Shared; @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 1d64725e..24639b22 100644 --- a/Oqtane.Client/Modules/HtmlText/Index.razor +++ b/Oqtane.Client/Modules/HtmlText/Index.razor @@ -1,10 +1,5 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules.HtmlText.Services -@using Oqtane.Modules +@using Oqtane.Modules.HtmlText.Services @using Oqtane.Modules.HtmlText.Models -@using System.Net.Http; -@using Oqtane.Modules.Controls -@using Oqtane.Shared; @namespace Oqtane.Modules.HtmlText @inherits ModuleBase @inject NavigationManager NavigationManager diff --git a/Oqtane.Client/Modules/HtmlText/Module.cs b/Oqtane.Client/Modules/HtmlText/Module.cs index 2928d111..38682a92 100644 --- a/Oqtane.Client/Modules/HtmlText/Module.cs +++ b/Oqtane.Client/Modules/HtmlText/Module.cs @@ -1,5 +1,4 @@ -using Oqtane.Modules; -using System.Collections.Generic; +using System.Collections.Generic; namespace Oqtane.Modules.HtmlText { diff --git a/Oqtane.Client/Modules/Weather/Index.razor b/Oqtane.Client/Modules/Weather/Index.razor index e410592e..88e346f8 100644 --- a/Oqtane.Client/Modules/Weather/Index.razor +++ b/Oqtane.Client/Modules/Weather/Index.razor @@ -1,5 +1,3 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Modules @using Oqtane.Modules.Weather.Services @namespace Oqtane.Modules.Weather @inherits ModuleBase diff --git a/Oqtane.Client/Modules/Weather/Module.cs b/Oqtane.Client/Modules/Weather/Module.cs index 04286cba..65d719d8 100644 --- a/Oqtane.Client/Modules/Weather/Module.cs +++ b/Oqtane.Client/Modules/Weather/Module.cs @@ -1,5 +1,4 @@ -using Oqtane.Modules; -using System.Collections.Generic; +using System.Collections.Generic; namespace Oqtane.Modules.Weather { diff --git a/Oqtane.Client/Shared/ContainerBuilder.razor b/Oqtane.Client/Shared/ContainerBuilder.razor index 10e30bf7..09106a68 100644 --- a/Oqtane.Client/Shared/ContainerBuilder.razor +++ b/Oqtane.Client/Shared/ContainerBuilder.razor @@ -1,7 +1,4 @@ -@using Oqtane.Models -@using Oqtane.Shared -@using Oqtane.Modules -@namespace Oqtane.Shared +@namespace Oqtane.Shared @DynamicComponent diff --git a/Oqtane.Client/Shared/Installer.razor b/Oqtane.Client/Shared/Installer.razor index 3b278a54..479211f7 100644 --- a/Oqtane.Client/Shared/Installer.razor +++ b/Oqtane.Client/Shared/Installer.razor @@ -1,8 +1,4 @@ -@using Microsoft.AspNetCore.Components.Web -@using Oqtane.Services -@using Oqtane.Models -@using Oqtane.Shared -@namespace Oqtane.Shared +@namespace Oqtane.Shared @inject NavigationManager NavigationManager @inject IInstallationService InstallationService @inject ISiteService SiteService diff --git a/Oqtane.Client/Shared/Interop.cs b/Oqtane.Client/Shared/Interop.cs index 8987e650..16a0096f 100644 --- a/Oqtane.Client/Shared/Interop.cs +++ b/Oqtane.Client/Shared/Interop.cs @@ -1,5 +1,4 @@ using Microsoft.JSInterop; -using System; using System.Threading.Tasks; namespace Oqtane.Shared diff --git a/Oqtane.Client/Shared/ModuleInstance.razor b/Oqtane.Client/Shared/ModuleInstance.razor index 2b67de38..3e31897a 100644 --- a/Oqtane.Client/Shared/ModuleInstance.razor +++ b/Oqtane.Client/Shared/ModuleInstance.razor @@ -1,7 +1,4 @@ -@using Oqtane.Models -@using Oqtane.Shared -@using Oqtane.Modules -@namespace Oqtane.Shared +@namespace Oqtane.Shared @DynamicComponent diff --git a/Oqtane.Client/Shared/Pane.razor b/Oqtane.Client/Shared/Pane.razor index cb66c01e..f55e9881 100644 --- a/Oqtane.Client/Shared/Pane.razor +++ b/Oqtane.Client/Shared/Pane.razor @@ -1,11 +1,4 @@ -@using System -@using Oqtane.Services -@using Oqtane.Modules -@using Oqtane.Models -@using Oqtane.Shared -@using Oqtane.Security -@using System.Linq -@namespace Oqtane.Shared +@namespace Oqtane.Shared @inject IUserService UserService @inject IModuleService ModuleService @inject IModuleDefinitionService ModuleDefinitionService diff --git a/Oqtane.Client/Shared/PaneLayout.razor b/Oqtane.Client/Shared/PaneLayout.razor index 71366a87..9841a568 100644 --- a/Oqtane.Client/Shared/PaneLayout.razor +++ b/Oqtane.Client/Shared/PaneLayout.razor @@ -1,6 +1,4 @@ -@using System -@using Oqtane.Shared -@namespace Oqtane.Shared +@namespace Oqtane.Shared @DynamicComponent diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor index 3f4c06ce..ab32578e 100644 --- a/Oqtane.Client/Shared/SiteRouter.razor +++ b/Oqtane.Client/Shared/SiteRouter.razor @@ -1,14 +1,4 @@ -@using System -@using Oqtane.Services -@using Oqtane.Models -@using Oqtane.Modules -@using System.Linq -@using System.Collections.Generic -@using Oqtane.Shared -@using Oqtane.Security -@using Microsoft.AspNetCore.Components.Authorization -@using Microsoft.AspNetCore.Components.Routing -@namespace Oqtane.Shared +@namespace Oqtane.Shared @inject AuthenticationStateProvider AuthenticationStateProvider @inject SiteState SiteState @inject NavigationManager NavigationManager diff --git a/Oqtane.Client/Shared/ThemeBuilder.razor b/Oqtane.Client/Shared/ThemeBuilder.razor index c9fa26a0..c4734e89 100644 --- a/Oqtane.Client/Shared/ThemeBuilder.razor +++ b/Oqtane.Client/Shared/ThemeBuilder.razor @@ -1,7 +1,4 @@ -@using Oqtane.Shared -@using Oqtane.Modules -@using Microsoft.JSInterop -@namespace Oqtane.Shared +@namespace Oqtane.Shared @inject IJSRuntime jsRuntime @DynamicComponent diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor index c7380739..721dcb44 100644 --- a/Oqtane.Client/Themes/AdminContainer.razor +++ b/Oqtane.Client/Themes/AdminContainer.razor @@ -1,6 +1,4 @@ -@using Oqtane.Shared -@using Oqtane.Themes.Controls -@namespace Oqtane.Themes +@namespace Oqtane.Themes @inherits ContainerBase