Skip to content

Commit eb196a9

Browse files
bkndsbknds
committed
Merge branch 'dev'
2 parents 5351bbf + 238ca58 commit eb196a9

26 files changed

+295
-182
lines changed

‎.angular-cli.json

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ npm-debug.log
3333
testem.log
3434
/typings
3535
yarn-error.log
36+
yarn.lock
3637

3738
# e2e
3839
/e2e/*.js

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sudo: false
33
language: node_js
44

55
node_js:
6-
- 6.0
6+
- 8.9
77

88
branches:
99
only:
@@ -14,7 +14,7 @@ before_install:
1414
- export DISPLAY=:99.0
1515
- sh -e /etc/init.d/xvfb start
1616

17-
script:
17+
script:
1818
- npm run build:ci
1919

2020
git:

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Default | Dark | Light
99

1010

1111
## Based on
12-
Angular 4+, Angular CLI, TypeScript, Scss, Bootstrap
12+
Angular 7+, Angular CLI, TypeScript, Scss, Bootstrap 3
1313

1414
## Demo
1515

@@ -25,6 +25,10 @@ ng serve
2525
2626
localhost:4200
2727
```
28+
## Change theme
29+
```
30+
Edit src\app\shared\theme\conf.scss
31+
```
2832

2933
## License
3034
[MIT license](LICENSE)

‎angular.json

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"ng-pi-admin": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"architect": {
11+
"build": {
12+
"builder": "@angular-devkit/build-angular:browser",
13+
"options": {
14+
"outputPath": "dist",
15+
"index": "src/index.html",
16+
"main": "src/main.ts",
17+
"tsConfig": "src/tsconfig.app.json",
18+
"polyfills": "src/polyfills.ts",
19+
"assets": [
20+
"src/assets",
21+
"src/favicon.ico"
22+
],
23+
"styles": [
24+
"node_modules/normalize.css/normalize.css",
25+
"node_modules/font-awesome/scss/font-awesome.scss",
26+
"node_modules/bootstrap/less/bootstrap.less",
27+
"node_modules/sweetalert2/dist/sweetalert2.css",
28+
"node_modules/animate.css/animate.css",
29+
"src/assets/iconfonts/iconfont.css",
30+
"src/app/shared/_styles.scss",
31+
"src/styles.scss"
32+
],
33+
"scripts": [
34+
"node_modules/jquery/dist/jquery.js",
35+
"node_modules/bootstrap/dist/js/bootstrap.js",
36+
"node_modules/sweetalert2/dist/sweetalert2.js",
37+
"node_modules/echarts/dist/echarts.min.js",
38+
"node_modules/echarts/map/js/china.js",
39+
"node_modules/echarts/dist/extension/bmap.js",
40+
"src/app/shared/theme/echarts/dark.js"
41+
]
42+
},
43+
"configurations": {
44+
"production": {
45+
"optimization": true,
46+
"outputHashing": "all",
47+
"sourceMap": false,
48+
"extractCss": true,
49+
"namedChunks": false,
50+
"aot": true,
51+
"extractLicenses": true,
52+
"vendorChunk": false,
53+
"buildOptimizer": true,
54+
"fileReplacements": [
55+
{
56+
"replace": "src/environments/environment.ts",
57+
"with": "src/environments/environment.prod.ts"
58+
}
59+
]
60+
}
61+
}
62+
},
63+
"serve": {
64+
"builder": "@angular-devkit/build-angular:dev-server",
65+
"options": {
66+
"browserTarget": "ng-pi-admin:build"
67+
},
68+
"configurations": {
69+
"production": {
70+
"browserTarget": "ng-pi-admin:build:production"
71+
}
72+
}
73+
},
74+
"extract-i18n": {
75+
"builder": "@angular-devkit/build-angular:extract-i18n",
76+
"options": {
77+
"browserTarget": "ng-pi-admin:build"
78+
}
79+
},
80+
"test": {
81+
"builder": "@angular-devkit/build-angular:karma",
82+
"options": {
83+
"main": "src/test.ts",
84+
"karmaConfig": "./karma.conf.js",
85+
"polyfills": "src/polyfills.ts",
86+
"tsConfig": "src/tsconfig.spec.json",
87+
"scripts": [
88+
"node_modules/jquery/dist/jquery.js",
89+
"node_modules/bootstrap/dist/js/bootstrap.js",
90+
"node_modules/sweetalert2/dist/sweetalert2.js",
91+
"node_modules/echarts/dist/echarts.min.js",
92+
"node_modules/echarts/map/js/china.js",
93+
"node_modules/echarts/dist/extension/bmap.js",
94+
"src/app/shared/theme/echarts/dark.js"
95+
],
96+
"styles": [
97+
"node_modules/normalize.css/normalize.css",
98+
"node_modules/font-awesome/scss/font-awesome.scss",
99+
"node_modules/bootstrap/less/bootstrap.less",
100+
"node_modules/sweetalert2/dist/sweetalert2.css",
101+
"node_modules/animate.css/animate.css",
102+
"src/assets/iconfonts/iconfont.css",
103+
"src/app/shared/_styles.scss",
104+
"src/styles.scss"
105+
],
106+
"assets": [
107+
"src/assets",
108+
"src/favicon.ico"
109+
]
110+
}
111+
},
112+
"lint": {
113+
"builder": "@angular-devkit/build-angular:tslint",
114+
"options": {
115+
"tsConfig": [
116+
"src/tsconfig.app.json",
117+
"src/tsconfig.spec.json"
118+
],
119+
"exclude": [
120+
"**/node_modules/**"
121+
]
122+
}
123+
}
124+
}
125+
},
126+
"ng-pi-admin-e2e": {
127+
"root": "e2e",
128+
"sourceRoot": "e2e",
129+
"projectType": "application",
130+
"architect": {
131+
"e2e": {
132+
"builder": "@angular-devkit/build-angular:protractor",
133+
"options": {
134+
"protractorConfig": "./protractor.conf.js",
135+
"devServerTarget": "ng-pi-admin:serve"
136+
}
137+
},
138+
"lint": {
139+
"builder": "@angular-devkit/build-angular:tslint",
140+
"options": {
141+
"tsConfig": [
142+
"e2e/tsconfig.e2e.json"
143+
],
144+
"exclude": [
145+
"**/node_modules/**"
146+
]
147+
}
148+
}
149+
}
150+
}
151+
},
152+
"defaultProject": "ng-pi-admin",
153+
"schematics": {
154+
"@schematics/angular:component": {
155+
"prefix": "app",
156+
"styleext": "scss"
157+
},
158+
"@schematics/angular:directive": {
159+
"prefix": "app"
160+
}
161+
}
162+
}

‎karma.conf.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,22 @@
44
module.exports = function (config) {
55
const configuration = {
66
basePath: '',
7-
frameworks: ['jasmine', '@angular/cli'],
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular/cli/plugins/karma')
13+
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client:{
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
1818
coverageIstanbulReporter: {
19-
reports: [ 'html', 'lcovonly' ],
19+
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
2020
fixWebpackSourcePaths: true
2121
},
22-
angularCli: {
23-
environment: 'dev'
24-
},
22+
2523
reporters: ['progress', 'kjhtml'],
2624
port: 9876,
2725
colors: true,

0 commit comments

Comments
 (0)