Quartzmin to SilkierQuartz

This commit is contained in:
MysticBoy
2020-06-06 09:11:36 +08:00
parent 604571f838
commit 170258d28d
73 changed files with 144 additions and 144 deletions

View File

@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29326.143
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{B669A725-70A9-4E80-BAC7-9765A14CAAA4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Quartzmin", "src\Quartzmin\Quartzmin.csproj", "{D7BBB236-B0D3-4CB8-86C8-C7E925BBBE38}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SilkierQuartz", "src\Quartzmin\SilkierQuartz.csproj", "{D7BBB236-B0D3-4CB8-86C8-C7E925BBBE38}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Quartz.Plugins.RecentHistory", "src\Quartz.Plugins.RecentHistory\Quartz.Plugins.RecentHistory.csproj", "{4CEFA319-5052-4B65-B1B8-647CCFFF2A1C}"
EndProject

View File

@@ -3,12 +3,12 @@
[![NuGet](https://img.shields.io/nuget/v/SilkierQuartz.svg)](https://www.nuget.org/packages/SilkierQuartz)
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
SilkierQuartz is a new after merging [Quartzmin](https://github.com/jlucansky/Quartzmin) and [QuartzHostedService](https://github.com/mukmyash/QuartzHostedService)!
SilkierQuartz is a new after merging [SilkierQuartz](https://github.com/jlucansky/SilkierQuartz) and [QuartzHostedService](https://github.com/mukmyash/QuartzHostedService)!
> [Quartz.NET](https://www.quartz-scheduler.net) is a full-featured, open source job scheduling system that can be used from smallest apps to large scale enterprise systems.
> [Quartzmin](https://github.com/jlucansky/Quartzmin) Quartzmin is powerful, easy to use web management tool for Quartz.NET
> [SilkierQuartz](https://github.com/jlucansky/SilkierQuartz) SilkierQuartz is powerful, easy to use web management tool for Quartz.NET
> [QuartzHostedService](https://github.com/mukmyash/QuartzHostedService) QuartzHostedService is easy to host Quartz as service in .Net Core !
@@ -18,11 +18,11 @@ So
SilkierQuartz can be used within your existing application with minimum effort as a Quartz.NET plugin when it automatically creates embedded web server. Or it can be plugged into your existing OWIN-based web application as a middleware.
![Demo](https://raw.githubusercontent.com/jlucansky/public-assets/master/Quartzmin/demo.gif)
![Demo](https://raw.githubusercontent.com/jlucansky/public-assets/master/SilkierQuartz/demo.gif)
The goal of this project is to provide convenient tool to utilize most of the functionality that Quartz.NET enables. The biggest challenge was to create a simple yet effective editor of job data map which is heart of Quartz.NET. Every job data map item is strongly typed and Quartzmin can be easily extended with a custom editor for your specific type beside standard supported types such as String, Integer, DateTime and so on.
The goal of this project is to provide convenient tool to utilize most of the functionality that Quartz.NET enables. The biggest challenge was to create a simple yet effective editor of job data map which is heart of Quartz.NET. Every job data map item is strongly typed and SilkierQuartz can be easily extended with a custom editor for your specific type beside standard supported types such as String, Integer, DateTime and so on.
Quartzmin was created with **Semantic UI** and **Handlebars.Net** as the template engine.
SilkierQuartz was created with **Semantic UI** and **Handlebars.Net** as the template engine.
## Features
- Add, modify jobs and triggers
@@ -74,7 +74,7 @@ public void ConfigureServices(IServiceCollection services)
public void Configure(IApplicationBuilder app)
{
app.UseSilkierQuartz(new QuartzminOptions()
app.UseSilkierQuartz(new SilkierQuartzOptions()
{
Scheduler = StdSchedulerFactory.GetDefaultScheduler().Result
});

View File

@@ -6,7 +6,7 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Quartz.Plugins.RecentHistory\Quartz.Plugins.RecentHistory.csproj" />
<ProjectReference Include="..\..\src\Quartzmin\Quartzmin.csproj" />
<ProjectReference Include="..\..\src\SilkierQuartz\SilkierQuartz.csproj" />
</ItemGroup>

View File

@@ -6,7 +6,7 @@ using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
namespace Quartzmin
namespace SilkierQuartz
{
public static class DemoScheduler
{

View File

@@ -22,7 +22,7 @@
<a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" href= "/Quartzmin">Quartzmin</a>
<a class="nav-link text-dark" href= "/SilkierQuartz">SilkierQuartz</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>

View File

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Quartzmin;
using SilkierQuartz;
namespace AspNetCore31
{

View File

@@ -10,7 +10,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options;
using Quartz;
using Quartzmin;
using SilkierQuartz;
namespace AspNetCore31
{
@@ -27,7 +27,7 @@ namespace AspNetCore31
public void ConfigureServices(IServiceCollection services)
{
services.AddRazorPages();
services.AddQuartzmin();
services.AddSilkierQuartz();
services.AddOptions();
services.Configure<AppSettings>(Configuration);
services.Configure<InjectProperty>(options => { options.WriteText = "This is inject string"; });
@@ -54,7 +54,7 @@ namespace AspNetCore31
app.UseStaticFiles();
app.UseRouting();
app.UseAuthorization();
app.UseQuartzmin(new QuartzminOptions() { Scheduler = scheduler, VirtualPathRoot = "/Quartzmin" , UseLocalTime =true, DefaultDateFormat="yyyy-MM-dd", DefaultTimeFormat="HH:mm:ss" });
app.UseSilkierQuartz(new SilkierQuartzOptions() { Scheduler = scheduler, VirtualPathRoot = "/SilkierQuartz" , UseLocalTime =true, DefaultDateFormat="yyyy-MM-dd", DefaultTimeFormat="HH:mm:ss" });
app.UseEndpoints(endpoints =>
{
endpoints.MapRazorPages();

View File

@@ -11,15 +11,15 @@
<Product>Quartz.Plugins.RecentHistory</Product>
<Title>Quartz.NET plugin to persist recent job execution history</Title>
<Authors>Jan Lucansky</Authors>
<PackageProjectUrl>https://github.com/jlucansky/Quartzmin</PackageProjectUrl>
<Description>This is supporting package for Quartzmin</Description>
<PackageProjectUrl>https://github.com/jlucansky/SilkierQuartz</PackageProjectUrl>
<Description>This is supporting package for SilkierQuartz</Description>
<PackageTags>quartz;recent;history</PackageTags>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>Copyright © 2018 Jan Lucansky</Copyright>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/jlucansky/Quartzmin</RepositoryUrl>
<RepositoryUrl>https://github.com/jlucansky/SilkierQuartz</RepositoryUrl>
<PackageId>Quartz.Plugins.RecentHistoryFork</PackageId>
</PropertyGroup>

View File

@@ -7,7 +7,7 @@ using Microsoft.Owin.StaticFiles.ContentTypes;
using MultipartDataMediaFormatter;
using MultipartDataMediaFormatter.Infrastructure;
using Owin;
using Quartzmin.Owin;
using SilkierQuartz.Owin;
using System;
using System.Globalization;
using System.Net;
@@ -23,11 +23,11 @@ using System.Web.Http.Hosting;
using System.Web.Http.Results;
using System.Web.Management;
namespace Quartzmin
namespace SilkierQuartz
{
public static class AppBuilderExtensions
{
public static void UseQuartzmin(this IAppBuilder app, QuartzminOptions options, Action<Services> configure = null)
public static void UseSilkierQuartz(this IAppBuilder app, SilkierQuartzOptions options, Action<Services> configure = null)
{
options = options ?? throw new ArgumentNullException(nameof(options));
@@ -45,7 +45,7 @@ namespace Quartzmin
HttpConfiguration config = new HttpConfiguration();
config.Routes.MapHttpRoute(
name: nameof(Quartzmin),
name: nameof(SilkierQuartz),
routeTemplate: "{controller}/{action}",
defaults: new { controller = "Scheduler", action = "Index" }
);
@@ -110,11 +110,11 @@ namespace Quartzmin
bool IHostBufferPolicySelector.UseBufferedInputStream(object hostContext) => true;
}
private static void UseFileServer(this IAppBuilder app, QuartzminOptions options)
private static void UseFileServer(this IAppBuilder app, SilkierQuartzOptions options)
{
IFileSystem fs;
if (string.IsNullOrEmpty(options.ContentRootDirectory))
fs = new FixedEmbeddedResourceFileSystem(Assembly.GetExecutingAssembly(), nameof(Quartzmin) + ".Content");
fs = new FixedEmbeddedResourceFileSystem(Assembly.GetExecutingAssembly(), nameof(SilkierQuartz) + ".Content");
else
fs = new PhysicalFileSystem(options.ContentRootDirectory);

View File

@@ -9,11 +9,11 @@ using Microsoft.Extensions.FileProviders;
using System;
using System.Reflection;
namespace Quartzmin
namespace SilkierQuartz
{
public static class ApplicationBuilderExtensions
{
public static void UseQuartzmin( this IApplicationBuilder app, QuartzminOptions options, Action<Services> configure = null )
public static void UseSilkierQuartz( this IApplicationBuilder app, SilkierQuartzOptions options, Action<Services> configure = null )
{
options = options ?? throw new ArgumentNullException( nameof( options ) );
@@ -32,19 +32,19 @@ namespace Quartzmin
#if NETCOREAPP
app.UseEndpoints( endpoints =>
{
endpoints.MapControllerRoute( nameof( Quartzmin ), $"{options.VirtualPathRoot}/{{controller=Scheduler}}/{{action=Index}}" );
endpoints.MapControllerRoute( nameof( SilkierQuartz ), $"{options.VirtualPathRoot}/{{controller=Scheduler}}/{{action=Index}}" );
} );
#else
app.UseMvc( routes =>
{
routes.MapRoute(
name: nameof( Quartzmin ),
name: nameof( SilkierQuartz ),
template: "{controller=Scheduler}/{action=Index}" );
} );
#endif
}
private static void UseFileServer( this IApplicationBuilder app, QuartzminOptions options )
private static void UseFileServer( this IApplicationBuilder app, SilkierQuartzOptions options )
{
IFileProvider fs;
if ( string.IsNullOrEmpty( options.ContentRootDirectory ) )
@@ -64,14 +64,14 @@ namespace Quartzmin
}
#if NETCOREAPP
public static void AddQuartzmin( this IServiceCollection services )
public static void AddSilkierQuartz( this IServiceCollection services )
{
services.AddControllers()
.AddApplicationPart( Assembly.GetExecutingAssembly() )
.AddNewtonsoftJson();
}
#else
public static void AddQuartzmin( this IServiceCollection services )
public static void AddSilkierQuartz( this IServiceCollection services )
{
services.AddMvcCore()
.AddApplicationPart( Assembly.GetExecutingAssembly() )

View File

@@ -3,7 +3,7 @@ using Quartz.Impl.Matchers;
using System.Collections.Generic;
using System.Linq;
namespace Quartzmin
namespace SilkierQuartz
{
internal class Cache
{

View File

@@ -1,6 +1,6 @@
using Quartz;
using Quartzmin.Helpers;
using Quartzmin.Models;
using SilkierQuartz.Helpers;
using SilkierQuartz.Models;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -16,7 +16,7 @@ using IActionResult = System.Web.Http.IHttpActionResult;
#endif
#endregion
namespace Quartzmin.Controllers
namespace SilkierQuartz.Controllers
{
public class CalendarsController : PageControllerBase
{

View File

@@ -1,6 +1,6 @@
using Quartz;
using Quartzmin.Helpers;
using Quartzmin.Models;
using SilkierQuartz.Helpers;
using SilkierQuartz.Models;
using Quartz.Plugins.RecentHistory;
using Quartz.Impl.Matchers;
using System;
@@ -18,7 +18,7 @@ using IActionResult = System.Web.Http.IHttpActionResult;
#endif
#endregion
namespace Quartzmin.Controllers
namespace SilkierQuartz.Controllers
{
public class ExecutionsController : PageControllerBase
{

View File

@@ -14,7 +14,7 @@ using IActionResult = System.Web.Http.IHttpActionResult;
#endif
#endregion
namespace Quartzmin.Controllers
namespace SilkierQuartz.Controllers
{
public class HistoryController : PageControllerBase
{

View File

@@ -1,6 +1,6 @@
using Quartzmin.Helpers;
using Quartzmin.Models;
using Quartzmin.TypeHandlers;
using SilkierQuartz.Helpers;
using SilkierQuartz.Models;
using SilkierQuartz.TypeHandlers;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using System.Linq;
@@ -20,7 +20,7 @@ using System.Web.Http.Results;
#endif
#endregion
namespace Quartzmin.Controllers
namespace SilkierQuartz.Controllers
{
public class JobDataMapController : PageControllerBase
{

View File

@@ -1,7 +1,7 @@
using Quartz;
using Quartz.Impl.Matchers;
using Quartzmin.Helpers;
using Quartzmin.Models;
using SilkierQuartz.Helpers;
using SilkierQuartz.Models;
using Quartz.Plugins.RecentHistory;
using System;
using System.Collections.Generic;
@@ -18,7 +18,7 @@ using IActionResult = System.Web.Http.IHttpActionResult;
#endif
#endregion
namespace Quartzmin.Controllers
namespace SilkierQuartz.Controllers
{
public class JobsController : PageControllerBase
{

View File

@@ -4,11 +4,11 @@ using System.Dynamic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Quartzmin.Models;
using Quartzmin.Helpers;
using SilkierQuartz.Models;
using SilkierQuartz.Helpers;
using Quartz;
namespace Quartzmin.Controllers
namespace SilkierQuartz.Controllers
{
#region Target-Specific Directives

View File

@@ -1,6 +1,6 @@
using Quartz;
using Quartzmin.Helpers;
using Quartzmin.Models;
using SilkierQuartz.Helpers;
using SilkierQuartz.Models;
using Quartz.Plugins.RecentHistory;
using Quartz.Impl.Matchers;
using System;
@@ -19,7 +19,7 @@ using IActionResult = System.Web.Http.IHttpActionResult;
#endif
#endregion
namespace Quartzmin.Controllers
namespace SilkierQuartz.Controllers
{
public class SchedulerController : PageControllerBase
{

View File

@@ -1,7 +1,7 @@
using Quartz;
using Quartz.Impl.Matchers;
using Quartzmin.Helpers;
using Quartzmin.Models;
using SilkierQuartz.Helpers;
using SilkierQuartz.Models;
using Quartz.Plugins.RecentHistory;
using System;
using System.Collections.Generic;
@@ -18,7 +18,7 @@ using IActionResult = System.Web.Http.IHttpActionResult;
#endif
#endregion
namespace Quartzmin.Controllers
namespace SilkierQuartz.Controllers
{
public class TriggersController : PageControllerBase
{

View File

@@ -1,4 +1,4 @@
namespace Quartzmin
namespace SilkierQuartz
{
internal static class DateTimeSettings
{

View File

@@ -1,6 +1,6 @@
using Quartz;
using Quartzmin.Models;
using Quartzmin.TypeHandlers;
using SilkierQuartz.Models;
using SilkierQuartz.TypeHandlers;
using System;
using System.Collections.Generic;
using System.Globalization;
@@ -21,7 +21,7 @@ using HttpRequest = System.Net.Http.HttpRequestMessage;
#endif
#endregion
namespace Quartzmin
namespace SilkierQuartz
{
internal static class Extensions
{

View File

@@ -2,7 +2,7 @@
using System;
namespace Quartzmin.Helpers
namespace SilkierQuartz.Helpers
{
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
public class FromFormAttribute : Attribute

View File

@@ -1,6 +1,6 @@
using HandlebarsDotNet;
using Quartzmin.Models;
using Quartzmin.TypeHandlers;
using SilkierQuartz.Models;
using SilkierQuartz.TypeHandlers;
using System;
using System.Collections.Generic;
using System.Globalization;
@@ -10,9 +10,9 @@ using System.Reflection;
using System.Text;
using System.Web;
using static Quartzmin.Controllers.PageControllerBase;
using static SilkierQuartz.Controllers.PageControllerBase;
namespace Quartzmin.Helpers
namespace SilkierQuartz.Helpers
{
internal class HandlebarsHelpers
{
@@ -57,7 +57,7 @@ namespace Quartzmin.Helpers
h.RegisterHelper(nameof(eachItems), eachItems);
h.RegisterHelper(nameof(ToBase64), ToBase64);
h.RegisterHelper(nameof(footer), footer);
h.RegisterHelper(nameof(QuartzminVersion), QuartzminVersion);
h.RegisterHelper(nameof(SilkierQuartzVersion), SilkierQuartzVersion);
h.RegisterHelper(nameof(Logo), Logo);
h.RegisterHelper(nameof(ProductName), ProductName);
}
@@ -258,7 +258,7 @@ namespace Quartzmin.Helpers
options.Template(writer, (object)context);
}
}
void QuartzminVersion(TextWriter output, dynamic context, params object[] arguments)
void SilkierQuartzVersion(TextWriter output, dynamic context, params object[] arguments)
{
var v = GetType().Assembly.GetCustomAttributes<AssemblyInformationalVersionAttribute>().FirstOrDefault();
output.Write(v.InformationalVersion);

View File

@@ -1,4 +1,4 @@
using Quartzmin.Models;
using SilkierQuartz.Models;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -13,7 +13,7 @@ using System.Net.Http;
#endif
#endregion
namespace Quartzmin.Helpers
namespace SilkierQuartz.Helpers
{
internal static class JobDataMapRequest
{

View File

@@ -1,5 +1,5 @@

namespace Quartzmin.Helpers
namespace SilkierQuartz.Helpers
{
#if (NETSTANDARD || NETCOREAPP)
using Microsoft.AspNetCore.Mvc.Filters;

View File

@@ -2,7 +2,7 @@
using System;
using System.Text.Json;
namespace Quartzmin.Helpers
namespace SilkierQuartz.Helpers
{
public class JsonPascalCaseNamingPolicy : JsonNamingPolicy
{

View File

@@ -1,11 +1,11 @@
using Quartzmin.Models;
using SilkierQuartz.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Reflection;
namespace Quartzmin.Helpers
namespace SilkierQuartz.Helpers
{
public static class ModelValidator
{

View File

@@ -1,6 +1,6 @@
using Microsoft.Extensions.DependencyInjection;
namespace Quartzmin.HostedService
namespace SilkierQuartz.HostedService
{
public interface IJobRegistrator
{

View File

@@ -9,7 +9,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace Quartzmin.HostedService
namespace SilkierQuartz.HostedService
{
public static class IJobRegistratorExtensions
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Quartz;
namespace Quartzmin.HostedService
namespace SilkierQuartz.HostedService
{
internal interface IScheduleJob
{

View File

@@ -9,7 +9,7 @@ using System.Collections.Generic;
using System.Collections.Specialized;
using System.Text;
namespace Quartzmin.HostedService
namespace SilkierQuartz.HostedService
{
public static class IServiceCollectionExtensions
{

View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
namespace Quartzmin.HostedService
namespace SilkierQuartz.HostedService
{
public class JobOptions
{

View File

@@ -3,7 +3,7 @@ using System;
using System.Collections.Generic;
using System.Text;
namespace Quartzmin.HostedService
namespace SilkierQuartz.HostedService
{
internal class JobRegistrator : IJobRegistrator
{

View File

@@ -10,7 +10,7 @@ using Quartz;
using Quartz.Spi;
using System.Linq;
namespace Quartzmin.HostedService
namespace SilkierQuartz.HostedService
{
internal class QuartzHostedService : IHostedService
{

View File

@@ -2,7 +2,7 @@
using System;
using System.Collections.Generic;
namespace Quartzmin.HostedService
namespace SilkierQuartz.HostedService
{
internal class ScheduleJob : IScheduleJob
{

View File

@@ -6,7 +6,7 @@ using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Text;
namespace Quartzmin.HostedService
namespace SilkierQuartz.HostedService
{
public class ServiceCollectionJobFactory : IJobFactory
{

View File

@@ -3,7 +3,7 @@ using System;
using System.Collections.Generic;
using System.Text;
namespace Quartzmin.HostedService
namespace SilkierQuartz.HostedService
{
public class TriggerOptions
{

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class CalendarListItem
{

View File

@@ -1,14 +1,14 @@
using Quartz;
using Quartz.Impl.Calendar;
using Quartzmin.Helpers;
using Quartzmin.TypeHandlers;
using SilkierQuartz.Helpers;
using SilkierQuartz.TypeHandlers;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Globalization;
using System.Linq;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class CalendarViewModel : IHasValidation
{

View File

@@ -1,6 +1,6 @@
using System.IO;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class FormFile
{

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class Histogram
{

View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public interface IHasValidation
{

View File

@@ -1,6 +1,6 @@
using Quartzmin.TypeHandlers;
using SilkierQuartz.TypeHandlers;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class JobDataMapItem : JobDataMapItemBase
{

View File

@@ -1,9 +1,9 @@
using Quartzmin.TypeHandlers;
using SilkierQuartz.TypeHandlers;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class JobDataMapItemBase : IHasValidation
{

View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class JobDataMapModel
{

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class JobListItem
{

View File

@@ -1,8 +1,8 @@
using Quartzmin.Helpers;
using SilkierQuartz.Helpers;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class JobViewModel : IHasValidation
{

View File

@@ -1,6 +1,6 @@
using Quartz;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class KeyModel
{

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class TriggerListItem
{

View File

@@ -2,7 +2,7 @@
using Quartz;
using Quartz.Impl.Matchers;
using Quartz.Impl.Triggers;
using Quartzmin.Helpers;
using SilkierQuartz.Helpers;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
using static Quartz.MisfireInstruction;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class TriggerViewModel : IHasValidation
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Linq;
namespace Quartzmin.Models
namespace SilkierQuartz.Models
{
public class ValidationResult
{

View File

@@ -7,7 +7,7 @@ using System.IO;
using System.Linq;
using System.Reflection;
namespace Quartzmin.Owin
namespace SilkierQuartz.Owin
{
/// <summary>
/// Looks up files using embedded resources in the specified assembly.

View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
using System.Web;
using System.Web.Management;
namespace Quartzmin.Owin
namespace SilkierQuartz.Owin
{
internal class SeekableRequestMiddleware : OwinMiddleware
{

View File

@@ -1,18 +1,18 @@
using Quartz;
using Quartzmin.TypeHandlers;
using SilkierQuartz.TypeHandlers;
using System.Collections.Generic;
using System.IO;
using Number = Quartzmin.TypeHandlers.NumberHandler.UnderlyingType;
using Number = SilkierQuartz.TypeHandlers.NumberHandler.UnderlyingType;
namespace Quartzmin
namespace SilkierQuartz
{
public class QuartzminOptions
public class SilkierQuartzOptions
{
/// <summary>
/// Supports any value that is a viable as a img src attribute value: url, or base64
/// src='data:image/jpeg;base64, LzlqLzRBQ...[end of base64 data]'
/// Defaults to the quartzmin original logo
/// Defaults to the SilkierQuartz original logo
/// </summary>
public string Logo { get; set; } = "Content/Images/logo.png";
@@ -50,7 +50,7 @@ namespace Quartzmin
set => DateTimeSettings.UseLocalTime = value;
}
public QuartzminOptions()
public SilkierQuartzOptions()
{
DefaultSelectedType = new StringHandler() { Name = "String" };

View File

@@ -1,14 +1,14 @@
using HandlebarsDotNet;
using Quartz;
using Quartzmin.Helpers;
using SilkierQuartz.Helpers;
namespace Quartzmin
namespace SilkierQuartz
{
public class Services
{
internal const string ContextKey = "quartzmin.services";
internal const string ContextKey = "SilkierQuartz.services";
public QuartzminOptions Options { get; set; }
public SilkierQuartzOptions Options { get; set; }
public ViewEngine ViewEngine { get; set; }
@@ -20,7 +20,7 @@ namespace Quartzmin
internal Cache Cache { get; private set; }
public static Services Create(QuartzminOptions options)
public static Services Create(SilkierQuartzOptions options)
{
var handlebarsConfiguration = new HandlebarsConfiguration()
{

View File

@@ -9,10 +9,10 @@
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<Version>1.0.5</Version>
<Product>Quartzmin</Product>
<Product>SilkierQuartz</Product>
<Title>Web management tool for Quartz.NET</Title>
<Authors>Jan Lucansky</Authors>
<PackageProjectUrl>https://github.com/jlucansky/Quartzmin</PackageProjectUrl>
<PackageProjectUrl>https://github.com/jlucansky/SilkierQuartz</PackageProjectUrl>
<PackageIconUrl></PackageIconUrl>
<Description>Powerful, easy to use web management tool for Quartz.NET</Description>
<PackageTags>quartz;web;ui</PackageTags>
@@ -21,11 +21,11 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>Copyright © 2020 Jan Lucansky</Copyright>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/jlucansky/Quartzmin</RepositoryUrl>
<RepositoryUrl>https://github.com/jlucansky/SilkierQuartz</RepositoryUrl>
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageId>QuartzminFork</PackageId>
<PackageId>SilkierQuartzFork</PackageId>
<PackageIcon>logo.png</PackageIcon>
</PropertyGroup>

View File

@@ -1,12 +1,12 @@
using JsonSubTypes;
using Newtonsoft.Json;
using Quartzmin.TypeHandlers;
using SilkierQuartz.TypeHandlers;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Quartzmin
namespace SilkierQuartz
{
public class TypeHandlerService
{

View File

@@ -3,7 +3,7 @@ using System.IO;
using System.Reflection;
using System.Text;
namespace Quartzmin.TypeHandlers
namespace SilkierQuartz.TypeHandlers
{
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
public class TypeHandlerResourcesAttribute : Attribute

View File

@@ -1,4 +1,4 @@
namespace Quartzmin.TypeHandlers
namespace SilkierQuartz.TypeHandlers
{
[EmbeddedTypeHandlerResources(nameof(BooleanHandler))]
public class BooleanHandler : TypeHandlerBase

View File

@@ -1,7 +1,7 @@
using System;
using System.Globalization;
namespace Quartzmin.TypeHandlers
namespace SilkierQuartz.TypeHandlers
{
[EmbeddedTypeHandlerResources(nameof(DateTimeHandler))]
public class DateTimeHandler : TypeHandlerBase

View File

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Reflection;
namespace Quartzmin.TypeHandlers
namespace SilkierQuartz.TypeHandlers
{
public class EnumHandler : OptionSetHandler
{

View File

@@ -1,10 +1,10 @@
using Quartzmin.Models;
using SilkierQuartz.Models;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System;
namespace Quartzmin.TypeHandlers
namespace SilkierQuartz.TypeHandlers
{
[EmbeddedTypeHandlerResources(nameof(FileHandler))]
public class FileHandler : TypeHandlerBase

View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Globalization;
namespace Quartzmin.TypeHandlers
namespace SilkierQuartz.TypeHandlers
{
[EmbeddedTypeHandlerResources(nameof(NumberHandler), Script = "")]
public class NumberHandler : TypeHandlerBase

View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace Quartzmin.TypeHandlers
namespace SilkierQuartz.TypeHandlers
{
[EmbeddedTypeHandlerResources(nameof(OptionSetHandler))]
public abstract class OptionSetHandler : TypeHandlerBase

View File

@@ -1,6 +1,6 @@
using System;
namespace Quartzmin.TypeHandlers
namespace SilkierQuartz.TypeHandlers
{
[EmbeddedTypeHandlerResources(nameof(StringHandler))]
public class StringHandler : TypeHandlerBase

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
namespace Quartzmin.TypeHandlers
namespace SilkierQuartz.TypeHandlers
{
public abstract class TypeHandlerBase
{
@@ -17,7 +17,7 @@ namespace Quartzmin.TypeHandlers
internal static string GetTypeId(Type type) => type.FullName;
/// <summary>
/// Unique name across <see cref="QuartzminOptions.StandardTypes"/>
/// Unique name across <see cref="SilkierQuartzOptions.StandardTypes"/>
/// </summary>
public string Name
{

View File

@@ -1,4 +1,4 @@
namespace Quartzmin.TypeHandlers
namespace SilkierQuartz.TypeHandlers
{
[EmbeddedTypeHandlerResources(nameof(UnsupportedTypeHandler), Script = "")]
public class UnsupportedTypeHandler : TypeHandlerBase

View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Globalization;
namespace Quartzmin
namespace SilkierQuartz
{
public class ViewEngine
{

View File

@@ -3,11 +3,11 @@ using System.IO;
using System.Reflection;
using System.Text;
namespace Quartzmin
namespace SilkierQuartz
{
public static class ViewFileSystemFactory
{
public static ViewEngineFileSystem Create(QuartzminOptions options)
public static ViewEngineFileSystem Create(SilkierQuartzOptions options)
{
ViewEngineFileSystem fs;
@@ -81,7 +81,7 @@ namespace Quartzmin
string GetFullPath(string filePath)
{
return Path.Combine(nameof(Quartzmin) + ".Views", filePath.Replace("partials/", "Partials/")).Replace('/', '.').Replace('\\', '.');
return Path.Combine(nameof(SilkierQuartz) + ".Views", filePath.Replace("partials/", "Partials/")).Replace('/', '.').Replace('\\', '.');
}
}

View File

@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title>{{ViewBag.Title}} - Quartzmin</title>
<title>{{ViewBag.Title}} - SilkierQuartz</title>
<link rel="icon" type="image/png" sizes="16x16" href="Content/Images/favicons/favicon-16.png">
<link rel="icon" type="image/png" sizes="24x24" href="Content/Images/favicons/favicon-24.png">
@@ -37,7 +37,7 @@
<div class="ui header item">
<img class="logo" src="{{Logo}}">
<a class="navbar-brand" href="{{BaseUrl}}">
{{ProductName}} Quartzmin
{{ProductName}} SilkierQuartz
</a>
</div>
@@ -77,7 +77,7 @@
{{#footer}}
<footer style="text-align:center; margin-top: 3em; padding: .8em 0; background-color: #f8f8f8; font-size: 90%; border-top: 1px solid rgba(34,36,38,.1);">
<a href="https://github.com/jlucansky/Quartzmin" target="_blank" style="color: #909090"><i class="github icon"></i> Quartzmin&nbsp;&nbsp;v{{QuartzminVersion}}</a>
<a href="https://github.com/jlucansky/SilkierQuartz" target="_blank" style="color: #909090"><i class="github icon"></i> SilkierQuartz&nbsp;&nbsp;v{{SilkierQuartzVersion}}</a>
</footer>
{{/footer}}
</body>

View File

@@ -4,8 +4,8 @@ using Microsoft.Extensions.Hosting;
using Quartz;
using Quartz.Impl;
using Quartz.Spi;
using Quartzmin;
using Quartzmin.HostedService;
using SilkierQuartz;
using SilkierQuartz.HostedService;
using System;
using Xunit;
@@ -22,7 +22,7 @@ namespace SilkierQuartz.Test
var testClass = serviceCollection.BuildServiceProvider().GetRequiredService<IHostedService>();
testClass.Should()
.NotBeNull()
.And.BeOfType<Quartzmin.HostedService.QuartzHostedService>();
.And.BeOfType<SilkierQuartz.HostedService.QuartzHostedService>();
}
[Fact(DisplayName = "«арегистрировали IJobFactory (дл¤ DI в Job'ах)")]

View File

@@ -7,7 +7,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
using Quartzmin.HostedService;
using SilkierQuartz.HostedService;
namespace SilkierQuartz.Test
{
public class QuartzHostedServiceUnitTest

View File

@@ -21,7 +21,7 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Quartz.Plugins.RecentHistory\Quartz.Plugins.RecentHistory.csproj" />
<ProjectReference Include="..\..\src\Quartzmin\Quartzmin.csproj" />
<ProjectReference Include="..\..\src\SilkierQuartz\SilkierQuartz.csproj" />
</ItemGroup>
</Project>