feat: add ui backup module (list of backups by date and version, down…

…load backup, clear all) and refact dependencies
indrivo · Mar 16, 2020 · 643741b · 643741b
1 parent 97a9142
commit 643741b
Show file tree

Hide file tree

Showing 27 changed files with 526 additions and 501 deletions.
diff --git a/GR.sln.DotSettings b/GR.sln.DotSettings
@@ -24,6 +24,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Foreing/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=formeo/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=fullfillment/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gres/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gtin/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Indrivo/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ISODMS/@EntryIndexedValue">True</s:Boolean>

diff --git a/...ons/GR.Application.Extension/GR.WebApplication/Extensions/ServiceCollectionsExtensions.cs b/...ons/GR.Application.Extension/GR.WebApplication/Extensions/ServiceCollectionsExtensions.cs
@@ -14,11 +14,9 @@
 using GR.Core.Helpers.ModelBinders.ModelBinderProviders;
 using GR.Core.Razor.Extensions;
 using GR.Localization.Abstractions.Extensions;
-using GR.Localization.Abstractions.Models;
 using GR.Localization.Abstractions.Models.Config;
 using GR.Notifications.Abstractions.Extensions;
 using GR.Notifications.Hub.Hubs;
-using GR.PageRender.Abstractions.Extensions;
 using GR.WebApplication.Helpers;
 using GR.WebApplication.Helpers.AppConfigurations;
 using Microsoft.AspNetCore.Builder;
@@ -180,9 +178,6 @@ public static IGearAppBuilder UseGearWebApp(this IApplicationBuilder app, Action
                 app.UseExceptionHandler("/Home/Error");
             }
 
-            //-----------------------Custom url redirection Usage-------------------------------------
-            if (configuration.UseCustomUrlRewrite) app.UseUrlRewriteModule();
-
             //----------------------------------Origin Cors Usage-------------------------------------
             if (configuration.UseDefaultCorsConfiguration) app.UseConfiguredCors();
 

diff --git a/...Application.Extension/GR.WebApplication/Helpers/AppConfigurations/GearAppBuilderConfig.cs b/...Application.Extension/GR.WebApplication/Helpers/AppConfigurations/GearAppBuilderConfig.cs
@@ -23,11 +23,6 @@ public class GearAppBuilderConfig
         /// </summary>
         public IConfiguration Configuration { get; set; }
 
-        /// <summary>
-        /// Use dynamic pages url rewrite
-        /// </summary>
-        public virtual bool UseCustomUrlRewrite { get; set; } = true;
-
         /// <summary>
         /// Use default cors 
         /// </summary>

diff --git a/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Services/ExportDataIO.cs b/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Services/ExportDataIO.cs
diff --git a/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Services/ExportManager.cs b/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Services/ExportManager.cs
diff --git a/...nsions/GR.Backup.Extension/GR.Backup.Abstractions/BackgroundServices/BackupTimeService.cs b/...nsions/GR.Backup.Extension/GR.Backup.Abstractions/BackgroundServices/BackupTimeService.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
@@ -30,9 +29,9 @@ namespace GR.Backup.Abstractions.BackgroundServices
         /// <summary>
         /// Inject backup service
         /// </summary>
-        private readonly IBackupService<T> _backupService;
+        private readonly IBackupService _backupService;
 
-        public BackupTimeService(ILogger<BackupTimeService<T>> logger, IOptions<T> options, IBackupService<T> backupService)
+        public BackupTimeService(ILogger<BackupTimeService<T>> logger, IOptions<T> options, IBackupService backupService)
         {
             _logger = logger;
             _backupService = backupService;

diff --git a/...ions/GR.Backup.Extension/GR.Backup.Abstractions/Extensions/ServiceCollectionExtensions.cs b/...ions/GR.Backup.Extension/GR.Backup.Abstractions/Extensions/ServiceCollectionExtensions.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using GR.Backup.Abstractions.Models;
+using GR.Core.Extensions;
 
 namespace GR.Backup.Abstractions.Extensions
 {
@@ -13,15 +14,26 @@ public static class ServiceCollectionExtensions
         /// <param name="services"></param>
         /// <param name="configuration"></param>
         /// <returns></returns>
-        public static IServiceCollection RegisterDatabaseBackupRunnerModule<TRunner, TBackupSettings, TBackupService>(this IServiceCollection services, IConfiguration configuration)
-            where TRunner : class, IHostedService
+        public static IServiceCollection RegisterDatabaseBackupRunnerModule<TBackupSettings, TBackupService>(this IServiceCollection services, IConfiguration configuration)
             where TBackupSettings : BackupSettings
-            where TBackupService : class, IBackupService<TBackupSettings>
+            where TBackupService : class, IBackupService
         {
-            services.AddTransient<IBackupService<TBackupSettings>, TBackupService>();
+            services.AddGearSingleton<IBackupService, TBackupService>();
+
             services.Configure<TBackupSettings>(configuration.GetSection(nameof(BackupSettings)));
+            return services;
+        }
 
-            //Run background service for backup database
+        /// <summary>
+        /// Register auto backup runner
+        /// </summary>
+        /// <typeparam name="TRunner"></typeparam>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public static IServiceCollection RegisterDatabaseBackgroundService<TRunner>(this IServiceCollection services)
+            where TRunner : class, IHostedService
+        {
+            //Register background service for backup database
             services.AddHostedService<TRunner>();
             return services;
         }