diff --git a/Directory.Packages.props b/Directory.Packages.props index f064948..27fb6cc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,8 +3,8 @@ true - + @@ -20,8 +20,7 @@ - - + diff --git a/src/RDMG.Core/RDMG.Core.csproj b/src/RDMG.Core/RDMG.Core.csproj index 6b441be..3a097c4 100644 --- a/src/RDMG.Core/RDMG.Core.csproj +++ b/src/RDMG.Core/RDMG.Core.csproj @@ -1,16 +1,15 @@  - - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/RDMG.Infrastructure/RDMG.Infrastructure.csproj b/src/RDMG.Infrastructure/RDMG.Infrastructure.csproj index 8d11a36..81c832e 100644 --- a/src/RDMG.Infrastructure/RDMG.Infrastructure.csproj +++ b/src/RDMG.Infrastructure/RDMG.Infrastructure.csproj @@ -1,11 +1,11 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/RDMG.Resources/RDMG.Resources.csproj b/src/RDMG.Resources/RDMG.Resources.csproj index b82d9bc..d1a1248 100644 --- a/src/RDMG.Resources/RDMG.Resources.csproj +++ b/src/RDMG.Resources/RDMG.Resources.csproj @@ -1,80 +1,76 @@ - - - - - - - - PreserveNewest - true - PreserveNewest - - - PreserveNewest - true - PreserveNewest - - - - - - True - True - Common.resx - - - True - True - Dungeon.resx - - - True - True - Error.resx - - - True - True - Home.resx - - - True - True - Profile.resx - - - True - True - User.resx - - - - - - PublicResXFileCodeGenerator - Common.Designer.cs - - - PublicResXFileCodeGenerator - Dungeon.Designer.cs - - - PublicResXFileCodeGenerator - Error.Designer.cs - - - PublicResXFileCodeGenerator - Home.Designer.cs - - - PublicResXFileCodeGenerator - Profile.Designer.cs - - - PublicResXFileCodeGenerator - User.Designer.cs - - - + + + + + + + PreserveNewest + true + PreserveNewest + + + PreserveNewest + true + PreserveNewest + + + + + True + True + Common.resx + + + True + True + Dungeon.resx + + + True + True + Error.resx + + + True + True + Home.resx + + + True + True + Profile.resx + + + True + True + User.resx + + + + + PublicResXFileCodeGenerator + Common.Designer.cs + + + PublicResXFileCodeGenerator + Dungeon.Designer.cs + + + PublicResXFileCodeGenerator + Error.Designer.cs + + + PublicResXFileCodeGenerator + Home.Designer.cs + + + PublicResXFileCodeGenerator + Profile.Designer.cs + + + PublicResXFileCodeGenerator + User.Designer.cs + + diff --git a/src/RDMG.Web/ConfigureServices.cs b/src/RDMG.Web/ConfigureServices.cs index 80be355..ad65c9b 100644 --- a/src/RDMG.Web/ConfigureServices.cs +++ b/src/RDMG.Web/ConfigureServices.cs @@ -38,6 +38,11 @@ public static IServiceCollection AddWebServices(this IServiceCollection services #endif ; + services.AddWebOptimizer(pipeline => + { + pipeline.AddJavaScriptBundle("js/site.min.js", "js/site.js", "js/password.js"); + pipeline.AddCssBundle("css/site.min.css", "css/site.css"); + }); services.AddHealthChecks(); return services; diff --git a/src/RDMG.Web/Program.cs b/src/RDMG.Web/Program.cs index 2e703ef..ee60fbf 100644 --- a/src/RDMG.Web/Program.cs +++ b/src/RDMG.Web/Program.cs @@ -52,6 +52,7 @@ } app.UseHttpsRedirection(); +app.UseWebOptimizer(); app.UseStaticFiles(); app.UseRouting(); app.UseCookiePolicy(); @@ -63,4 +64,4 @@ pattern: "{controller=Home}/{action=Index}/{id?}"); app.MapHealthChecks("/health"); -app.Run(); +app.Run(); \ No newline at end of file diff --git a/src/RDMG.Web/RDMG.Web.csproj b/src/RDMG.Web/RDMG.Web.csproj index a86fbbb..3cecb34 100644 --- a/src/RDMG.Web/RDMG.Web.csproj +++ b/src/RDMG.Web/RDMG.Web.csproj @@ -1,23 +1,21 @@  - - true - true - 1.0.4.0 - b2a492d1-90ea-4e42-b3e5-5d962495bef1 - - - - - - - - - - - - - - - - + + true + true + 1.0.4.1 + b2a492d1-90ea-4e42-b3e5-5d962495bef1 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/RDMG.Web/Views/Shared/_ValidationScriptsPartial.cshtml b/src/RDMG.Web/Views/Shared/_ValidationScriptsPartial.cshtml index 9afae6b..53badf2 100644 --- a/src/RDMG.Web/Views/Shared/_ValidationScriptsPartial.cshtml +++ b/src/RDMG.Web/Views/Shared/_ValidationScriptsPartial.cshtml @@ -3,18 +3,20 @@ - - \ No newline at end of file diff --git a/src/RDMG.Web/bundleconfig.json b/src/RDMG.Web/bundleconfig.json deleted file mode 100644 index e424310..0000000 --- a/src/RDMG.Web/bundleconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "outputFileName": "wwwroot/css/site.min.css", - "inputFiles": [ - "wwwroot/css/site.css" - ] - }, - { - "outputFileName": "wwwroot/js/site.min.js", - "inputFiles": [ - "wwwroot/js/site.js", - "wwwroot/js/password.js" - ], - "minify": { - "enabled": true, - "renameLocals": true - }, - "sourceMap": false - } -] \ No newline at end of file diff --git a/src/RDMG.Web/libman.json b/src/RDMG.Web/libman.json index 6d9007d..219a78a 100644 --- a/src/RDMG.Web/libman.json +++ b/src/RDMG.Web/libman.json @@ -7,7 +7,7 @@ "destination": "wwwroot/lib/jquery" }, { - "library": "twitter-bootstrap@5.3.3", + "library": "twitter-bootstrap@5.3.8", "destination": "wwwroot/lib/bootstrap" }, { @@ -27,7 +27,7 @@ "destination": "wwwroot/lib/jquery-validation" }, { - "library": "font-awesome@6.7.2", + "library": "font-awesome@7.0.1", "destination": "wwwroot/lib/font-awesome" } ] diff --git a/src/RDMG.Web/wwwroot/css/site.min.css b/src/RDMG.Web/wwwroot/css/site.min.css deleted file mode 100644 index 6dd6a47..0000000 --- a/src/RDMG.Web/wwwroot/css/site.min.css +++ /dev/null @@ -1 +0,0 @@ -a.navbar-brand{white-space:normal;text-align:center;word-break:break-all}html{font-size:14px}@media(min-width:768px){html{font-size:16px}}.border-top{border-top:1px solid #e5e5e5}.border-bottom{border-bottom:1px solid #e5e5e5}.box-shadow{box-shadow:0 .25rem .75rem #000;box-shadow:0 .25rem .75rem rgba(0,0,0,.05)}button.accept-policy{font-size:1rem;line-height:inherit}html{position:relative;min-height:100%}body{margin-bottom:60px}.footer{position:absolute;bottom:0;width:100%;white-space:nowrap;height:60px;line-height:59px}.table td th{vertical-align:middle}.root{background-color:#d3d3d3}.toparrow{display:none;position:fixed;bottom:5px;right:5px;z-index:99;border:none;outline:none;color:#000;cursor:pointer;padding:15px;border-radius:10px;font-size:30px}.links{text-decoration:none} \ No newline at end of file diff --git a/src/RDMG.Web/wwwroot/js/site.min.js b/src/RDMG.Web/wwwroot/js/site.min.js deleted file mode 100644 index f47dc02..0000000 --- a/src/RDMG.Web/wwwroot/js/site.min.js +++ /dev/null @@ -1 +0,0 @@ -window.onscroll=function(){scrollFunction()};var scrollFunction=function(){document.body.scrollTop>120||document.documentElement.scrollTop>120?$(".toparrow").show():$(".toparrow").hide()},topFunction=function(){document.body.scrollTop=0;document.documentElement.scrollTop=0},tooltipTriggerList=[].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')),tooltipList=tooltipTriggerList.map(function(n){return new bootstrap.Tooltip(n)});(function(n){n(document).on("click",".input-group-password a",function(t){t.preventDefault();var u=n(this).closest(".input-group-password"),i=n("input",u),r=n("i",u);i.attr("type")==="text"?(i.attr("type","password"),r.addClass("fa-eye-slash"),r.removeClass("fa-eye")):i.attr("type")==="password"&&(i.attr("type","text"),r.removeClass("fa-eye-slash"),r.addClass("fa-eye"))})})(jQuery); \ No newline at end of file diff --git a/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj b/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj index ff3110d..5b5621f 100644 --- a/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj +++ b/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj @@ -1,29 +1,29 @@  - - false - true - Exe - - - - - - - PreserveNewest - true - PreserveNewest - - - - - - - - - - - - - - + + false + true + Exe + + + + + + + PreserveNewest + true + PreserveNewest + + + + + + + + + + + + + + \ No newline at end of file