Skip to content

Commit 936df5a

Browse files
hikalkanhikalkan
committed
Bundling&minifying applied for angular template.
1 parent ba03ad7 commit 936df5a

File tree

6 files changed

+68
-78
lines changed

6 files changed

+68
-78
lines changed

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.WebSpaAngular/App/Common/styles/main.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.WebSpaAngular/App/Common/styles/main.less

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.WebSpaAngular/App/Common/styles/main.min.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.WebSpaAngular/App/Main/views/layout/layout.cshtml

Lines changed: 8 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,40 @@
11
@using System.Web.Optimization
22
<!DOCTYPE html>
33
<html lang="en">
4-
<head>
54

6-
<!-- Common meta tags -->
5+
<head>
76
<meta charset="utf-8">
87
<meta http-equiv="X-UA-Compatible" content="IE=edge">
98
<meta name="viewport" content="width=device-width, initial-scale=1">
109
<meta name="description" content="">
1110
<meta name="author" content="">
1211

13-
<!-- favicon -->
1412
<link rel="shortcut icon" href="~/favicon.ico">
1513

16-
<!-- Site title -->
1714
<title>MySpaProject</title>
1815

19-
<!-- Style for jQueryUI -->
20-
<link href="~/Content/themes/base/all.css" rel="stylesheet" />
21-
22-
<!-- Style for Bootstrap -->
23-
<link href="~/Content/bootstrap-cosmo.min.css" rel="stylesheet">
24-
25-
<!-- Styles for jQuery plug-ins -->
26-
<link href="~/Content/toastr.min.css" rel="stylesheet" />
27-
28-
<!-- Country flags -->
29-
<link href="~/Content/flags/famfamfam-flags.css" rel="stylesheet" />
30-
31-
<!-- Font awecome -->
32-
<link href="~/Content/font-awesome.min.css" rel="stylesheet" />
33-
34-
<!-- Common styles for this application -->
35-
<link href="~/App/Common/styles/main.css" rel="stylesheet" />
16+
@Styles.Render("~/Bundles/App/vendor/css")
17+
@Styles.Render("~/Bundles/App/Main/css")
3618

3719
<script type="text/javascript">
3820
//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.
39-
var abp = abp || {};
40-
abp.appPath = '@ApplicationPath';
21+
var abp = abp || {}; abp.appPath = '@ApplicationPath';
4122
</script>
4223

4324
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
4425
<!--[if lt IE 9]>
4526
<script src="@Url.Content("~/Scripts/others/html5shiv.js")"></script>
4627
<script src="@Url.Content("~/Scripts/others/respond.min.js")"></script>
4728
<![endif]-->
29+
@Scripts.Render("~/Bundles/App/vendor/js")
4830

49-
<!-- Application styles -->
50-
@Styles.Render("~/Bundles/App/Main/css")
51-
52-
<!-- Windows Phone 8 and Internet Explorer 10 FIX -->
53-
<script src="~/Abp/Framework/scripts/utils/ie10fix.js"></script>
54-
55-
<!-- Modernizr -->
56-
<script src="~/Scripts/modernizr-2.8.3.js"></script>
57-
58-
<!-- jQuery and plugins -->
59-
<script src="~/Scripts/json2.min.js"></script>
60-
<script src="~/Scripts/jquery-2.1.1.min.js"></script>
61-
<script src="~/Scripts/jquery-ui.min-1.11.1.js"></script>
62-
<script src="~/Scripts/jquery.blockUI.min.js"></script>
63-
<script src="~/Scripts/toastr.min.js"></script>
64-
<script src="~/Scripts/others/spinjs/spin.js"></script>
65-
<script src="~/Scripts/others/spinjs/jquery.spin.js"></script>
66-
67-
<!-- Twitter Bootstrap -->
68-
<script src="~/Scripts/bootstrap.min.js"></script>
69-
70-
<!-- Angular scripts -->
71-
<script src="~/Scripts/angular.min.js"></script>
72-
<script src="~/Scripts/angular-animate.min.js"></script>
73-
<script src="~/Scripts/angular-sanitize.min.js"></script>
74-
<script src="~/Scripts/angular-ui-router.min.js"></script>
75-
<script src="~/Scripts/angular-ui/ui-bootstrap.min.js"></script>
76-
<script src="~/Scripts/angular-ui/ui-bootstrap-tpls.min.js"></script>
77-
<script src="~/Scripts/angular-ui/ui-utils.min.js"></script>
78-
79-
<!-- Abp framework scripts -->
80-
<script src="~/Abp/Framework/scripts/abp.js"></script>
81-
<script src="~/Abp/Framework/scripts/libs/abp.jquery.js"></script>
82-
<script src="~/Abp/Framework/scripts/libs/abp.toastr.js"></script>
83-
<script src="~/Abp/Framework/scripts/libs/abp.blockUI.js"></script>
84-
<script src="~/Abp/Framework/scripts/libs/abp.spin.js"></script>
85-
<script src="~/Abp/Framework/scripts/libs/angularjs/abp.ng.js"></script>
86-
87-
<!-- Dynamic script of ABP system (It's created on runtime) -->
31+
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
8832
<script src="~/api/AbpServiceProxies/GetAll?type=angular"></script>
8933
<script src="~/AbpLocalization/GetScripts" type="text/javascript"></script>
34+
<script src="~/AbpAuthorization/GetScripts" type="text/javascript"></script>
9035
<script src="~/AbpNavigation/GetScripts" type="text/javascript"></script>
9136

92-
<!-- Application scripts -->
9337
@Scripts.Render("~/Bundles/App/Main/js")
94-
9538
</head>
9639

9740
<body>
@@ -106,4 +49,5 @@
10649
</div>
10750
</div>
10851
</body>
52+
10953
</html>

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.WebSpaAngular/App_Start/BundleConfig.cs

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,69 @@ public static void RegisterBundles(BundleCollection bundles)
88
{
99
bundles.IgnoreList.Clear();
1010

11+
//VENDOR RESOURCES
12+
13+
//~/Bundles/App/vendor/css
14+
bundles.Add(
15+
new StyleBundle("~/Bundles/App/vendor/css")
16+
.Include(
17+
"~/Content/themes/base/all.css",
18+
"~/Content/bootstrap-cosmo.min.css",
19+
"~/Content/toastr.min.css",
20+
"~/Content/flags/famfamfam-flags.css",
21+
"~/Content/font-awesome.min.css"
22+
)
23+
);
24+
25+
//~/Bundles/App/vendor/js
26+
bundles.Add(
27+
new ScriptBundle("~/Bundles/App/vendor/js")
28+
.Include(
29+
"~/Abp/Framework/scripts/utils/ie10fix.js",
30+
"~/Scripts/json2.min.js",
31+
32+
"~/Scripts/modernizr-2.8.3.js",
33+
34+
"~/Scripts/jquery-2.1.1.min.js",
35+
"~/Scripts/jquery-ui.min-1.11.1.js",
36+
37+
"~/Scripts/bootstrap.min.js",
38+
39+
"~/Scripts/jquery.blockUI.min.js",
40+
"~/Scripts/toastr.min.js",
41+
"~/Scripts/others/spinjs/spin.js",
42+
"~/Scripts/others/spinjs/jquery.spin.js",
43+
44+
"~/Scripts/angular.min.js",
45+
"~/Scripts/angular-animate.min.js",
46+
"~/Scripts/angular-sanitize.min.js",
47+
"~/Scripts/angular-ui-router.min.js",
48+
"~/Scripts/angular-ui/ui-bootstrap.min.js",
49+
"~/Scripts/angular-ui/ui-bootstrap-tpls.min.js",
50+
"~/Scripts/angular-ui/ui-utils.min.js",
51+
52+
"~/Abp/Framework/scripts/abp.js",
53+
"~/Abp/Framework/scripts/libs/abp.jquery.js",
54+
"~/Abp/Framework/scripts/libs/abp.toastr.js",
55+
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
56+
"~/Abp/Framework/scripts/libs/abp.spin.js",
57+
"~/Abp/Framework/scripts/libs/angularjs/abp.ng.js"
58+
)
59+
);
60+
61+
//APPLICATION RESOURCES
62+
1163
//~/App/Main/css //TODO: Does it includes both .css and .min.css?
12-
bundles.Add(new StyleBundle("~/Bundles/App/Main/css").IncludeDirectory("~/App/Main", "*.css", true));
64+
bundles.Add(
65+
new StyleBundle("~/Bundles/App/Main/css")
66+
.IncludeDirectory("~/App/Main", "*.css", true)
67+
);
1368

1469
//~/App/Main/js //TODO: Does it includes both .js and .min.js?
15-
bundles.Add(new ScriptBundle("~/Bundles/App/Main/js").IncludeDirectory("~/App/Main", "*.js", true));
70+
bundles.Add(
71+
new ScriptBundle("~/Bundles/App/Main/js")
72+
.IncludeDirectory("~/App/Main", "*.js", true)
73+
);
1674
}
1775
}
1876
}

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.WebSpaAngular/MySpaProject.WebSpaAngular.csproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,6 @@
174174
<Content Include="Abp\Framework\styles\abp.css" />
175175
<Content Include="Abp\Framework\styles\abp.min.css" />
176176
<Content Include="Abp\Framework\styles\utils\ie10fix.css" />
177-
<Content Include="App\Common\styles\main.css">
178-
<DependentUpon>main.less</DependentUpon>
179-
</Content>
180-
<Content Include="App\Common\styles\main.min.css">
181-
<DependentUpon>main.css</DependentUpon>
182-
</Content>
183177
<Content Include="App\Main\app.js" />
184178
<Content Include="App\Main\images\abp-logo.png" />
185179
<Content Include="App\Main\main.css">
@@ -282,7 +276,6 @@
282276
<Content Include="App\Main\views\home\home.cshtml" />
283277
<Content Include="App\Main\views\about\about.cshtml" />
284278
<Content Include="App\Main\web.config" />
285-
<Content Include="App\Common\styles\main.less" />
286279
<Content Include="log4net.config" />
287280
<Content Include="Scripts\angular.js" />
288281
<Content Include="Scripts\angular.min.js" />
@@ -1091,8 +1084,6 @@
10911084
</None>
10921085
</ItemGroup>
10931086
<ItemGroup>
1094-
<Folder Include="App\Common\images\" />
1095-
<Folder Include="App\Common\scripts\" />
10961087
<Folder Include="App_Data\" />
10971088
<Folder Include="Models\" />
10981089
</ItemGroup>

0 commit comments

Comments
 (0)