Skip to content

Commit

Permalink
feat(material): Upgrade @angular/material to v 2.0.0-beta.12
Browse files Browse the repository at this point in the history 
Angular material removed the global MaterialModule all the
components needs to be imported individually.

Fixes ngrx#448
  • Loading branch information
@izifortune
izifortune committed Oct 14, 2017
1 parent d5640ec commit b0d6297
Show file tree
Hide file tree
Showing 25 changed files with 271 additions and 218 deletions.
2 changes: 1 addition & 1 deletion e2e/app.po.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ export class ExampleAppPage {
}

getAppDescription() {
return element(by.css('md-toolbar-row')).getText();
return element(by.css('mat-toolbar-row')).getText();
}
}
2 changes: 1 addition & 1 deletion example-app/app/auth/auth.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { NgModule, ModuleWithProviders } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { ReactiveFormsModule } from '@angular/forms';
import { MaterialModule } from '@angular/material';
import { StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { LoginPageComponent } from './containers/login-page.component';
Expand All @@ -12,6 +11,7 @@ import { AuthService } from './services/auth.service';
import { AuthGuard } from './services/auth-guard.service';
import { AuthEffects } from './effects/auth.effects';
import { reducers } from './reducers';
import { MaterialModule } from '../material';

export const COMPONENTS = [LoginPageComponent, LoginFormComponent];

Expand Down
90 changes: 45 additions & 45 deletions example-app/app/auth/components/__snapshots__/login-form.component.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ exports[`Login Page should compile 1`] = `
submitted={[Function EventEmitter]}
>
<md-card
<mat-card
_ngcontent-c0=""
>
<md-card-title
<mat-card-title
_ngcontent-c0=""
>
Login
</md-card-title>
</mat-card-title>
<md-card-content
<mat-card-content
_ngcontent-c0=""
>
Expand All @@ -36,7 +36,7 @@ exports[`Login Page should compile 1`] = `
>
<md-input-container
<mat-input-container
_ngcontent-c0=""
>
Expand All @@ -45,14 +45,14 @@ exports[`Login Page should compile 1`] = `
_ngcontent-c0=""
class="ng-untouched ng-pristine ng-valid"
formcontrolname="username"
mdinput=""
matinput=""
ng-reflect-name="username"
placeholder="Username"
type="text"
/>
</md-input-container>
</mat-input-container>
</p>
Expand All @@ -64,7 +64,7 @@ exports[`Login Page should compile 1`] = `
>
<md-input-container
<mat-input-container
_ngcontent-c0=""
>
Expand All @@ -73,23 +73,23 @@ exports[`Login Page should compile 1`] = `
_ngcontent-c0=""
class="ng-untouched ng-pristine ng-valid"
formcontrolname="password"
mdinput=""
matinput=""
ng-reflect-name="password"
placeholder="Password"
type="password"
/>
</md-input-container>
</mat-input-container>
</p>
<p
_ngcontent-c0=""
Expand All @@ -99,7 +99,7 @@ exports[`Login Page should compile 1`] = `
<button
_ngcontent-c0=""
md-button=""
mat-button=""
type="submit"
>
Login
Expand All @@ -113,10 +113,10 @@ exports[`Login Page should compile 1`] = `
</form>
</md-card-content>
</mat-card-content>
</md-card>
</mat-card>
</bc-login-form>
`;
Expand All @@ -127,19 +127,19 @@ exports[`Login Page should disable the form if pending 1`] = `
submitted={[Function EventEmitter]}
>
<md-card
<mat-card
_ngcontent-c1=""
>
<md-card-title
<mat-card-title
_ngcontent-c1=""
>
Login
</md-card-title>
</mat-card-title>
<md-card-content
<mat-card-content
_ngcontent-c1=""
>
Expand All @@ -157,7 +157,7 @@ exports[`Login Page should disable the form if pending 1`] = `
>
<md-input-container
<mat-input-container
_ngcontent-c1=""
>
Expand All @@ -167,14 +167,14 @@ exports[`Login Page should disable the form if pending 1`] = `
class="ng-untouched ng-pristine"
disabled=""
formcontrolname="username"
mdinput=""
matinput=""
ng-reflect-name="username"
placeholder="Username"
type="text"
/>
</md-input-container>
</mat-input-container>
</p>
Expand All @@ -186,7 +186,7 @@ exports[`Login Page should disable the form if pending 1`] = `
>
<md-input-container
<mat-input-container
_ngcontent-c1=""
>
Expand All @@ -196,23 +196,23 @@ exports[`Login Page should disable the form if pending 1`] = `
class="ng-untouched ng-pristine"
disabled=""
formcontrolname="password"
mdinput=""
matinput=""
ng-reflect-name="password"
placeholder="Password"
type="password"
/>
</md-input-container>
</mat-input-container>
</p>
<p
_ngcontent-c1=""
Expand All @@ -222,7 +222,7 @@ exports[`Login Page should disable the form if pending 1`] = `
<button
_ngcontent-c1=""
md-button=""
mat-button=""
type="submit"
>
Login
Expand All @@ -236,10 +236,10 @@ exports[`Login Page should disable the form if pending 1`] = `
</form>
</md-card-content>
</mat-card-content>
</md-card>
</mat-card>
</bc-login-form>
`;
Expand All @@ -251,19 +251,19 @@ exports[`Login Page should display an error message if provided 1`] = `
submitted={[Function EventEmitter]}
>
<md-card
<mat-card
_ngcontent-c2=""
>
<md-card-title
<mat-card-title
_ngcontent-c2=""
>
Login
</md-card-title>
</mat-card-title>
<md-card-content
<mat-card-content
_ngcontent-c2=""
>
Expand All @@ -281,7 +281,7 @@ exports[`Login Page should display an error message if provided 1`] = `
>
<md-input-container
<mat-input-container
_ngcontent-c2=""
>
Expand All @@ -290,14 +290,14 @@ exports[`Login Page should display an error message if provided 1`] = `
_ngcontent-c2=""
class="ng-untouched ng-pristine ng-valid"
formcontrolname="username"
mdinput=""
matinput=""
ng-reflect-name="username"
placeholder="Username"
type="text"
/>
</md-input-container>
</mat-input-container>
</p>
Expand All @@ -309,7 +309,7 @@ exports[`Login Page should display an error message if provided 1`] = `
>
<md-input-container
<mat-input-container
_ngcontent-c2=""
>
Expand All @@ -318,14 +318,14 @@ exports[`Login Page should display an error message if provided 1`] = `
_ngcontent-c2=""
class="ng-untouched ng-pristine ng-valid"
formcontrolname="password"
mdinput=""
matinput=""
ng-reflect-name="password"
placeholder="Password"
type="password"
/>
</md-input-container>
</mat-input-container>
</p>
Expand All @@ -341,8 +341,8 @@ exports[`Login Page should display an error message if provided 1`] = `
Invalid credentials
</p>
<p
_ngcontent-c2=""
Expand All @@ -352,7 +352,7 @@ exports[`Login Page should display an error message if provided 1`] = `
<button
_ngcontent-c2=""
md-button=""
mat-button=""
type="submit"
>
Login
Expand All @@ -366,10 +366,10 @@ exports[`Login Page should display an error message if provided 1`] = `
</form>
</md-card-content>
</mat-card-content>
</md-card>
</mat-card>
</bc-login-form>
`;
Loading

0 comments on commit b0d6297

Please sign in to comment.