LeptonXLite applied

dolunay · dolunay · commit ec433e72e61d · 2025-04-14T02:23:50.000+03:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -208,7 +208,11 @@
 		<PackageVersion Include="Google.Apis.Keep.v1" Version="1.68.0.2637" />
 		<PackageVersion Include="Google.Apis.Tasks.v1" Version="1.68.0.3468" />
 		<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
+		
 		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="4.1.1" />
+		<PackageVersion Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="4.1.1" />
+		<PackageVersion Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="4.1.1" />
+		<PackageVersion Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme.Bundling" Version="4.1.1" />
 	</ItemGroup>
 	<!-- .NET Blazor-->
 	<ItemGroup>
@@ -321,13 +325,6 @@
 		<PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
 		<PackageVersion Include="Fody" Version="6.8.2" />
 	</ItemGroup>
-	<!-- BasicTheme -->
-	<ItemGroup>
-		<PackageVersion Include="Syrna.Alpha.AspNetCore.Components.Server.BasicTheme" Version="$(SyrnaAlphaPackageVersion)" />
-		<PackageVersion Include="Syrna.Alpha.AspNetCore.Components.Web.BasicTheme" Version="$(SyrnaAlphaPackageVersion)" />
-		<PackageVersion Include="Syrna.Alpha.AspNetCore.Components.WebAssembly.BasicTheme" Version="$(SyrnaAlphaPackageVersion)" />
-		<PackageVersion Include="Syrna.Alpha.AspNetCore.Mvc.UI.Theme.Basic" Version="$(SyrnaAlphaPackageVersion)" />
-	</ItemGroup>
 	<!-- ApiDescription -->
 	<ItemGroup>
 		<PackageVersion Include="NSwag.ApiDescription.Client" Version="14.2.0" />
diff --git a/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/MainDemoBlazorHostClientModule.cs b/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/MainDemoBlazorHostClientModule.cs
@@ -12,7 +12,8 @@
 using System.Net.Http;
 using Volo.Abp.Account;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
-using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme;
+using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme;
+using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme.Bundling;
 using Volo.Abp.Autofac.WebAssembly;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Identity.Blazor.WebAssembly;
@@ -24,7 +25,8 @@
 namespace Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client;
 
 [DependsOn(typeof(AbpAutofacWebAssemblyModule))]
-[DependsOn(typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule))]
+//[DependsOn(typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule))]
+[DependsOn(typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule))]
 [DependsOn(typeof(AbpAccountApplicationContractsModule))]
 [DependsOn(typeof(AbpIdentityBlazorWebAssemblyModule))]
 [DependsOn(typeof(AbpTenantManagementBlazorWebAssemblyModule))]
diff --git a/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/Menus/MainDemoBlazorHostClientMenuContributor.cs b/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/Menus/MainDemoBlazorHostClientMenuContributor.cs
@@ -33,27 +33,9 @@ private Task ConfigureMainMenuAsync(MenuConfigurationContext context)
                 MainDemoBlazorHostClientMenus.Home,
                 l["Menu:Home"],
                 "/",
-                icon: "fa-home"
+                icon: "fa fa-house"
             )
         );
-
-        var groupMenuItem = new ApplicationMenuItem(MainDemoBlazorHostClientMenus.Prefix, l["Menu:QuartzAdmin"], icon: IconName.Clock.ToString());
-        context.Menu.AddItem(groupMenuItem);
-
-        groupMenuItem.AddItem(new ApplicationMenuItem(
-            MainDemoBlazorHostClientMenus.Overview,
-            l["Menu:Overview"],
-            url: "~/overview").RequirePermissions(QuartzAdminPermissions.Overview.Default));
-
-        groupMenuItem.AddItem(new ApplicationMenuItem(
-            MainDemoBlazorHostClientMenus.Schedules,
-            l["Menu:Schedules"],
-            url: "~/schedules").RequirePermissions(QuartzAdminPermissions.Schedules.Default));
-
-        groupMenuItem.AddItem(new ApplicationMenuItem(
-            MainDemoBlazorHostClientMenus.History,
-            l["Menu:History"],
-            url: "~/history").RequirePermissions(QuartzAdminPermissions.History.Default));
 
         return Task.CompletedTask;
     }
@@ -66,9 +48,9 @@ private Task ConfigureUserMenuAsync(MenuConfigurationContext context)
 
         context.Menu.AddItem(new ApplicationMenuItem(
             "Account.Manage",
-            accountStringLocalizer["MyAccount"],
+            accountStringLocalizer["MyAccount"]??"My Account",
             $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={configuration["App:SelfUrl"]}",
-            icon: "fa fa-cog",
+            icon: "fa-cog",
             order: 1000,
             null).RequireAuthenticated());
 
diff --git a/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/Menus/MainDemoBlazorHostClientMenus.cs b/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/Menus/MainDemoBlazorHostClientMenus.cs
@@ -4,9 +4,4 @@ public class MainDemoBlazorHostClientMenus
 {
     public const string Prefix = "MainDemo";
     public const string Home = Prefix + ".Home";
-
-    public const string Overview = Prefix + ".Overview";
-    public const string Schedules = Prefix + ".Schedules";
-    public const string History = Prefix + ".History";
-
 }
diff --git a/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/Routes.razor b/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/Routes.razor
@@ -1,5 +1,5 @@
-﻿﻿@using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
+﻿@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
+﻿@using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp
 <Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="WebAppAdditionalAssembliesHelper.GetAssemblies<MainDemoBlazorHostClientModule>()">
     <Found Context="routeData">
         <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">
diff --git a/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client.csproj b/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client.csproj
@@ -31,7 +31,7 @@
 		<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" />
 		
 		<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly" />
-		<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" />
+		<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" />
 		<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" />
 		<PackageReference Include="Volo.Abp.TenantManagement.Blazor.WebAssembly" />
 		<PackageReference Include="Volo.Abp.SettingManagement.Blazor.WebAssembly" />
diff --git a/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host/MainDemoBlazorHostModule.cs b/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host/MainDemoBlazorHostModule.cs
@@ -4,19 +4,18 @@
 using Microsoft.Extensions.Hosting;
 using Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client;
 using Volo.Abp;
-using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Bundling;
+using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme.Bundling;
 using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.Autofac;
 using Volo.Abp.Modularity;
 
 namespace Syrna.QuartzAdmin.MainDemo.Blazor.Host;
 
-[DependsOn(
-    typeof(AbpAutofacModule),
-    typeof(AbpAspNetCoreMvcUiBundlingModule),
-    typeof(AbpAspNetCoreComponentsWebAssemblyThemingBundlingModule)
-)]
+[DependsOn(typeof(AbpAutofacModule))]
+[DependsOn(typeof(AbpAspNetCoreMvcUiBundlingModule))]
+//[DependsOn(typeof(AbpAspNetCoreComponentsWebAssemblyThemingBundlingModule))]
+[DependsOn(typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeBundlingModule))]
 public class MainDemoBlazorHostModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.csproj b/demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.csproj
@@ -18,7 +18,7 @@
 
 		<PackageReference Include="Volo.Abp.Autofac" />
 		<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Bundling" />
-		<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Bundling" />
+		<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme.Bundling" />
 		
 	</ItemGroup>
 
diff --git a/demos/MainDemo/src/Syrna.QuartzAdmin.MainDemo.Domain.Shared/MainDemoDomainSharedModule.cs b/demos/MainDemo/src/Syrna.QuartzAdmin.MainDemo.Domain.Shared/MainDemoDomainSharedModule.cs
@@ -44,13 +44,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                 .Add<MainDemoResource>("en")
                 .AddBaseTypes(typeof(AbpValidationResource))
                 .AddVirtualJson("/Localization/MainDemo");
-
-            options.DefaultResourceType = typeof(MainDemoResource);
-        });
-
-        Configure<AbpExceptionLocalizationOptions>(options =>
-        {
-            options.MapCodeNamespace("MainDemo", typeof(MainDemoResource));
         });
     }
 }
diff --git a/demos/MainDemo/src/Syrna.QuartzAdmin.MainDemo.Domain.Shared/Syrna.QuartzAdmin.MainDemo.Domain.Shared.csproj b/demos/MainDemo/src/Syrna.QuartzAdmin.MainDemo.Domain.Shared/Syrna.QuartzAdmin.MainDemo.Domain.Shared.csproj
@@ -23,13 +23,9 @@
 
 	<ItemGroup>
 		<EmbeddedResource Include="Localization\MainDemo\*.json" />
-		<Compile Remove="Settings\**" />
 		<Content Remove="Localization\MainDemo\*.json" />
-		<Content Remove="Settings\**" />
-		<EmbeddedResource Remove="Settings\**" />
-		<None Remove="Settings\**" />
 	</ItemGroup>
-
+	
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" />
 	</ItemGroup>
diff --git a/modules/src/Syrna.QuartzAdmin.Application/Syrna/QuartzAdmin/Scheduler/SchedulerAppService.cs b/modules/src/Syrna.QuartzAdmin.Application/Syrna/QuartzAdmin/Scheduler/SchedulerAppService.cs
@@ -371,8 +371,10 @@ public async Task CreateSchedule(JobDetailModel jobDetailModel, TriggerDetailMod
                 if (existingJob != null)
                 {
                     //await scheduler.GetTriggersOfJob(job.Key)
-                    var jobTriggers = new List<ITrigger>(1);
-                    jobTriggers.Add(trigger);
+                    var jobTriggers = new List<ITrigger>(1)
+                    {
+                        trigger
+                    };
 
                     await Scheduler.ScheduleJob(existingJob, jobTriggers.AsReadOnly(), true);
                     return;
diff --git a/modules/src/Syrna.QuartzAdmin.Blazor/QuartzAdminBlazorModule.cs b/modules/src/Syrna.QuartzAdmin.Blazor/QuartzAdminBlazorModule.cs
@@ -9,12 +9,10 @@
 
 namespace Syrna.QuartzAdmin.Blazor
 {
-    [DependsOn(
-        typeof(QuartzAdminApplicationContractsModule),
-        typeof(AbpAspNetCoreComponentsWebThemingModule),
-        typeof(AbpAutoMapperModule),
-        typeof(AbpBlazoriseUIModule)
-        )]
+    [DependsOn(typeof(QuartzAdminApplicationContractsModule))]
+    [DependsOn(typeof(AbpAspNetCoreComponentsWebThemingModule))]
+    [DependsOn(typeof(AbpAutoMapperModule))]
+    [DependsOn(typeof(AbpBlazoriseUIModule))]
     public class QuartzAdminBlazorModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
@@ -35,12 +33,12 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddMaps<QuartzAdminBlazorModule>(validate: true);
+            });
+
+            Configure<AbpNavigationOptions>(options =>
+            {
+                options.MenuContributors.Add(new QuartzAdminMenuContributor());
             });
-            
-            //Configure<AbpNavigationOptions>(options =>
-            //{
-            //    options.MenuContributors.Add(new QuartzAdminMenuContributor());
-            //});
 
             Configure<AbpRouterOptions>(options =>
             {
diff --git a/modules/src/Syrna.QuartzAdmin.Blazor/QuartzAdminMenuContributor.cs b/modules/src/Syrna.QuartzAdmin.Blazor/QuartzAdminMenuContributor.cs
@@ -0,0 +1,41 @@
+﻿using Blazorise;
+using Syrna.Alpha.AccountingDef.Blazor;
+using Syrna.QuartzAdmin.Localization;
+using System.Threading.Tasks;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.UI.Navigation;
+
+namespace Syrna.QuartzAdmin.Blazor;
+
+public class QuartzAdminMenuContributor : IMenuContributor
+{
+    public virtual Task ConfigureMenuAsync(MenuConfigurationContext context)
+    {
+        if (context.Menu.Name != StandardMenus.Main)
+        {
+            return Task.CompletedTask;
+        }
+
+        var l = context.GetLocalizer<QuartzAdminResource>();
+       
+        var groupMenuItem = new ApplicationMenuItem(QuartzAdminMenuNames.GroupName, l["Menu:QuartzAdmin"], icon: IconName.Clock.ToString());
+        context.Menu.AddItem(groupMenuItem);
+
+        groupMenuItem.AddItem(new ApplicationMenuItem(
+            QuartzAdminMenuNames.Overview,
+            l["Menu:Overview"],
+            url: "~/overview")/*.RequirePermissions(QuartzAdminPermissions.Overview.Default)*/);
+
+        groupMenuItem.AddItem(new ApplicationMenuItem(
+            QuartzAdminMenuNames.Schedules,
+            l["Menu:Schedules"],
+            url: "~/schedules")/*.RequirePermissions(QuartzAdminPermissions.Schedules.Default)*/);
+
+        groupMenuItem.AddItem(new ApplicationMenuItem(
+            QuartzAdminMenuNames.History,
+            l["Menu:History"],
+            url: "~/history")/*.RequirePermissions(QuartzAdminPermissions.History.Default)*/);
+
+        return Task.CompletedTask;
+    }
+}
diff --git a/modules/src/Syrna.QuartzAdmin.Blazor/QuartzAdminMenuNames.cs b/modules/src/Syrna.QuartzAdmin.Blazor/QuartzAdminMenuNames.cs
@@ -0,0 +1,10 @@
+﻿namespace Syrna.Alpha.AccountingDef.Blazor;
+
+public class QuartzAdminMenuNames
+{
+    public const string GroupName = "QuartzAdmin";
+
+    public const string Overview = GroupName + ".Overview";
+    public const string Schedules = GroupName + ".Schedules";
+    public const string History = GroupName + ".History";
+}
diff --git a/modules/src/Syrna.QuartzAdmin.Domain.Shared/Syrna/QuartzAdmin/Localization/QuartzAdmin/en.json b/modules/src/Syrna.QuartzAdmin.Domain.Shared/Syrna/QuartzAdmin/Localization/QuartzAdmin/en.json
@@ -1,6 +1,7 @@
 {
   "culture": "en",
   "texts": {
+    "MyAccount": "My Account",
     "Back": "Back",
     "Cancel": "Cancel",
     "Next": "Next",
diff --git a/modules/src/Syrna.QuartzAdmin.Domain.Shared/Syrna/QuartzAdmin/Localization/QuartzAdmin/tr.json b/modules/src/Syrna.QuartzAdmin.Domain.Shared/Syrna/QuartzAdmin/Localization/QuartzAdmin/tr.json
@@ -1,6 +1,7 @@
 {
   "culture": "tr",
   "texts": {
+    "MyAccount": "Hesabım",
     "Back": "Geri",
     "Cancel": "Vazgeç",
     "Next": "İleri",
diff --git a/modules/src/Syrna.QuartzAdmin.Domain.Shared/Syrna/QuartzAdmin/QuartzAdminDomainSharedModule.cs b/modules/src/Syrna.QuartzAdmin.Domain.Shared/Syrna/QuartzAdmin/QuartzAdminDomainSharedModule.cs
@@ -29,11 +29,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                     .AddBaseTypes(typeof(AbpValidationResource))
                     .AddVirtualJson("/Syrna/QuartzAdmin/Localization/QuartzAdmin");
             });
-
-            Configure<AbpExceptionLocalizationOptions>(options =>
-            {
-                options.MapCodeNamespace("SyrnaQuartzAdmin", typeof(QuartzAdminResource));
-            });
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,4 @@ public class MainDemoBlazorHostClientMenus`
`4`	`4`	`{`
`5`	`5`	`public const string Prefix = "MainDemo";`
`6`	`6`	`public const string Home = Prefix + ".Home";`
`7`		`-`
`8`		`- public const string Overview = Prefix + ".Overview";`
`9`		`- public const string Schedules = Prefix + ".Schedules";`
`10`		`- public const string History = Prefix + ".History";`
`11`		`-`
`12`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)`
`44`	`44`	`.Add<MainDemoResource>("en")`
`45`	`45`	`.AddBaseTypes(typeof(AbpValidationResource))`
`46`	`46`	`.AddVirtualJson("/Localization/MainDemo");`
`47`		`-`
`48`		`- options.DefaultResourceType = typeof(MainDemoResource);`
`49`		`- });`
`50`		`-`
`51`		`- Configure<AbpExceptionLocalizationOptions>(options =>`
`52`		`- {`
`53`		`- options.MapCodeNamespace("MainDemo", typeof(MainDemoResource));`
`54`	`47`	`});`
`55`	`48`	`}`
`56`	`49`	`}`