From 052853d0490045933f1730e84c803f22af4f482d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuzhan=20A=C4=9F=C4=B1r?= <90545225+oguzhanagir@users.noreply.github.com> Date: Tue, 14 Jan 2025 13:40:14 +0300 Subject: [PATCH 1/2] Switched to gulp structure for packages --- .../.gitignore | 6 +- ...pCompanyName.AbpProjectName.Web.Mvc.csproj | 4 - .../Views/Account/_Scripts.cshtml | 58 +- .../Views/Account/_Styles.cshtml | 22 +- .../Views/Home/Index.cshtml | 9 +- .../RightNavbarUserArea/Default.cshtml | 2 +- .../Components/SideBarUserArea/Default.cshtml | 2 +- .../Views/Shared/Layout/_Scripts.cshtml | 70 +- .../Views/Shared/Layout/_Styles.cshtml | 25 +- .../bundleconfig.json | 160 - .../bundles.json | 123 + .../gulpfile.mjs | 282 + .../libman.json | 190 - .../package.json | 51 + .../wwwroot/img/avatar.png | Bin 0 -> 7587 bytes .../yarn.lock | 4524 +++++++++++++++++ 16 files changed, 5003 insertions(+), 525 deletions(-) delete mode 100644 aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bundleconfig.json create mode 100644 aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bundles.json create mode 100644 aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/gulpfile.mjs delete mode 100644 aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/libman.json create mode 100644 aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/package.json create mode 100644 aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/img/avatar.png create mode 100644 aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/yarn.lock diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/.gitignore b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/.gitignore index cfc0637a8..1ec6cd4f5 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/.gitignore +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/.gitignore @@ -1,6 +1,8 @@ -# Ignore libraries generated by libman +# Ignore libraries generated by gulpfile wwwroot/libs/ +wwwroot/dist/ # Ignore bundle files wwwroot/view-resources/Views/**/*.min.* -wwwroot/view-resources/Views/Shared/Components/**/*.min.* \ No newline at end of file +wwwroot/view-resources/Views/Shared/Components/**/*.min.* +/package-lock.json \ No newline at end of file diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj index 29dacf920..809f4143d 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj @@ -41,8 +41,4 @@ - - - - \ No newline at end of file diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Scripts.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Scripts.cshtml index 1da096f4a..4219a5388 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Scripts.cshtml +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Scripts.cshtml @@ -5,57 +5,13 @@ @inject ICachedUniqueKeyPerUser CachedUniqueKeyPerUser @inject IGetScriptsResponsePerUserConfiguration GetScriptsResponsePerUserConfiguration - - @*core scripts start*@ - - @*core scripts end*@ - - @*admin-lte scripts start*@ - - - @*admin-lte scripts end*@ - - @*abp scripts start*@ - - - - - - - - - - - - - @*abp scripts end*@ - - @*other scripts start*@ - - - @*other scripts end*@ - - @*custom scripts start*@ - - @*custom scripts end*@ - - - - - - - - + + @if (CultureInfo.CurrentUICulture.Name != "en") { diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Styles.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Styles.cshtml index 0bfe78700..215020ff9 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Styles.cshtml +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Styles.cshtml @@ -1,24 +1,4 @@  - - @*admin-lte styles start*@ - - - - @*admin-lte styles end*@ - - @*abp styles start*@ - - - @*abp styles end*@ - - @*custom styles start*@ - - - @*custom styles end*@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Home/Index.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Home/Index.cshtml index 65a1fd082..701530d93 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Home/Index.cshtml +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Home/Index.cshtml @@ -6,14 +6,7 @@ @section scripts { - - - - - - - - + }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/RightNavbarUserArea/Default.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/RightNavbarUserArea/Default.cshtml index 1f7b38f61..3fb9cfa3f 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/RightNavbarUserArea/Default.cshtml +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/RightNavbarUserArea/Default.cshtml @@ -1,7 +1,7 @@ @model AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.RightNavbarUserArea.RightNavbarUserAreaViewModel