Skip to content

Commit 85980bb

Browse files
authored
Merge pull request #152 from coreui/dev-angular-v8
v2.5.0 for Angular 8
2 parents 20fecb7 + 6567e3a commit 85980bb

18 files changed

+143
-97
lines changed

CHANGELOG.md

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

3+
###### `v2.5.0`
4+
- refactor(app.routing): lazy loading via dynamic import()
5+
- refactor(modals): `ViewChild` second parameter
6+
- refactor(tsconfig): "module: "esnext", "target": "es6"
7+
- chore: update `[email protected]` imports
8+
- chore: update `[email protected]`
9+
- fix(collapse): `No provider for AnimationBuilder` add import `BrowserAnimationsModule` to app.module
10+
- fix(polyfill): import `web-animations-js`
11+
- chore(tslint): remove depracated/undefined rules
12+
- chore(tsconfig): set "target" to "es5" / IE11 compatible
13+
- update: Angular to `v8.0.0`
14+
- update: `@angular/animations` to `^8.0.0`
15+
- update: `@angular/common` to `^8.0.0`
16+
- update: `@angular/compiler` to `^8.0.0`
17+
- update: `@angular/core` to `^8.0.0`
18+
- update: `@angular/forms` to `^8.0.0`
19+
- update: `@angular/http` to `^8.0.0-beta.10`
20+
- update: `@angular/platform-browser` to `^8.0.0`
21+
- update: `@angular/platform-browser-dynamic` to `^8.0.0`
22+
- update: `@angular/router` to `^8.0.0`
23+
- update: `@coreui/angular` to `^2.5.0`
24+
- update: `@coreui/coreui` to `^2.1.11`
25+
- update: `@coreui/coreui-plugin-chartjs-custom-tooltips` to `^1.3.1`
26+
- update: `core-js` to `^2.6.9`
27+
- update: `ng2-charts` to `^2.3.0`
28+
- update: `ngx-boottsrap` to `^4.2.0`
29+
- update: `rxjs` to `^6.5.2`
30+
- update: `tsickle` to `^0.35.0`
31+
- update: `tslib` to `^1.9.3`
32+
- update: `zone.js` to `^0.9.1`
33+
- update: `@angular-devkit/build-angular` to `^0.800.1`
34+
- update: `@angular/cli` to `^8.0.1`
35+
- update: `@angular/compiler-cli` to `^8.0.0`
36+
- update: `@angular/language-service` to `^8.0.0`
37+
- update: `@types/node` to `^12.0.4`
38+
- update: `codelyzer` to `^5.1.0`
39+
- update: `jasmine-core` to `^3.4.0`
40+
- update: `karma` to `^4.1.0`
41+
- update: `karma-jasmine-html-reporter` to `^1.4.2`
42+
- update: `ts-node` to `^8.2.0`
43+
- update: `tslint` to `^5.17.0`
44+
- update: `typescript` to `~3.4.5`
45+
346
###### `v2.4.5`
447
- refactor(modals): add `@ViewChild`
548
- update: `@coreui/angular` to `^2.4.5`

README.md

Lines changed: 13 additions & 3 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-^7.2.10-lightgrey.svg?style=flat-square)
7+
![angular](https://img.shields.io/badge/angular-^8.0.0-lightgrey.svg?style=flat-square)
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
@@ -21,7 +21,13 @@ Curious why I decided to create CoreUI? Please read this article: [Jack of all t
2121

2222
CoreUI is an Open Source Bootstrap Admin Template. But CoreUI is not just another Admin Template. It goes way beyond hitherto admin templates thanks to transparent code and file structure. And if that's not enough, let’s just add that CoreUI consists bunch of unique features and over 1000 high quality icons.
2323

24-
CoreUI is based on Bootstrap 4 and offers 6 versions: [HTML5 AJAX](https://github.com/coreui/free-bootstrap-admin-template-ajax), [HTML5](https://github.com/coreui/free-angular-admin-template), [Angular 2+](https://github.com/coreui/free-angular-admin-template), [React.js](https://github.com/coreui/free-react-admin-template) & [Vue.js](https://github.com/coreui/free-vue-admin-template), [.NET Core 2](https://github.com/coreui/free-dotnet-admin-template).
24+
CoreUI is based on Bootstrap 4 and offers 6 versions:
25+
[HTML5 AJAX](https://github.com/coreui/coreui-free-bootstrap-admin-template-ajax),
26+
[HTML5](https://github.com/coreui/coreui-free-angular-admin-template),
27+
[Angular 2+](https://github.com/coreui/coreui-free-angular-admin-template),
28+
[React.js](https://github.com/coreui/coreui-free-react-admin-template),
29+
[Vue.js](https://github.com/coreui/coreui-free-vue-admin-template)
30+
& [.NET Core 2](https://github.com/mrholek/CoreUI-NET).
2531

2632
CoreUI is meant to be the UX game changer. Pure & transparent code is devoid of redundant components, so the app is light enough to offer ultimate user experience. This means mobile devices also, where the navigation is just as easy and intuitive as on a desktop or laptop. The CoreUI Layout API lets you customize your project for almost any device – be it Mobile, Web or WebApp – CoreUI covers them all!
2733

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

7379
###### Node.js
74-
Angular requires `Node.js` version 8.x or 10.x.
80+
Angular requires `Node.js` version 8.x or 10.x
7581

7682
- To check your version, run `node -v` in a terminal/console window.
7783
- To get `Node.js`, go to [nodejs.org](https://nodejs.org/).
@@ -82,6 +88,10 @@ Install the Angular CLI globally using a terminal/console window.
8288
npm install -g @angular/cli
8389
```
8490

91+
##### Update to Angular 8
92+
Angular 8 requires `Node.js` version 12.x
93+
Update guide - see: [https://update.angular.io](https://update.angular.io)
94+
8595
## Installation
8696

8797
### Clone repo

package.json

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-angular-admin-template",
3-
"version": "2.4.5",
3+
"version": "2.5.0",
44
"description": "CoreUI Free Angular 2+ Admin Template",
55
"author": {
66
"name": "Łukasz Holeczek",
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"homepage": "https://coreui.io/angular",
18-
"copyright": "Copyright 2018 creativeLabs Łukasz Holeczek",
18+
"copyright": "Copyright 2019 creativeLabs Łukasz Holeczek",
1919
"license": "MIT",
2020
"scripts": {
2121
"ng": "ng",
@@ -27,59 +27,60 @@
2727
},
2828
"private": true,
2929
"dependencies": {
30-
"@angular/animations": "^7.2.10",
31-
"@angular/common": "^7.2.10",
32-
"@angular/compiler": "^7.2.10",
33-
"@angular/core": "^7.2.10",
34-
"@angular/forms": "^7.2.10",
35-
"@angular/http": "^7.2.10",
36-
"@angular/platform-browser": "^7.2.10",
37-
"@angular/platform-browser-dynamic": "^7.2.10",
38-
"@angular/router": "^7.2.10",
39-
"@coreui/angular": "^2.4.5",
40-
"@coreui/coreui": "^2.1.8",
41-
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
30+
"@angular/animations": "^8.0.0",
31+
"@angular/common": "^8.0.0",
32+
"@angular/compiler": "^8.0.0",
33+
"@angular/core": "^8.0.0",
34+
"@angular/forms": "^8.0.0",
35+
"@angular/http": "^8.0.0-beta.10",
36+
"@angular/platform-browser": "^8.0.0",
37+
"@angular/platform-browser-dynamic": "^8.0.0",
38+
"@angular/router": "^8.0.0",
39+
"@coreui/angular": "^2.5.0",
40+
"@coreui/coreui": "^2.1.11",
41+
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
4242
"@coreui/icons": "0.3.0",
4343
"bootstrap": "^4.3.1",
4444
"chart.js": "^2.8.0",
45-
"core-js": "^2.6.5",
45+
"core-js": "^2.6.9",
4646
"flag-icon-css": "^3.3.0",
4747
"font-awesome": "^4.7.0",
4848
"moment": "^2.24.0",
4949
"mutationobserver-shim": "^0.3.3",
50-
"ng2-charts": "^1.6.0",
51-
"ngx-bootstrap": "^3.2.0",
50+
"ng2-charts": "^2.3.0",
51+
"ngx-bootstrap": "^4.2.0",
5252
"ngx-perfect-scrollbar": "^7.2.1",
53-
"rxjs": "^6.4.0",
53+
"rxjs": "^6.5.2",
5454
"simple-line-icons": "^2.4.1",
5555
"ts-helpers": "^1.1.2",
56-
"tsickle": "^0.34.3",
57-
"tslib": "^1.9.0",
58-
"zone.js": "^0.8.29"
56+
"tsickle": "^0.35.0",
57+
"tslib": "^1.9.3",
58+
"web-animations-js": "^2.3.1",
59+
"zone.js": "^0.9.1"
5960
},
6061
"devDependencies": {
61-
"@angular-devkit/build-angular": "^0.13.6",
62-
"@angular/cli": "^7.3.6",
63-
"@angular/compiler-cli": "^7.2.10",
64-
"@angular/language-service": "^7.2.10",
65-
"@types/jasmine": "^3.3.12",
62+
"@angular-devkit/build-angular": "^0.800.1",
63+
"@angular/cli": "^8.0.1",
64+
"@angular/compiler-cli": "^8.0.0",
65+
"@angular/language-service": "^8.0.0",
66+
"@types/jasmine": "^3.3.13",
6667
"@types/jasminewd2": "^2.0.6",
67-
"@types/node": "^11.11.4",
68-
"codelyzer": "^4.5.0",
69-
"jasmine-core": "^3.3.0",
68+
"@types/node": "^12.0.4",
69+
"codelyzer": "^5.1.0",
70+
"jasmine-core": "^3.4.0",
7071
"jasmine-spec-reporter": "^4.2.1",
71-
"karma": "^4.0.1",
72+
"karma": "^4.1.0",
7273
"karma-chrome-launcher": "^2.2.0",
7374
"karma-coverage-istanbul-reporter": "^2.0.5",
7475
"karma-jasmine": "^2.0.1",
75-
"karma-jasmine-html-reporter": "^1.4.0",
76+
"karma-jasmine-html-reporter": "^1.4.2",
7677
"protractor": "^5.4.2",
77-
"ts-node": "^8.0.3",
78-
"tslint": "^5.14.0",
79-
"typescript": "~3.2.4"
78+
"ts-node": "^8.2.0",
79+
"tslint": "^5.17.0",
80+
"typescript": "~3.4.5"
8081
},
8182
"engines": {
82-
"node": ">= 8.9.4",
83-
"npm": ">= 5.6.0"
83+
"node": ">= 12",
84+
"npm": ">= 6"
8485
}
8586
}

src/app/app.component.html

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

src/app/app.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { BrowserModule } from '@angular/platform-browser';
22
import { NgModule } from '@angular/core';
33
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
4+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
45

56
import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
67
import { PERFECT_SCROLLBAR_CONFIG } from 'ngx-perfect-scrollbar';
@@ -38,11 +39,12 @@ import { AppRoutingModule } from './app.routing';
3839
// Import 3rd party components
3940
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
4041
import { TabsModule } from 'ngx-bootstrap/tabs';
41-
import { ChartsModule } from 'ng2-charts/ng2-charts';
42+
import { ChartsModule } from 'ng2-charts';
4243

4344
@NgModule({
4445
imports: [
4546
BrowserModule,
47+
BrowserAnimationsModule,
4648
AppRoutingModule,
4749
AppAsideModule,
4850
AppBreadcrumbModule.forRoot(),

src/app/app.routing.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,35 +52,35 @@ export const routes: Routes = [
5252
children: [
5353
{
5454
path: 'base',
55-
loadChildren: './views/base/base.module#BaseModule'
55+
loadChildren: () => import('./views/base/base.module').then(m => m.BaseModule)
5656
},
5757
{
5858
path: 'buttons',
59-
loadChildren: './views/buttons/buttons.module#ButtonsModule'
59+
loadChildren: () => import('./views/buttons/buttons.module').then(m => m.ButtonsModule)
6060
},
6161
{
6262
path: 'charts',
63-
loadChildren: './views/chartjs/chartjs.module#ChartJSModule'
63+
loadChildren: () => import('./views/chartjs/chartjs.module').then(m => m.ChartJSModule)
6464
},
6565
{
6666
path: 'dashboard',
67-
loadChildren: './views/dashboard/dashboard.module#DashboardModule'
67+
loadChildren: () => import('./views/dashboard/dashboard.module').then(m => m.DashboardModule)
6868
},
6969
{
7070
path: 'icons',
71-
loadChildren: './views/icons/icons.module#IconsModule'
71+
loadChildren: () => import('./views/icons/icons.module').then(m => m.IconsModule)
7272
},
7373
{
7474
path: 'notifications',
75-
loadChildren: './views/notifications/notifications.module#NotificationsModule'
75+
loadChildren: () => import('./views/notifications/notifications.module').then(m => m.NotificationsModule)
7676
},
7777
{
7878
path: 'theme',
79-
loadChildren: './views/theme/theme.module#ThemeModule'
79+
loadChildren: () => import('./views/theme/theme.module').then(m => m.ThemeModule)
8080
},
8181
{
8282
path: 'widgets',
83-
loadChildren: './views/widgets/widgets.module#WidgetsModule'
83+
loadChildren: () => import('./views/widgets/widgets.module').then(m => m.WidgetsModule)
8484
}
8585
]
8686
},

src/app/views/base/carousels.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import { Component } from '@angular/core';
22
import { CarouselConfig } from 'ngx-bootstrap/carousel';
33

44
@Component({
5-
templateUrl: 'carousels.component.html', providers: [
6-
{ provide: CarouselConfig, useValue: { interval: 1500, noPause: true } }
5+
templateUrl: 'carousels.component.html',
6+
providers: [
7+
{ provide: CarouselConfig, useValue: { interval: 1500, noPause: true } },
78
]
89
})
910
export class CarouselsComponent {

src/app/views/buttons/dropdowns.component.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
1-
import { Component } from '@angular/core';
1+
import {Component, OnDestroy} from '@angular/core';
22

33
@Component({
44
templateUrl: 'dropdowns.component.html',
55
styleUrls: ['dropdowns.component.css']
66
})
7-
export class DropdownsComponent {
7+
export class DropdownsComponent implements OnDestroy {
88

99
status: { isOpen: boolean } = { isOpen: false };
1010
disabled: boolean = false;
1111
isDropup: boolean = true;
1212
autoClose: boolean = false;
1313

14-
constructor() { }
15-
1614
items: string[] = [
1715
'The first choice!',
1816
'And another choice for you.',
1917
'but wait! A third!'
2018
];
2119

20+
constructor() { }
21+
22+
ngOnDestroy () {
23+
this.status.isOpen = false;
24+
}
25+
2226
onHidden(): void {
2327
console.log('Dropdown is hidden');
2428
}

src/app/views/chartjs/chartjs.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NgModule } from '@angular/core';
2-
import { ChartsModule } from 'ng2-charts/ng2-charts';
2+
import { ChartsModule } from 'ng2-charts';
33

44
import { ChartJSComponent } from './chartjs.component';
55
import { ChartJSRoutingModule } from './chartjs-routing.module';

src/app/views/dashboard/dashboard.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NgModule } from '@angular/core';
22
import { FormsModule } from '@angular/forms';
3-
import { ChartsModule } from 'ng2-charts/ng2-charts';
3+
import { ChartsModule } from 'ng2-charts';
44
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
55
import { ButtonsModule } from 'ngx-bootstrap/buttons';
66

0 commit comments

Comments
 (0)