Skip to content

Commit

Permalink
Merge pull request #676 from aspnetboilerplate/issue-#7089
Browse files Browse the repository at this point in the history 
Switched to gulp structure for packages
  • Loading branch information
@ismcagdas
ismcagdas authored Jan 14, 2025
2 parents d124b79 + 3484828 commit f3a7958
Show file tree
Hide file tree
Showing 16 changed files with 5,003 additions and 525 deletions.
6 changes: 4 additions & 2 deletions aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Ignore libraries generated by libman
# Ignore libraries generated by gulp
wwwroot/libs/
wwwroot/dist/

# Ignore bundle files
wwwroot/view-resources/Views/**/*.min.*
wwwroot/view-resources/Views/Shared/Components/**/*.min.*
wwwroot/view-resources/Views/Shared/Components/**/*.min.*
/package-lock.json
4 changes: 0 additions & 4 deletions ...re/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,4 @@
<PackageReference Include="Abp.RedisCache" Version="10.0.0" />
<PackageReference Include="Abp.Castle.Log4Net" Version="10.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\libs\" />
<Folder Include="wwwroot\view-resources\Views\_Bundles\" />
</ItemGroup>
</Project>
58 changes: 7 additions & 51 deletions aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Scripts.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,57 +5,13 @@
@inject ICachedUniqueKeyPerUser CachedUniqueKeyPerUser
@inject IGetScriptsResponsePerUserConfiguration GetScriptsResponsePerUserConfiguration

<environment names="Development">
@*core scripts start*@
<script src="~/libs/jquery/jquery.js" asp-append-version="true"></script>
@*core scripts end*@

@*admin-lte scripts start*@
<script src="~/libs/bootstrap/dist/js/bootstrap.bundle.js" asp-append-version="true"></script>
<script src="~/libs/admin-lte/dist/js/adminlte.js" asp-append-version="true"></script>
@*admin-lte scripts end*@

@*abp scripts start*@
<script src="~/libs/block-ui/jquery.blockUI.js" asp-append-version="true"></script>
<script src="~/libs/spin/spin.js" asp-append-version="true"></script>
<script src="~/libs-ext/spin/jquery.spin.js" asp-append-version="true"></script>
<script src="~/libs/sweetalert/sweetalert.min.js" asp-append-version="true"></script>
<script src="~/libs/toastr/toastr.min.js" asp-append-version="true"></script>
<script src="~/libs/moment/moment-with-locales.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/abp.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js" asp-append-version="true"></script>
@*abp scripts end*@

@*other scripts start*@
<script src="~/libs/jquery-validate/jquery.validate.js" asp-append-version="true"></script>
<script src="~/libs/jquery-validate/jquery.validate.unobtrusive.js" asp-append-version="true"></script>
@*other scripts end*@

@*custom scripts start*@
<script src="~/js/main.js" asp-append-version="true"></script>
@*custom scripts end*@

<script type="text/javascript">
// This is used to get the application's root path from javascript.
// It's useful if you're running application in a virtual directory under IIS.
var abp = abp || {};
abp.appPath = '@ApplicationPath';
</script>
</environment>

<environment names="Staging,Production">
<script src="~/view-resources/Views/_Bundles/account-layout.min.js" asp-append-version="true"></script>
<script type="text/javascript">
// This is used to get the application's root path from javascript.
// It's useful if you're running application in a virtual directory under IIS.
var abp = abp || {};
abp.appPath = '@ApplicationPath';
</script>
</environment>
<script src="~/view-resources/Views/_Bundles/account-layout.min.js" asp-append-version="true"></script>
<script type="text/javascript">
// This is used to get the application's root path from javascript.
// It's useful if you're running application in a virtual directory under IIS.
var abp = abp || {};
abp.appPath = '@ApplicationPath';
</script>

@if (CultureInfo.CurrentUICulture.Name != "en")
{
Expand Down
22 changes: 1 addition & 21 deletions aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Styles.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,4 @@
<link rel="shortcut icon" href="~/img/favicon.ico">
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">

<environment names="Development">
@*admin-lte styles start*@
<link href="~/libs/font-awesome/css/all.min.css" rel="stylesheet" asp-append-version="true" />
<link href="~/libs/icheck-bootstrap/icheck-bootstrap.css" rel="stylesheet" asp-append-version="true" />
<link href="~/libs/admin-lte/dist/css/adminlte.min.css" rel="stylesheet" asp-append-version="true" />
@*admin-lte styles end*@

@*abp styles start*@
<link href="~/libs/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />
<link href="~/libs-ext/famfamfam-flags/dist/sprite/famfamfam-flags.min.css" rel="stylesheet" asp-append-version="true" />
@*abp styles end*@

@*custom styles start*@
<link href="~/view-resources/Views/Account/_Layout.css" rel="stylesheet" asp-append-version="true" />
<link href="~/css/style.css" rel="stylesheet" asp-append-version="true" />
@*custom styles end*@
</environment>

<environment names="Staging,Production">
<link rel="stylesheet" href="~/view-resources/Views/_Bundles/account-layout.min.css" asp-append-version="true" />
</environment>
<link rel="stylesheet" href="~/view-resources/Views/_Bundles/account-layout.min.css" asp-append-version="true" />
9 changes: 1 addition & 8 deletions aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Home/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,7 @@

@section scripts
{
<environment names="Development">
<script src="~/libs/chartjs/dist/Chart.js" asp-append-version="true"></script>
<script src="~/view-resources/Views/Home/Index.js" asp-append-version="true"></script>
</environment>

<environment names="Staging,Production">
<script src="~/view-resources/Views/_Bundles/home-index.min.js" asp-append-version="true"></script>
</environment>
<script src="~/view-resources/Views/_Bundles/home-index.min.js" asp-append-version="true"></script>
}

<div class="content-header">
Expand Down
2 changes: 1 addition & 1 deletion ...anyName.AbpProjectName.Web.Mvc/Views/Shared/Components/RightNavbarUserArea/Default.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@model AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.RightNavbarUserArea.RightNavbarUserAreaViewModel
<li class="nav-item dropdown nav-user-menu">
<a href="javascript:void(0);" class="nav-link" data-toggle="dropdown" role="button">
<img class="user-image img-circle elevation-2" src="~/libs/admin-lte/dist/img/avatar5.png" alt="User Image">
<img class="user-image img-circle elevation-2" src="~/img/avatar.png" alt="User Image">
</a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" asp-controller="Users" asp-action="ChangePassword">
Expand Down
2 changes: 1 addition & 1 deletion ...CompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/SideBarUserArea/Default.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image">
<img src="~/libs/admin-lte/dist/img/avatar5.png" class="img-circle elevation-2" alt="User Image">
<img src="~/img/avatar.png" class="img-circle elevation-2" alt="User Image">
</div>
<div class="info">
<a class="d-block" href="javascript:void(0);">@Html.Raw(Model.GetShownLoginName())</a>
Expand Down
70 changes: 7 additions & 63 deletions aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Layout/_Scripts.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,69 +5,13 @@
@inject ICachedUniqueKeyPerUser CachedUniqueKeyPerUser
@inject IGetScriptsResponsePerUserConfiguration GetScriptsResponsePerUserConfiguration

<environment names="Development">
@*core scripts start*@
<script src="~/libs/jquery/jquery.js" asp-append-version="true"></script>
@*core scripts end*@

@*admin-lte scripts start*@
<script src="~/libs/bootstrap/dist/js/bootstrap.bundle.js" asp-append-version="true"></script>
<script src="~/libs/datatables/js/jquery.dataTables.min.js" asp-append-version="true"></script>
<script src="~/view-resources/Views/_Bundles/helpers.min.js" asp-append-version="true"></script>
<script src="~/view-resources/Views/_Bundles/datatables.ajax.min.js" asp-append-version="true"></script>
<script src="~/libs/datatables/js/dataTables.bootstrap4.min.js" asp-append-version="true"></script>
<script src="~/libs/datatables/js/dataTables.responsive.min.js" asp-append-version="true"></script>
<script src="~/libs/datatables/js/responsive.bootstrap4.min.js" asp-append-version="true"></script>
<script src="~/libs/datatables/js/dataTables.buttons.js" asp-append-version="true"></script>
<script src="~/libs/datatables/js/buttons.bootstrap4.js" asp-append-version="true"></script>
<script src="~/libs/admin-lte/dist/js/adminlte.js" asp-append-version="true"></script>
@*admin-lte scripts end*@

@*abp scripts start*@
<script src="~/libs/block-ui/jquery.blockUI.js" asp-append-version="true"></script>
<script src="~/libs/spin/spin.js" asp-append-version="true"></script>
<script src="~/libs-ext/spin/jquery.spin.js" asp-append-version="true"></script>
<script src="~/libs/sweetalert/sweetalert.min.js" asp-append-version="true"></script>
<script src="~/libs/toastr/toastr.min.js" asp-append-version="true"></script>
<script src="~/libs/moment/moment-with-locales.js" asp-append-version="true"></script>
<script src="~/libs/signalr/dist/browser/signalr.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/abp.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js" asp-append-version="true"></script>
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js" asp-append-version="true"></script>
@*abp scripts end*@

@*other scripts start*@
<script src="~/libs/jquery-validate/jquery.validate.js" asp-append-version="true"></script>
<script src="~/libs/jquery-validate/jquery.validate.unobtrusive.js" asp-append-version="true"></script>
<script src="~/libs/push.js/push.js" asp-append-version="true"></script>
@*other scripts end*@

@*custom scripts start*@
<script src="~/js/abp.dataTable.js" asp-append-version="true"></script>
<script src="~/js/main.js" asp-append-version="true"></script>
@*custom scripts end*@

<script type="text/javascript">
// This is used to get the application's root path from javascript.
// It's useful if you're running application in a virtual directory under IIS.
var abp = abp || {};
abp.appPath = '@ApplicationPath';
</script>
</environment>

<environment names="Staging,Production">
<script src="~/view-resources/Views/_Bundles/shared-layout.min.js" asp-append-version="true"></script>
<script type="text/javascript">
// This is used to get the application's root path from javascript.
// It's useful if you're running application in a virtual directory under IIS.
var abp = abp || {};
abp.appPath = '@ApplicationPath';
</script>
</environment>
<script src="~/view-resources/Views/_Bundles/shared-layout.min.js" asp-append-version="true"></script>
<script type="text/javascript">
// This is used to get the application's root path from javascript.
// It's useful if you're running application in a virtual directory under IIS.
var abp = abp || {};
abp.appPath = '@ApplicationPath';
</script>

@if (CultureInfo.CurrentUICulture.Name != "en")
{
Expand Down
25 changes: 1 addition & 24 deletions aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Layout/_Styles.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
<link rel="shortcut icon" href="~/img/favicon.ico">
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">

<environment names="Development">
@*admin-lte styles start*@
<link href="~/libs/font-awesome/css/all.min.css" rel="stylesheet" asp-append-version="true" />
<link href="~/libs/icheck-bootstrap/icheck-bootstrap.css" rel="stylesheet" asp-append-version="true" />
<link href="~/libs/datatables/css/dataTables.bootstrap4.min.css" rel="stylesheet" asp-append-version="true" />
<link href="~/libs/datatables/css/responsive.bootstrap4.min.css" rel="stylesheet" asp-append-version="true" />
<link href="~/libs/datatables/css/buttons.bootstrap4.min.css" rel="stylesheet" asp-append-version="true" />
<link href="~/libs/admin-lte/dist/css/adminlte.min.css" rel="stylesheet" asp-append-version="true" />
@*admin-lte styles end*@

@*abp styles start*@
<link href="~/libs/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />
<link href="~/libs-ext/famfamfam-flags/dist/sprite/famfamfam-flags.min.css" rel="stylesheet" asp-append-version="true" />
@*abp styles end*@

@*custom styles start*@
<link href="~/view-resources/Views/Shared/_Layout.css" rel="stylesheet" asp-append-version="true" />
<link href="~/css/style.css" rel="stylesheet" asp-append-version="true" />
@*custom styles end*@
</environment>

<environment names="Staging,Production">
<link href="~/view-resources/Views/_Bundles/shared-layout.min.css" rel="stylesheet" asp-append-version="true" />
</environment>
<link href="~/view-resources/Views/_Bundles/shared-layout.min.css" rel="stylesheet" asp-append-version="true" />
Loading

0 comments on commit f3a7958

Please sign in to comment.