Skip to content

Commit d6350ff

Browse files
zubycodeszubycodes
committed
2 parents 0b72183 + a97faa0 commit d6350ff

22 files changed

+566
-556
lines changed

‎.browserslistrc‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# For the full list of supported browsers by the Angular framework, please see:
6+
# https://angular.io/guide/browser-support
7+
8+
# You can see what browsers were selected by your queries by running:
9+
# npx browserslist
10+
11+
last 1 Chrome version
12+
last 1 Firefox version
13+
last 2 Edge major versions
14+
last 2 Safari major versions
15+
last 2 iOS major versions
16+
Firefox ESR
17+
IE 11 # Angular supports IE 11 only as an opt-in. To opt-out, add the 'not' prefix on this line.

‎CHANGELOG.md‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,207 @@
11
## [CoreUI for Angular](./README.md) version `changelog`
22

3+
###### `v2.11.2`
4+
5+
- chore: update to `Angular 11.2`
6+
7+
###### dependencies update
8+
- update `@angular/animations` to `^11.2.5`
9+
- update `@angular/cdk` to `^11.2.4
10+
- update `@angular/common` to `^11.2.5`
11+
- update `@angular/compiler` to `^11.2.5`
12+
- update `@angular/core` to `^11.2.5`
13+
- update `@angular/forms` to `^11.2.5`
14+
- update `@angular/localize` to `^11.2.5`
15+
- update `@angular/platform-browser` to `^11.2.5`
16+
- update `@angular/platform-browser-dynamic` to `^11.2.5`
17+
- update `@angular/router` to `^11.2.5`
18+
- update `@coreui/angular` to `^2.11.2`
19+
- update `core-js` to `^3.9.1`
20+
- update `rxjs` to `^6.6.6`
21+
- update `@angular-devkit/build-angular` to `^0.1102.4`
22+
- update `@angular/cli` to `^11.2.4`
23+
- update `@angular/compiler-cli` to `^11.2.5`
24+
- update `@angular/language-service` to `^11.2.5`
25+
- update `@types/jasmine` to `^3.6.6`
26+
- update `@types/node` to `^14.14.33`
27+
- update `typescript` to `^4.1.5`
28+
29+
###### `v2.11.1`
30+
31+
- chore: update to `Angular 11.1`
32+
33+
###### dependencies update
34+
- update `@angular/animations` to `^11.1.0`
35+
- update `@angular/cdk` to `^11.1.0`
36+
- update `@angular/common` to `^11.1.0`
37+
- update `@angular/compiler` to `^11.1.0`
38+
- update `@angular/core` to `^11.1.0`
39+
- update `@angular/forms` to `^11.1.0`
40+
- update `@angular/localize` to `^11.1.0`
41+
- update `@angular/platform-browser` to `^11.1.0`
42+
- update `@angular/platform-browser-dynamic` to `^11.1.0`
43+
- update `@angular/router` to `^11.1.0`
44+
- update `@coreui/angular` to `~2.11.1`
45+
- update `bootstrap` to `^4.6.0`
46+
- update `core-js` to `^3.8.3`
47+
- update `@angular-devkit/build-angular` to `^0.1101.1`
48+
- update `@angular/cli` to `^11.1.1`
49+
- update `@angular/compiler-cli` to `^11.1.0`
50+
- update `@angular/language-service` to `^11.1.0`
51+
- update `@types/jasmine` to `^3.6.3`
52+
- update `@types/node` to `^14.14.22`
53+
54+
###### `v2.11.0`
55+
56+
- chore: update to `Angular 11` and `TypeScript 4`
57+
- [https://update.angular.io/](https://update.angular.io/?v=10.2-11.0)
58+
- [https://v11.angular.io/guide/updating-to-version-11](https://v11.angular.io/guide/updating-to-version-11)
59+
- [TypeScript: Documentation - TypeScript 4](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-0.html)
60+
- remove deprecated support for IE 9, 10, and IE mobile
61+
62+
###### dependencies update
63+
- update `@angular/animations` to `^11.0.9`
64+
- update `@angular/cdk` to `^11.0.4`
65+
- update `@angular/common` to `^11.0.9`
66+
- update `@angular/compiler` to `^11.0.9`
67+
- update `@angular/core` to `^11.0.9`
68+
- update `@angular/forms` to `^11.0.9`
69+
- update `@angular/localize` to `^11.0.9`
70+
- update `@angular/platform-browser` to `^11.0.9`
71+
- update `@angular/platform-browser-dynamic` to `^11.0.9`
72+
- update `@angular/router` to `^11.0.9`
73+
- update `@coreui/angular` to `~2.11.0`
74+
- update `@angular-devkit/build-angular` to `^0.1100.7`
75+
- update `@angular/cli` to `^11.0.7`
76+
- update `@angular/compiler-cli` to `^11.0.9`
77+
- update `@angular/language-service` to `^11.0.9`
78+
- update `@types/jasmine` to `~3.6.0`
79+
- update `codelyzer` to `^6.0.0`
80+
- update `karma-coverage` to `~2.0.3`
81+
- update `typescript` to `~4.0.5`
82+
83+
###### `v2.10.0`
84+
85+
- chore: update to `Angular 10` and `TypeScript 3.9`
86+
- [https://update.angular.io/](https://update.angular.io/?v=9.1-10.2)
87+
- [https://v10.angular.io/guide/updating-to-version-10](https://v10.angular.io/guide/updating-to-version-10)
88+
- [TypeScript: Documentation - TypeScript 3.9](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-9.html)
89+
90+
91+
- test: deprecate `async()` in favour of `waitForAsync()`
92+
93+
###### dependencies update
94+
- update `@angular/animations` to `^10.2.4`
95+
- update `@angular/cdk` to `^10.2.7`
96+
- update `@angular/common` to `^10.2.4`
97+
- update `@angular/compiler` to `^10.2.4`
98+
- update `@angular/core` to `^10.2.4`
99+
- update `@angular/forms` to `^10.2.4`
100+
- update `@angular/localize` to `^10.2.4`
101+
- update `@angular/platform-browser` to `^10.2.4`
102+
- update `@angular/platform-browser-dynamic` to `^10.2.4`
103+
- update `@angular/router` to `^10.2.4`
104+
- update `@coreui/angular` to `~2.10.0`
105+
- update `classlist.js` to `^1.1.20150312`
106+
- update `ng2-charts` to `^2.4.2`
107+
- update `ngx-bootstrap` to `^6.2.0`
108+
- update `ngx-perfect-scrollbar` to `^10.1.0`
109+
- update `tslib` to `^2.0.0`
110+
- update `@angular-devkit/build-angular` to `^0.1002.1`
111+
- update `@angular/cli` to `^10.2.1`
112+
- update `@angular/compiler-cli` to `^10.2.4`
113+
- update `@angular/language-service` to `^10.2.4`
114+
- update `jasmine-core` to `~3.6.0`
115+
- update `jasmine-spec-reporter` to `~5.0.0`
116+
- update `karma` to `~5.2.0`
117+
- update `karma-chrome-launcher` to `~3.1.0`
118+
- update `karma-coverage-istanbul-reporter` to `~3.0.2`
119+
- update `karma-jasmine` to `~4.0.0`
120+
- update `karma-jasmine-html-reporter` to `^1.5.0`
121+
- update `protractor` to `~7.0.0`
122+
- update `tslint` to `~6.1.0`
123+
- update `typescript` to `^3.9.7`
124+
125+
126+
###### `v2.9.6`
127+
- feat(icons): update to @coreui/icons v2 and @coreui/icons-angular
128+
129+
###### dependencies update
130+
- update `@angular/animations` to `^9.1.13`
131+
- update `@angular/cdk` to `^9.2.4`
132+
- update `@angular/common` to `^9.1.13`
133+
- update `@angular/compiler` to `^9.1.13`
134+
- update `@angular/core` to `^9.1.13`
135+
- update `@angular/forms` to `^9.1.13`
136+
- update `@angular/platform-browser` to `^9.1.13`
137+
- update `@angular/platform-browser-dynamic` to `^9.1.13`
138+
- update `@angular/router` to `^9.1.13`
139+
- update `@coreui/angular`: `~2.9.6`
140+
- update `@coreui/icons` to `^2.0.0-rc.0`
141+
- update `@coreui/icons-angular` to `1.0.0-alpha.3`
142+
- update `bootstrap` to `^4.5.3`
143+
- update `chart.js` to `^2.9.4`
144+
- update `core-js` to `^3.8.2`
145+
- update `ng2-charts` to `~2.3.3`
146+
- update `ngx-bootstrap` to `^5.6.2`
147+
- update `rxjs` to `^6.6.3`
148+
- update `simple-line-icons` to `^2.5.5`
149+
- update `tslib` to `^1.14.1`
150+
- update `@angular-devkit/build-angular` to `^0.901.13`
151+
- update `@angular/cli` to `^9.1.13`
152+
- update `@angular/compiler-cli` to `^9.1.13`
153+
- update `@angular/language-service` to `^9.1.13`
154+
- update `@types/jasmine` to `^3.6.2`
155+
- update `@types/node` to `^14.14.20`
156+
- update `karma` to `^5.2.3`
157+
158+
###### `v2.9.5`
159+
- fix(simple-line-icons): Can't resolve simple-line-icons.css - fixes #196
160+
161+
###### dependencies update
162+
- update `simple-line-icons` to `^2.5.2`
163+
- update `@angular-devkit/build-angular` to `^0.901.12`
164+
- update `@angular/cli` to `^9.1.12`
165+
- update `@types/jasmine` to `^3.5.12`
166+
- update `jasmine-core` to `^3.6.0`
167+
- update `jasmine-spec-reporter` to `^5.0.2`
168+
- update `karma` to `^5.1.1`
169+
- update `karma-coverage-istanbul-reporter` to `^3.0.3`
170+
- update `tslint` to `^6.1.3`
171+
172+
###### `v2.9.4`
173+
- refactor(polyfills): update core-js polyfills imports
174+
175+
###### dependencies update
176+
- update `@angular/animations` to `^9.1.12`
177+
- update `@angular/common` to `^9.1.12`
178+
- update `@angular/compiler` to `^9.1.12`
179+
- update `@angular/core` to `^9.1.12`
180+
- update `@angular/forms` to `^9.1.12`
181+
- update `@angular/platform-browser` to `^9.1.12`
182+
- update `@angular/platform-browser-dynamic` to `^9.1.12`
183+
- update `@angular/router` to `^9.1.12`
184+
- update `@coreui/angular` to `~2.9.4`
185+
- update `bootstrap` to `^4.5.0`
186+
- update `core-js` to `^3.6.5`
187+
- update `flag-icon-css` to `^3.5.0`
188+
- update `moment` to `^2.27.0`
189+
- update `mutationobserver-shim` to `^0.3.7`
190+
- update `ng2-charts` to `^2.3.2`
191+
- update `rxjs` to `^6.6.0`
192+
- update `tslib` to `^1.13.0`
193+
- update `@angular-devkit/build-angular` to `^0.901.11`
194+
- update `@angular/cli` to `^9.1.11`
195+
- update `@angular/compiler-cli` to `^9.1.12`
196+
- update `@angular/language-service` to `^9.1.12`
197+
- update `@types/jasmine` to `^3.5.11`
198+
- update `@types/node` to `^13.13.14`
199+
- update `karma` to `^5.1.0`
200+
- update `karma-jasmine` to `^3.3.1`
201+
- update `karma-jasmine-html-reporter` to `^1.5.4`
202+
- update `protractor` to `^7.0.0`
203+
- update `ts-node` to `^8.10.2`
204+
3205
###### `v2.9.2`
4206
- fix(navbars): cannot find module `ngx-bootstrap`
5207

‎README.md‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![@coreui coreui](https://img.shields.io/badge/@coreui%20-coreui-lightgrey.svg?style=flat-square)](https://github.com/coreui/coreui)
55
[![npm package][npm-coreui-badge]][npm-coreui]
66
[![NPM downloads][npm-coreui-download]][npm-coreui]
7-
![angular](https://img.shields.io/badge/angular-^9.1.1-lightgrey.svg?style=flat-square&logo=angular)
7+
![angular](https://img.shields.io/badge/angular-^11.0.9-lightgrey.svg?style=flat-square&logo=angular)
88

99
[npm-coreui-angular]: https://www.npmjs.com/package/@coreui/angular
1010
[npm-coreui-angular-badge]: https://img.shields.io/npm/v/@coreui/angular.png?style=flat-square
@@ -41,7 +41,7 @@ CoreUI is meant to be the UX game changer. Pure & transparent code is devoid of
4141
- [Prerequisites](#prerequisites)
4242
- [Node.js](#nodejs)
4343
- [Angular CLI](#angular-cli)
44-
- [Update to Angular 9](#update-to-angular-9)
44+
- [Update to Angular 11](#update-to-angular-9)
4545
- [Installation](#installation)
4646
- [Clone repo](#clone-repo)
4747
- [Usage](#usage)
@@ -62,7 +62,6 @@ CoreUI is built on top of Bootstrap 4 and supports popular frameworks.
6262
* [CoreUI Free Bootstrap Admin Template](https://github.com/coreui/coreui-free-bootstrap-admin-template)
6363
* [CoreUI Free Bootstrap Admin Template (Ajax)](https://github.com/coreui/coreui-free-bootstrap-admin-template-ajax)
6464
* [CoreUI Free Angular 2+ Admin Template](https://github.com/coreui/coreui-free-angular-admin-template)
65-
* 🚧 CoreUI Free .NET Core 2 Admin Template (Available Soon)
6665
* [CoreUI Free React.js Admin Template](https://github.com/coreui/coreui-free-react-admin-template)
6766
* [CoreUI Free Vue.js Admin Template](https://github.com/coreui/coreui-free-vue-admin-template)
6867

@@ -84,7 +83,7 @@ CoreUI is built on top of Bootstrap 4 and supports popular frameworks.
8483
Before you begin, make sure your development environment includes `Node.js®` and an `npm` package manager.
8584

8685
###### Node.js
87-
Angular 9 requires `Node.js` version 10.13 or later.
86+
Angular 11 requires `Node.js` version 10.13 or later.
8887

8988
- To check your version, run `node -v` in a terminal/console window.
9089
- To get `Node.js`, go to [nodejs.org](https://nodejs.org/).
@@ -95,8 +94,8 @@ Install the Angular CLI globally using a terminal/console window.
9594
npm install -g @angular/cli
9695
```
9796

98-
##### Update to Angular 9
99-
Angular 9 requires `Node.js` version 10.x or newer
97+
##### Update to Angular 11
98+
Angular 11 requires `Node.js` version 10.13 or newer
10099
Update guide - see: [https://update.angular.io](https://update.angular.io)
101100

102101
## Installation
@@ -187,11 +186,11 @@ Some of projects created by community but not maintained by CoreUI team.
187186

188187
## Copyright and license
189188

190-
copyright 2017-2020 creativeLabs Łukasz Holeczek. Code released under [the MIT license](https://github.com/coreui/coreui-free-angular-admin-template/blob/master/LICENSE).
189+
copyright 2017-2021 creativeLabs Łukasz Holeczek. Code released under [the MIT license](https://github.com/coreui/coreui-free-angular-admin-template/blob/master/LICENSE).
191190
There is only one limitation you can't re-distribute the CoreUI as stock. You can’t do this if you modify the CoreUI. In past we faced some problems with persons who tried to sell CoreUI based templates.
192191

193192
## Support CoreUI Development
194193

195194
CoreUI is an MIT licensed open source project and completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by donating on [PayPal](https://www.paypal.me/holeczek), buying [CoreUI Pro Version](https://coreui.io/pro) or buying one of our [premium admin templates](https://genesisui.com/?support=1).
196195

197-
As of now I am exploring the possibility of working on CoreUI fulltime - if you are a business that is building core products using CoreUI, I am also open to conversations regarding custom sponsorship / consulting arrangements. Get in touch on [Twitter](https://twitter.com/lukaszholeczek).
196+
As of now I am exploring the possibility of working on CoreUI full-time - if you are a business that is building core products using CoreUI, I am also open to conversations regarding custom sponsorship / consulting arrangements. Get in touch on [Twitter](https://twitter.com/lukaszholeczek).

‎angular.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,21 @@
2020
"src/assets"
2121
],
2222
"styles": [
23-
"node_modules/@coreui/icons/css/coreui-icons.css",
23+
"node_modules/@coreui/icons/css/free.css",
2424
"node_modules/flag-icon-css/css/flag-icon.css",
2525
"node_modules/font-awesome/css/font-awesome.css",
26-
"node_modules/simple-line-icons/css/simple-line-icons.css",
26+
"node_modules/simple-line-icons/dist/styles/simple-line-icons.css",
2727
"src/scss/style.scss"
2828
],
2929
"stylePreprocessorOptions": {
3030
"includePaths": [
3131
"./node_modules"
3232
]
3333
},
34-
"scripts": [
35-
"node_modules/chart.js/dist/Chart.min.js"
34+
"scripts": [],
35+
"allowedCommonJsDependencies": [
36+
"chart.js",
37+
"classnames"
3638
]
3739
},
3840
"configurations": {
@@ -46,7 +48,6 @@
4648
"optimization": true,
4749
"outputHashing": "all",
4850
"sourceMap": false,
49-
"extractCss": true,
5051
"namedChunks": false,
5152
"aot": true,
5253
"extractLicenses": true,
@@ -85,13 +86,12 @@
8586
"karmaConfig": "./karma.conf.js",
8687
"polyfills": "src/polyfills.ts",
8788
"tsConfig": "src/tsconfig.spec.json",
88-
"scripts": [
89-
"node_modules/chart.js/dist/Chart.min.js"
90-
],
89+
"scripts": [],
9190
"styles": [
91+
"node_modules/@coreui/icons/css/free.css",
9292
"node_modules/flag-icon-css/css/flag-icon.css",
9393
"node_modules/font-awesome/css/font-awesome.css",
94-
"node_modules/simple-line-icons/css/simple-line-icons.css",
94+
"node_modules/simple-line-icons/dist/styles/simple-line-icons.css",
9595
"src/scss/style.scss"
9696
],
9797
"stylePreprocessorOptions": {
@@ -149,7 +149,7 @@
149149
"schematics": {
150150
"@schematics/angular:component": {
151151
"prefix": "app",
152-
"styleext": "scss"
152+
"style": "scss"
153153
},
154154
"@schematics/angular:directive": {
155155
"prefix": "app"
@@ -158,4 +158,4 @@
158158
"cli": {
159159
"analytics": false
160160
}
161-
}
161+
}

‎e2e/app.e2e-spec.ts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ describe('CoreUI template', () => {
3636
button.click();
3737
browser.sleep(sleep);
3838
expect(body.getAttribute('class')).not.toContain('sidebar-minimized');
39-
browser.driver.manage().window().setSize(600, 800);
40-
browser.sleep(1000);
4139
});
4240

4341
it('should toggle `sidebar-show` body.class on `navbar-toggler` click', () => {
@@ -56,4 +54,19 @@ describe('CoreUI template', () => {
5654
browser.sleep(sleep);
5755
expect(body.getAttribute('class')).not.toContain('sidebar-show');
5856
});
57+
58+
it('should toggle `aside-menu-lg-show` body.class on `navbar-toggler` click', () => {
59+
browser.manage().window().maximize();
60+
browser.sleep(1000);
61+
const body = page.getBody();
62+
expect(body.getAttribute('class')).not.toContain('aside-menu-lg-show');
63+
const button1 = page.getByCss('.navbar-toggler.d-none.d-lg-block').last();
64+
button1.click();
65+
browser.sleep(sleep);
66+
expect(body.getAttribute('class')).toContain('aside-menu-lg-show');
67+
browser.sleep(sleep);
68+
button1.click();
69+
browser.sleep(sleep);
70+
expect(body.getAttribute('class')).not.toContain('aside-menu-lg-show');
71+
});
5972
});

0 commit comments

Comments
 (0)