Skip to content

Commit 8e56698

Browse files
rarestomararestoma
authored
Merge pull request #35 from creativetimofficial/feature/v1.8.0
Feature/v1.8.0
2 parents 9955ee2 + 1825d51 commit 8e56698

File tree

15 files changed

+100
-181
lines changed

15 files changed

+100
-181
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ node_modules
3232
npm-debug.log
3333
testem.log
3434
/typings
35+
/.angular
3536

3637
# e2e
3738
/e2e/*.js
@@ -40,3 +41,4 @@ testem.log
4041
#System Files
4142
.DS_Store
4243
Thumbs.db
44+
package-lock.json

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [1.8.0] - 2022-05-06
2+
### Updates
3+
- update to Angular 13
4+
- update all dependencies to match the Angular 13 version
5+
- routing, build and configuration issues fixed
6+
17
## [1.7.0] - 2020-12-15
28
### Updates
39
- update to Angular 11

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,5 +168,5 @@ Instagram: <https://instagram.com/creativetimofficial>
168168

169169
[CHANGELOG]: ./CHANGELOG.md
170170

171-
[version-badge]: https://img.shields.io/badge/version-1.7.0-blue.svg
171+
[version-badge]: https://img.shields.io/badge/version-1.8.0-blue.svg
172172
[license-badge]: https://img.shields.io/badge/license-MIT-blue.svg

‎angular.json‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@
3939
"optimization": true,
4040
"outputHashing": "all",
4141
"sourceMap": false,
42-
"extractCss": true,
4342
"namedChunks": false,
44-
"aot": true,
4543
"extractLicenses": true,
4644
"vendorChunk": false,
4745
"buildOptimizer": true,
@@ -51,6 +49,22 @@
5149
"with": "src/environments/environment.prod.ts"
5250
}
5351
]
52+
},
53+
"development": {
54+
"vendorChunk": true,
55+
"extractLicenses": false,
56+
"sourceMap": true,
57+
"namedChunks": true,
58+
"buildOptimizer": false,
59+
"optimization": {
60+
"scripts": true,
61+
"styles": {
62+
"minify": false,
63+
"inlineCritical": true
64+
},
65+
"fonts": true
66+
},
67+
"outputHashing": "all"
5468
}
5569
}
5670
},
@@ -62,7 +76,11 @@
6276
"configurations": {
6377
"production": {
6478
"browserTarget": "lbd-free-angular-cli:build:production"
65-
}
79+
},
80+
"development": {
81+
"browserTarget": "lbd-free-angular-cli:build:development"
82+
},
83+
"defaultConfiguration": "development"
6684
}
6785
},
6886
"extract-i18n": {
@@ -135,7 +153,7 @@
135153
"schematics": {
136154
"@schematics/angular:component": {
137155
"prefix": "app",
138-
"styleext": "scss"
156+
"style": "scss"
139157
},
140158
"@schematics/angular:directive": {
141159
"prefix": "app"

‎documentation/tutorial-lbd-angular2.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<div class="filter"></div>
6464
<div class="title-container text-center">
6565
<h1>Light Bootstrap Dashboard Angular</h1>
66-
<h3 class="category">v1.7.0</h3>
66+
<h3 class="category">v1.8.0</h3>
6767
<h4 class="description text-center">We are constantly doing updates for you.</h4>
6868
<a href="http://demos.creative-tim.com/light-bootstrap-dashboard-angular2/documentation/tutorial" class="btn btn-neutral btn-lg btn-round btn-fill" target="_blank">View Documentation</a>
6969
</div>

‎package.json‎

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lbd-free-angular-cli",
3-
"version": "1.7.0",
3+
"version": "1.8.0",
44
"license": "MIT",
55
"scripts": {
66
"ng": "ng",
@@ -13,14 +13,18 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "11.0.4",
17-
"@angular/common": "11.0.4",
18-
"@angular/compiler": "11.0.4",
19-
"@angular/core": "11.0.4",
20-
"@angular/forms": "11.0.4",
21-
"@angular/platform-browser": "11.0.4",
22-
"@angular/platform-browser-dynamic": "11.0.4",
23-
"@angular/router": "11.0.4",
16+
"@angular/animations": "^13.2.6",
17+
"@angular/cdk": "^13.2.6",
18+
"@angular/common": "^13.2.6",
19+
"@angular/compiler": "^13.2.6",
20+
"@angular/core": "^13.2.6",
21+
"@angular/elements": "^13.2.6",
22+
"@angular/forms": "^13.2.6",
23+
"@angular/localize": "^13.2.6",
24+
"@angular/material": "^13.2.6",
25+
"@angular/platform-browser": "^13.2.6",
26+
"@angular/platform-browser-dynamic": "^13.2.6",
27+
"@angular/router": "^13.2.6",
2428
"@ngui/map": "0.30.3",
2529
"@types/googlemaps": "3.40.5",
2630
"animate.css": "4.1.1",
@@ -32,28 +36,30 @@
3236
"googleapis": "66.0.0",
3337
"jquery": "3.5.1",
3438
"perfect-scrollbar": "1.5.0",
35-
"rxjs": "6.6.3",
36-
"rxjs-compat": "6.6.3",
37-
"zone.js": "0.11.3"
39+
"rxjs": "^7.5.5",
40+
"zone.js": "~0.11.5"
3841
},
3942
"devDependencies": {
40-
"@angular-devkit/build-angular": "0.1100.4",
41-
"@angular/cli": "11.0.4",
42-
"@angular/compiler-cli": "11.0.4",
43-
"@types/jasmine": "3.6.2",
44-
"@types/node": "14.14.13",
45-
"codelyzer": "6.0.1",
46-
"jasmine-core": "3.6.0",
47-
"jasmine-spec-reporter": "6.0.0",
48-
"karma": "5.2.3",
49-
"karma-chrome-launcher": "3.1.0",
50-
"karma-cli": "2.0.0",
51-
"karma-jasmine": "4.0.1",
52-
"karma-jasmine-html-reporter": "1.5.4",
53-
"karma-coverage-istanbul-reporter": "3.0.3",
43+
"@angular-devkit/build-angular": "^13.2.6",
44+
"@angular/cli": "^13.2.6",
45+
"@angular/compiler-cli": "^13.2.6",
46+
"@angular/language-service": "13.2.6",
47+
"@types/jasmine": "~3.10.3",
48+
"@types/jasminewd2": "~2.0.10",
49+
"@types/chartist": "0.11.0",
50+
"@types/jquery": "3.5.1",
51+
"@types/node": "16.3.2",
52+
"codelyzer": "6.0.2",
53+
"jasmine-core": "~4.0.1",
54+
"jasmine-spec-reporter": "~7.0.0",
55+
"karma": "^6.3.17",
56+
"karma-chrome-launcher": "~3.1.1",
57+
"karma-coverage": "^2.2.0",
58+
"karma-coverage-istanbul-reporter": "~3.0.3",
59+
"karma-jasmine": "~4.0.1",
60+
"karma-jasmine-html-reporter": "^1.7.0",
5461
"protractor": "7.0.0",
55-
"ts-node": "9.1.1",
56-
"tslint": "6.1.3",
57-
"typescript": "4.0.3"
62+
"ts-node": "~10.7.0",
63+
"typescript": "~4.4.2"
5864
}
59-
}
65+
}

‎src/app/app.routing.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const routes: Routes =[
1616
children: [
1717
{
1818
path: '',
19-
loadChildren: './layouts/admin-layout/admin-layout.module#AdminLayoutModule'
19+
loadChildren: () => import('./layouts/admin-layout/admin-layout.module').then(x => x.AdminLayoutModule)
2020
}]},
2121
{
2222
path: '**',

‎src/app/home/home.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<div class="row">
3333
<div class="col-md-6">
3434
<lbd-chart
35-
[title]="'2014 Sales'"
35+
[title]="'2021 Sales'"
3636
[subtitle]="'All products including Taxes'"
3737
[chartType]="activityChartType"
3838
[chartData]="activityChartData"

‎src/app/layouts/admin-layout/admin-layout.component.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core';
2-
import { Location, LocationStrategy, PathLocationStrategy, PopStateEvent } from '@angular/common';
3-
import 'rxjs/add/operator/filter';
4-
import { NavbarComponent } from '../../shared/navbar/navbar.component';
1+
import { Component, OnInit} from '@angular/core';
2+
import { Location, PopStateEvent } from '@angular/common';
53
import { Router, NavigationEnd, NavigationStart } from '@angular/router';
6-
import { Subscription } from 'rxjs/Subscription';
74
import PerfectScrollbar from 'perfect-scrollbar';
8-
import { Observable } from 'rxjs';
5+
import { filter, Subscription } from 'rxjs';
96

107
@Component({
118
selector: 'app-admin-layout',
@@ -48,7 +45,7 @@ export class AdminLayoutComponent implements OnInit {
4845
window.scrollTo(0, 0);
4946
}
5047
});
51-
this._router = this.router.events.filter(event => event instanceof NavigationEnd).subscribe((event: NavigationEnd) => {
48+
this._router = this.router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => {
5249
elemMainPanel.scrollTop = 0;
5350
elemSidebar.scrollTop = 0;
5451
});

‎src/assets/sass/light-bootstrap-dashboard.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
33
=========================================================
4-
* Light Bootstrap Dashboard Angular - v1.7.0
4+
* Light Bootstrap Dashboard Angular - v1.8.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-angular2
@@ -36,3 +36,4 @@
3636
@import "lbd/cards";
3737
@import "lbd/chartist";
3838
@import "lbd/responsive";
39+
@import "../css/pe-icon-7-stroke.css"

0 commit comments

Comments
 (0)