fix imports (#757)

* fix imports

* fix lazy paths
This commit is contained in:
Denys Vuika
2018-10-26 16:09:31 +01:00
committed by GitHub
parent c9f5bc7de3
commit f975650850
4 changed files with 22 additions and 31 deletions

View File

@@ -43,13 +43,12 @@ export const APP_ROUTES: Routes = [
}, },
{ {
path: 'settings', path: 'settings',
loadChildren: loadChildren: './components/settings/settings.module#AppSettingsModule'
'src/app/components/settings/settings.module#AppSettingsModule'
}, },
{ {
path: 'preview/s/:id', path: 'preview/s/:id',
loadChildren: loadChildren:
'src/app/components/shared-link-view/shared-link-view.module#AppSharedLinkViewModule' './components/shared-link-view/shared-link-view.module#AppSharedLinkViewModule'
}, },
{ {
path: '', path: '',
@@ -66,12 +65,11 @@ export const APP_ROUTES: Routes = [
{ {
path: '', path: '',
loadChildren: loadChildren:
'src/app/components/favorites/favorites.module#AppFavoritesModule' './components/favorites/favorites.module#AppFavoritesModule'
}, },
{ {
path: 'preview/:nodeId', path: 'preview/:nodeId',
loadChildren: loadChildren: './components/preview/preview.module#PreviewModule',
'src/app/components/preview/preview.module#PreviewModule',
data: { data: {
navigateSource: 'favorites' navigateSource: 'favorites'
} }
@@ -99,8 +97,7 @@ export const APP_ROUTES: Routes = [
}, },
{ {
path: ':folderId/preview/:nodeId', path: ':folderId/preview/:nodeId',
loadChildren: loadChildren: './components/preview/preview.module#PreviewModule',
'src/app/components/preview/preview.module#PreviewModule',
data: { data: {
navigateSource: 'libraries' navigateSource: 'libraries'
} }
@@ -130,16 +127,14 @@ export const APP_ROUTES: Routes = [
}, },
{ {
path: 'preview/:nodeId', path: 'preview/:nodeId',
loadChildren: loadChildren: './components/preview/preview.module#PreviewModule',
'src/app/components/preview/preview.module#PreviewModule',
data: { data: {
navigateSource: 'personal-files' navigateSource: 'personal-files'
} }
}, },
{ {
path: ':folderId/preview/:nodeId', path: ':folderId/preview/:nodeId',
loadChildren: loadChildren: './components/preview/preview.module#PreviewModule',
'src/app/components/preview/preview.module#PreviewModule',
data: { data: {
navigateSource: 'personal-files' navigateSource: 'personal-files'
} }
@@ -155,12 +150,11 @@ export const APP_ROUTES: Routes = [
{ {
path: '', path: '',
loadChildren: loadChildren:
'src/app/components/recent-files/recent-files.module#AppRecentFilesModule' './components/recent-files/recent-files.module#AppRecentFilesModule'
}, },
{ {
path: 'preview/:nodeId', path: 'preview/:nodeId',
loadChildren: loadChildren: './components/preview/preview.module#PreviewModule',
'src/app/components/preview/preview.module#PreviewModule',
data: { data: {
navigateSource: 'recent-files' navigateSource: 'recent-files'
} }
@@ -173,12 +167,11 @@ export const APP_ROUTES: Routes = [
{ {
path: '', path: '',
loadChildren: loadChildren:
'src/app/components/shared-files/shared-files.module#AppSharedFilesModule' './components/shared-files/shared-files.module#AppSharedFilesModule'
}, },
{ {
path: 'preview/:nodeId', path: 'preview/:nodeId',
loadChildren: loadChildren: './components/preview/preview.module#PreviewModule',
'src/app/components/preview/preview.module#PreviewModule',
data: { data: {
navigateSource: 'shared' navigateSource: 'shared'
} }
@@ -189,12 +182,11 @@ export const APP_ROUTES: Routes = [
}, },
{ {
path: 'trashcan', path: 'trashcan',
loadChildren: loadChildren: './components/trashcan/trashcan.module#AppTrashcanModule'
'src/app/components/trashcan/trashcan.module#AppTrashcanModule'
}, },
{ {
path: 'about', path: 'about',
loadChildren: 'src/app/components/about/about.module#AboutModule' loadChildren: './components/about/about.module#AboutModule'
}, },
{ {
path: 'search', path: 'search',
@@ -209,8 +201,7 @@ export const APP_ROUTES: Routes = [
}, },
{ {
path: 'preview/:nodeId', path: 'preview/:nodeId',
loadChildren: loadChildren: './components/preview/preview.module#PreviewModule',
'src/app/components/preview/preview.module#PreviewModule',
data: { data: {
navigateSource: 'search' navigateSource: 'search'
} }

View File

@@ -31,16 +31,16 @@ import {
OnInit OnInit
} from '@angular/core'; } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from 'src/app/store/states';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { import {
selectHeaderColor, selectHeaderColor,
selectAppName, selectAppName,
selectLogoPath selectLogoPath
} from 'src/app/store/selectors/app.selectors'; } from '../../store/selectors/app.selectors';
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
import { ContentActionRef } from '@alfresco/adf-extensions'; import { ContentActionRef } from '@alfresco/adf-extensions';
import { AppExtensionService } from '../../extensions/extension.service'; import { AppExtensionService } from '../../extensions/extension.service';
import { AppStore } from '../../store/states';
@Component({ @Component({
selector: 'app-header', selector: 'app-header',

View File

@@ -39,7 +39,7 @@ import { LibrariesComponent } from './libraries.component';
import { AppTestingModule } from '../../testing/app-testing.module'; import { AppTestingModule } from '../../testing/app-testing.module';
import { ExperimentalDirective } from '../../directives/experimental.directive'; import { ExperimentalDirective } from '../../directives/experimental.directive';
import { EffectsModule } from '@ngrx/effects'; import { EffectsModule } from '@ngrx/effects';
import { LibraryEffects } from 'src/app/store/effects'; import { LibraryEffects } from '../../store/effects';
describe('LibrariesComponent', () => { describe('LibrariesComponent', () => {
let fixture: ComponentFixture<LibrariesComponent>; let fixture: ComponentFixture<LibrariesComponent>;

View File

@@ -23,15 +23,15 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { Component, OnInit } from '@angular/core';
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
import { PageComponent } from '../page.component'; import { Component, OnInit } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from '../../store/states/app.state';
import { SiteEntry } from 'alfresco-js-api'; import { SiteEntry } from 'alfresco-js-api';
import { ContentManagementService } from '../../services/content-management.service';
import { AppExtensionService } from '../../extensions/extension.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({ @Component({
templateUrl: './libraries.component.html' templateUrl: './libraries.component.html'