Skip to content

Commit 3cf8d8a

Browse files
authored
Merge pull request #341 from jdi-testing/revert-337-4918-toggle-buttons
Revert "4918 toggle buttons"
2 parents 92c902a + cdd69ff commit 3cf8d8a

File tree

611 files changed

+11865
-28603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

611 files changed

+11865
-28603
lines changed

angular-site/.eslintrc.json

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

angular-site/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,3 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
2525
## Further help
2626

2727
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
28-
29-
## For deploy in repo jdi-light
30-
31-
ng build --prod --base-href="/jdi-light/angular-page/"

angular-site/angular.json

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
"main": "src/main.ts",
1919
"polyfills": "src/polyfills.ts",
2020
"tsConfig": "tsconfig.app.json",
21+
"aot": true,
2122
"assets": [
2223
"src/favicon.ico",
2324
"src/angular/assets"
2425
],
2526
"styles": [
26-
"@angular/material/prebuilt-themes/deeppurple-amber.css",
27+
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
2728
"src/styles.css"
2829
],
2930
"scripts": []
@@ -39,6 +40,7 @@
3940
"optimization": true,
4041
"outputHashing": "none",
4142
"sourceMap": false,
43+
"extractCss": true,
4244
"namedChunks": false,
4345
"extractLicenses": true,
4446
"vendorChunk": true,
@@ -55,14 +57,6 @@
5557
"maximumError": "10kb"
5658
}
5759
]
58-
},
59-
"development": {
60-
"buildOptimizer": false,
61-
"optimization": false,
62-
"vendorChunk": true,
63-
"extractLicenses": false,
64-
"sourceMap": true,
65-
"namedChunks": true
6660
}
6761
}
6862
},
@@ -74,12 +68,8 @@
7468
"configurations": {
7569
"production": {
7670
"browserTarget": "my-app:build:production"
77-
},
78-
"development": {
79-
"browserTarget": "my-app:build:development"
8071
}
81-
},
82-
"defaultConfiguration": "development"
72+
}
8373
},
8474
"extract-i18n": {
8575
"builder": "@angular-devkit/build-angular:extract-i18n",
@@ -99,18 +89,22 @@
9989
"src/assets"
10090
],
10191
"styles": [
102-
"@angular/material/prebuilt-themes/deeppurple-amber.css",
92+
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
10393
"src/styles.css"
10494
],
10595
"scripts": []
10696
}
10797
},
10898
"lint": {
109-
"builder": "@angular-eslint/builder:lint",
99+
"builder": "@angular-devkit/build-angular:tslint",
110100
"options": {
111-
"lintFilePatterns": [
112-
"src/**/*.ts",
113-
"src/**/*.html"
101+
"tsConfig": [
102+
"tsconfig.app.json",
103+
"tsconfig.spec.json",
104+
"e2e/tsconfig.json"
105+
],
106+
"exclude": [
107+
"**/node_modules/**"
114108
]
115109
}
116110
},
@@ -129,9 +123,5 @@
129123
}
130124
}
131125
},
132-
"cli": {
133-
"schematicCollections": [
134-
"@angular-eslint/schematics"
135-
]
136-
}
126+
"defaultProject": "my-app"
137127
}

angular-site/.browserslistrc renamed to angular-site/browserslist

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
# You can see what browsers were selected by your queries by running:
66
# npx browserslist
77

8-
last 2 Chrome versions
9-
last 1 Firefox version
10-
last 2 Edge major versions
11-
last 2 Safari major versions
12-
last 2 iOS major versions
8+
> 0.5%
9+
last 2 versions
1310
Firefox ESR
11+
not dead
12+
not IE 9-11 # For IE 9-11 support, remove 'not'.

angular-site/e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",
6-
"target": "es2018",
6+
"target": "es5",
77
"types": [
88
"jasmine",
99
"jasminewd2",

0 commit comments

Comments
 (0)