Initial migration

Oqtane.Client/Services/AliasService.cs

@@ -12,18 +12,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public AliasService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public AliasService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Alias"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Alias"); }
         }
 
         public async Task<List<Alias>> GetAliasesAsync()

Oqtane.Client/Services/FileService.cs

@@ -8,19 +8,19 @@ namespace Oqtane.Services
     public class FileService : ServiceBase, IFileService
     {
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
         private readonly IJSRuntime jsRuntime;
 
-        public FileService(SiteState sitestate, IUriHelper urihelper, IJSRuntime jsRuntime)
+        public FileService(SiteState sitestate, NavigationManager NavigationManager, IJSRuntime jsRuntime)
         {
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
             this.jsRuntime = jsRuntime;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "File"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "File"); }
         }
 
         public async Task UploadFilesAsync(string Folder)

Oqtane.Client/Services/Interfaces/InstallationService.cs

@@ -12,18 +12,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public InstallationService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public InstallationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Installation"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Installation"); }
         }
 
         public async Task<GenericResponse> IsInstalled()

Oqtane.Client/Services/ModuleDefinitionService.cs

@@ -14,18 +14,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public ModuleDefinitionService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public ModuleDefinitionService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "ModuleDefinition"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "ModuleDefinition"); }
         }
 
         public async Task<List<ModuleDefinition>> GetModuleDefinitionsAsync()

Oqtane.Client/Services/ModuleService.cs

@@ -12,18 +12,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public ModuleService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public ModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Module"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Module"); }
         }
 
         public async Task<List<Module>> GetModulesAsync(int PageId)

Oqtane.Client/Services/PageModuleService.cs

@@ -12,18 +12,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public PageModuleService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public PageModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "PageModule"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "PageModule"); }
         }
 
         public async Task<List<PageModule>> GetPageModulesAsync()

Oqtane.Client/Services/PageService.cs

@@ -13,18 +13,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public PageService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public PageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Page"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Page"); }
         }
 
         public async Task<List<Page>> GetPagesAsync(int SiteId)

Oqtane.Client/Services/ProfileService.cs

@@ -12,18 +12,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public ProfileService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public ProfileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Profile"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Profile"); }
         }
 
         public async Task<List<Profile>> GetProfilesAsync()

Oqtane.Client/Services/RoleService.cs

@@ -12,18 +12,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public RoleService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public RoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Role"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Role"); }
         }
 
         public async Task<List<Role>> GetRolesAsync()

Oqtane.Client/Services/SettingService.cs

@@ -12,18 +12,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public SettingService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public SettingService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Setting"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Setting"); }
         }
 
         public async Task<Dictionary<string, string>> GetHostSettingsAsync()

Oqtane.Client/Services/SiteService.cs

@@ -12,18 +12,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public SiteService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public SiteService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Site"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Site"); }
         }
 
         public async Task<List<Site>> GetSitesAsync()

Oqtane.Client/Services/TenantService.cs

@@ -12,18 +12,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public TenantService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public TenantService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Tenant"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Tenant"); }
         }
 
         public async Task<List<Tenant>> GetTenantsAsync()

Oqtane.Client/Services/ThemeService.cs

@@ -14,18 +14,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public ThemeService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public ThemeService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Theme"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Theme"); }
         }
 
         public async Task<List<Theme>> GetThemesAsync()

Oqtane.Client/Services/UserRoleService.cs

@@ -12,18 +12,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public UserRoleService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public UserRoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "UserRole"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "UserRole"); }
         }
 
         public async Task<List<UserRole>> GetUserRolesAsync()

Oqtane.Client/Services/UserService.cs

@@ -13,18 +13,18 @@ namespace Oqtane.Services
     {
         private readonly HttpClient http;
         private readonly SiteState sitestate;
-        private readonly IUriHelper urihelper;
+        private readonly NavigationManager NavigationManager;
 
-        public UserService(HttpClient http, SiteState sitestate, IUriHelper urihelper)
+        public UserService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
         {
             this.http = http;
             this.sitestate = sitestate;
-            this.urihelper = urihelper;
+            this.NavigationManager = NavigationManager;
         }
 
         private string apiurl
         {
-            get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "User"); }
+            get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "User"); }
         }
 
         public async Task<List<User>> GetUsersAsync(int SiteId)