From e586e2908f96b3e02478b69d8503da49e2c6b002 Mon Sep 17 00:00:00 2001
From: Kristofer Karlsson <karlsson.kristofer@gmail.com>
Date: Wed, 8 Feb 2017 22:12:14 +0100
Subject: [PATCH] md-sidenav-layout has been deprecated in favour of
 md-sidenav-container See: angular/material2#2183

---
 src/app/app.component.html                           |  2 +-
 src/app/layout/layout.module.ts                      |  6 +++---
 .../sidenav-container.component.html}                |  4 ++--
 .../sidenav-container.component.scss}                |  2 +-
 .../sidenav-container.component.spec.ts}             | 12 ++++++------
 .../sidenav-container.component.ts}                  |  8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)
 rename src/app/layout/{sidenav-layout/sidenav-layout.component.html => sidenav-container/sidenav-container.component.html} (79%)
 rename src/app/layout/{sidenav-layout/sidenav-layout.component.scss => sidenav-container/sidenav-container.component.scss} (95%)
 rename src/app/layout/{sidenav-layout/sidenav-layout.component.spec.ts => sidenav-container/sidenav-container.component.spec.ts} (65%)
 rename src/app/layout/{sidenav-layout/sidenav-layout.component.ts => sidenav-container/sidenav-container.component.ts} (81%)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index c260675..c59dc13 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1 +1 @@
-<gpf-sidenav-layout></gpf-sidenav-layout>
+<gpf-sidenav-container></gpf-sidenav-container>
diff --git a/src/app/layout/layout.module.ts b/src/app/layout/layout.module.ts
index 57a9531..a44fa21 100644
--- a/src/app/layout/layout.module.ts
+++ b/src/app/layout/layout.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { MaterialModule } from '@angular/material';
 
-import { SidenavLayoutComponent } from './sidenav-layout/sidenav-layout.component';
+import { SidenavContainerComponent } from './sidenav-container/sidenav-container.component';
 import { ToolbarComponent } from './toolbar/toolbar.component';
 
 @NgModule({
@@ -11,10 +11,10 @@ import { ToolbarComponent } from './toolbar/toolbar.component';
     MaterialModule.forRoot(),
   ],
   exports: [
-    SidenavLayoutComponent,
+    SidenavContainerComponent,
   ],
   declarations: [
-    SidenavLayoutComponent,
+    SidenavContainerComponent,
     ToolbarComponent,
   ],
 })
diff --git a/src/app/layout/sidenav-layout/sidenav-layout.component.html b/src/app/layout/sidenav-container/sidenav-container.component.html
similarity index 79%
rename from src/app/layout/sidenav-layout/sidenav-layout.component.html
rename to src/app/layout/sidenav-container/sidenav-container.component.html
index 4ec9fef..16b38df 100644
--- a/src/app/layout/sidenav-layout/sidenav-layout.component.html
+++ b/src/app/layout/sidenav-container/sidenav-container.component.html
@@ -1,6 +1,6 @@
 <gpf-toolbar *ngIf="!isSmallScreen()" [isSmallScreen]="isSmallScreen()"></gpf-toolbar>
 
-<md-sidenav-layout [class.is-small-screen]="isSmallScreen()">
+<md-sidenav-container [class.is-small-screen]="isSmallScreen()">
   <md-sidenav [opened]="!isSmallScreen()" [mode]="isSmallScreen() ? 'over' : 'side'">
     Sidenav
   </md-sidenav>
@@ -10,4 +10,4 @@
   <main>
     Content
   </main>
-</md-sidenav-layout>
+</md-sidenav-container>
diff --git a/src/app/layout/sidenav-layout/sidenav-layout.component.scss b/src/app/layout/sidenav-container/sidenav-container.component.scss
similarity index 95%
rename from src/app/layout/sidenav-layout/sidenav-layout.component.scss
rename to src/app/layout/sidenav-container/sidenav-container.component.scss
index 1919def..31b96bd 100644
--- a/src/app/layout/sidenav-layout/sidenav-layout.component.scss
+++ b/src/app/layout/sidenav-container/sidenav-container.component.scss
@@ -1,7 +1,7 @@
 $main-padding: 16px;
 $sidenav-width: 256px;
 
-md-sidenav-layout {
+md-sidenav-container {
   height: 100vh;
 
   &:not(.is-small-screen) {
diff --git a/src/app/layout/sidenav-layout/sidenav-layout.component.spec.ts b/src/app/layout/sidenav-container/sidenav-container.component.spec.ts
similarity index 65%
rename from src/app/layout/sidenav-layout/sidenav-layout.component.spec.ts
rename to src/app/layout/sidenav-container/sidenav-container.component.spec.ts
index bb3316b..36e7309 100644
--- a/src/app/layout/sidenav-layout/sidenav-layout.component.spec.ts
+++ b/src/app/layout/sidenav-container/sidenav-container.component.spec.ts
@@ -2,12 +2,12 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MaterialModule } from '@angular/material';
 
-import { SidenavLayoutComponent } from './sidenav-layout.component';
+import { SidenavContainerComponent } from './sidenav-container.component';
 import { ToolbarComponent } from '../toolbar/toolbar.component';
 
-describe('SidenavLayoutComponent', () => {
-  let component: SidenavLayoutComponent;
-  let fixture: ComponentFixture<SidenavLayoutComponent>;
+describe('SidenavContainerComponent', () => {
+  let component: SidenavContainerComponent;
+  let fixture: ComponentFixture<SidenavContainerComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -15,7 +15,7 @@ describe('SidenavLayoutComponent', () => {
         MaterialModule.forRoot(),
       ],
       declarations: [
-        SidenavLayoutComponent,
+        SidenavContainerComponent,
         ToolbarComponent,
       ],
     })
@@ -23,7 +23,7 @@ describe('SidenavLayoutComponent', () => {
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SidenavLayoutComponent);
+    fixture = TestBed.createComponent(SidenavContainerComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/layout/sidenav-layout/sidenav-layout.component.ts b/src/app/layout/sidenav-container/sidenav-container.component.ts
similarity index 81%
rename from src/app/layout/sidenav-layout/sidenav-layout.component.ts
rename to src/app/layout/sidenav-container/sidenav-container.component.ts
index 26c7090..4dfb49d 100644
--- a/src/app/layout/sidenav-layout/sidenav-layout.component.ts
+++ b/src/app/layout/sidenav-container/sidenav-container.component.ts
@@ -4,11 +4,11 @@ import { MdSidenav } from '@angular/material';
 const MD_BREAKPOINT = 960;
 
 @Component({
-  selector: 'gpf-sidenav-layout',
-  templateUrl: './sidenav-layout.component.html',
-  styleUrls: ['./sidenav-layout.component.scss']
+  selector: 'gpf-sidenav-container',
+  templateUrl: './sidenav-container.component.html',
+  styleUrls: ['./sidenav-container.component.scss']
 })
-export class SidenavLayoutComponent implements OnInit {
+export class SidenavContainerComponent implements OnInit {
   @ViewChild(MdSidenav) drawer: MdSidenav;
 
   ngOnInit(): void {