Skip to content

Commit 5d003d1

Browse files
committed
update versions
1 parent a94d8fc commit 5d003d1

File tree

4 files changed

+35
-34
lines changed

4 files changed

+35
-34
lines changed

angular.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"src/favicon.ico"
2222
],
2323
"styles": [
24+
"node_modules/perfect-scrollbar/css/perfect-scrollbar.css",
2425
"node_modules/animate.css/animate.min.css",
2526
"node_modules/bootstrap/dist/css/bootstrap.min.css",
2627
"src/assets/sass/light-bootstrap-dashboard.scss",

package.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,48 +13,48 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "6.1.7",
17-
"@angular/common": "6.1.7",
18-
"@angular/compiler": "6.1.7",
19-
"@angular/core": "6.1.7",
20-
"@angular/forms": "6.1.7",
21-
"@angular/http": "6.1.7",
22-
"@angular/platform-browser": "6.1.7",
23-
"@angular/platform-browser-dynamic": "6.1.7",
24-
"@angular/router": "6.1.7",
16+
"@angular/animations": "7.2.12",
17+
"@angular/common": "7.2.12",
18+
"@angular/compiler": "7.2.12",
19+
"@angular/core": "7.2.12",
20+
"@angular/forms": "7.2.12",
21+
"@angular/platform-browser": "7.2.12",
22+
"@angular/platform-browser-dynamic": "7.2.12",
23+
"@angular/router": "7.2.12",
2524
"@ngui/map": "0.30.3",
26-
"@types/googlemaps": "3.30.13",
25+
"@types/googlemaps": "3.30.19",
2726
"animate.css": "^3.7.0",
2827
"arrive": "2.4.1",
2928
"bootstrap": "3.3.7",
3029
"bootstrap-notify": "3.1.3",
3130
"chartist": "0.11.0",
32-
"core-js": "2.5.7",
31+
"core-js": "3.0.1",
3332
"googleapis": "33.0.0",
3433
"jquery": "3.3.1",
35-
"perfect-scrollbar": "^1.4.0",
36-
"rxjs": "6.3.2",
37-
"rxjs-compat": "6.3.2",
38-
"zone.js": "0.8.26"
34+
"perfect-scrollbar": "1.4.0",
35+
"rxjs": "6.4.0",
36+
"rxjs-compat": "6.4.0",
37+
"zone.js": "0.9.0",
38+
"webpack": "4.29.6"
3939
},
4040
"devDependencies": {
41-
"@angular-devkit/build-angular": "0.8.1",
42-
"@angular/cli": "6.2.1",
43-
"@angular/compiler-cli": "6.1.7",
44-
"@types/jasmine": "2.8.8",
45-
"@types/node": "10.9.4",
46-
"codelyzer": "4.4.4",
47-
"jasmine-core": "3.2.1",
41+
"@angular-devkit/build-angular": "0.13.8",
42+
"@angular/cli": "7.3.8",
43+
"@angular/compiler-cli": "7.2.12",
44+
"@types/jasmine": "3.3.12",
45+
"@types/node": "11.13.0",
46+
"codelyzer": "5.0.0",
47+
"jasmine-core": "3.4.0",
4848
"jasmine-spec-reporter": "4.2.1",
49-
"karma": "3.0.0",
49+
"karma": "4.0.1",
5050
"karma-chrome-launcher": "2.2.0",
51-
"karma-cli": "1.0.1",
52-
"karma-jasmine": "1.1.2",
53-
"karma-jasmine-html-reporter": "1.3.1",
54-
"karma-coverage-istanbul-reporter": "2.0.4",
55-
"protractor": "5.4.1",
56-
"ts-node": "7.0.1",
57-
"tslint": "5.11.0",
58-
"typescript": "2.9.2"
51+
"karma-cli": "2.0.0",
52+
"karma-jasmine": "2.0.1",
53+
"karma-jasmine-html-reporter": "1.4.0",
54+
"karma-coverage-istanbul-reporter": "2.0.5",
55+
"protractor": "5.4.2",
56+
"ts-node": "8.0.3",
57+
"tslint": "5.15.0",
58+
"typescript": "3.2.2"
5959
}
6060
}

src/app/app.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
22
import { NgModule } from '@angular/core';
33
import { FormsModule } from '@angular/forms';
4-
import { HttpModule } from '@angular/http';
4+
import { HttpClientModule } from '@angular/common/http';
55
import { RouterModule } from '@angular/router';
66

77
import { AppRoutingModule } from './app.routing';
@@ -18,7 +18,7 @@ import { AdminLayoutComponent } from './layouts/admin-layout/admin-layout.compon
1818
BrowserAnimationsModule,
1919
FormsModule,
2020
RouterModule,
21-
HttpModule,
21+
HttpClientModule,
2222
NavbarModule,
2323
FooterModule,
2424
SidebarModule,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class AdminLayoutComponent implements OnInit {
2323
console.log(this.router)
2424
const isWindows = navigator.platform.indexOf('Win') > -1 ? true : false;
2525

26-
if (isWindows && !document.getElementsByTagName('body')[0].classList.contains('sidebar-mini')) {
26+
if (isWindows) {
2727
// if we are on windows OS we activate the perfectScrollbar function
2828

2929
document.getElementsByTagName('body')[0].classList.add('perfect-scrollbar-on');

0 commit comments

Comments
 (0)