Skip to content

Commit f3a7958

Browse files
ismcagdasismcagdas
authored
Merge pull request #676 from aspnetboilerplate/issue-#7089
Switched to gulp structure for packages
2 parents d124b79 + 3484828 commit f3a7958

File tree

16 files changed

+5003
-525
lines changed

16 files changed

+5003
-525
lines changed

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
# Ignore libraries generated by libman
1+
# Ignore libraries generated by gulp
22
wwwroot/libs/
3+
wwwroot/dist/
34

45
# Ignore bundle files
56
wwwroot/view-resources/Views/**/*.min.*
6-
wwwroot/view-resources/Views/Shared/Components/**/*.min.*
7+
wwwroot/view-resources/Views/Shared/Components/**/*.min.*
8+
/package-lock.json

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,4 @@
4141
<PackageReference Include="Abp.RedisCache" Version="10.0.0" />
4242
<PackageReference Include="Abp.Castle.Log4Net" Version="10.0.0" />
4343
</ItemGroup>
44-
<ItemGroup>
45-
<Folder Include="wwwroot\libs\" />
46-
<Folder Include="wwwroot\view-resources\Views\_Bundles\" />
47-
</ItemGroup>
4844
</Project>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Scripts.cshtml

Lines changed: 7 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5,57 +5,13 @@
55
@inject ICachedUniqueKeyPerUser CachedUniqueKeyPerUser
66
@inject IGetScriptsResponsePerUserConfiguration GetScriptsResponsePerUserConfiguration
77

8-
<environment names="Development">
9-
@*core scripts start*@
10-
<script src="~/libs/jquery/jquery.js" asp-append-version="true"></script>
11-
@*core scripts end*@
12-
13-
@*admin-lte scripts start*@
14-
<script src="~/libs/bootstrap/dist/js/bootstrap.bundle.js" asp-append-version="true"></script>
15-
<script src="~/libs/admin-lte/dist/js/adminlte.js" asp-append-version="true"></script>
16-
@*admin-lte scripts end*@
17-
18-
@*abp scripts start*@
19-
<script src="~/libs/block-ui/jquery.blockUI.js" asp-append-version="true"></script>
20-
<script src="~/libs/spin/spin.js" asp-append-version="true"></script>
21-
<script src="~/libs-ext/spin/jquery.spin.js" asp-append-version="true"></script>
22-
<script src="~/libs/sweetalert/sweetalert.min.js" asp-append-version="true"></script>
23-
<script src="~/libs/toastr/toastr.min.js" asp-append-version="true"></script>
24-
<script src="~/libs/moment/moment-with-locales.js" asp-append-version="true"></script>
25-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/abp.js" asp-append-version="true"></script>
26-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js" asp-append-version="true"></script>
27-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js" asp-append-version="true"></script>
28-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js" asp-append-version="true"></script>
29-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js" asp-append-version="true"></script>
30-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js" asp-append-version="true"></script>
31-
@*abp scripts end*@
32-
33-
@*other scripts start*@
34-
<script src="~/libs/jquery-validate/jquery.validate.js" asp-append-version="true"></script>
35-
<script src="~/libs/jquery-validate/jquery.validate.unobtrusive.js" asp-append-version="true"></script>
36-
@*other scripts end*@
37-
38-
@*custom scripts start*@
39-
<script src="~/js/main.js" asp-append-version="true"></script>
40-
@*custom scripts end*@
41-
42-
<script type="text/javascript">
43-
// This is used to get the application's root path from javascript.
44-
// It's useful if you're running application in a virtual directory under IIS.
45-
var abp = abp || {};
46-
abp.appPath = '@ApplicationPath';
47-
</script>
48-
</environment>
49-
50-
<environment names="Staging,Production">
51-
<script src="~/view-resources/Views/_Bundles/account-layout.min.js" asp-append-version="true"></script>
52-
<script type="text/javascript">
53-
// This is used to get the application's root path from javascript.
54-
// It's useful if you're running application in a virtual directory under IIS.
55-
var abp = abp || {};
56-
abp.appPath = '@ApplicationPath';
57-
</script>
58-
</environment>
8+
<script src="~/view-resources/Views/_Bundles/account-layout.min.js" asp-append-version="true"></script>
9+
<script type="text/javascript">
10+
// This is used to get the application's root path from javascript.
11+
// It's useful if you're running application in a virtual directory under IIS.
12+
var abp = abp || {};
13+
abp.appPath = '@ApplicationPath';
14+
</script>
5915

6016
@if (CultureInfo.CurrentUICulture.Name != "en")
6117
{

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Styles.cshtml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,4 @@
11
<link rel="shortcut icon" href="~/img/favicon.ico">
22
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
33

4-
<environment names="Development">
5-
@*admin-lte styles start*@
6-
<link href="~/libs/font-awesome/css/all.min.css" rel="stylesheet" asp-append-version="true" />
7-
<link href="~/libs/icheck-bootstrap/icheck-bootstrap.css" rel="stylesheet" asp-append-version="true" />
8-
<link href="~/libs/admin-lte/dist/css/adminlte.min.css" rel="stylesheet" asp-append-version="true" />
9-
@*admin-lte styles end*@
10-
11-
@*abp styles start*@
12-
<link href="~/libs/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />
13-
<link href="~/libs-ext/famfamfam-flags/dist/sprite/famfamfam-flags.min.css" rel="stylesheet" asp-append-version="true" />
14-
@*abp styles end*@
15-
16-
@*custom styles start*@
17-
<link href="~/view-resources/Views/Account/_Layout.css" rel="stylesheet" asp-append-version="true" />
18-
<link href="~/css/style.css" rel="stylesheet" asp-append-version="true" />
19-
@*custom styles end*@
20-
</environment>
21-
22-
<environment names="Staging,Production">
23-
<link rel="stylesheet" href="~/view-resources/Views/_Bundles/account-layout.min.css" asp-append-version="true" />
24-
</environment>
4+
<link rel="stylesheet" href="~/view-resources/Views/_Bundles/account-layout.min.css" asp-append-version="true" />

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Home/Index.cshtml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66

77
@section scripts
88
{
9-
<environment names="Development">
10-
<script src="~/libs/chartjs/dist/Chart.js" asp-append-version="true"></script>
11-
<script src="~/view-resources/Views/Home/Index.js" asp-append-version="true"></script>
12-
</environment>
13-
14-
<environment names="Staging,Production">
15-
<script src="~/view-resources/Views/_Bundles/home-index.min.js" asp-append-version="true"></script>
16-
</environment>
9+
<script src="~/view-resources/Views/_Bundles/home-index.min.js" asp-append-version="true"></script>
1710
}
1811

1912
<div class="content-header">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/RightNavbarUserArea/Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@model AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.RightNavbarUserArea.RightNavbarUserAreaViewModel
22
<li class="nav-item dropdown nav-user-menu">
33
<a href="javascript:void(0);" class="nav-link" data-toggle="dropdown" role="button">
4-
<img class="user-image img-circle elevation-2" src="~/libs/admin-lte/dist/img/avatar5.png" alt="User Image">
4+
<img class="user-image img-circle elevation-2" src="~/img/avatar.png" alt="User Image">
55
</a>
66
<div class="dropdown-menu dropdown-menu-right">
77
<a class="dropdown-item" asp-controller="Users" asp-action="ChangePassword">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/SideBarUserArea/Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
55
<div class="image">
6-
<img src="~/libs/admin-lte/dist/img/avatar5.png" class="img-circle elevation-2" alt="User Image">
6+
<img src="~/img/avatar.png" class="img-circle elevation-2" alt="User Image">
77
</div>
88
<div class="info">
99
<a class="d-block" href="javascript:void(0);">@Html.Raw(Model.GetShownLoginName())</a>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Layout/_Scripts.cshtml

Lines changed: 7 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -5,69 +5,13 @@
55
@inject ICachedUniqueKeyPerUser CachedUniqueKeyPerUser
66
@inject IGetScriptsResponsePerUserConfiguration GetScriptsResponsePerUserConfiguration
77

8-
<environment names="Development">
9-
@*core scripts start*@
10-
<script src="~/libs/jquery/jquery.js" asp-append-version="true"></script>
11-
@*core scripts end*@
12-
13-
@*admin-lte scripts start*@
14-
<script src="~/libs/bootstrap/dist/js/bootstrap.bundle.js" asp-append-version="true"></script>
15-
<script src="~/libs/datatables/js/jquery.dataTables.min.js" asp-append-version="true"></script>
16-
<script src="~/view-resources/Views/_Bundles/helpers.min.js" asp-append-version="true"></script>
17-
<script src="~/view-resources/Views/_Bundles/datatables.ajax.min.js" asp-append-version="true"></script>
18-
<script src="~/libs/datatables/js/dataTables.bootstrap4.min.js" asp-append-version="true"></script>
19-
<script src="~/libs/datatables/js/dataTables.responsive.min.js" asp-append-version="true"></script>
20-
<script src="~/libs/datatables/js/responsive.bootstrap4.min.js" asp-append-version="true"></script>
21-
<script src="~/libs/datatables/js/dataTables.buttons.js" asp-append-version="true"></script>
22-
<script src="~/libs/datatables/js/buttons.bootstrap4.js" asp-append-version="true"></script>
23-
<script src="~/libs/admin-lte/dist/js/adminlte.js" asp-append-version="true"></script>
24-
@*admin-lte scripts end*@
25-
26-
@*abp scripts start*@
27-
<script src="~/libs/block-ui/jquery.blockUI.js" asp-append-version="true"></script>
28-
<script src="~/libs/spin/spin.js" asp-append-version="true"></script>
29-
<script src="~/libs-ext/spin/jquery.spin.js" asp-append-version="true"></script>
30-
<script src="~/libs/sweetalert/sweetalert.min.js" asp-append-version="true"></script>
31-
<script src="~/libs/toastr/toastr.min.js" asp-append-version="true"></script>
32-
<script src="~/libs/moment/moment-with-locales.js" asp-append-version="true"></script>
33-
<script src="~/libs/signalr/dist/browser/signalr.js" asp-append-version="true"></script>
34-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/abp.js" asp-append-version="true"></script>
35-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js" asp-append-version="true"></script>
36-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js" asp-append-version="true"></script>
37-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js" asp-append-version="true"></script>
38-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js" asp-append-version="true"></script>
39-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js" asp-append-version="true"></script>
40-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js" asp-append-version="true"></script>
41-
@*abp scripts end*@
42-
43-
@*other scripts start*@
44-
<script src="~/libs/jquery-validate/jquery.validate.js" asp-append-version="true"></script>
45-
<script src="~/libs/jquery-validate/jquery.validate.unobtrusive.js" asp-append-version="true"></script>
46-
<script src="~/libs/push.js/push.js" asp-append-version="true"></script>
47-
@*other scripts end*@
48-
49-
@*custom scripts start*@
50-
<script src="~/js/abp.dataTable.js" asp-append-version="true"></script>
51-
<script src="~/js/main.js" asp-append-version="true"></script>
52-
@*custom scripts end*@
53-
54-
<script type="text/javascript">
55-
// This is used to get the application's root path from javascript.
56-
// It's useful if you're running application in a virtual directory under IIS.
57-
var abp = abp || {};
58-
abp.appPath = '@ApplicationPath';
59-
</script>
60-
</environment>
61-
62-
<environment names="Staging,Production">
63-
<script src="~/view-resources/Views/_Bundles/shared-layout.min.js" asp-append-version="true"></script>
64-
<script type="text/javascript">
65-
// This is used to get the application's root path from javascript.
66-
// It's useful if you're running application in a virtual directory under IIS.
67-
var abp = abp || {};
68-
abp.appPath = '@ApplicationPath';
69-
</script>
70-
</environment>
8+
<script src="~/view-resources/Views/_Bundles/shared-layout.min.js" asp-append-version="true"></script>
9+
<script type="text/javascript">
10+
// This is used to get the application's root path from javascript.
11+
// It's useful if you're running application in a virtual directory under IIS.
12+
var abp = abp || {};
13+
abp.appPath = '@ApplicationPath';
14+
</script>
7115

7216
@if (CultureInfo.CurrentUICulture.Name != "en")
7317
{

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Layout/_Styles.cshtml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,4 @@
11
<link rel="shortcut icon" href="~/img/favicon.ico">
22
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
33

4-
<environment names="Development">
5-
@*admin-lte styles start*@
6-
<link href="~/libs/font-awesome/css/all.min.css" rel="stylesheet" asp-append-version="true" />
7-
<link href="~/libs/icheck-bootstrap/icheck-bootstrap.css" rel="stylesheet" asp-append-version="true" />
8-
<link href="~/libs/datatables/css/dataTables.bootstrap4.min.css" rel="stylesheet" asp-append-version="true" />
9-
<link href="~/libs/datatables/css/responsive.bootstrap4.min.css" rel="stylesheet" asp-append-version="true" />
10-
<link href="~/libs/datatables/css/buttons.bootstrap4.min.css" rel="stylesheet" asp-append-version="true" />
11-
<link href="~/libs/admin-lte/dist/css/adminlte.min.css" rel="stylesheet" asp-append-version="true" />
12-
@*admin-lte styles end*@
13-
14-
@*abp styles start*@
15-
<link href="~/libs/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />
16-
<link href="~/libs-ext/famfamfam-flags/dist/sprite/famfamfam-flags.min.css" rel="stylesheet" asp-append-version="true" />
17-
@*abp styles end*@
18-
19-
@*custom styles start*@
20-
<link href="~/view-resources/Views/Shared/_Layout.css" rel="stylesheet" asp-append-version="true" />
21-
<link href="~/css/style.css" rel="stylesheet" asp-append-version="true" />
22-
@*custom styles end*@
23-
</environment>
24-
25-
<environment names="Staging,Production">
26-
<link href="~/view-resources/Views/_Bundles/shared-layout.min.css" rel="stylesheet" asp-append-version="true" />
27-
</environment>
4+
<link href="~/view-resources/Views/_Bundles/shared-layout.min.css" rel="stylesheet" asp-append-version="true" />

0 commit comments

Comments
 (0)