diff --git a/src/app/main/apps/mail-ngrx/mail.component.ts b/src/app/main/apps/mail-ngrx/mail.component.ts index ad1f6952..c218a5d0 100644 --- a/src/app/main/apps/mail-ngrx/mail.component.ts +++ b/src/app/main/apps/mail-ngrx/mail.component.ts @@ -1,19 +1,17 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; - import { Store } from '@ngrx/store'; - import { Observable } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service'; import { FuseConfigService } from '@fuse/services/config.service'; -import { MailNgrxService } from './mail.service'; -import { Mail } from './mail.model'; -import * as fromStore from './store'; -import { locale as english } from './i18n/en'; -import { locale as turkish } from './i18n/tr'; +import { Mail } from 'app/main/apps/mail-ngrx/mail.model'; +import { MailNgrxService } from 'app/main/apps/mail-ngrx/mail.service'; +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 turkish } from 'app/main/apps/mail-ngrx/i18n/tr'; @Component({ selector : 'fuse-mail', diff --git a/src/app/main/apps/mail-ngrx/mail.module.ts b/src/app/main/apps/mail-ngrx/mail.module.ts index 63456592..84653891 100644 --- a/src/app/main/apps/mail-ngrx/mail.module.ts +++ b/src/app/main/apps/mail-ngrx/mail.module.ts @@ -1,22 +1,19 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - import { MatButtonModule, MatCheckboxModule, MatDialogModule, MatFormFieldModule, MatIconModule, MatInputModule, MatMenuModule, MatRippleModule, MatSelectModule, MatSidenavModule, MatToolbarModule } from '@angular/material'; - import { TranslateModule } from '@ngx-translate/core'; import { FuseSharedModule } from '@fuse/shared.module'; -import { MailAppStoreModule } from './store/store.module'; -import * as fromGuards from './store/guards/index'; - -import { FuseMailNgrxComponent } from './mail.component'; -import { FuseMailNgrxMainSidenavComponent } from './sidenavs/main/main-sidenav.component'; -import { FuseMailNgrxListItemComponent } from './mail-list/mail-list-item/mail-list-item.component'; -import { FuseMailNgrxListComponent } from './mail-list/mail-list.component'; -import { FuseMailNgrxDetailsComponent } from './mail-details/mail-details.component'; -import { MailNgrxService } from './mail.service'; -import { FuseMailNgrxComposeDialogComponent } from './dialogs/compose/compose.component'; +import { MailAppStoreModule } from 'app/main/apps/mail-ngrx/store/store.module'; +import * as fromGuards from 'app/main/apps/mail-ngrx/store/guards/index'; +import { FuseMailNgrxComponent } from 'app/main/apps/mail-ngrx/mail.component'; +import { FuseMailNgrxListComponent } from 'app/main/apps/mail-ngrx/mail-list/mail-list.component'; +import { FuseMailNgrxListItemComponent } from 'app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component'; +import { FuseMailNgrxDetailsComponent } from 'app/main/apps/mail-ngrx/mail-details/mail-details.component'; +import { FuseMailNgrxMainSidenavComponent } from 'app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component'; +import { FuseMailNgrxComposeDialogComponent } from 'app/main/apps/mail-ngrx/dialogs/compose/compose.component'; +import { MailNgrxService } from 'app/main/apps/mail-ngrx/mail.service'; const routes: Routes = [ { diff --git a/src/app/main/apps/mail-ngrx/mail.service.ts b/src/app/main/apps/mail-ngrx/mail.service.ts index 99776059..26cbd9a8 100644 --- a/src/app/main/apps/mail-ngrx/mail.service.ts +++ b/src/app/main/apps/mail-ngrx/mail.service.ts @@ -3,9 +3,9 @@ import { HttpClient } from '@angular/common/http'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; -import { Mail } from './mail.model'; -import { MailAppState } from './store/reducers'; -import { getFiltersArr, getFoldersArr, getLabelsArr, getMailsArr } from './store/selectors'; +import { Mail } from 'app/main/apps/mail-ngrx/mail.model'; +import { MailAppState } from 'app/main/apps/mail-ngrx/store/reducers'; +import { getFiltersArr, getFoldersArr, getLabelsArr, getMailsArr } from 'app/main/apps/mail-ngrx/store/selectors'; @Injectable() export class MailNgrxService diff --git a/src/app/main/apps/mail-ngrx/store/actions/mails.actions.ts b/src/app/main/apps/mail-ngrx/store/actions/mails.actions.ts index 007c39d5..fc1f03f4 100644 --- a/src/app/main/apps/mail-ngrx/store/actions/mails.actions.ts +++ b/src/app/main/apps/mail-ngrx/store/actions/mails.actions.ts @@ -1,5 +1,5 @@ import { Action } from '@ngrx/store'; -import { Mail } from '../../mail.model'; +import { Mail } from 'app/main/apps/mail-ngrx/mail.model'; export const GET_MAILS = '[MAILS] GET MAILS'; export const GET_MAILS_SUCCESS = '[MAILS] GET MAILS SUCCESS'; diff --git a/src/app/main/apps/mail-ngrx/store/effects/filters.effects.ts b/src/app/main/apps/mail-ngrx/store/effects/filters.effects.ts index 6caaa85a..2d3832b4 100644 --- a/src/app/main/apps/mail-ngrx/store/effects/filters.effects.ts +++ b/src/app/main/apps/mail-ngrx/store/effects/filters.effects.ts @@ -4,8 +4,8 @@ import { Actions, Effect } from '@ngrx/effects'; import { Observable, of } from 'rxjs'; import { catchError, map, switchMap } from 'rxjs/operators'; -import * as FiltersActions from '../actions/filters.actions'; -import { MailNgrxService } from '../../mail.service'; +import * as FiltersActions from 'app/main/apps/mail-ngrx/store/actions/filters.actions'; +import { MailNgrxService } from 'app/main/apps/mail-ngrx/mail.service'; @Injectable() export class FiltersEffect diff --git a/src/app/main/apps/mail-ngrx/store/effects/folders.effects.ts b/src/app/main/apps/mail-ngrx/store/effects/folders.effects.ts index a3d439b4..aad0cdf1 100644 --- a/src/app/main/apps/mail-ngrx/store/effects/folders.effects.ts +++ b/src/app/main/apps/mail-ngrx/store/effects/folders.effects.ts @@ -4,8 +4,8 @@ import { Actions, Effect } from '@ngrx/effects'; import { Observable, of } from 'rxjs'; import { catchError, map, switchMap } from 'rxjs/operators'; -import * as FoldersActions from '../actions/folders.actions'; -import { MailNgrxService } from '../../mail.service'; +import * as FoldersActions from 'app/main/apps/mail-ngrx/store/actions/folders.actions'; +import { MailNgrxService } from 'app/main/apps/mail-ngrx/mail.service'; @Injectable() export class FoldersEffect diff --git a/src/app/main/apps/mail-ngrx/store/effects/labels.effects.ts b/src/app/main/apps/mail-ngrx/store/effects/labels.effects.ts index f755b28b..7f12bf28 100644 --- a/src/app/main/apps/mail-ngrx/store/effects/labels.effects.ts +++ b/src/app/main/apps/mail-ngrx/store/effects/labels.effects.ts @@ -5,7 +5,7 @@ import { Observable, of } from 'rxjs'; import { catchError, map, switchMap } from 'rxjs/operators'; import * as LabelsActions from '../actions/labels.actions'; -import { MailNgrxService } from '../../mail.service'; +import { MailNgrxService } from 'app/main/apps/mail-ngrx/mail.service'; @Injectable() export class LabelsEffect diff --git a/src/app/main/apps/mail-ngrx/store/effects/mails.effects.ts b/src/app/main/apps/mail-ngrx/store/effects/mails.effects.ts index beeef436..66c9ccc1 100644 --- a/src/app/main/apps/mail-ngrx/store/effects/mails.effects.ts +++ b/src/app/main/apps/mail-ngrx/store/effects/mails.effects.ts @@ -6,12 +6,12 @@ import { Observable, of, forkJoin } from 'rxjs'; import { catchError, debounceTime, map, mergeMap, exhaustMap, withLatestFrom } from 'rxjs/operators'; import { getRouterState, State } from 'app/store/reducers'; -import { getMailsState } from '../selectors'; -import * as MailsActions from '../actions/mails.actions'; -import * as fromRoot from '../../../../../../store'; +import { getMailsState } from 'app/main/apps/mail-ngrx/store/selectors'; +import * as MailsActions from 'app/main/apps/mail-ngrx/store/actions/mails.actions'; +import * as fromRoot from 'app/store'; -import { MailNgrxService } from '../../mail.service'; -import { Mail } from '../../mail.model'; +import { Mail } from 'app/main/apps/mail-ngrx/mail.model'; +import { MailNgrxService } from 'app/main/apps/mail-ngrx/mail.service'; @Injectable() export class MailsEffect diff --git a/src/app/main/apps/mail-ngrx/store/guards/resolve.guard.ts b/src/app/main/apps/mail-ngrx/store/guards/resolve.guard.ts index 2102ec33..6fa3324d 100644 --- a/src/app/main/apps/mail-ngrx/store/guards/resolve.guard.ts +++ b/src/app/main/apps/mail-ngrx/store/guards/resolve.guard.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate } from '@angular/router'; +import { RouterStateSnapshot } from '@angular/router/src/router_state'; import { Store } from '@ngrx/store'; import { Observable, forkJoin, of } from 'rxjs'; import { map, switchMap, catchError, tap, take, filter } from 'rxjs/operators'; -import { MailAppState } from '../reducers'; -import * as fromStore from '../index'; -import { getFiltersLoaded, getFoldersLoaded, getLabelsLoaded, getMailsLoaded } from '../selectors'; -import { RouterStateSnapshot } from '@angular/router/src/router_state'; +import { MailAppState } from 'app/main/apps/mail-ngrx/store/reducers'; +import * as fromStore from 'app/main/apps/mail-ngrx/store'; +import { getFiltersLoaded, getFoldersLoaded, getLabelsLoaded, getMailsLoaded } from 'app/main/apps/mail-ngrx/store/selectors'; import { getRouterState } from 'app/store/reducers'; @Injectable() diff --git a/src/app/main/apps/mail-ngrx/store/reducers/filters.reducer.ts b/src/app/main/apps/mail-ngrx/store/reducers/filters.reducer.ts index eef4eb5f..1251a19d 100644 --- a/src/app/main/apps/mail-ngrx/store/reducers/filters.reducer.ts +++ b/src/app/main/apps/mail-ngrx/store/reducers/filters.reducer.ts @@ -1,4 +1,4 @@ -import * as FiltersActions from '../actions/filters.actions'; +import * as FiltersActions from 'app/main/apps/mail-ngrx/store/actions/filters.actions'; export interface FiltersState { diff --git a/src/app/main/apps/mail-ngrx/store/reducers/folders.reducer.ts b/src/app/main/apps/mail-ngrx/store/reducers/folders.reducer.ts index 91efb30e..9fe04dc5 100644 --- a/src/app/main/apps/mail-ngrx/store/reducers/folders.reducer.ts +++ b/src/app/main/apps/mail-ngrx/store/reducers/folders.reducer.ts @@ -1,4 +1,4 @@ -import * as FoldersActions from '../actions/folders.actions'; +import * as FoldersActions from 'app/main/apps/mail-ngrx/store/actions/folders.actions'; export interface FoldersState { diff --git a/src/app/main/apps/mail-ngrx/store/reducers/labels.reducer.ts b/src/app/main/apps/mail-ngrx/store/reducers/labels.reducer.ts index 147b4f3c..f6052b5b 100644 --- a/src/app/main/apps/mail-ngrx/store/reducers/labels.reducer.ts +++ b/src/app/main/apps/mail-ngrx/store/reducers/labels.reducer.ts @@ -1,4 +1,4 @@ -import * as LabelsActions from '../actions/labels.actions'; +import * as LabelsActions from 'app/main/apps/mail-ngrx/store/actions/labels.actions'; export interface LabelsState { diff --git a/src/app/main/apps/mail-ngrx/store/reducers/mails.reducer.ts b/src/app/main/apps/mail-ngrx/store/reducers/mails.reducer.ts index 9095d7c4..cd62c048 100644 --- a/src/app/main/apps/mail-ngrx/store/reducers/mails.reducer.ts +++ b/src/app/main/apps/mail-ngrx/store/reducers/mails.reducer.ts @@ -1,5 +1,5 @@ -import * as MailsActions from '../actions/mails.actions'; -import { Mail } from '../../mail.model'; +import * as MailsActions from 'app/main/apps/mail-ngrx/store/actions/mails.actions'; +import { Mail } from 'app/main/apps/mail-ngrx/mail.model'; export interface MailsState { diff --git a/src/app/main/apps/mail-ngrx/store/selectors/filters.selectors.ts b/src/app/main/apps/mail-ngrx/store/selectors/filters.selectors.ts index 5b740ff8..24b013e2 100644 --- a/src/app/main/apps/mail-ngrx/store/selectors/filters.selectors.ts +++ b/src/app/main/apps/mail-ngrx/store/selectors/filters.selectors.ts @@ -1,5 +1,5 @@ import { createSelector } from '@ngrx/store'; -import { FiltersState, getMailAppState, MailAppState } from '../reducers'; +import { FiltersState, getMailAppState, MailAppState } from 'app/main/apps/mail-ngrx/store/reducers'; export const getFiltersState = createSelector( getMailAppState, diff --git a/src/app/main/apps/mail-ngrx/store/selectors/folders.selectors.ts b/src/app/main/apps/mail-ngrx/store/selectors/folders.selectors.ts index 814f0113..e7153ec5 100644 --- a/src/app/main/apps/mail-ngrx/store/selectors/folders.selectors.ts +++ b/src/app/main/apps/mail-ngrx/store/selectors/folders.selectors.ts @@ -1,5 +1,5 @@ import { createSelector } from '@ngrx/store'; -import { FoldersState, getMailAppState, MailAppState } from '../reducers'; +import { FoldersState, getMailAppState, MailAppState } from 'app/main/apps/mail-ngrx/store/reducers'; export const getFoldersState = createSelector( getMailAppState, diff --git a/src/app/main/apps/mail-ngrx/store/selectors/labels.selectors.ts b/src/app/main/apps/mail-ngrx/store/selectors/labels.selectors.ts index c5ae21f5..94423ff6 100644 --- a/src/app/main/apps/mail-ngrx/store/selectors/labels.selectors.ts +++ b/src/app/main/apps/mail-ngrx/store/selectors/labels.selectors.ts @@ -1,5 +1,5 @@ import { createSelector } from '@ngrx/store'; -import { LabelsState, getMailAppState, MailAppState } from '../reducers'; +import { LabelsState, getMailAppState, MailAppState } from 'app/main/apps/mail-ngrx/store/reducers'; export const getLabelsState = createSelector( getMailAppState, diff --git a/src/app/main/apps/mail-ngrx/store/selectors/mails.selectors.ts b/src/app/main/apps/mail-ngrx/store/selectors/mails.selectors.ts index 27d4c19f..42dfed3a 100644 --- a/src/app/main/apps/mail-ngrx/store/selectors/mails.selectors.ts +++ b/src/app/main/apps/mail-ngrx/store/selectors/mails.selectors.ts @@ -1,7 +1,7 @@ import { FuseUtils } from '@fuse/utils'; import { createSelector } from '@ngrx/store'; -import { getMailAppState, MailAppState, MailsState } from '../reducers'; +import { getMailAppState, MailAppState, MailsState } from 'app/main/apps/mail-ngrx/store/reducers'; export const getMailsState = createSelector( getMailAppState, diff --git a/src/app/main/apps/mail-ngrx/store/store.module.ts b/src/app/main/apps/mail-ngrx/store/store.module.ts index 32b0a5d0..0a955f92 100644 --- a/src/app/main/apps/mail-ngrx/store/store.module.ts +++ b/src/app/main/apps/mail-ngrx/store/store.module.ts @@ -1,8 +1,9 @@ import { StoreModule } from '@ngrx/store'; import { NgModule } from '@angular/core'; import { EffectsModule } from '@ngrx/effects'; -import { reducers } from './reducers'; -import { effects } from './effects'; + +import { reducers } from 'app/main/apps/mail-ngrx/store/reducers'; +import { effects } from 'app/main/apps/mail-ngrx/store/effects'; @NgModule({ imports : [