koyduk

src/app/app.component.html

@@ -1,12 +1 @@
-<md-sidenav-container>
+<fuse-main></fuse-main>
-
-    <fuse-layout></fuse-layout>
-
-    <!-- QUICK PANEL -->
-    <md-sidenav fuseMdSidenavHelper="quick-panel" align="end">
-        quick-panel
-    </md-sidenav>
-    <!-- / QUICK PANEL -->
-
-</md-sidenav-container>
-

src/app/app.module.ts

@@ -5,21 +5,21 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { AppComponent } from './app.component';
 import { RouterModule, Routes } from '@angular/router';
 import 'hammerjs';
-import { ProjectModule } from './main/apps/dashboards/project/project.module';
+import { ProjectModule } from './main/content/apps/dashboards/project/project.module';
 import { FuseLayoutService } from './core/services/layout.service';
 import { FuseNavigationService } from './core/components/navigation/navigation.service';
 import { FuseMatchMedia } from './core/services/match-media.service';
-import { FuseNavbarService } from './core/components/layout/navbar/navbar.service';
+import { FuseNavbarService } from './main/navbar/navbar.service';
 import { SharedModule } from './core/modules/shared.module';
 import { FuseMdSidenavHelperService } from './core/directives/md-sidenav-helper/md-sidenav-helper.service';
-import { FuseLayoutModule } from './core/components/layout/layout.module';
+import { FuseMainModule } from './main/main.module';
 import { PerfectScrollbarConfigInterface, PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
 import { HttpModule } from '@angular/http';
 import { InMemoryWebApiModule } from 'angular-in-memory-web-api';
 import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service';
-import { PagesModule } from './main/pages/pages.module';
+import { PagesModule } from './main/content/pages/pages.module';
-import { UIModule } from './main/ui/ui.module';
+import { UIModule } from './main/content/ui/ui.module';
-import { ComponentsModule } from './main/components/components.module';
+import { ComponentsModule } from './main/content/components/components.module';
 
 const PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
     suppressScrollX: true
@@ -72,7 +72,7 @@ const appRoutes: Routes = [
 
         PerfectScrollbarModule.forRoot(PERFECT_SCROLLBAR_CONFIG),
 
-        FuseLayoutModule,
+        FuseMainModule,
 
         ProjectModule,
 

src/app/core/components/layout/layout.component.html

@@ -1,37 +0,0 @@
-<!-- TOOLBAR: Above -->
-<ng-container *ngIf="layoutSettings.toolbar === 'above'">
-    <fuse-toolbar class="above"></fuse-toolbar>
-</ng-container>
-<!-- / TOOLBAR: Above -->
-
-<div id="wrapper">
-
-    <fuse-navbar class="md-primary-bg" *ngIf="layoutSettings.navigation === 'left'"></fuse-navbar>
-
-    <div class="content-wrapper">
-
-        <!-- TOOLBAR: Below -->
-        <ng-container *ngIf="layoutSettings.toolbar === 'below'">
-            <fuse-toolbar class="below"></fuse-toolbar>
-        </ng-container>
-        <!-- / TOOLBAR: Below -->
-
-        <fuse-content perfect-scrollbar></fuse-content>
-
-        <!-- FOOTER: Below -->
-        <ng-container *ngIf="layoutSettings.footer === 'below'">
-            <fuse-footer class="below"></fuse-footer>
-        </ng-container>
-        <!-- / FOOTER: Below -->
-
-    </div>
-
-    <fuse-navbar class="md-primary-bg" *ngIf="layoutSettings.navigation === 'right'"></fuse-navbar>
-
-</div>
-
-<!-- FOOTER: Above -->
-<ng-container *ngIf="layoutSettings.footer === 'above'">
-    <fuse-footer class="above"></fuse-footer>
-</ng-container>
-<!-- FOOTER: Above -->

src/app/core/components/layout/layout.component.scss

@@ -1,32 +0,0 @@
-fuse-layout {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-
-    #wrapper {
-        display: flex;
-        flex: 1;
-
-        .content-wrapper {
-            display: flex;
-            flex-direction: column;
-            flex: 1;
-            overflow: hidden;
-
-            fuse-content {
-                display: flex;
-                flex-direction: row;
-                width: 100%;
-                height: 100%;
-                overflow-x: hidden;
-                overflow-y: auto;
-
-                > *:not(router-outlet):not(.ps__scrollbar-x-rail):not(.ps__scrollbar-y-rail) {
-                    width: 100%;
-                    min-width: 100%;
-                }
-            }
-        }
-    }
-}

src/app/main/content/apps/calendar/calendar.component.ts

@@ -12,7 +12,7 @@ import {
     CalendarEventTimesChangedEvent,
     CalendarMonthViewDay
 } from 'angular-calendar';
-import { FuseConfirmDialogComponent } from '../../../core/components/confirm-dialog/confirm-dialog.component';
+import { FuseConfirmDialogComponent } from '../../../../core/components/confirm-dialog/confirm-dialog.component';
 
 @Component({
     selector       : 'fuse-calendar',

src/app/main/content/apps/calendar/calendar.module.ts

@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 import { RouterModule, Routes } from '@angular/router';
 import { CalendarComponent } from './calendar.component';
 import { CalendarService } from './calendar.service';

src/app/main/content/apps/chat/chat.module.ts

@@ -1,5 +1,5 @@
 import {NgModule} from '@angular/core';
-import {SharedModule} from '../../../core/modules/shared.module';
+import {SharedModule} from '../../../../core/modules/shared.module';
 import {RouterModule, Routes} from '@angular/router';
 import {ChatComponent} from './chat.component';
 import {ChatService} from './chat.service';

src/app/main/content/apps/chat/chat.service.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable';
 import { Http } from '@angular/http';
 import { Subject } from 'rxjs/Subject';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { FuseUtils } from '../../../core/fuseUtils';
+import { FuseUtils } from '../../../../core/fuseUtils';
 
 @Injectable()
 export class ChatService implements Resolve<any>

src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ChatService } from '../../../chat.service';
-import { FuseMdSidenavHelperService } from '../../../../../../core/directives/md-sidenav-helper/md-sidenav-helper.service';
+import { FuseMdSidenavHelperService } from '../../../../../../../core/directives/md-sidenav-helper/md-sidenav-helper.service';
 import { ObservableMedia } from '@angular/flex-layout';
 
 @Component({

src/app/main/content/apps/chat/sidenavs/left/left.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Animations } from '../../../../../core/animations';
+import { Animations } from '../../../../../../core/animations';
 import { ChatService } from '../../chat.service';
 
 @Component({

src/app/main/content/apps/chat/sidenavs/right/right.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Animations } from '../../../../../core/animations';
+import { Animations } from '../../../../../../core/animations';
 import { ChatService } from '../../chat.service';
 
 @Component({

src/app/main/content/apps/contacts/contacts.module.ts

@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 import { RouterModule, Routes } from '@angular/router';
 import { MainSidenavComponent } from './sidenavs/main/main.component';
 import { ContactsComponent } from './contacts.component';

src/app/main/content/apps/dashboards/project/project.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 import { Subscription } from 'rxjs/Subscription';
 
 @Component({

src/app/main/content/apps/dashboards/project/project.module.ts

@@ -1,7 +1,7 @@
 import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 import {ProjectComponent} from './project.component';
-import {SharedModule} from '../../../../core/modules/shared.module';
+import {SharedModule} from '../../../../../core/modules/shared.module';
 
 const routes: Routes = [
     {

src/app/main/content/apps/file-manager/file-manager.module.ts

@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 import { RouterModule, Routes } from '@angular/router';
 import { FileManagerComponent } from './file-manager.component';
 import { FileManagerService } from './file-manager.service';

src/app/main/content/apps/mail/mail.module.ts

@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 import { RouterModule, Routes } from '@angular/router';
 import { MailComponent } from './mail.component';
 import { MainSidenavComponent } from './sidenavs/main/main-sidenav.component';

src/app/main/content/apps/todo/todo-details/todo-details.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../core/scss/fuse';
+@import '../../../../../core/scss/fuse';
 
 :host {
     display: flex;

src/app/main/content/apps/todo/todo-details/todo-details.component.ts

@@ -3,7 +3,7 @@ import { TodoService } from '../todo.service';
 import { Todo } from '../todo.model';
 import { Subscription } from 'rxjs/Subscription';
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
-import { FuseUtils } from '../../../../core/fuseUtils';
+import { FuseUtils } from '../../../../../core/fuseUtils';
 
 @Component({
     selector   : 'fuse-todo-details',

src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss

@@ -1,4 +1,4 @@
-@import 'src/app/core/scss/fuse';
+@import '../../../../../../core/scss/fuse';
 
 .todo-list-item {
     display: block;