Skip to content

Commit 5447441

Browse files
committed
Updated dependencies and small fixes
1 parent 6bbfc69 commit 5447441

File tree

7 files changed

+7289
-4138
lines changed

7 files changed

+7289
-4138
lines changed

angular-cli.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"testTsconfig": "tsconfig.spec.json",
2020
"prefix": "app",
2121
"styles": [
22-
"styles.css"
22+
"styles.scss"
2323
],
2424
"scripts": [],
2525
"environmentSource": "environments/environment.ts",

package-lock.json

Lines changed: 7249 additions & 4099 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,54 +18,55 @@
1818
"angular-cli": {},
1919
"scripts": {
2020
"ng": "ng",
21-
"start": "ng serve --aot",
21+
"start": "ng serve --aot --open",
2222
"ngtest2": "ng serve --aot && ngc --watch --diagnostics",
2323
"test": "ng test",
2424
"pree2e": "webdriver-manager update --standalone false --gecko false",
2525
"e2e": "protractor",
2626
"dist": "ng build --aot",
2727
"prod": "ng build --prod --aot",
2828
"prod:opt": "ng build --prod --aot --build-optimizer",
29+
"prod:src": "ng build --prod --aot --sourcemaps",
2930
"i18n": "ng-xi18n"
3031
},
3132
"dependencies": {
32-
"@angular/animations": "^5.1.1",
33-
"@angular/cdk": "^2.0.0-beta.12",
34-
"@angular/common": "^5.1.1",
35-
"@angular/compiler": "^5.1.1",
36-
"@angular/core": "^5.1.1",
37-
"@angular/forms": "^5.1.1",
38-
"@angular/http": "^5.1.1",
39-
"@angular/material": "^2.0.0-beta.12",
40-
"@angular/platform-browser": "^5.1.1",
41-
"@angular/platform-browser-dynamic": "^5.1.1",
42-
"@angular/platform-server": "^5.1.1",
43-
"@angular/router": "^5.1.1",
33+
"@angular/animations": "^5.2.0",
34+
"@angular/cdk": "^5.0.4",
35+
"@angular/common": "^5.2.0",
36+
"@angular/compiler": "^5.2.0",
37+
"@angular/core": "^5.2.0",
38+
"@angular/forms": "^5.2.0",
39+
"@angular/http": "^5.2.0",
40+
"@angular/material": "^5.0.4",
41+
"@angular/platform-browser": "^5.2.0",
42+
"@angular/platform-browser-dynamic": "^5.2.0",
43+
"@angular/platform-server": "^5.2.0",
44+
"@angular/router": "^5.2.0",
4445
"core-js": "^2.5.3",
4546
"firebase": "^4.8.0",
4647
"hammerjs": "^2.0.8",
47-
"rxjs": "^5.5.5",
48+
"rxjs": "^5.5.6",
4849
"ts-helpers": "*",
49-
"zone.js": "^0.8.18"
50+
"zone.js": "^0.8.20"
5051
},
5152
"devDependencies": {
52-
"@angular/cli": "^1.6.1",
53-
"@angular/compiler-cli": "^5.1.1",
54-
"@angular/language-service": "^5.1.1",
55-
"@types/jasmine": "^2.8.2",
56-
"@types/node": "^8.5.1",
57-
"codelyzer": "^3.2.2",
58-
"jasmine-core": "^2.7.0",
59-
"jasmine-spec-reporter": "^4.2.0",
60-
"karma": "^1.7.0",
53+
"@angular/cli": "^1.6.4",
54+
"@angular/compiler-cli": "^5.2.0",
55+
"@angular/language-service": "^5.2.0",
56+
"@types/jasmine": "^2.8.4",
57+
"@types/node": "^9.3.0",
58+
"codelyzer": "^4.0.2",
59+
"jasmine-core": "^2.8.0",
60+
"jasmine-spec-reporter": "^4.2.1",
61+
"karma": "^2.0.0",
6162
"karma-chrome-launcher": "^2.2.0",
6263
"karma-cli": "^1.0.1",
63-
"karma-coverage-istanbul-reporter": "^1.3.0",
64+
"karma-coverage-istanbul-reporter": "^1.3.3",
6465
"karma-jasmine": "^1.1.1",
6566
"karma-jasmine-html-reporter": "^0.2.2",
6667
"protractor": "^5.2.2",
67-
"ts-node": "^3.3.0",
68-
"tslint": "^5.8.0",
68+
"ts-node": "^4.1.0",
69+
"tslint": "^5.9.1",
6970
"typescript": "^2.6.2",
7071
"webpack": "^3.10.0"
7172
}

src/app/components/auth/auth.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { PhoneSigninComponent } from './phone-signin/phone-signin.component';
2525
FormsModule,
2626
HttpModule,
2727
MatButtonModule, MatInputModule, MatProgressBarModule,
28-
MatCardModule, MatIconModule,
28+
MatCardModule, MatIconModule,
2929
UsersRouting
3030
],
3131
providers: [

src/app/components/messages/messages.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
33
import { CommonModule } from '@angular/common';
44
import { BrowserModule } from '@angular/platform-browser';
55
import { MatButtonModule, MatCheckboxModule, MatMenuModule, MatInputModule,
6-
MatToolbarModule, MatDialogModule} from '@angular/material';
6+
MatToolbarModule, MatCardModule, MatDialogModule} from '@angular/material';
77
import { FormsModule } from '@angular/forms';
88

99
// Components
@@ -20,7 +20,7 @@ import { MessageService } from './message.service';
2020
CommonModule,
2121
BrowserModule,
2222
MatButtonModule, MatCheckboxModule, MatMenuModule, MatInputModule,
23-
MatToolbarModule, MatDialogModule,
23+
MatToolbarModule, MatCardModule, MatDialogModule,
2424
FormsModule
2525
],
2626
providers: [

src/app/components/misc/misc.module.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33

4-
import { MatButtonModule, MatCheckboxModule, MatInputModule, MatNativeDateModule,
5-
MatSlideToggleModule, MatStepperModule, MatTooltipModule, MatSidenavModule,
4+
import { MatButtonModule, MatCheckboxModule, MatInputModule, MatNativeDateModule,
5+
MatSlideToggleModule, MatStepperModule, MatTooltipModule, MatSidenavModule,
66
MatTableModule, MatCardModule, MatDatepickerModule, MatExpansionModule,
7-
MatIconModule } from '@angular/material';
7+
MatIconModule, MatToolbarModule } from '@angular/material';
88

99
// import { CdkTableModule } from '@angular/cdk';
1010
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -34,10 +34,10 @@ import { ExpansionPanelComponent } from './expansion-panel/expansion-panel.compo
3434
],
3535
imports: [
3636
CommonModule,
37-
MatButtonModule, MatCheckboxModule, MatInputModule, MatNativeDateModule,
38-
MatSlideToggleModule, MatStepperModule, MatTooltipModule, MatSidenavModule,
37+
MatButtonModule, MatCheckboxModule, MatInputModule, MatNativeDateModule,
38+
MatSlideToggleModule, MatStepperModule, MatTooltipModule, MatSidenavModule,
3939
MatTableModule, MatCardModule, MatDatepickerModule, MatExpansionModule,
40-
MatIconModule,
40+
MatIconModule, MatToolbarModule,
4141
FormsModule, ReactiveFormsModule,
4242
PipesModule,
4343
// MiscRoutingModule

src/styles.css renamed to src/styles.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* You can add global styles to this file, and also import other style files */
2-
@import '~@angular/material/prebuilt-themes/deeppurple-amber.css';
2+
@import '~@angular/material/prebuilt-themes/deeppurple-amber';
33

44
body {
55
background-color: #f7f7f7;
@@ -23,4 +23,4 @@ body {
2323
/* Mobile format portrait (small) */
2424
@media only screen and (max-width: 320px) {
2525

26-
}
26+
}

0 commit comments

Comments
 (0)