From f9756508509d364a05901b5ac330cb8674403ef2 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 26 Oct 2018 16:09:31 +0100 Subject: [PATCH] fix imports (#757) * fix imports * fix lazy paths --- src/app/app.routes.ts | 37 +++++++------------ src/app/components/header/header.component.ts | 4 +- .../libraries/libraries.component.spec.ts | 2 +- .../libraries/libraries.component.ts | 10 ++--- 4 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index c1a2e52b7..d63c383f3 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -43,13 +43,12 @@ export const APP_ROUTES: Routes = [ }, { path: 'settings', - loadChildren: - 'src/app/components/settings/settings.module#AppSettingsModule' + loadChildren: './components/settings/settings.module#AppSettingsModule' }, { path: 'preview/s/:id', loadChildren: - 'src/app/components/shared-link-view/shared-link-view.module#AppSharedLinkViewModule' + './components/shared-link-view/shared-link-view.module#AppSharedLinkViewModule' }, { path: '', @@ -66,12 +65,11 @@ export const APP_ROUTES: Routes = [ { path: '', loadChildren: - 'src/app/components/favorites/favorites.module#AppFavoritesModule' + './components/favorites/favorites.module#AppFavoritesModule' }, { path: 'preview/:nodeId', - loadChildren: - 'src/app/components/preview/preview.module#PreviewModule', + loadChildren: './components/preview/preview.module#PreviewModule', data: { navigateSource: 'favorites' } @@ -99,8 +97,7 @@ export const APP_ROUTES: Routes = [ }, { path: ':folderId/preview/:nodeId', - loadChildren: - 'src/app/components/preview/preview.module#PreviewModule', + loadChildren: './components/preview/preview.module#PreviewModule', data: { navigateSource: 'libraries' } @@ -130,16 +127,14 @@ export const APP_ROUTES: Routes = [ }, { path: 'preview/:nodeId', - loadChildren: - 'src/app/components/preview/preview.module#PreviewModule', + loadChildren: './components/preview/preview.module#PreviewModule', data: { navigateSource: 'personal-files' } }, { path: ':folderId/preview/:nodeId', - loadChildren: - 'src/app/components/preview/preview.module#PreviewModule', + loadChildren: './components/preview/preview.module#PreviewModule', data: { navigateSource: 'personal-files' } @@ -155,12 +150,11 @@ export const APP_ROUTES: Routes = [ { path: '', loadChildren: - 'src/app/components/recent-files/recent-files.module#AppRecentFilesModule' + './components/recent-files/recent-files.module#AppRecentFilesModule' }, { path: 'preview/:nodeId', - loadChildren: - 'src/app/components/preview/preview.module#PreviewModule', + loadChildren: './components/preview/preview.module#PreviewModule', data: { navigateSource: 'recent-files' } @@ -173,12 +167,11 @@ export const APP_ROUTES: Routes = [ { path: '', loadChildren: - 'src/app/components/shared-files/shared-files.module#AppSharedFilesModule' + './components/shared-files/shared-files.module#AppSharedFilesModule' }, { path: 'preview/:nodeId', - loadChildren: - 'src/app/components/preview/preview.module#PreviewModule', + loadChildren: './components/preview/preview.module#PreviewModule', data: { navigateSource: 'shared' } @@ -189,12 +182,11 @@ export const APP_ROUTES: Routes = [ }, { path: 'trashcan', - loadChildren: - 'src/app/components/trashcan/trashcan.module#AppTrashcanModule' + loadChildren: './components/trashcan/trashcan.module#AppTrashcanModule' }, { path: 'about', - loadChildren: 'src/app/components/about/about.module#AboutModule' + loadChildren: './components/about/about.module#AboutModule' }, { path: 'search', @@ -209,8 +201,7 @@ export const APP_ROUTES: Routes = [ }, { path: 'preview/:nodeId', - loadChildren: - 'src/app/components/preview/preview.module#PreviewModule', + loadChildren: './components/preview/preview.module#PreviewModule', data: { navigateSource: 'search' } diff --git a/src/app/components/header/header.component.ts b/src/app/components/header/header.component.ts index 5814b000e..01afb5930 100644 --- a/src/app/components/header/header.component.ts +++ b/src/app/components/header/header.component.ts @@ -31,16 +31,16 @@ import { OnInit } from '@angular/core'; import { Store } from '@ngrx/store'; -import { AppStore } from 'src/app/store/states'; import { Observable } from 'rxjs'; import { selectHeaderColor, selectAppName, selectLogoPath -} from 'src/app/store/selectors/app.selectors'; +} from '../../store/selectors/app.selectors'; import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { ContentActionRef } from '@alfresco/adf-extensions'; import { AppExtensionService } from '../../extensions/extension.service'; +import { AppStore } from '../../store/states'; @Component({ selector: 'app-header', diff --git a/src/app/components/libraries/libraries.component.spec.ts b/src/app/components/libraries/libraries.component.spec.ts index ed03b529e..e2b23fde6 100644 --- a/src/app/components/libraries/libraries.component.spec.ts +++ b/src/app/components/libraries/libraries.component.spec.ts @@ -39,7 +39,7 @@ import { LibrariesComponent } from './libraries.component'; import { AppTestingModule } from '../../testing/app-testing.module'; import { ExperimentalDirective } from '../../directives/experimental.directive'; import { EffectsModule } from '@ngrx/effects'; -import { LibraryEffects } from 'src/app/store/effects'; +import { LibraryEffects } from '../../store/effects'; describe('LibrariesComponent', () => { let fixture: ComponentFixture; diff --git a/src/app/components/libraries/libraries.component.ts b/src/app/components/libraries/libraries.component.ts index d8e4e988c..915c96c0a 100644 --- a/src/app/components/libraries/libraries.component.ts +++ b/src/app/components/libraries/libraries.component.ts @@ -23,15 +23,15 @@ * along with Alfresco. If not, see . */ -import { Component, OnInit } from '@angular/core'; import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; -import { PageComponent } from '../page.component'; +import { Component, OnInit } from '@angular/core'; import { Store } from '@ngrx/store'; -import { AppStore } from '../../store/states/app.state'; import { SiteEntry } from 'alfresco-js-api'; -import { ContentManagementService } from '../../services/content-management.service'; import { AppExtensionService } from '../../extensions/extension.service'; -import { NavigateLibraryAction } from 'src/app/store/actions'; +import { ContentManagementService } from '../../services/content-management.service'; +import { NavigateLibraryAction } from '../../store/actions'; +import { AppStore } from '../../store/states/app.state'; +import { PageComponent } from '../page.component'; @Component({ templateUrl: './libraries.component.html'