Skip to content

Commit 20a4929

Browse files
ismcagdasismcagdas
committed
Merge branch 'netcore2.0-2'
2 parents 5357929 + 474a541 commit 20a4929

File tree

37 files changed

+2140
-1631
lines changed

37 files changed

+2140
-1631
lines changed

‎angular/.angular-cli.json‎

Lines changed: 102 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,108 @@
1-
{
2-
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"project": {
4-
"version": "1.0.0",
5-
"name": "abp-project-name-template"
6-
},
7-
"apps": [
8-
{
9-
"root": "src",
10-
"outDir": "dist",
11-
"assets": [
12-
"assets",
13-
"favicon.ico",
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"project": {
4+
"name": "abp-project-name-template"
5+
},
6+
"apps": [
147
{
15-
"glob": "abp.signalr.js",
16-
"input": "../node_modules/abp-web-resources/Abp/Framework/scripts/libs/",
17-
"output": "./assets/abp/"
8+
"root": "src",
9+
"outDir": "dist",
10+
"assets": [
11+
"assets",
12+
"favicon.ico",
13+
{
14+
"glob": "abp.signalr.js",
15+
"input": "../node_modules/abp-web-resources/Abp/Framework/scripts/libs/",
16+
"output": "./assets/abp/"
17+
}
18+
],
19+
"index": "index.html",
20+
"main": "main.ts",
21+
"polyfills": "polyfills.ts",
22+
"test": "test.ts",
23+
"tsconfig": "tsconfig.json",
24+
"prefix": "app",
25+
"styles": [
26+
"assets/fonts/roboto/roboto.css",
27+
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
28+
"../node_modules/simple-line-icons/css/simple-line-icons.css",
29+
"../node_modules/font-awesome/css/font-awesome.css",
30+
"../node_modules/famfamfam-flags/dist/sprite/famfamfam-flags.css",
31+
"../node_modules/toastr/build/toastr.css",
32+
"../node_modules/sweetalert/dist/sweetalert.css",
33+
"../node_modules/node-waves/dist/waves.css",
34+
"../src/bsb-theme/css/materialize.css",
35+
"../src/bsb-theme/css/style.css",
36+
"../src/bsb-theme/css/themes/all-themes.css",
37+
"../src/shared/core.less"
38+
],
39+
"scripts": [
40+
"../node_modules/jquery/dist/jquery.min.js",
41+
"../node_modules/jquery-migrate/dist/jquery-migrate.min.js",
42+
"../node_modules/js-cookie/src/js.cookie.js",
43+
"../node_modules/bootstrap/dist/js/bootstrap.js",
44+
"../node_modules/lodash/lodash.min.js",
45+
"../node_modules/moment/min/moment.min.js",
46+
"../node_modules/signalr/jquery.signalR.js",
47+
"../node_modules/toastr/toastr.js",
48+
"../node_modules/sweetalert/dist/sweetalert.min.js",
49+
"../node_modules/block-ui/jquery.blockUI.js",
50+
"../node_modules/spin.js/spin.min.js",
51+
"../node_modules/spin.js/jquery.spin.js",
52+
"../node_modules/push.js/bin/push.min.js",
53+
"../node_modules/jquery-slimscroll/jquery.slimscroll.min.js",
54+
"../node_modules/node-waves/dist/waves.min.js",
55+
"../node_modules/jquery-countto/jquery.countTo.js",
56+
"../node_modules/raphael/raphael.min.js",
57+
"../node_modules/morris.js/morris.min.js",
58+
"../node_modules/chart.js/dist/Chart.bundle.min.js",
59+
"../node_modules/flot/jquery.flot.js",
60+
"../node_modules/flot/jquery.flot.resize.js",
61+
"../node_modules/flot/jquery.flot.pie.js",
62+
"../node_modules/flot/jquery.flot.categories.js",
63+
"../node_modules/flot/jquery.flot.time.js",
64+
"../node_modules/jquery-sparkline/jquery.sparkline.min.js",
65+
"../node_modules/abp-web-resources/Abp/Framework/scripts/abp.js",
66+
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
67+
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
68+
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
69+
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
70+
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
71+
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js",
72+
"../src/bsb-theme/js/admin.js",
73+
"../src/bsb-theme/js/demo.js",
74+
"../src/bsb-theme/js/jquery.validate.js"
75+
],
76+
"environmentSource": "environments/environment.ts",
77+
"environments": {
78+
"dev": "environments/environment.ts",
79+
"prod": "environments/environment.prod.ts",
80+
"hmr": "environments/environment.hmr.ts"
81+
}
82+
}
83+
],
84+
"e2e": {
85+
"protractor": {
86+
"config": "./protractor.conf.js"
1887
}
19-
],
20-
"index": "index.html",
21-
"main": "main.ts",
22-
"polyfills": "polyfills.ts",
23-
"test": "test.ts",
24-
"tsconfig": "tsconfig.json",
25-
"prefix": "app",
26-
"styles": [
27-
"assets/fonts/roboto/roboto.css",
28-
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
29-
"../node_modules/simple-line-icons/css/simple-line-icons.css",
30-
"../node_modules/font-awesome/css/font-awesome.css",
31-
"../node_modules/famfamfam-flags/dist/sprite/famfamfam-flags.css",
32-
"../node_modules/toastr/build/toastr.css",
33-
"../node_modules/sweetalert/dist/sweetalert.css",
34-
"../node_modules/node-waves/dist/waves.css",
35-
"../src/bsb-theme/css/materialize.css",
36-
"../src/bsb-theme/css/style.css",
37-
"../src/bsb-theme/css/themes/all-themes.css",
38-
"../src/shared/core.less"
39-
],
40-
"scripts": [
41-
"../node_modules/jquery/dist/jquery.min.js",
42-
"../node_modules/jquery-migrate/dist/jquery-migrate.min.js",
43-
"../node_modules/js-cookie/src/js.cookie.js",
44-
"../node_modules/bootstrap/dist/js/bootstrap.js",
45-
"../node_modules/lodash/lodash.min.js",
46-
"../node_modules/moment/min/moment.min.js",
47-
"../node_modules/signalr/jquery.signalR.js",
48-
"../node_modules/toastr/toastr.js",
49-
"../node_modules/sweetalert/dist/sweetalert-dev.js",
50-
"../node_modules/block-ui/jquery.blockUI.js",
51-
"../node_modules/spin.js/spin.min.js",
52-
"../node_modules/spin.js/jquery.spin.js",
53-
"../node_modules/push.js/push.min.js",
54-
"../node_modules/jquery-slimscroll/jquery.slimscroll.min.js",
55-
"../node_modules/node-waves/dist/waves.min.js",
56-
"../node_modules/jquery-countto/jquery.countTo.js",
57-
"../node_modules/raphael/raphael.min.js",
58-
"../node_modules/morris.js/morris.min.js",
59-
"../node_modules/chart.js/dist/Chart.bundle.min.js",
60-
"../node_modules/flot/jquery.flot.js",
61-
"../node_modules/flot/jquery.flot.resize.js",
62-
"../node_modules/flot/jquery.flot.pie.js",
63-
"../node_modules/flot/jquery.flot.categories.js",
64-
"../node_modules/flot/jquery.flot.time.js",
65-
"../node_modules/jquery-sparkline/jquery.sparkline.min.js",
66-
"../node_modules/abp-web-resources/Abp/Framework/scripts/abp.js",
67-
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
68-
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
69-
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
70-
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
71-
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
72-
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js",
73-
"../src/bsb-theme/js/admin.js",
74-
"../src/bsb-theme/js/demo.js",
75-
"../src/bsb-theme/js/jquery.validate.js"
76-
],
77-
"environmentSource": "environments/environment.ts",
78-
"environments": {
79-
"dev": "environments/environment.ts",
80-
"prod": "environments/environment.prod.ts",
81-
"hmr": "environments/environment.hmr.ts"
82-
}
83-
}
84-
],
85-
"e2e": {
86-
"protractor": {
87-
"config": "./protractor.conf.js"
88-
}
89-
},
90-
"lint": [
91-
{
92-
"files": "src/**/*.ts",
93-
"project": "src/tsconfig.json"
9488
},
95-
{
96-
"files": "e2e/**/*.ts",
97-
"project": "e2e/tsconfig.json"
98-
}
99-
],
100-
"test": {
101-
"karma": {
102-
"config": "./karma.conf.js"
103-
}
104-
},
105-
"defaults": {
106-
"styleExt": "css",
107-
"prefixInterfaces": false,
108-
"inline": {
109-
"style": false,
110-
"template": false
89+
"lint": [
90+
{
91+
"files": "src/**/*.ts",
92+
"project": "src/tsconfig.json"
93+
},
94+
{
95+
"files": "e2e/**/*.ts",
96+
"project": "e2e/tsconfig.json"
97+
}
98+
],
99+
"test": {
100+
"karma": {
101+
"config": "./karma.conf.js"
102+
}
111103
},
112-
"spec": {
113-
"class": false,
114-
"component": true,
115-
"directive": true,
116-
"module": false,
117-
"pipe": true,
118-
"service": true
104+
"defaults": {
105+
"styleExt": "css",
106+
"component": {}
119107
}
120-
}
121108
}

0 commit comments

Comments
 (0)