Skip to content

Commit aedf20e

Browse files
izifortunekrjordan
izifortune
authored and
krjordan
committed
feat(material): Upgrade @angular/material to v 2.0.0-beta.12 (#482)
Angular material removed the global MaterialModule all the components needs to be imported individually. Fixes #448
1 parent b5485fe commit aedf20e

25 files changed

+267
-221
lines changed

‎e2e/app.po.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ export class ExampleAppPage {
66
}
77

88
getAppDescription() {
9-
return element(by.css('md-toolbar-row')).getText();
9+
return element(by.css('mat-toolbar-row')).getText();
1010
}
1111
}

‎example-app/app/auth/auth.module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { NgModule, ModuleWithProviders } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { RouterModule } from '@angular/router';
44
import { ReactiveFormsModule } from '@angular/forms';
5-
import { MaterialModule } from '@angular/material';
65
import { StoreModule } from '@ngrx/store';
76
import { EffectsModule } from '@ngrx/effects';
87
import { LoginPageComponent } from './containers/login-page.component';
@@ -12,6 +11,7 @@ import { AuthService } from './services/auth.service';
1211
import { AuthGuard } from './services/auth-guard.service';
1312
import { AuthEffects } from './effects/auth.effects';
1413
import { reducers } from './reducers';
14+
import { MaterialModule } from '../material';
1515

1616
export const COMPONENTS = [LoginPageComponent, LoginFormComponent];
1717

‎example-app/app/auth/components/__snapshots__/login-form.component.spec.ts.snap‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ exports[`Login Page should compile 1`] = `
66
submitted={[Function EventEmitter]}
77
>
88
9-
<md-card
9+
<mat-card
1010
_ngcontent-c0=""
1111
>
1212
1313
14-
<md-card-title
14+
<mat-card-title
1515
_ngcontent-c0=""
1616
>
1717
Login
18-
</md-card-title>
18+
</mat-card-title>
1919
2020
21-
<md-card-content
21+
<mat-card-content
2222
_ngcontent-c0=""
2323
>
2424
@@ -36,7 +36,7 @@ exports[`Login Page should compile 1`] = `
3636
>
3737
3838
39-
<md-input-container
39+
<mat-input-container
4040
_ngcontent-c0=""
4141
>
4242
@@ -45,14 +45,14 @@ exports[`Login Page should compile 1`] = `
4545
_ngcontent-c0=""
4646
class="ng-untouched ng-pristine ng-valid"
4747
formcontrolname="username"
48-
mdinput=""
48+
matinput=""
4949
ng-reflect-name="username"
5050
placeholder="Username"
5151
type="text"
5252
/>
5353
5454
55-
</md-input-container>
55+
</mat-input-container>
5656
5757
5858
</p>
@@ -64,7 +64,7 @@ exports[`Login Page should compile 1`] = `
6464
>
6565
6666
67-
<md-input-container
67+
<mat-input-container
6868
_ngcontent-c0=""
6969
>
7070
@@ -73,23 +73,23 @@ exports[`Login Page should compile 1`] = `
7373
_ngcontent-c0=""
7474
class="ng-untouched ng-pristine ng-valid"
7575
formcontrolname="password"
76-
mdinput=""
76+
matinput=""
7777
ng-reflect-name="password"
7878
placeholder="Password"
7979
type="password"
8080
/>
8181
8282
83-
</md-input-container>
83+
</mat-input-container>
8484
8585
8686
</p>
8787
8888
8989
9090
91-
92-
91+
92+
9393
9494
<p
9595
_ngcontent-c0=""
@@ -99,7 +99,7 @@ exports[`Login Page should compile 1`] = `
9999
100100
<button
101101
_ngcontent-c0=""
102-
md-button=""
102+
mat-button=""
103103
type="submit"
104104
>
105105
Login
@@ -113,10 +113,10 @@ exports[`Login Page should compile 1`] = `
113113
</form>
114114
115115
116-
</md-card-content>
116+
</mat-card-content>
117117
118118
119-
</md-card>
119+
</mat-card>
120120
121121
</bc-login-form>
122122
`;
@@ -127,19 +127,19 @@ exports[`Login Page should disable the form if pending 1`] = `
127127
submitted={[Function EventEmitter]}
128128
>
129129
130-
<md-card
130+
<mat-card
131131
_ngcontent-c1=""
132132
>
133133
134134
135-
<md-card-title
135+
<mat-card-title
136136
_ngcontent-c1=""
137137
>
138138
Login
139-
</md-card-title>
139+
</mat-card-title>
140140
141141
142-
<md-card-content
142+
<mat-card-content
143143
_ngcontent-c1=""
144144
>
145145
@@ -157,7 +157,7 @@ exports[`Login Page should disable the form if pending 1`] = `
157157
>
158158
159159
160-
<md-input-container
160+
<mat-input-container
161161
_ngcontent-c1=""
162162
>
163163
@@ -167,14 +167,14 @@ exports[`Login Page should disable the form if pending 1`] = `
167167
class="ng-untouched ng-pristine"
168168
disabled=""
169169
formcontrolname="username"
170-
mdinput=""
170+
matinput=""
171171
ng-reflect-name="username"
172172
placeholder="Username"
173173
type="text"
174174
/>
175175
176176
177-
</md-input-container>
177+
</mat-input-container>
178178
179179
180180
</p>
@@ -186,7 +186,7 @@ exports[`Login Page should disable the form if pending 1`] = `
186186
>
187187
188188
189-
<md-input-container
189+
<mat-input-container
190190
_ngcontent-c1=""
191191
>
192192
@@ -196,23 +196,23 @@ exports[`Login Page should disable the form if pending 1`] = `
196196
class="ng-untouched ng-pristine"
197197
disabled=""
198198
formcontrolname="password"
199-
mdinput=""
199+
matinput=""
200200
ng-reflect-name="password"
201201
placeholder="Password"
202202
type="password"
203203
/>
204204
205205
206-
</md-input-container>
206+
</mat-input-container>
207207
208208
209209
</p>
210210
211211
212212
213213
214-
215-
214+
215+
216216
217217
<p
218218
_ngcontent-c1=""
@@ -222,7 +222,7 @@ exports[`Login Page should disable the form if pending 1`] = `
222222
223223
<button
224224
_ngcontent-c1=""
225-
md-button=""
225+
mat-button=""
226226
type="submit"
227227
>
228228
Login
@@ -236,10 +236,10 @@ exports[`Login Page should disable the form if pending 1`] = `
236236
</form>
237237
238238
239-
</md-card-content>
239+
</mat-card-content>
240240
241241
242-
</md-card>
242+
</mat-card>
243243
244244
</bc-login-form>
245245
`;
@@ -251,19 +251,19 @@ exports[`Login Page should display an error message if provided 1`] = `
251251
submitted={[Function EventEmitter]}
252252
>
253253
254-
<md-card
254+
<mat-card
255255
_ngcontent-c2=""
256256
>
257257
258258
259-
<md-card-title
259+
<mat-card-title
260260
_ngcontent-c2=""
261261
>
262262
Login
263-
</md-card-title>
263+
</mat-card-title>
264264
265265
266-
<md-card-content
266+
<mat-card-content
267267
_ngcontent-c2=""
268268
>
269269
@@ -281,7 +281,7 @@ exports[`Login Page should display an error message if provided 1`] = `
281281
>
282282
283283
284-
<md-input-container
284+
<mat-input-container
285285
_ngcontent-c2=""
286286
>
287287
@@ -290,14 +290,14 @@ exports[`Login Page should display an error message if provided 1`] = `
290290
_ngcontent-c2=""
291291
class="ng-untouched ng-pristine ng-valid"
292292
formcontrolname="username"
293-
mdinput=""
293+
matinput=""
294294
ng-reflect-name="username"
295295
placeholder="Username"
296296
type="text"
297297
/>
298298
299299
300-
</md-input-container>
300+
</mat-input-container>
301301
302302
303303
</p>
@@ -309,7 +309,7 @@ exports[`Login Page should display an error message if provided 1`] = `
309309
>
310310
311311
312-
<md-input-container
312+
<mat-input-container
313313
_ngcontent-c2=""
314314
>
315315
@@ -318,14 +318,14 @@ exports[`Login Page should display an error message if provided 1`] = `
318318
_ngcontent-c2=""
319319
class="ng-untouched ng-pristine ng-valid"
320320
formcontrolname="password"
321-
mdinput=""
321+
matinput=""
322322
ng-reflect-name="password"
323323
placeholder="Password"
324324
type="password"
325325
/>
326326
327327
328-
</md-input-container>
328+
</mat-input-container>
329329
330330
331331
</p>
@@ -341,8 +341,8 @@ exports[`Login Page should display an error message if provided 1`] = `
341341
Invalid credentials
342342
343343
</p>
344-
345-
344+
345+
346346
347347
<p
348348
_ngcontent-c2=""
@@ -352,7 +352,7 @@ exports[`Login Page should display an error message if provided 1`] = `
352352
353353
<button
354354
_ngcontent-c2=""
355-
md-button=""
355+
mat-button=""
356356
type="submit"
357357
>
358358
Login
@@ -366,10 +366,10 @@ exports[`Login Page should display an error message if provided 1`] = `
366366
</form>
367367
368368
369-
</md-card-content>
369+
</mat-card-content>
370370
371371
372-
</md-card>
372+
</mat-card>
373373
374374
</bc-login-form>
375375
`;

0 commit comments

Comments
 (0)