(Apps) Moved the apps to the new page layouts and replaced MatSidenav with FuseSidebar on majority of them

This commit is contained in:
Sercan Yemen 2018-06-11 16:48:53 +03:00
parent 42ab15d9e1
commit a174c00072
4 changed files with 3 additions and 20 deletions

View File

@ -11,7 +11,6 @@ import { AcademyCoursesService } from 'app/main/apps/academy/courses.service';
import { AcademyCourseService } from 'app/main/apps/academy/course.service'; import { AcademyCourseService } from 'app/main/apps/academy/course.service';
import { FuseSidebarModule } from '@fuse/components'; import { FuseSidebarModule } from '@fuse/components';
const routes = [ const routes = [
{ {
path : 'courses', path : 'courses',

View File

@ -2,9 +2,9 @@ import { AfterViewInit, ChangeDetectorRef, Component, OnDestroy, OnInit, QueryLi
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { fuseAnimations } from '@fuse/animations';
import { FusePerfectScrollbarDirective } from '@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; import { FusePerfectScrollbarDirective } from '@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive';
import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service'; import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service';
import { fuseAnimations } from '@fuse/animations';
import { AcademyCourseService } from 'app/main/apps/academy/course.service'; import { AcademyCourseService } from 'app/main/apps/academy/course.service';

View File

@ -4,8 +4,8 @@ import { Store } from '@ngrx/store';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service';
import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service'; import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service';
import { FuseConfigService } from '@fuse/services/config.service';
import { Mail } from 'app/main/apps/mail-ngrx/mail.model'; import { Mail } from 'app/main/apps/mail-ngrx/mail.model';
import { MailNgrxService } from 'app/main/apps/mail-ngrx/mail.service'; import { MailNgrxService } from 'app/main/apps/mail-ngrx/mail.service';
@ -13,7 +13,6 @@ import * as fromStore from 'app/main/apps/mail-ngrx/store';
import { locale as english } from 'app/main/apps/mail-ngrx/i18n/en'; import { locale as english } from 'app/main/apps/mail-ngrx/i18n/en';
import { locale as turkish } from 'app/main/apps/mail-ngrx/i18n/tr'; import { locale as turkish } from 'app/main/apps/mail-ngrx/i18n/tr';
import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service';
@Component({ @Component({
selector : 'mail-ngrx', selector : 'mail-ngrx',
@ -39,7 +38,6 @@ export class MailNgrxComponent implements OnInit, OnDestroy
* Constructor * Constructor
* *
* @param {ChangeDetectorRef} _changeDetectorRef * @param {ChangeDetectorRef} _changeDetectorRef
* @param {FuseConfigService} _fuseConfigService
* @param {FuseSidebarService} _fuseSidebarService * @param {FuseSidebarService} _fuseSidebarService
* @param {FuseTranslationLoaderService} _fuseTranslationLoaderService * @param {FuseTranslationLoaderService} _fuseTranslationLoaderService
* @param {MailNgrxService} _mailNgrxService * @param {MailNgrxService} _mailNgrxService
@ -47,18 +45,12 @@ export class MailNgrxComponent implements OnInit, OnDestroy
*/ */
constructor( constructor(
private _changeDetectorRef: ChangeDetectorRef, private _changeDetectorRef: ChangeDetectorRef,
private _fuseConfigService: FuseConfigService,
private _fuseSidebarService: FuseSidebarService, private _fuseSidebarService: FuseSidebarService,
private _fuseTranslationLoaderService: FuseTranslationLoaderService, private _fuseTranslationLoaderService: FuseTranslationLoaderService,
private _mailNgrxService: MailNgrxService, private _mailNgrxService: MailNgrxService,
private _store: Store<fromStore.MailAppState> private _store: Store<fromStore.MailAppState>
) )
{ {
// Configure the layout
this._fuseConfigService.config = {
routerAnimation: 'none'
};
// Set the defaults // Set the defaults
this.searchInput = new FormControl(''); this.searchInput = new FormControl('');
this._fuseTranslationLoaderService.loadTranslations(english, turkish); this._fuseTranslationLoaderService.loadTranslations(english, turkish);

View File

@ -3,9 +3,8 @@ import { FormControl } from '@angular/forms';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators'; import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators';
import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service';
import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service'; import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service';
import { FuseConfigService } from '@fuse/services/config.service'; import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service';
import { Mail } from 'app/main/apps/mail/mail.model'; import { Mail } from 'app/main/apps/mail/mail.model';
import { MailService } from 'app/main/apps/mail/mail.service'; import { MailService } from 'app/main/apps/mail/mail.service';
@ -35,22 +34,15 @@ export class MailComponent implements OnInit, OnDestroy
* Constructor * Constructor
* *
* @param {MailService} _mailService * @param {MailService} _mailService
* @param {FuseConfigService} _fuseConfigService
* @param {FuseSidebarService} _fuseSidebarService * @param {FuseSidebarService} _fuseSidebarService
* @param {FuseTranslationLoaderService} _fuseTranslationLoaderService * @param {FuseTranslationLoaderService} _fuseTranslationLoaderService
*/ */
constructor( constructor(
private _mailService: MailService, private _mailService: MailService,
private _fuseConfigService: FuseConfigService,
private _fuseSidebarService: FuseSidebarService, private _fuseSidebarService: FuseSidebarService,
private _fuseTranslationLoaderService: FuseTranslationLoaderService private _fuseTranslationLoaderService: FuseTranslationLoaderService
) )
{ {
// Configure the layout
this._fuseConfigService.config = {
routerAnimation: 'none'
};
// Load the translations // Load the translations
this._fuseTranslationLoaderService.loadTranslations(english, turkish); this._fuseTranslationLoaderService.loadTranslations(english, turkish);