diff --git a/src/Squidex/app-config/webpack.config.js b/src/Squidex/app-config/webpack.config.js index 06b097999..e0746044b 100644 --- a/src/Squidex/app-config/webpack.config.js +++ b/src/Squidex/app-config/webpack.config.js @@ -2,6 +2,7 @@ path = require('path'), HtmlWebpackPlugin = require('html-webpack-plugin'), ExtractTextPlugin = require('extract-text-webpack-plugin'), +TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'), helpers = require('./helpers'); module.exports = { @@ -23,6 +24,10 @@ module.exports = { helpers.root('app-libs'), helpers.root('node_modules') ], + + plugins: [ + new TsconfigPathsPlugin() + ] }, /* diff --git a/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts b/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts index 97887dc24..22dce1f0e 100644 --- a/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts +++ b/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts @@ -9,7 +9,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; -import { allParams } from 'framework'; +import { allParams } from '@app/framework'; import { UsersState } from './../state/users.state'; diff --git a/src/Squidex/app/features/administration/module.ts b/src/Squidex/app/features/administration/module.ts index 19b96d8f5..1da69495c 100644 --- a/src/Squidex/app/features/administration/module.ts +++ b/src/Squidex/app/features/administration/module.ts @@ -11,7 +11,7 @@ import { RouterModule, Routes } from '@angular/router'; import { SqxSharedModule, SqxFrameworkModule -} from 'shared'; +} from '@app/shared'; import { AdministrationAreaComponent, diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts index a87cd7bc3..48af3da86 100644 --- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts +++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts @@ -13,7 +13,7 @@ import { DialogService, ImmutableArray, ModalView -} from 'shared'; +} from '@app/shared'; import { EventConsumerDto, EventConsumersService } from './../../services/event-consumers.service'; diff --git a/src/Squidex/app/features/administration/pages/users/user-page.component.ts b/src/Squidex/app/features/administration/pages/users/user-page.component.ts index 1fb3bef80..7830d06bc 100644 --- a/src/Squidex/app/features/administration/pages/users/user-page.component.ts +++ b/src/Squidex/app/features/administration/pages/users/user-page.component.ts @@ -10,7 +10,7 @@ import { FormBuilder, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { Subscription } from 'rxjs'; -import { AuthService, ValidatorsEx } from 'shared'; +import { AuthService, ValidatorsEx } from '@app/shared'; import { UserDto } from './../../services/users.service'; import { UsersState } from './../../state/users.state'; diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.ts b/src/Squidex/app/features/administration/pages/users/users-page.component.ts index 902068c7b..2184a49e5 100644 --- a/src/Squidex/app/features/administration/pages/users/users-page.component.ts +++ b/src/Squidex/app/features/administration/pages/users/users-page.component.ts @@ -8,7 +8,7 @@ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { AuthService, DialogService } from 'shared'; +import { AuthService, DialogService } from '@app/shared'; import { UserDto } from './../../services/users.service'; import { UsersState } from './../../state/users.state'; diff --git a/src/Squidex/app/features/administration/services/event-consumers.service.spec.ts b/src/Squidex/app/features/administration/services/event-consumers.service.spec.ts index acef1ec06..683a119e7 100644 --- a/src/Squidex/app/features/administration/services/event-consumers.service.spec.ts +++ b/src/Squidex/app/features/administration/services/event-consumers.service.spec.ts @@ -8,7 +8,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; -import { ApiUrlConfig } from 'framework'; +import { ApiUrlConfig } from '@app/framework'; import { EventConsumerDto, EventConsumersService } from './event-consumers.service'; diff --git a/src/Squidex/app/features/administration/services/event-consumers.service.ts b/src/Squidex/app/features/administration/services/event-consumers.service.ts index fb4ae66ea..fdd5f86c8 100644 --- a/src/Squidex/app/features/administration/services/event-consumers.service.ts +++ b/src/Squidex/app/features/administration/services/event-consumers.service.ts @@ -9,9 +9,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; -import { ApiUrlConfig, HTTP } from 'framework'; +import { ApiUrlConfig, HTTP } from '@app/framework'; export class EventConsumerDto { constructor( diff --git a/src/Squidex/app/features/administration/services/users.service.spec.ts b/src/Squidex/app/features/administration/services/users.service.spec.ts index 675c5e24c..20603ba9e 100644 --- a/src/Squidex/app/features/administration/services/users.service.spec.ts +++ b/src/Squidex/app/features/administration/services/users.service.spec.ts @@ -8,7 +8,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; -import { ApiUrlConfig } from 'framework'; +import { ApiUrlConfig } from '@app/framework'; import { CreateUserDto, diff --git a/src/Squidex/app/features/administration/services/users.service.ts b/src/Squidex/app/features/administration/services/users.service.ts index 9b8b28ff0..799c2b0be 100644 --- a/src/Squidex/app/features/administration/services/users.service.ts +++ b/src/Squidex/app/features/administration/services/users.service.ts @@ -9,9 +9,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; -import { ApiUrlConfig, HTTP } from 'framework'; +import { ApiUrlConfig, HTTP } from '@app/framework'; export class UsersDto { constructor( diff --git a/src/Squidex/app/features/administration/state/users.state.ts b/src/Squidex/app/features/administration/state/users.state.ts index a70e68f98..6c5112eb4 100644 --- a/src/Squidex/app/features/administration/state/users.state.ts +++ b/src/Squidex/app/features/administration/state/users.state.ts @@ -8,13 +8,13 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import 'framework/utils/rxjs-extensions'; +import '@app/framework/utils/rxjs-extensions'; import { DialogService, ImmutableArray, Pager -} from 'shared'; +} from '@app/shared'; import { CreateUserDto, diff --git a/src/Squidex/app/features/api/api-area.component.ts b/src/Squidex/app/features/api/api-area.component.ts index 446dfdd57..6e9e538cc 100644 --- a/src/Squidex/app/features/api/api-area.component.ts +++ b/src/Squidex/app/features/api/api-area.component.ts @@ -7,7 +7,7 @@ import { Component } from '@angular/core'; -import { AppsState } from 'shared'; +import { AppsState } from '@app/shared'; @Component({ selector: 'sqx-api-area', diff --git a/src/Squidex/app/features/api/module.ts b/src/Squidex/app/features/api/module.ts index 00d6dda1f..7f7614cdc 100644 --- a/src/Squidex/app/features/api/module.ts +++ b/src/Squidex/app/features/api/module.ts @@ -12,7 +12,7 @@ import { DndModule } from 'ng2-dnd'; import { SqxFrameworkModule, SqxSharedModule -} from 'shared'; +} from '@app/shared'; import { ApiAreaComponent, diff --git a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts index 824d6acf0..7f4a9d50f 100644 --- a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts +++ b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts @@ -19,7 +19,7 @@ import { AppsState, GraphQlService, LocalStoreService -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-graphql-page', diff --git a/src/Squidex/app/features/apps/module.ts b/src/Squidex/app/features/apps/module.ts index 467e2c61b..69c393429 100644 --- a/src/Squidex/app/features/apps/module.ts +++ b/src/Squidex/app/features/apps/module.ts @@ -8,7 +8,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SqxFrameworkModule, SqxSharedModule } from 'shared'; +import { SqxFrameworkModule, SqxSharedModule } from '@app/shared'; import { AppsPageComponent, diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.ts b/src/Squidex/app/features/apps/pages/apps-page.component.ts index 146b4ebc3..87756a0bf 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.ts +++ b/src/Squidex/app/features/apps/pages/apps-page.component.ts @@ -16,7 +16,7 @@ import { ImmutableArray, ModalView, OnboardingService -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-apps-page', diff --git a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.ts b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.ts index 2d3689ac5..f6511f0b1 100644 --- a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.ts +++ b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.ts @@ -11,7 +11,7 @@ import { fadeAnimation, ModalView, slideAnimation -} from 'framework'; +} from '@app/framework'; @Component({ selector: 'sqx-onboarding-dialog', diff --git a/src/Squidex/app/features/assets/module.ts b/src/Squidex/app/features/assets/module.ts index d3dbe97a1..496d2aaed 100644 --- a/src/Squidex/app/features/assets/module.ts +++ b/src/Squidex/app/features/assets/module.ts @@ -9,7 +9,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { DndModule } from 'ng2-dnd'; -import { SqxFrameworkModule, SqxSharedModule } from 'shared'; +import { SqxFrameworkModule, SqxSharedModule } from '@app/shared'; import { AssetsPageComponent diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.ts b/src/Squidex/app/features/assets/pages/assets-page.component.ts index 3d6606fd1..b1424acc9 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.ts +++ b/src/Squidex/app/features/assets/pages/assets-page.component.ts @@ -18,7 +18,7 @@ import { AssetUpdated, ImmutableArray, Pager -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-assets-page', diff --git a/src/Squidex/app/features/content/module.ts b/src/Squidex/app/features/content/module.ts index aea408271..d6916db71 100644 --- a/src/Squidex/app/features/content/module.ts +++ b/src/Squidex/app/features/content/module.ts @@ -16,7 +16,7 @@ import { ResolvePublishedSchemaGuard, SqxFrameworkModule, SqxSharedModule -} from 'shared'; +} from '@app/shared'; import { AssetsEditorComponent, diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.ts b/src/Squidex/app/features/content/pages/content/content-field.component.ts index deca02d33..6fcef307b 100644 --- a/src/Squidex/app/features/content/pages/content/content-field.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-field.component.ts @@ -13,7 +13,7 @@ import { AppLanguageDto, FieldDto, fieldInvariant -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-content-field', diff --git a/src/Squidex/app/features/content/pages/content/content-history.component.ts b/src/Squidex/app/features/content/pages/content/content-history.component.ts index 72c7a0f04..f8e045787 100644 --- a/src/Squidex/app/features/content/pages/content/content-history.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-history.component.ts @@ -16,7 +16,7 @@ import { HistoryEventDto, HistoryService, UsersProviderService -} from 'shared'; +} from '@app/shared'; import { ContentVersionSelected } from './../messages'; diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.ts b/src/Squidex/app/features/content/pages/content/content-page.component.ts index fceb55df8..ea16779a2 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-page.component.ts @@ -28,7 +28,7 @@ import { fieldInvariant, SchemaDetailsDto, Version -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-content-page', diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts index 7f984b731..666fa8b90 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts @@ -29,7 +29,7 @@ import { Pager, SchemaDetailsDto, Versioned -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-contents-page', diff --git a/src/Squidex/app/features/content/pages/messages.ts b/src/Squidex/app/features/content/pages/messages.ts index 112827d57..f2086f627 100644 --- a/src/Squidex/app/features/content/pages/messages.ts +++ b/src/Squidex/app/features/content/pages/messages.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ContentDto } from 'shared'; +import { ContentDto } from '@app/shared'; export class ContentCreated { constructor( diff --git a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts index b2c463b9b..de20e283e 100644 --- a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts +++ b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts @@ -13,7 +13,7 @@ import { AppContext, SchemaDto, SchemasService -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-schemas-page', diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.ts b/src/Squidex/app/features/content/shared/assets-editor.component.ts index 48aa6302f..babe3c7c2 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.ts +++ b/src/Squidex/app/features/content/shared/assets-editor.component.ts @@ -18,7 +18,7 @@ import { AssetUpdated, ImmutableArray, Types -} from 'shared'; +} from '@app/shared'; export const SQX_ASSETS_EDITOR_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => AssetsEditorComponent), multi: true diff --git a/src/Squidex/app/features/content/shared/content-item.component.ts b/src/Squidex/app/features/content/shared/content-item.component.ts index 794b20523..2b287ab97 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.ts +++ b/src/Squidex/app/features/content/shared/content-item.component.ts @@ -20,7 +20,7 @@ import { SchemaDto, Types, Versioned -} from 'shared'; +} from '@app/shared'; /* tslint:disable:component-selector */ diff --git a/src/Squidex/app/features/content/shared/references-editor.component.ts b/src/Squidex/app/features/content/shared/references-editor.component.ts index 1d614d088..bcacd9f5f 100644 --- a/src/Squidex/app/features/content/shared/references-editor.component.ts +++ b/src/Squidex/app/features/content/shared/references-editor.component.ts @@ -21,7 +21,7 @@ import { SchemaDetailsDto, SchemasService, Types -} from 'shared'; +} from '@app/shared'; export const SQX_REFERENCES_EDITOR_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => ReferencesEditorComponent), multi: true diff --git a/src/Squidex/app/features/dashboard/module.ts b/src/Squidex/app/features/dashboard/module.ts index a97e4aff7..0942cc3b6 100644 --- a/src/Squidex/app/features/dashboard/module.ts +++ b/src/Squidex/app/features/dashboard/module.ts @@ -9,7 +9,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ChartModule } from 'angular2-chartjs'; -import { SqxFrameworkModule, SqxSharedModule } from 'shared'; +import { SqxFrameworkModule, SqxSharedModule } from '@app/shared'; import { DashboardPageComponent diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts index 877eac33a..16232096e 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts @@ -18,7 +18,7 @@ import { HistoryService, UsagesService, UsersProviderService -} from 'shared'; +} from '@app/shared'; declare var _urq: any; diff --git a/src/Squidex/app/features/rules/module.ts b/src/Squidex/app/features/rules/module.ts index 932ce0878..25b4973bb 100644 --- a/src/Squidex/app/features/rules/module.ts +++ b/src/Squidex/app/features/rules/module.ts @@ -12,7 +12,7 @@ import { HelpComponent, SqxFrameworkModule, SqxSharedModule -} from 'shared'; +} from '@app/shared'; import { AlgoliaActionComponent, diff --git a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts index a1f40d5e8..46cac2531 100644 --- a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts +++ b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts @@ -13,7 +13,7 @@ import { Pager, RuleEventDto, RulesService -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-rule-events-page', diff --git a/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.ts b/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.ts index 981bd7302..681f3cc36 100644 --- a/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/actions/azure-queue-action.component.ts @@ -8,7 +8,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; -import { ValidatorsEx } from 'shared'; +import { ValidatorsEx } from '@app/shared'; @Component({ selector: 'sqx-azure-queue-action', diff --git a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts index 524d88b32..ddd0c95de 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts @@ -18,7 +18,7 @@ import { RulesService, SchemaDto, UpdateRuleDto -} from 'shared'; +} from '@app/shared'; export const MODE_WIZARD = 'Wizard'; export const MODE_EDIT_TRIGGER = 'EditTrigger'; diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts index 40e6f3e91..85612c3a1 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts @@ -19,7 +19,7 @@ import { RulesService, SchemaDto, SchemasService -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-rules-page', diff --git a/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.ts b/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.ts index faf6b0439..abacf9013 100644 --- a/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.ts @@ -11,7 +11,7 @@ import { ImmutableArray, SchemaDto, Types -} from 'shared'; +} from '@app/shared'; export interface TriggerSchemaForm { schema: SchemaDto; diff --git a/src/Squidex/app/features/schemas/guards/schema-must-exist.guard.ts b/src/Squidex/app/features/schemas/guards/schema-must-exist.guard.ts index 4fd7e92c0..fe4ae3462 100644 --- a/src/Squidex/app/features/schemas/guards/schema-must-exist.guard.ts +++ b/src/Squidex/app/features/schemas/guards/schema-must-exist.guard.ts @@ -9,7 +9,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; -import { allParams } from 'framework'; +import { allParams } from '@app/framework'; import { SchemasState } from './../state/schemas.state'; diff --git a/src/Squidex/app/features/schemas/module.ts b/src/Squidex/app/features/schemas/module.ts index 1cf021032..c57b3e749 100644 --- a/src/Squidex/app/features/schemas/module.ts +++ b/src/Squidex/app/features/schemas/module.ts @@ -12,7 +12,7 @@ import { DndModule } from 'ng2-dnd'; import { SqxFrameworkModule, SqxSharedModule -} from 'shared'; +} from '@app/shared'; import { FieldComponent, diff --git a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts index d9f742941..837f4c2d0 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts @@ -17,7 +17,7 @@ import { SchemaDetailsDto, UpdateFieldDto, ValidatorsEx -} from 'shared'; +} from '@app/shared'; import { SchemasState } from './../../state/schemas.state'; diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.ts b/src/Squidex/app/features/schemas/pages/schema/field.component.ts index e583f0658..3400cb856 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.ts @@ -15,7 +15,7 @@ import { ModalView, SchemaDetailsDto, UpdateFieldDto -} from 'shared'; +} from '@app/shared'; import { SchemasState } from './../../state/schemas.state'; diff --git a/src/Squidex/app/features/schemas/pages/schema/forms/field-form-common.component.ts b/src/Squidex/app/features/schemas/pages/schema/forms/field-form-common.component.ts index 2def62f0c..2533e7e3e 100644 --- a/src/Squidex/app/features/schemas/pages/schema/forms/field-form-common.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/forms/field-form-common.component.ts @@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { FieldDto } from 'shared'; +import { FieldDto } from '@app/shared'; @Component({ selector: 'sqx-field-form-common', diff --git a/src/Squidex/app/features/schemas/pages/schema/forms/field-form-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/forms/field-form-ui.component.ts index 49aecfdce..c1d70fc1b 100644 --- a/src/Squidex/app/features/schemas/pages/schema/forms/field-form-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/forms/field-form-ui.component.ts @@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { FieldDto } from 'shared'; +import { FieldDto } from '@app/shared'; @Component({ selector: 'sqx-field-form-ui', diff --git a/src/Squidex/app/features/schemas/pages/schema/forms/field-form-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/forms/field-form-validation.component.ts index a1da5ec5d..ee27c0a52 100644 --- a/src/Squidex/app/features/schemas/pages/schema/forms/field-form-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/forms/field-form-validation.component.ts @@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { FieldDto } from 'shared'; +import { FieldDto } from '@app/shared'; @Component({ selector: 'sqx-field-form-validation', diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts index 4f7c01519..6e8a08341 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts @@ -8,7 +8,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; -import { SchemaDetailsDto, UpdateSchemaDto } from 'shared'; +import { SchemaDetailsDto, UpdateSchemaDto } from '@app/shared'; import { SchemasState } from './../../state/schemas.state'; diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts index 3ea3797d1..df2737b39 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts @@ -17,7 +17,7 @@ import { MessageBus, ModalView, SchemaDetailsDto -} from 'shared'; +} from '@app/shared'; import { SchemaCloning diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.ts index 979615b53..c10ae90c9 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.ts @@ -8,7 +8,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormBuilder } from '@angular/forms'; -import { SchemaDetailsDto, UpdateSchemaScriptsDto } from 'shared'; +import { SchemaDetailsDto, UpdateSchemaScriptsDto } from '@app/shared'; import { SchemasState } from './../../state/schemas.state'; diff --git a/src/Squidex/app/features/schemas/pages/schema/types/assets-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/assets-ui.component.ts index b7a65cea4..b60830843 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/assets-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/assets-ui.component.ts @@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { AssetsFieldPropertiesDto } from 'shared'; +import { AssetsFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-assets-ui', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/assets-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/assets-validation.component.ts index 0877f94b6..e7c8e1829 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/assets-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/assets-validation.component.ts @@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { AssetsFieldPropertiesDto } from 'shared'; +import { AssetsFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-assets-validation', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/boolean-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/boolean-ui.component.ts index 7336ef71a..a989a0f91 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/boolean-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/boolean-ui.component.ts @@ -8,7 +8,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { BooleanFieldPropertiesDto } from 'shared'; +import { BooleanFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-boolean-ui', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts index 7dbc279be..ac238a85c 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts @@ -9,7 +9,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Observable } from 'rxjs'; -import { BooleanFieldPropertiesDto } from 'shared'; +import { BooleanFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-boolean-validation', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.ts index 97a0855fd..66e521156 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.ts @@ -9,7 +9,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; -import { FloatConverter, NumberFieldPropertiesDto } from 'shared'; +import { FloatConverter, NumberFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-date-time-ui', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts index 4ff7d6be2..2605bac91 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts @@ -9,7 +9,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Observable } from 'rxjs'; -import { DateTimeFieldPropertiesDto, ValidatorsEx } from 'shared'; +import { DateTimeFieldPropertiesDto, ValidatorsEx } from '@app/shared'; @Component({ selector: 'sqx-date-time-validation', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.ts index a5de1bf68..8ef0850e5 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.ts @@ -8,7 +8,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormGroup, FormControl, Validators } from '@angular/forms'; -import { GeolocationFieldPropertiesDto } from 'shared'; +import { GeolocationFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-geolocation-ui', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/geolocation-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/geolocation-validation.component.ts index 65edbdcaa..d2d68f460 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/geolocation-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/geolocation-validation.component.ts @@ -8,7 +8,7 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { GeolocationFieldPropertiesDto } from 'shared'; +import { GeolocationFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-geolocation-validation', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/json-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/json-ui.component.ts index 4535282ff..04b9e40f2 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/json-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/json-ui.component.ts @@ -8,7 +8,7 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { JsonFieldPropertiesDto } from 'shared'; +import { JsonFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-json-ui', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/json-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/json-validation.component.ts index 04507f457..4681e79ab 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/json-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/json-validation.component.ts @@ -8,7 +8,7 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { JsonFieldPropertiesDto } from 'shared'; +import { JsonFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-json-validation', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts index 30342c35d..e044f201e 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts @@ -9,7 +9,7 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Observable, Subscription } from 'rxjs'; -import { FloatConverter, NumberFieldPropertiesDto } from 'shared'; +import { FloatConverter, NumberFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-number-ui', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts index 6e076e127..f4bb550ab 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts @@ -9,7 +9,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Observable } from 'rxjs'; -import { NumberFieldPropertiesDto } from 'shared'; +import { NumberFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-number-validation', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/references-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/references-ui.component.ts index e79477dbc..c908e10f4 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/references-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/references-ui.component.ts @@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { ReferencesFieldPropertiesDto } from 'shared'; +import { ReferencesFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-references-ui', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.ts index 3a3f4fd44..6783c18cf 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.ts @@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { ReferencesFieldPropertiesDto } from 'shared'; +import { ReferencesFieldPropertiesDto } from '@app/shared'; import { SchemasState } from './../../../state/schemas.state'; diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts index 157b66cfe..0a01db825 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts @@ -9,7 +9,7 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Observable, Subscription } from 'rxjs'; -import { StringFieldPropertiesDto } from 'shared'; +import { StringFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-string-ui', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts index fde5f8edf..6f7775009 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts @@ -13,7 +13,7 @@ import { AppPatternDto, ModalView, StringFieldPropertiesDto -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-string-validation', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/tags-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/tags-ui.component.ts index e6b449359..43319dc9c 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/tags-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/tags-ui.component.ts @@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { AssetsFieldPropertiesDto } from 'shared'; +import { AssetsFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-tags-ui', diff --git a/src/Squidex/app/features/schemas/pages/schema/types/tags-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/tags-validation.component.ts index 4c9e1b44b..507737fac 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/tags-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/tags-validation.component.ts @@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { AssetsFieldPropertiesDto } from 'shared'; +import { AssetsFieldPropertiesDto } from '@app/shared'; @Component({ selector: 'sqx-tags-validation', diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts index b5af05a25..23714c75b 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts +++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts @@ -12,7 +12,7 @@ import { ApiUrlConfig, AppsState, ValidatorsEx -} from 'shared'; +} from '@app/shared'; import { SchemasState } from './../../state/schemas.state'; diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts index 99ec3f3e3..0f9ebdf34 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts +++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts @@ -15,7 +15,7 @@ import { fadeAnimation, MessageBus, ModalView -} from 'shared'; +} from '@app/shared'; import { SchemaCloning } from './../messages'; diff --git a/src/Squidex/app/features/schemas/state/schemas.state.ts b/src/Squidex/app/features/schemas/state/schemas.state.ts index 4396e94f5..ae698fded 100644 --- a/src/Squidex/app/features/schemas/state/schemas.state.ts +++ b/src/Squidex/app/features/schemas/state/schemas.state.ts @@ -8,7 +8,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import 'framework/utils/rxjs-extensions'; +import '@app/framework/utils/rxjs-extensions'; import { AddFieldDto, @@ -25,7 +25,7 @@ import { UpdateFieldDto, UpdateSchemaScriptsDto, UpdateSchemaDto -} from 'shared'; +} from '@app/shared'; @Injectable() export class SchemasState { diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts index 40b5ccd3c..db1a914ab 100644 --- a/src/Squidex/app/features/settings/module.ts +++ b/src/Squidex/app/features/settings/module.ts @@ -14,7 +14,7 @@ import { HistoryComponent, SqxFrameworkModule, SqxSharedModule -} from 'shared'; +} from '@app/shared'; import { BackupsPageComponent, diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts index 52c52b4c9..affda3829 100644 --- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts @@ -15,7 +15,7 @@ import { BackupsService, Duration, ImmutableArray -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-backups-page', diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.ts b/src/Squidex/app/features/settings/pages/clients/client.component.ts index 220d8888f..8fc20a702 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.ts +++ b/src/Squidex/app/features/settings/pages/clients/client.component.ts @@ -15,7 +15,7 @@ import { AppClientsService, fadeAnimation, ModalView -} from 'shared'; +} from '@app/shared'; const ESCAPE_KEY = 27; diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts b/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts index d14afbbcc..4c42e00df 100644 --- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts +++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts @@ -17,7 +17,7 @@ import { HistoryChannelUpdated, UpdateAppClientDto, ValidatorsEx -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-clients-page', diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts index 5880f4053..e9edfdc0f 100644 --- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts +++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts @@ -17,7 +17,7 @@ import { AutocompleteSource, HistoryChannelUpdated, UsersService -} from 'shared'; +} from '@app/shared'; export class UsersDataSource implements AutocompleteSource { constructor( diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.ts b/src/Squidex/app/features/settings/pages/languages/language.component.ts index 0af21ee70..a59987115 100644 --- a/src/Squidex/app/features/settings/pages/languages/language.component.ts +++ b/src/Squidex/app/features/settings/pages/languages/language.component.ts @@ -9,7 +9,7 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output, OnInit } import { FormBuilder } from '@angular/forms'; import { Subscription } from 'rxjs'; -import { AppLanguageDto, fadeAnimation } from 'shared'; +import { AppLanguageDto, fadeAnimation } from '@app/shared'; @Component({ selector: 'sqx-language', diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts index 7e334b485..e641144c5 100644 --- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts +++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts @@ -18,7 +18,7 @@ import { ImmutableArray, LanguageDto, LanguagesService -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-languages-page', diff --git a/src/Squidex/app/features/settings/pages/more/more-page.component.ts b/src/Squidex/app/features/settings/pages/more/more-page.component.ts index fec08a9d8..2bab632bc 100644 --- a/src/Squidex/app/features/settings/pages/more/more-page.component.ts +++ b/src/Squidex/app/features/settings/pages/more/more-page.component.ts @@ -8,7 +8,7 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { AppContext } from 'shared'; +import { AppContext } from '@app/shared'; @Component({ selector: 'sqx-more-page', diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts b/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts index 1f9063112..c988bc27c 100644 --- a/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts +++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts @@ -13,7 +13,7 @@ import { fadeAnimation, ValidatorsEx, UpdatePatternDto -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-pattern', diff --git a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts index 8ccd5ff67..ee09bc166 100644 --- a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts +++ b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts @@ -14,7 +14,7 @@ import { AppPatternsService, HistoryChannelUpdated, UpdatePatternDto -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-patterns-page', diff --git a/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts b/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts index 5097d552e..2715c2ad4 100644 --- a/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts +++ b/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts @@ -14,7 +14,7 @@ import { AppPlansDto, ChangePlanDto, PlansService -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-plans-page', diff --git a/src/Squidex/app/features/settings/settings-area.component.ts b/src/Squidex/app/features/settings/settings-area.component.ts index 329ad88f8..0ac815a0c 100644 --- a/src/Squidex/app/features/settings/settings-area.component.ts +++ b/src/Squidex/app/features/settings/settings-area.component.ts @@ -7,7 +7,7 @@ import { Component } from '@angular/core'; -import { AppContext } from 'shared'; +import { AppContext } from '@app/shared'; @Component({ selector: 'sqx-settings-area', diff --git a/src/Squidex/app/framework/angular/forms/confirm-click.directive.ts b/src/Squidex/app/framework/angular/forms/confirm-click.directive.ts index a0a761d0c..28aa2597b 100644 --- a/src/Squidex/app/framework/angular/forms/confirm-click.directive.ts +++ b/src/Squidex/app/framework/angular/forms/confirm-click.directive.ts @@ -7,7 +7,7 @@ import { Directive, EventEmitter, HostListener, Input, OnDestroy, Output } from '@angular/core'; -import { DialogService } from './../services/dialog.service'; +import { DialogService } from '@app/framework/internal'; class DelayEventEmitter extends EventEmitter { private delayedNexts: any[] | null = []; diff --git a/src/Squidex/app/framework/angular/forms/control-errors.component.ts b/src/Squidex/app/framework/angular/forms/control-errors.component.ts index 4e036fba0..b14a04c73 100644 --- a/src/Squidex/app/framework/angular/forms/control-errors.component.ts +++ b/src/Squidex/app/framework/angular/forms/control-errors.component.ts @@ -9,7 +9,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Host, Input, OnC import { AbstractControl, FormGroupDirective } from '@angular/forms'; import { Observable, Subscription } from 'rxjs'; -import { fadeAnimation } from './animations'; +import { fadeAnimation } from '@app/framework/internal'; const DEFAULT_ERRORS: { [key: string]: string } = { required: '{field} is required.', diff --git a/src/Squidex/app/framework/angular/forms/copy.directive.ts b/src/Squidex/app/framework/angular/forms/copy.directive.ts index 655a6cc93..3bfa74a98 100644 --- a/src/Squidex/app/framework/angular/forms/copy.directive.ts +++ b/src/Squidex/app/framework/angular/forms/copy.directive.ts @@ -7,8 +7,11 @@ import { Directive, HostListener, Input } from '@angular/core'; -import { Types } from './../utils/types'; -import { DialogService, Notification } from './../services/dialog.service'; +import { + DialogService, + Notification, + Types +} from '@app/framework/internal'; @Directive({ selector: '[sqxCopy]' diff --git a/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts b/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts index 024d73b1d..fd2424964 100644 --- a/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts @@ -10,7 +10,7 @@ import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from '@angular/f import { Subscription } from 'rxjs'; import * as moment from 'moment'; -import { Types } from './../utils/types'; +import { Types } from '@app/framework/internal'; let Pikaday = require('pikaday/pikaday'); diff --git a/src/Squidex/app/framework/angular/forms/dropdown.component.ts b/src/Squidex/app/framework/angular/forms/dropdown.component.ts index 56077df4d..b3af31325 100644 --- a/src/Squidex/app/framework/angular/forms/dropdown.component.ts +++ b/src/Squidex/app/framework/angular/forms/dropdown.component.ts @@ -13,7 +13,7 @@ const KEY_ESCAPE = 27; const KEY_UP = 38; const KEY_DOWN = 40; -import { ModalView } from './../utils/modal-view'; +import { ModalView } from '@app/framework/internal'; export const SQX_DROPDOWN_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => DropdownComponent), multi: true diff --git a/src/Squidex/app/framework/angular/forms/indeterminate-value.directive.ts b/src/Squidex/app/framework/angular/forms/indeterminate-value.directive.ts index 551e7c66a..ffed96be0 100644 --- a/src/Squidex/app/framework/angular/forms/indeterminate-value.directive.ts +++ b/src/Squidex/app/framework/angular/forms/indeterminate-value.directive.ts @@ -8,7 +8,7 @@ import { Directive, forwardRef, ElementRef, HostListener, Renderer } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Types } from './../utils/types'; +import { Types } from '@app/framework/internal'; export const SQX_INDETERMINATE_VALUE_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => IndeterminateValueDirective), multi: true diff --git a/src/Squidex/app/framework/angular/forms/jscript-editor.component.ts b/src/Squidex/app/framework/angular/forms/jscript-editor.component.ts index 0f323bd97..a87171c9a 100644 --- a/src/Squidex/app/framework/angular/forms/jscript-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/jscript-editor.component.ts @@ -9,9 +9,7 @@ import { AfterViewInit, Component, forwardRef, ElementRef, ViewChild } from '@an import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { Subject } from 'rxjs'; -import { Types } from './../utils/types'; - -import { ResourceLoaderService } from './../services/resource-loader.service'; +import { ResourceLoaderService, Types } from '@app/framework/internal'; declare var ace: any; diff --git a/src/Squidex/app/framework/angular/forms/json-editor.component.ts b/src/Squidex/app/framework/angular/forms/json-editor.component.ts index 2dd932655..5ae69dbb9 100644 --- a/src/Squidex/app/framework/angular/forms/json-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/json-editor.component.ts @@ -9,7 +9,7 @@ import { AfterViewInit, Component, forwardRef, ElementRef, ViewChild } from '@an import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { Subject } from 'rxjs'; -import { ResourceLoaderService } from './../services/resource-loader.service'; +import { ResourceLoaderService } from '@app/framework/internal'; declare var ace: any; diff --git a/src/Squidex/app/framework/angular/forms/lowercase-input.directive.ts b/src/Squidex/app/framework/angular/forms/lowercase-input.directive.ts index fb02686f1..a83cf8bdd 100644 --- a/src/Squidex/app/framework/angular/forms/lowercase-input.directive.ts +++ b/src/Squidex/app/framework/angular/forms/lowercase-input.directive.ts @@ -8,7 +8,7 @@ import { Directive, forwardRef, ElementRef, HostListener, Renderer } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Types } from './../utils/types'; +import { Types } from '@app/framework/internal'; export const SQX_LOWERCASE_INPUT_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => LowerCaseInputDirective), multi: true diff --git a/src/Squidex/app/framework/angular/forms/slider.component.ts b/src/Squidex/app/framework/angular/forms/slider.component.ts index 279a00b0d..103397e70 100644 --- a/src/Squidex/app/framework/angular/forms/slider.component.ts +++ b/src/Squidex/app/framework/angular/forms/slider.component.ts @@ -8,7 +8,7 @@ import { Component, ElementRef, forwardRef, Input, Renderer, ViewChild } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Types } from './../utils/types'; +import { Types } from '@app/framework/internal'; export const SQX_SLIDER_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => SliderComponent), multi: true diff --git a/src/Squidex/app/framework/angular/forms/slugify-input.directive.ts b/src/Squidex/app/framework/angular/forms/slugify-input.directive.ts index 005a65ab2..44a4d5395 100644 --- a/src/Squidex/app/framework/angular/forms/slugify-input.directive.ts +++ b/src/Squidex/app/framework/angular/forms/slugify-input.directive.ts @@ -10,7 +10,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import slugify from 'slugify'; -import { Types } from './../utils/types'; +import { Types } from '@app/framework/internal'; export const SQX_SLUGIFY_INPUT_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => SlugifyInputDirective), multi: true diff --git a/src/Squidex/app/framework/angular/forms/stars.component.ts b/src/Squidex/app/framework/angular/forms/stars.component.ts index 7665a6d36..482fcf71d 100644 --- a/src/Squidex/app/framework/angular/forms/stars.component.ts +++ b/src/Squidex/app/framework/angular/forms/stars.component.ts @@ -8,7 +8,7 @@ import { Component, forwardRef, Input } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Types } from './../utils/types'; +import { Types } from '@app/framework/internal'; export const SQX_STARS_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => StarsComponent), multi: true diff --git a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts index b835ca542..4fc1f4a71 100644 --- a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts @@ -8,7 +8,7 @@ import { Component, forwardRef, Input } from '@angular/core'; import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Types } from './../utils/types'; +import { Types } from '@app/framework/internal'; const KEY_ENTER = 13; diff --git a/src/Squidex/app/framework/angular/forms/toggle.component.ts b/src/Squidex/app/framework/angular/forms/toggle.component.ts index 37f28bbc5..f9e6b4de4 100644 --- a/src/Squidex/app/framework/angular/forms/toggle.component.ts +++ b/src/Squidex/app/framework/angular/forms/toggle.component.ts @@ -8,7 +8,7 @@ import { Component, forwardRef } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Types } from './../utils/types'; +import { Types } from '@app/framework/internal'; export const SQX_TOGGLE_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => ToggleComponent), multi: true diff --git a/src/Squidex/app/framework/angular/forms/validators.spec.ts b/src/Squidex/app/framework/angular/forms/validators.spec.ts index 3b9a88afd..3624fb416 100644 --- a/src/Squidex/app/framework/angular/forms/validators.spec.ts +++ b/src/Squidex/app/framework/angular/forms/validators.spec.ts @@ -7,8 +7,9 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { DateTime } from './../utils/date-time'; -import { ValidatorsEx } from './../'; +import { DateTime } from './../../utils/date-time'; + +import { ValidatorsEx } from './validators'; describe('ValidatorsEx.between', () => { it('should return null validator if no min value or max value', () => { diff --git a/src/Squidex/app/framework/angular/forms/validators.ts b/src/Squidex/app/framework/angular/forms/validators.ts index ccb55df47..7fe3d8615 100644 --- a/src/Squidex/app/framework/angular/forms/validators.ts +++ b/src/Squidex/app/framework/angular/forms/validators.ts @@ -5,14 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { - AbstractControl, - ValidatorFn, - Validators -} from '@angular/forms'; - -import { DateTime } from './../utils/date-time'; -import { Types } from './../utils/types'; +import { AbstractControl, ValidatorFn, Validators } from '@angular/forms'; + +import { DateTime, Types } from '@app/framework/internal'; export module ValidatorsEx { export function pattern(regex: string | RegExp, message?: string): ValidatorFn { diff --git a/src/Squidex/app/framework/angular/http/http-extensions-impl.ts b/src/Squidex/app/framework/angular/http/http-extensions-impl.ts index 3786707c3..498776a54 100644 --- a/src/Squidex/app/framework/angular/http/http-extensions-impl.ts +++ b/src/Squidex/app/framework/angular/http/http-extensions-impl.ts @@ -8,9 +8,9 @@ import { HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { ErrorDto } from './../utils/error'; +import { ErrorDto } from './../../utils/error'; -import { Version, Versioned } from './../utils/version'; +import { Version, Versioned } from './../../utils/version'; export module HTTP { export function getVersioned(http: HttpClient, url: string, version?: Version): Observable>> { diff --git a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts index 12c1d549e..d29364ba3 100644 --- a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts +++ b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts @@ -8,15 +8,13 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; -import { fadeAnimation } from './animations'; - import { DialogRequest, DialogService, + fadeAnimation, + ModalView, Notification -} from './../services/dialog.service'; - -import { ModalView } from './../utils/modal-view'; +} from '@app/framework/internal'; @Component({ selector: 'sqx-dialog-renderer', diff --git a/src/Squidex/app/framework/angular/modals/modal-view.directive.ts b/src/Squidex/app/framework/angular/modals/modal-view.directive.ts index 07aadc929..f9f4c86fe 100644 --- a/src/Squidex/app/framework/angular/modals/modal-view.directive.ts +++ b/src/Squidex/app/framework/angular/modals/modal-view.directive.ts @@ -8,7 +8,7 @@ import { Directive, EmbeddedViewRef, Input, OnChanges, OnDestroy, Renderer, SimpleChanges, TemplateRef, ViewContainerRef } from '@angular/core'; import { Subscription } from 'rxjs'; -import { ModalView } from './../utils/modal-view'; +import { ModalView } from '@app/framework/internal'; import { RootViewComponent } from './root-view.component'; diff --git a/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts b/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts index 4b4eb2845..ad9538f75 100644 --- a/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts +++ b/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts @@ -7,12 +7,12 @@ import { Component, Input, OnDestroy, OnInit, Renderer } from '@angular/core'; -import { ModalView } from './../utils/modal-view'; -import { Types } from './../utils/types'; - -import { OnboardingService } from './../services/onboarding.service'; - -import { fadeAnimation } from './animations'; +import { + fadeAnimation, + ModalView, + OnboardingService, + Types +} from '@app/framework/internal'; @Component({ selector: 'sqx-onboarding-tooltip', diff --git a/src/Squidex/app/framework/angular/modals/root-view.component.html b/src/Squidex/app/framework/angular/modals/root-view.component.html new file mode 100644 index 000000000..56146ad9f --- /dev/null +++ b/src/Squidex/app/framework/angular/modals/root-view.component.html @@ -0,0 +1,3 @@ +
+ + \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/modals/root-view.component.scss b/src/Squidex/app/framework/angular/modals/root-view.component.scss new file mode 100644 index 000000000..d1951ab29 --- /dev/null +++ b/src/Squidex/app/framework/angular/modals/root-view.component.scss @@ -0,0 +1,2 @@ +@import '_mixins'; +@import '_vars'; \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/modals/root-view.component.ts b/src/Squidex/app/framework/angular/modals/root-view.component.ts index 12173faf9..d0b260e75 100644 --- a/src/Squidex/app/framework/angular/modals/root-view.component.ts +++ b/src/Squidex/app/framework/angular/modals/root-view.component.ts @@ -9,11 +9,8 @@ import { Component, ViewChild, ViewContainerRef } from '@angular/core'; @Component({ selector: 'sqx-root-view', - template: ` -
- - - ` + styleUrls: ['./root-view.component.scss'], + template: './root-view.component.html' }) export class RootViewComponent { @ViewChild('element', { read: ViewContainerRef }) diff --git a/src/Squidex/app/framework/angular/modals/tooltip.component.html b/src/Squidex/app/framework/angular/modals/tooltip.component.html new file mode 100644 index 000000000..803b193d9 --- /dev/null +++ b/src/Squidex/app/framework/angular/modals/tooltip.component.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/src/Squidex/app/framework/angular/modals/tooltip.component.ts b/src/Squidex/app/framework/angular/modals/tooltip.component.ts index d1374b235..7b88efafa 100644 --- a/src/Squidex/app/framework/angular/modals/tooltip.component.ts +++ b/src/Squidex/app/framework/angular/modals/tooltip.component.ts @@ -7,17 +7,14 @@ import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit, Renderer } from '@angular/core'; -import { ModalView } from './../utils/modal-view'; +import { ModalView } from './../../utils/modal-view'; -import { fadeAnimation } from './animations'; +import { fadeAnimation } from './../animations'; @Component({ selector: 'sqx-tooltip', styleUrls: ['./tooltip.component.scss'], - template: ` -
- -
`, + template: './tooltip.component.html', animations: [ fadeAnimation ], diff --git a/src/Squidex/app/framework/angular/pipes/date-time.pipes.spec.ts b/src/Squidex/app/framework/angular/pipes/date-time.pipes.spec.ts index 276685d44..341e88f6e 100644 --- a/src/Squidex/app/framework/angular/pipes/date-time.pipes.spec.ts +++ b/src/Squidex/app/framework/angular/pipes/date-time.pipes.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DateTime, Duration } from './../'; +import { DateTime, Duration } from './../../'; import { DatePipe, diff --git a/src/Squidex/app/framework/angular/pipes/date-time.pipes.ts b/src/Squidex/app/framework/angular/pipes/date-time.pipes.ts index 754f278ad..61234e139 100644 --- a/src/Squidex/app/framework/angular/pipes/date-time.pipes.ts +++ b/src/Squidex/app/framework/angular/pipes/date-time.pipes.ts @@ -7,8 +7,8 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { DateTime } from './../utils/date-time'; -import { Duration } from './../utils/duration'; +import { DateTime } from './../../utils/date-time'; +import { Duration } from './../../utils/duration'; @Pipe({ name: 'sqxShortDate', diff --git a/src/Squidex/app/framework/angular/pipes/keys.pipe.spec.ts b/src/Squidex/app/framework/angular/pipes/keys.pipe.spec.ts index 2bdd65402..2e6e1f089 100644 --- a/src/Squidex/app/framework/angular/pipes/keys.pipe.spec.ts +++ b/src/Squidex/app/framework/angular/pipes/keys.pipe.spec.ts @@ -5,9 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { - KeysPipe -} from './keys.pipe'; +import { KeysPipe } from './keys.pipe'; describe('KeysPipe', () => { it('should return keys', () => { diff --git a/src/Squidex/app/framework/angular/pipes/money.pipe.spec.ts b/src/Squidex/app/framework/angular/pipes/money.pipe.spec.ts index ce87857d4..80f1b6cc8 100644 --- a/src/Squidex/app/framework/angular/pipes/money.pipe.spec.ts +++ b/src/Squidex/app/framework/angular/pipes/money.pipe.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { CurrencyConfig, DecimalSeparatorConfig } from './../'; +import { CurrencyConfig, DecimalSeparatorConfig } from './../../'; import { MoneyPipe } from './money.pipe'; diff --git a/src/Squidex/app/framework/angular/pipes/money.pipe.ts b/src/Squidex/app/framework/angular/pipes/money.pipe.ts index 93c110675..8508ae21b 100644 --- a/src/Squidex/app/framework/angular/pipes/money.pipe.ts +++ b/src/Squidex/app/framework/angular/pipes/money.pipe.ts @@ -7,7 +7,7 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { CurrencyConfig, DecimalSeparatorConfig } from './../configurations'; +import { CurrencyConfig, DecimalSeparatorConfig } from './../../configurations'; @Pipe({ name: 'sqxMoney', diff --git a/src/Squidex/app/framework/angular/pipes/name.pipe.ts b/src/Squidex/app/framework/angular/pipes/name.pipe.ts index 1e3190e2a..49e12ec4c 100644 --- a/src/Squidex/app/framework/angular/pipes/name.pipe.ts +++ b/src/Squidex/app/framework/angular/pipes/name.pipe.ts @@ -7,7 +7,7 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { StringHelper } from './../utils/string-helper'; +import { StringHelper } from './../../utils/string-helper'; @Pipe({ name: 'sqxDisplayName', diff --git a/src/Squidex/app/framework/angular/pipes/numbers.pipes.spec.ts b/src/Squidex/app/framework/angular/pipes/numbers.pipes.spec.ts index e16acdf23..b88db2eb0 100644 --- a/src/Squidex/app/framework/angular/pipes/numbers.pipes.spec.ts +++ b/src/Squidex/app/framework/angular/pipes/numbers.pipes.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { FileSizePipe, KNumberPipe } from './..'; +import { FileSizePipe, KNumberPipe } from './numbers.pipes'; describe('FileSizePipe', () => { it('should calculate correct human file size', () => { diff --git a/src/Squidex/app/framework/angular/routers/can-deactivate.guard.ts b/src/Squidex/app/framework/angular/routers/can-deactivate.guard.ts index b5e0105d8..a03810f71 100644 --- a/src/Squidex/app/framework/angular/routers/can-deactivate.guard.ts +++ b/src/Squidex/app/framework/angular/routers/can-deactivate.guard.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { CanDeactivate } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; export interface CanComponentDeactivate { canDeactivate(): Observable; diff --git a/src/Squidex/app/framework/angular/routers/router-utils.spec.ts b/src/Squidex/app/framework/angular/routers/router-utils.spec.ts index d5afe19e1..2f507ae1e 100644 --- a/src/Squidex/app/framework/angular/routers/router-utils.spec.ts +++ b/src/Squidex/app/framework/angular/routers/router-utils.spec.ts @@ -5,10 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { - allData, - allParams -} from './router-utils'; +import { allData, allParams } from './router-utils'; describe('RouterUtils', () => { it('should concat all params from route', () => { diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts index 878aef595..b73fcb585 100644 --- a/src/Squidex/app/framework/declarations.ts +++ b/src/Squidex/app/framework/declarations.ts @@ -41,9 +41,6 @@ export * from './angular/pipes/name.pipe'; export * from './angular/pipes/numbers.pipes'; export * from './angular/routers/can-deactivate.guard'; -export * from './angular/routers/router-utils'; - -export * from './angular/animations'; export * from './angular/ignore-scrollbar.directive'; export * from './angular/image-source.directive'; @@ -58,26 +55,4 @@ export * from './angular/template-wrapper.directive'; export * from './angular/title.component'; export * from './angular/user-report.component'; -export * from './services/analytics.service'; -export * from './services/clipboard.service'; -export * from './services/dialog.service'; -export * from './services/local-store.service'; -export * from './services/message-bus.service'; -export * from './services/onboarding.service'; -export * from './services/resource-loader.service'; -export * from './services/shortcut.service'; -export * from './services/title.service'; - -export * from './utils/date-helper'; -export * from './utils/date-time'; -export * from './utils/duration'; -export * from './utils/error'; -export * from './utils/immutable-array'; -export * from './utils/math-helper'; -export * from './utils/modal-view'; -export * from './utils/pager'; -export * from './utils/string-helper'; -export * from './utils/types'; -export * from './utils/version'; - -export * from './configurations'; \ No newline at end of file +export * from './internal'; \ No newline at end of file diff --git a/src/Squidex/app/framework/internal.ts b/src/Squidex/app/framework/internal.ts new file mode 100644 index 000000000..b6dca6cbc --- /dev/null +++ b/src/Squidex/app/framework/internal.ts @@ -0,0 +1,33 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +export * from './angular/routers/router-utils'; +export * from './angular/animations'; + +export * from './services/analytics.service'; +export * from './services/clipboard.service'; +export * from './services/dialog.service'; +export * from './services/local-store.service'; +export * from './services/message-bus.service'; +export * from './services/onboarding.service'; +export * from './services/resource-loader.service'; +export * from './services/shortcut.service'; +export * from './services/title.service'; + +export * from './utils/date-helper'; +export * from './utils/date-time'; +export * from './utils/duration'; +export * from './utils/error'; +export * from './utils/immutable-array'; +export * from './utils/math-helper'; +export * from './utils/modal-view'; +export * from './utils/pager'; +export * from './utils/string-helper'; +export * from './utils/types'; +export * from './utils/version'; + +export * from './configurations'; \ No newline at end of file diff --git a/src/Squidex/app/framework/services/clipboard.service.spec.ts b/src/Squidex/app/framework/services/clipboard.service.spec.ts index 7abb095d0..e5471f7b5 100644 --- a/src/Squidex/app/framework/services/clipboard.service.spec.ts +++ b/src/Squidex/app/framework/services/clipboard.service.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ClipboardService, ClipboardServiceFactory } from './../'; +import { ClipboardService, ClipboardServiceFactory } from './clipboard.service'; describe('ShortcutService', () => { it('should instantiate from factory', () => { diff --git a/src/Squidex/app/framework/services/dialog.service.spec.ts b/src/Squidex/app/framework/services/dialog.service.spec.ts index ffcad55b3..45e1a9bf0 100644 --- a/src/Squidex/app/framework/services/dialog.service.spec.ts +++ b/src/Squidex/app/framework/services/dialog.service.spec.ts @@ -10,7 +10,7 @@ import { DialogRequest, DialogService, DialogServiceFactory -} from './../'; +} from './dialog.service'; describe('DialogService', () => { it('should instantiate from factory', () => { diff --git a/src/Squidex/app/framework/services/local-store.service.spec.ts b/src/Squidex/app/framework/services/local-store.service.spec.ts index 01157aee7..765605c3b 100644 --- a/src/Squidex/app/framework/services/local-store.service.spec.ts +++ b/src/Squidex/app/framework/services/local-store.service.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { LocalStoreService, LocalStoreServiceFactory } from './../'; +import { LocalStoreService, LocalStoreServiceFactory } from './local-store.service'; describe('LocalStore', () => { it('should instantiate from factory', () => { diff --git a/src/Squidex/app/framework/services/message-bus.service.spec.ts b/src/Squidex/app/framework/services/message-bus.service.spec.ts index 8c5bfe4da..120b36cda 100644 --- a/src/Squidex/app/framework/services/message-bus.service.spec.ts +++ b/src/Squidex/app/framework/services/message-bus.service.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { MessageBus, MessageBusFactory } from './../'; +import { MessageBus, MessageBusFactory } from './message-bus.service'; class Event1 { } class Event2 { } diff --git a/src/Squidex/app/framework/services/onboarding.service.spec.ts b/src/Squidex/app/framework/services/onboarding.service.spec.ts index ee60f84bf..37bac41ab 100644 --- a/src/Squidex/app/framework/services/onboarding.service.spec.ts +++ b/src/Squidex/app/framework/services/onboarding.service.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { OnboardingService, OnboardingServiceFactory } from './../'; +import { OnboardingService, OnboardingServiceFactory } from './onboarding.service'; class LocalStoreMock { private store = {}; diff --git a/src/Squidex/app/framework/services/shortcut.service.spec.ts b/src/Squidex/app/framework/services/shortcut.service.spec.ts index 742abe168..69ddf2a50 100644 --- a/src/Squidex/app/framework/services/shortcut.service.spec.ts +++ b/src/Squidex/app/framework/services/shortcut.service.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ShortcutService, ShortcutServiceFactory } from './../'; +import { ShortcutService, ShortcutServiceFactory } from './shortcut.service'; describe('ShortcutService', () => { it('should instantiate from factory', () => { diff --git a/src/Squidex/app/framework/services/title.service.spec.ts b/src/Squidex/app/framework/services/title.service.spec.ts index 1fc4711a5..6225497a6 100644 --- a/src/Squidex/app/framework/services/title.service.spec.ts +++ b/src/Squidex/app/framework/services/title.service.spec.ts @@ -9,7 +9,7 @@ import { TitlesConfig, TitleService, TitleServiceFactory -} from './../'; +} from './title.service'; describe('TitleService', () => { beforeEach(() => { diff --git a/src/Squidex/app/framework/utils/date-helper.spec.ts b/src/Squidex/app/framework/utils/date-helper.spec.ts index abd4ccfc2..a538d2d0d 100644 --- a/src/Squidex/app/framework/utils/date-helper.spec.ts +++ b/src/Squidex/app/framework/utils/date-helper.spec.ts @@ -7,7 +7,7 @@ import * as moment from 'moment'; -import { DateHelper } from './../'; +import { DateHelper } from './date-helper'; describe('DateHelper', () => { it('should call config method of moment object', () => { diff --git a/src/Squidex/app/framework/utils/date-time.spec.ts b/src/Squidex/app/framework/utils/date-time.spec.ts index 43ce8b939..73f3434b8 100644 --- a/src/Squidex/app/framework/utils/date-time.spec.ts +++ b/src/Squidex/app/framework/utils/date-time.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DateTime } from './../'; +import { DateTime } from './date-time'; describe('DateTime', () => { const today = DateTime.today(); diff --git a/src/Squidex/app/framework/utils/duration.spec.ts b/src/Squidex/app/framework/utils/duration.spec.ts index d5168fae0..33a541c33 100644 --- a/src/Squidex/app/framework/utils/duration.spec.ts +++ b/src/Squidex/app/framework/utils/duration.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DateTime, Duration } from './../'; +import { DateTime } from './date-time'; +import { Duration } from './duration'; describe('Duration', () => { it('should instantiate and provide timestamp as property', () => { diff --git a/src/Squidex/app/framework/utils/error.spec.ts b/src/Squidex/app/framework/utils/error.spec.ts index 163b71075..9c60c6895 100644 --- a/src/Squidex/app/framework/utils/error.spec.ts +++ b/src/Squidex/app/framework/utils/error.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ErrorDto } from './../'; +import { ErrorDto } from './error'; describe('ErrorDto', () => { it('Should create simple message when no details are specified.', () => { diff --git a/src/Squidex/app/framework/utils/immutable-array.spec.ts b/src/Squidex/app/framework/utils/immutable-array.spec.ts index 737fc72d6..99e55ad80 100644 --- a/src/Squidex/app/framework/utils/immutable-array.spec.ts +++ b/src/Squidex/app/framework/utils/immutable-array.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ImmutableArray } from './../'; +import { ImmutableArray } from './immutable-array'; describe('ImmutableArray', () => { it('should create empty instance', () => { diff --git a/src/Squidex/app/framework/utils/math-helper.spec.ts b/src/Squidex/app/framework/utils/math-helper.spec.ts index 6729534b8..af58f664c 100644 --- a/src/Squidex/app/framework/utils/math-helper.spec.ts +++ b/src/Squidex/app/framework/utils/math-helper.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { MathHelper } from './../'; +import { MathHelper } from './math-helper'; describe('MathHelper', () => { it('should calculate same crc32 for same input', () => { diff --git a/src/Squidex/app/framework/utils/modal-view.spec.ts b/src/Squidex/app/framework/utils/modal-view.spec.ts index b08c8a58a..97ae82c02 100644 --- a/src/Squidex/app/framework/utils/modal-view.spec.ts +++ b/src/Squidex/app/framework/utils/modal-view.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ModalView } from './../'; +import { ModalView } from './modal-view'; describe('ModalView', () => { it('should have default values', () => { diff --git a/src/Squidex/app/framework/utils/pager.spec.ts b/src/Squidex/app/framework/utils/pager.spec.ts index 11b1c059b..2851fbdc7 100644 --- a/src/Squidex/app/framework/utils/pager.spec.ts +++ b/src/Squidex/app/framework/utils/pager.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Pager } from './../'; +import { Pager } from './pager'; describe('Pager', () => { it('should init with default values', () => { diff --git a/src/Squidex/app/framework/utils/string-helper.spec.ts b/src/Squidex/app/framework/utils/string-helper.spec.ts index 0f1fe2405..a08b4d0b1 100644 --- a/src/Squidex/app/framework/utils/string-helper.spec.ts +++ b/src/Squidex/app/framework/utils/string-helper.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { StringHelper } from './../'; +import { StringHelper } from './string-helper'; describe('StringHelper', () => { it('should return empty text if value is null or undefined', () => { diff --git a/src/Squidex/app/framework/utils/types.spec.ts b/src/Squidex/app/framework/utils/types.spec.ts index e8fa8b70a..70fa846c8 100644 --- a/src/Squidex/app/framework/utils/types.spec.ts +++ b/src/Squidex/app/framework/utils/types.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Types } from './../'; +import { Types } from './types'; describe('Types', () => { it('should make string check', () => { diff --git a/src/Squidex/app/framework/utils/version.spec.ts b/src/Squidex/app/framework/utils/version.spec.ts index 5ecf6160d..4af85456d 100644 --- a/src/Squidex/app/framework/utils/version.spec.ts +++ b/src/Squidex/app/framework/utils/version.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Version, Versioned } from './../'; +import { Version, Versioned } from './version'; describe('Version', () => { it('should initialize with init value', () => { diff --git a/src/Squidex/app/shared/components/app-context.ts b/src/Squidex/app/shared/components/app-context.ts index 3b54c73e7..b9ecbca70 100644 --- a/src/Squidex/app/shared/components/app-context.ts +++ b/src/Squidex/app/shared/components/app-context.ts @@ -9,7 +9,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { ActivatedRoute } from '@angular/router'; -import { MessageBus } from 'framework'; +import { MessageBus } from '@app/framework'; import { AppDto, @@ -18,7 +18,7 @@ import { DialogService, ErrorDto, Profile -} from './../declarations-base'; +} from '@app/shared/internal'; @Injectable() export class AppContext { diff --git a/src/Squidex/app/shared/components/app-form.component.ts b/src/Squidex/app/shared/components/app-form.component.ts index b8a3eec93..470ee3fbf 100644 --- a/src/Squidex/app/shared/components/app-form.component.ts +++ b/src/Squidex/app/shared/components/app-form.component.ts @@ -8,9 +8,12 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; -import { ApiUrlConfig, ValidatorsEx } from 'framework'; - -import { AppsState, CreateAppDto } from './../declarations-base'; +import { + ApiUrlConfig, + AppsState, + CreateAppDto, + ValidatorsEx +} from '@app/shared/internal'; const FALLBACK_NAME = 'my-app'; diff --git a/src/Squidex/app/shared/components/asset.component.ts b/src/Squidex/app/shared/components/asset.component.ts index 073f38bbb..c458db032 100644 --- a/src/Squidex/app/shared/components/asset.component.ts +++ b/src/Squidex/app/shared/components/asset.component.ts @@ -21,7 +21,7 @@ import { Version, Versioned, MessageBus -} from './../declarations-base'; +} from '@app/shared/internal'; @Component({ selector: 'sqx-asset', diff --git a/src/Squidex/app/shared/components/geolocation-editor.component.ts b/src/Squidex/app/shared/components/geolocation-editor.component.ts index 488dc91aa..f5e728e87 100644 --- a/src/Squidex/app/shared/components/geolocation-editor.component.ts +++ b/src/Squidex/app/shared/components/geolocation-editor.component.ts @@ -8,12 +8,12 @@ import { AfterViewInit, Component, ElementRef, forwardRef, ViewChild } from '@angular/core'; import { ControlValueAccessor, FormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Types } from './../../framework/utils/types'; - -import { ResourceLoaderService } from './../../framework/services/resource-loader.service'; -import { ValidatorsEx } from './../../framework/angular/validators'; - -import { UIService } from './../services/ui.service'; +import { + ResourceLoaderService, + Types, + UIService, + ValidatorsEx +} from '@app/shared/internal'; declare var L: any; declare var google: any; diff --git a/src/Squidex/app/shared/components/help.component.ts b/src/Squidex/app/shared/components/help.component.ts index df54bcd8f..f7d7bf68f 100644 --- a/src/Squidex/app/shared/components/help.component.ts +++ b/src/Squidex/app/shared/components/help.component.ts @@ -8,7 +8,7 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { HelpService } from './../declarations-base'; +import { HelpService } from '@app/shared/internal'; @Component({ selector: 'sqx-help', diff --git a/src/Squidex/app/shared/components/history.component.ts b/src/Squidex/app/shared/components/history.component.ts index f249735ba..7dc21f8e1 100644 --- a/src/Squidex/app/shared/components/history.component.ts +++ b/src/Squidex/app/shared/components/history.component.ts @@ -17,7 +17,7 @@ import { HistoryEventDto, HistoryService, UsersProviderService -} from './../declarations-base'; +} from '@app/shared/internal'; @Component({ selector: 'sqx-history', diff --git a/src/Squidex/app/shared/components/language-selector.component.ts b/src/Squidex/app/shared/components/language-selector.component.ts index 6a07c934c..22acc26af 100644 --- a/src/Squidex/app/shared/components/language-selector.component.ts +++ b/src/Squidex/app/shared/components/language-selector.component.ts @@ -7,7 +7,7 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; -import { fadeAnimation, ModalView } from 'framework'; +import { fadeAnimation, ModalView } from '@app/shared/internal'; export interface Language { iso2Code: string; englishName: string; isMasterLanguage: true; } diff --git a/src/Squidex/app/shared/components/markdown-editor.component.ts b/src/Squidex/app/shared/components/markdown-editor.component.ts index 70c43d14d..9943be16b 100644 --- a/src/Squidex/app/shared/components/markdown-editor.component.ts +++ b/src/Squidex/app/shared/components/markdown-editor.component.ts @@ -14,7 +14,7 @@ import { MessageBus, ResourceLoaderService, Types -} from './../declarations-base'; +} from '@app/shared/internal'; declare var SimpleMDE: any; diff --git a/src/Squidex/app/shared/components/pipes.ts b/src/Squidex/app/shared/components/pipes.ts index f2b641f3c..0f1b1f0ce 100644 --- a/src/Squidex/app/shared/components/pipes.ts +++ b/src/Squidex/app/shared/components/pipes.ts @@ -8,9 +8,12 @@ import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core'; import { Observable, Subscription } from 'rxjs'; -import { ApiUrlConfig, MathHelper } from 'framework'; - -import { UserDto, UsersProviderService } from './../declarations-base'; +import { + ApiUrlConfig, + MathHelper, + UserDto, + UsersProviderService +} from '@app/shared/internal'; class UserAsyncPipe implements OnDestroy { private lastUserId: string; diff --git a/src/Squidex/app/shared/components/rich-editor.component.ts b/src/Squidex/app/shared/components/rich-editor.component.ts index 5eda26239..033a3850b 100644 --- a/src/Squidex/app/shared/components/rich-editor.component.ts +++ b/src/Squidex/app/shared/components/rich-editor.component.ts @@ -14,7 +14,7 @@ import { MessageBus, ResourceLoaderService, Types -} from './../declarations-base'; +} from '@app/shared/internal'; declare var tinymce: any; diff --git a/src/Squidex/app/shared/declarations.ts b/src/Squidex/app/shared/declarations.ts index 3096be8f9..41f6665ba 100644 --- a/src/Squidex/app/shared/declarations.ts +++ b/src/Squidex/app/shared/declarations.ts @@ -16,4 +16,4 @@ export * from './components/markdown-editor.component'; export * from './components/pipes'; export * from './components/rich-editor.component'; -export * from './declarations-base'; \ No newline at end of file +export * from './internal'; \ No newline at end of file diff --git a/src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts b/src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts index b02f6bfea..890314d85 100644 --- a/src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts +++ b/src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts @@ -8,7 +8,7 @@ import { IMock, Mock } from 'typemoq'; import { Observable } from 'rxjs'; -import { AppsState } from 'shared'; +import { AppsState } from '@app/shared'; import { AppMustExistGuard } from './app-must-exist.guard'; import { RouterMockup } from './router-mockup'; diff --git a/src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts b/src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts index 6b8e62e4c..44e1a6162 100644 --- a/src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts +++ b/src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts @@ -8,7 +8,7 @@ import { IMock, Mock } from 'typemoq'; import { Observable } from 'rxjs'; -import { AuthService } from 'shared'; +import { AuthService } from '@app/shared'; import { MustBeAuthenticatedGuard } from './must-be-authenticated.guard'; import { RouterMockup } from './router-mockup'; diff --git a/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts b/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts index 5751cb109..b419d75db 100644 --- a/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts +++ b/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts @@ -8,7 +8,7 @@ import { IMock, Mock } from 'typemoq'; import { Observable } from 'rxjs'; -import { AuthService } from 'shared'; +import { AuthService } from '@app/shared'; import { MustBeNotAuthenticatedGuard } from './must-be-not-authenticated.guard'; import { RouterMockup } from './router-mockup'; diff --git a/src/Squidex/app/shared/guards/resolve-app-languages.guard.spec.ts b/src/Squidex/app/shared/guards/resolve-app-languages.guard.spec.ts index 0c7ab4264..6d1222ed8 100644 --- a/src/Squidex/app/shared/guards/resolve-app-languages.guard.spec.ts +++ b/src/Squidex/app/shared/guards/resolve-app-languages.guard.spec.ts @@ -12,7 +12,7 @@ import { AppLanguagesDto, AppLanguagesService, Version -} from 'shared'; +} from '@app/shared'; import { ResolveAppLanguagesGuard } from './resolve-app-languages.guard'; import { RouterMockup } from './router-mockup'; diff --git a/src/Squidex/app/shared/guards/resolve-app-languages.guard.ts b/src/Squidex/app/shared/guards/resolve-app-languages.guard.ts index cf427690d..fd1aaeb0b 100644 --- a/src/Squidex/app/shared/guards/resolve-app-languages.guard.ts +++ b/src/Squidex/app/shared/guards/resolve-app-languages.guard.ts @@ -9,7 +9,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; -import { allParams } from 'framework'; +import { allParams } from '@app/framework'; import { AppLanguageDto, AppLanguagesService } from './../services/app-languages.service'; diff --git a/src/Squidex/app/shared/guards/resolve-content.guard.spec.ts b/src/Squidex/app/shared/guards/resolve-content.guard.spec.ts index 73616e09a..fd0908670 100644 --- a/src/Squidex/app/shared/guards/resolve-content.guard.spec.ts +++ b/src/Squidex/app/shared/guards/resolve-content.guard.spec.ts @@ -8,7 +8,7 @@ import { IMock, Mock } from 'typemoq'; import { Observable } from 'rxjs'; -import { ContentsService } from 'shared'; +import { ContentsService } from '@app/shared'; import { ResolveContentGuard } from './resolve-content.guard'; import { RouterMockup } from './router-mockup'; diff --git a/src/Squidex/app/shared/guards/resolve-content.guard.ts b/src/Squidex/app/shared/guards/resolve-content.guard.ts index 7a0cad59f..fc166536b 100644 --- a/src/Squidex/app/shared/guards/resolve-content.guard.ts +++ b/src/Squidex/app/shared/guards/resolve-content.guard.ts @@ -9,7 +9,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; -import { allParams } from 'framework'; +import { allParams } from '@app/framework'; import { ContentDto, ContentsService } from './../services/contents.service'; diff --git a/src/Squidex/app/shared/guards/resolve-published-schema.guard.spec.ts b/src/Squidex/app/shared/guards/resolve-published-schema.guard.spec.ts index 6741cbc01..d36ac9644 100644 --- a/src/Squidex/app/shared/guards/resolve-published-schema.guard.spec.ts +++ b/src/Squidex/app/shared/guards/resolve-published-schema.guard.spec.ts @@ -8,7 +8,7 @@ import { IMock, Mock } from 'typemoq'; import { Observable } from 'rxjs'; -import { SchemasService } from 'shared'; +import { SchemasService } from '@app/shared'; import { ResolvePublishedSchemaGuard } from './resolve-published-schema.guard'; import { RouterMockup } from './router-mockup'; diff --git a/src/Squidex/app/shared/guards/resolve-published-schema.guard.ts b/src/Squidex/app/shared/guards/resolve-published-schema.guard.ts index 1eeffd574..2f018bb20 100644 --- a/src/Squidex/app/shared/guards/resolve-published-schema.guard.ts +++ b/src/Squidex/app/shared/guards/resolve-published-schema.guard.ts @@ -9,7 +9,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; -import { allParams } from 'framework'; +import { allParams } from '@app/framework'; import { SchemaDetailsDto, SchemasService } from './../services/schemas.service'; diff --git a/src/Squidex/app/shared/guards/resolve-schema.guard.spec.ts b/src/Squidex/app/shared/guards/resolve-schema.guard.spec.ts index 15d3755e7..75a71e0ac 100644 --- a/src/Squidex/app/shared/guards/resolve-schema.guard.spec.ts +++ b/src/Squidex/app/shared/guards/resolve-schema.guard.spec.ts @@ -8,7 +8,7 @@ import { IMock, Mock } from 'typemoq'; import { Observable } from 'rxjs'; -import { SchemasService } from 'shared'; +import { SchemasService } from '@app/shared'; import { ResolveSchemaGuard } from './resolve-schema.guard'; import { RouterMockup } from './router-mockup'; diff --git a/src/Squidex/app/shared/guards/resolve-schema.guard.ts b/src/Squidex/app/shared/guards/resolve-schema.guard.ts index 0bc0a8531..72b5cf6e3 100644 --- a/src/Squidex/app/shared/guards/resolve-schema.guard.ts +++ b/src/Squidex/app/shared/guards/resolve-schema.guard.ts @@ -9,7 +9,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; -import { allParams } from 'framework'; +import { allParams } from '@app/framework'; import { SchemaDetailsDto, SchemasService } from './../services/schemas.service'; diff --git a/src/Squidex/app/shared/guards/unset-app.guard.spec.ts b/src/Squidex/app/shared/guards/unset-app.guard.spec.ts index 1a2411c8a..04631c7fa 100644 --- a/src/Squidex/app/shared/guards/unset-app.guard.spec.ts +++ b/src/Squidex/app/shared/guards/unset-app.guard.spec.ts @@ -8,7 +8,7 @@ import { IMock, Mock, Times } from 'typemoq'; import { Observable } from 'rxjs'; -import { AppsState } from 'shared'; +import { AppsState } from '@app/shared'; import { UnsetAppGuard } from './unset-app.guard'; diff --git a/src/Squidex/app/shared/interceptors/auth.interceptor.ts b/src/Squidex/app/shared/interceptors/auth.interceptor.ts index f4be4e221..edd3236c8 100644 --- a/src/Squidex/app/shared/interceptors/auth.interceptor.ts +++ b/src/Squidex/app/shared/interceptors/auth.interceptor.ts @@ -10,7 +10,7 @@ import { Injectable} from '@angular/core'; import { Observable } from 'rxjs'; import { AuthService, Profile } from './../services/auth.service'; -import { ApiUrlConfig } from 'framework'; +import { ApiUrlConfig } from '@app/framework'; @Injectable() export class AuthInterceptor implements HttpInterceptor { diff --git a/src/Squidex/app/shared/declarations-base.ts b/src/Squidex/app/shared/internal.ts similarity index 98% rename from src/Squidex/app/shared/declarations-base.ts rename to src/Squidex/app/shared/internal.ts index 7da4788a2..eff7fd697 100644 --- a/src/Squidex/app/shared/declarations-base.ts +++ b/src/Squidex/app/shared/internal.ts @@ -42,4 +42,4 @@ export * from './state/apps.state'; export * from './utils/messages'; -export * from 'framework'; \ No newline at end of file +export * from '@app/framework'; \ No newline at end of file diff --git a/src/Squidex/app/shared/module.ts b/src/Squidex/app/shared/module.ts index 130892b21..f980eba0c 100644 --- a/src/Squidex/app/shared/module.ts +++ b/src/Squidex/app/shared/module.ts @@ -10,7 +10,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { DndModule } from 'ng2-dnd'; -import { SqxFrameworkModule } from 'framework'; +import { SqxFrameworkModule } from '@app/framework'; import { AppFormComponent, diff --git a/src/Squidex/app/shared/services/app-clients.service.ts b/src/Squidex/app/shared/services/app-clients.service.ts index 99384f470..013099b46 100644 --- a/src/Squidex/app/shared/services/app-clients.service.ts +++ b/src/Squidex/app/shared/services/app-clients.service.ts @@ -9,7 +9,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { AnalyticsService, @@ -17,7 +17,7 @@ import { HTTP, Version, Versioned -} from 'framework'; +} from '@app/framework'; export class AppClientsDto { constructor( diff --git a/src/Squidex/app/shared/services/app-contributors.service.ts b/src/Squidex/app/shared/services/app-contributors.service.ts index c3fd8e112..c730c5df5 100644 --- a/src/Squidex/app/shared/services/app-contributors.service.ts +++ b/src/Squidex/app/shared/services/app-contributors.service.ts @@ -9,7 +9,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { AnalyticsService, @@ -17,7 +17,7 @@ import { HTTP, Version, Versioned -} from 'framework'; +} from '@app/framework'; export class AppContributorsDto { constructor( diff --git a/src/Squidex/app/shared/services/app-languages.service.ts b/src/Squidex/app/shared/services/app-languages.service.ts index 8e5829d99..9b65e3ec8 100644 --- a/src/Squidex/app/shared/services/app-languages.service.ts +++ b/src/Squidex/app/shared/services/app-languages.service.ts @@ -9,7 +9,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { AnalyticsService, @@ -17,7 +17,7 @@ import { HTTP, Version, Versioned -} from 'framework'; +} from '@app/framework'; export class AppLanguagesDto { constructor( diff --git a/src/Squidex/app/shared/services/app-patterns.service.ts b/src/Squidex/app/shared/services/app-patterns.service.ts index 30f17f464..a26f2730f 100644 --- a/src/Squidex/app/shared/services/app-patterns.service.ts +++ b/src/Squidex/app/shared/services/app-patterns.service.ts @@ -9,14 +9,14 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { ApiUrlConfig, HTTP, Version, Versioned -} from 'framework'; +} from '@app/framework'; export class AppPatternsDto { constructor( diff --git a/src/Squidex/app/shared/services/apps.service.ts b/src/Squidex/app/shared/services/apps.service.ts index fe4ad18e2..7ec4b489c 100644 --- a/src/Squidex/app/shared/services/apps.service.ts +++ b/src/Squidex/app/shared/services/apps.service.ts @@ -9,14 +9,14 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { AnalyticsService, ApiUrlConfig, DateTime, HTTP -} from 'framework'; +} from '@app/framework'; export class AppDto { constructor( diff --git a/src/Squidex/app/shared/services/assets.service.ts b/src/Squidex/app/shared/services/assets.service.ts index 0504281ac..5b2b9e147 100644 --- a/src/Squidex/app/shared/services/assets.service.ts +++ b/src/Squidex/app/shared/services/assets.service.ts @@ -16,7 +16,7 @@ import { HTTP, Version, Versioned -} from 'framework'; +} from '@app/framework'; export class AssetsDto { constructor( diff --git a/src/Squidex/app/shared/services/auth.service.ts b/src/Squidex/app/shared/services/auth.service.ts index e9ae3abe9..b1f7ac20e 100644 --- a/src/Squidex/app/shared/services/auth.service.ts +++ b/src/Squidex/app/shared/services/auth.service.ts @@ -15,7 +15,7 @@ import { WebStorageStateStore } from 'oidc-client'; -import { ApiUrlConfig } from 'framework'; +import { ApiUrlConfig } from '@app/framework'; export class Profile { public get id(): string { diff --git a/src/Squidex/app/shared/services/backups.service.ts b/src/Squidex/app/shared/services/backups.service.ts index c29cd3097..7879b456d 100644 --- a/src/Squidex/app/shared/services/backups.service.ts +++ b/src/Squidex/app/shared/services/backups.service.ts @@ -9,13 +9,13 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { AnalyticsService, ApiUrlConfig, DateTime -} from 'framework'; +} from '@app/framework'; export class BackupDto { constructor( diff --git a/src/Squidex/app/shared/services/contents.service.ts b/src/Squidex/app/shared/services/contents.service.ts index 1c2aae0c4..a49f1f2dc 100644 --- a/src/Squidex/app/shared/services/contents.service.ts +++ b/src/Squidex/app/shared/services/contents.service.ts @@ -9,7 +9,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { AnalyticsService, @@ -18,7 +18,7 @@ import { HTTP, Version, Versioned -} from 'framework'; +} from '@app/framework'; export class ContentsDto { constructor( diff --git a/src/Squidex/app/shared/services/graphql.service.ts b/src/Squidex/app/shared/services/graphql.service.ts index 5ee18e5be..d028c8e73 100644 --- a/src/Squidex/app/shared/services/graphql.service.ts +++ b/src/Squidex/app/shared/services/graphql.service.ts @@ -9,7 +9,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { ApiUrlConfig } from 'framework'; +import { ApiUrlConfig } from '@app/framework'; @Injectable() export class GraphQlService { diff --git a/src/Squidex/app/shared/services/history.service.spec.ts b/src/Squidex/app/shared/services/history.service.spec.ts index cf7c0776f..8e1b83be4 100644 --- a/src/Squidex/app/shared/services/history.service.spec.ts +++ b/src/Squidex/app/shared/services/history.service.spec.ts @@ -8,7 +8,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; -import { DateTime } from 'framework'; +import { DateTime } from '@app/framework'; import { ApiUrlConfig, diff --git a/src/Squidex/app/shared/services/history.service.ts b/src/Squidex/app/shared/services/history.service.ts index d6151b5c8..8ed3ebf9f 100644 --- a/src/Squidex/app/shared/services/history.service.ts +++ b/src/Squidex/app/shared/services/history.service.ts @@ -9,7 +9,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { UsersProviderService } from './users-provider.service'; @@ -17,7 +17,7 @@ import { ApiUrlConfig, HTTP, DateTime -} from 'framework'; +} from '@app/framework'; export class HistoryEventDto { constructor( diff --git a/src/Squidex/app/shared/services/languages.service.ts b/src/Squidex/app/shared/services/languages.service.ts index a94a7620e..89d1b7300 100644 --- a/src/Squidex/app/shared/services/languages.service.ts +++ b/src/Squidex/app/shared/services/languages.service.ts @@ -9,9 +9,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; -import { ApiUrlConfig, HTTP } from 'framework'; +import { ApiUrlConfig, HTTP } from '@app/framework'; export class LanguageDto { constructor( diff --git a/src/Squidex/app/shared/services/plans.service.ts b/src/Squidex/app/shared/services/plans.service.ts index 287e56831..daf5e2fa3 100644 --- a/src/Squidex/app/shared/services/plans.service.ts +++ b/src/Squidex/app/shared/services/plans.service.ts @@ -9,7 +9,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { AnalyticsService, @@ -17,7 +17,7 @@ import { HTTP, Version, Versioned -} from 'framework'; +} from '@app/framework'; export class AppPlansDto { constructor( diff --git a/src/Squidex/app/shared/services/rules.service.ts b/src/Squidex/app/shared/services/rules.service.ts index 81bba204d..10b1645f5 100644 --- a/src/Squidex/app/shared/services/rules.service.ts +++ b/src/Squidex/app/shared/services/rules.service.ts @@ -9,7 +9,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { AnalyticsService, @@ -18,7 +18,7 @@ import { HTTP, Version, Versioned -} from 'framework'; +} from '@app/framework'; export const ruleTriggers: any = { 'AssetChanged': { diff --git a/src/Squidex/app/shared/services/schemas.fields.spec.ts b/src/Squidex/app/shared/services/schemas.fields.spec.ts index 55de4799b..0271cbc3d 100644 --- a/src/Squidex/app/shared/services/schemas.fields.spec.ts +++ b/src/Squidex/app/shared/services/schemas.fields.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DateTime } from 'framework'; +import { DateTime } from '@app/framework'; import { AssetsFieldPropertiesDto, diff --git a/src/Squidex/app/shared/services/schemas.service.ts b/src/Squidex/app/shared/services/schemas.service.ts index fb2889a5d..c350a5d04 100644 --- a/src/Squidex/app/shared/services/schemas.service.ts +++ b/src/Squidex/app/shared/services/schemas.service.ts @@ -10,7 +10,7 @@ import { Injectable } from '@angular/core'; import { ValidatorFn, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { AnalyticsService, @@ -21,7 +21,7 @@ import { ValidatorsEx, Version, Versioned -} from 'framework'; +} from '@app/framework'; export const fieldTypes = [ { diff --git a/src/Squidex/app/shared/services/ui.service.ts b/src/Squidex/app/shared/services/ui.service.ts index 88ce90434..87a9fd638 100644 --- a/src/Squidex/app/shared/services/ui.service.ts +++ b/src/Squidex/app/shared/services/ui.service.ts @@ -9,9 +9,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; -import { ApiUrlConfig } from 'framework'; +import { ApiUrlConfig } from '@app/framework'; export interface UISettingsDto { mapType: string; diff --git a/src/Squidex/app/shared/services/usages.service.ts b/src/Squidex/app/shared/services/usages.service.ts index a7f92759b..c9cbc23cb 100644 --- a/src/Squidex/app/shared/services/usages.service.ts +++ b/src/Squidex/app/shared/services/usages.service.ts @@ -9,13 +9,13 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; import { ApiUrlConfig, DateTime, HTTP -} from 'framework'; +} from '@app/framework'; export class CallsUsageDto { constructor( diff --git a/src/Squidex/app/shared/services/users.service.ts b/src/Squidex/app/shared/services/users.service.ts index e04e404af..f3e62fbd1 100644 --- a/src/Squidex/app/shared/services/users.service.ts +++ b/src/Squidex/app/shared/services/users.service.ts @@ -9,9 +9,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import 'framework/angular/http-extensions'; +import '@app/framework/angular/http/http-extensions'; -import { ApiUrlConfig, HTTP } from 'framework'; +import { ApiUrlConfig, HTTP } from '@app/framework'; export class UserDto { constructor( diff --git a/src/Squidex/app/shared/state/apps.state.ts b/src/Squidex/app/shared/state/apps.state.ts index 4af6f136f..76a72b454 100644 --- a/src/Squidex/app/shared/state/apps.state.ts +++ b/src/Squidex/app/shared/state/apps.state.ts @@ -6,12 +6,12 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import 'framework/utils/rxjs-extensions'; +import '@app/framework/utils/rxjs-extensions'; import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { DateTime, ImmutableArray } from 'framework'; +import { DateTime, ImmutableArray } from '@app/framework'; import { AppDto, diff --git a/src/Squidex/app/shell/module.ts b/src/Squidex/app/shell/module.ts index 01dd24ec4..7fa58f5de 100644 --- a/src/Squidex/app/shell/module.ts +++ b/src/Squidex/app/shell/module.ts @@ -7,7 +7,7 @@ import { NgModule } from '@angular/core'; -import { SqxFrameworkModule, SqxSharedModule } from 'shared'; +import { SqxFrameworkModule, SqxSharedModule } from '@app/shared'; import { AppAreaComponent, diff --git a/src/Squidex/app/shell/pages/app/left-menu.component.ts b/src/Squidex/app/shell/pages/app/left-menu.component.ts index f02dc7664..fdfb0118f 100644 --- a/src/Squidex/app/shell/pages/app/left-menu.component.ts +++ b/src/Squidex/app/shell/pages/app/left-menu.component.ts @@ -7,7 +7,7 @@ import { Component } from '@angular/core'; -import { AppContext } from 'shared'; +import { AppContext } from '@app/shared'; @Component({ selector: 'sqx-left-menu', diff --git a/src/Squidex/app/shell/pages/home/home-page.component.ts b/src/Squidex/app/shell/pages/home/home-page.component.ts index 9f51f2351..4403ddaa4 100644 --- a/src/Squidex/app/shell/pages/home/home-page.component.ts +++ b/src/Squidex/app/shell/pages/home/home-page.component.ts @@ -8,7 +8,7 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { AuthService } from 'shared'; +import { AuthService } from '@app/shared'; @Component({ selector: 'sqx-home-page', diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.ts b/src/Squidex/app/shell/pages/internal/apps-menu.component.ts index 5111226b6..4420f7035 100644 --- a/src/Squidex/app/shell/pages/internal/apps-menu.component.ts +++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.ts @@ -14,7 +14,7 @@ import { ImmutableArray, fadeAnimation, ModalView -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-apps-menu', diff --git a/src/Squidex/app/shell/pages/internal/internal-area.component.ts b/src/Squidex/app/shell/pages/internal/internal-area.component.ts index 90f632b2c..a41c7225c 100644 --- a/src/Squidex/app/shell/pages/internal/internal-area.component.ts +++ b/src/Squidex/app/shell/pages/internal/internal-area.component.ts @@ -12,7 +12,7 @@ import { Subscription } from 'rxjs'; import { DialogService, Notification -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-internal-area', diff --git a/src/Squidex/app/shell/pages/internal/profile-menu.component.ts b/src/Squidex/app/shell/pages/internal/profile-menu.component.ts index 837c81df0..970b846e2 100644 --- a/src/Squidex/app/shell/pages/internal/profile-menu.component.ts +++ b/src/Squidex/app/shell/pages/internal/profile-menu.component.ts @@ -13,7 +13,7 @@ import { AuthService, fadeAnimation, ModalView -} from 'shared'; +} from '@app/shared'; @Component({ selector: 'sqx-profile-menu', diff --git a/src/Squidex/app/shell/pages/login/login-page.component.ts b/src/Squidex/app/shell/pages/login/login-page.component.ts index def7513f5..447454f44 100644 --- a/src/Squidex/app/shell/pages/login/login-page.component.ts +++ b/src/Squidex/app/shell/pages/login/login-page.component.ts @@ -8,7 +8,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { AuthService } from 'shared'; +import { AuthService } from '@app/shared'; @Component({ selector: 'sqx-login', diff --git a/src/Squidex/app/shell/pages/logout/logout-page.component.ts b/src/Squidex/app/shell/pages/logout/logout-page.component.ts index ee2d31ee6..166f8a484 100644 --- a/src/Squidex/app/shell/pages/logout/logout-page.component.ts +++ b/src/Squidex/app/shell/pages/logout/logout-page.component.ts @@ -8,7 +8,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { AuthService } from 'shared'; +import { AuthService } from '@app/shared'; @Component({ selector: 'sqx-logout', diff --git a/src/Squidex/package-lock.json b/src/Squidex/package-lock.json index 142640ea0..15eb43dac 100644 --- a/src/Squidex/package-lock.json +++ b/src/Squidex/package-lock.json @@ -2480,6 +2480,12 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, + "deepmerge": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz", + "integrity": "sha512-Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw==", + "dev": true + }, "define-properties": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", @@ -11636,6 +11642,87 @@ } } }, + "tsconfig-paths": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.1.3.tgz", + "integrity": "sha512-Q8QfUfp/gzk3ahny/fHG4VKycBxR4iFULajHYTlJvo2rvvqjXManF2M8unbBET4xlfF2v7jqkimd/cnC9+bmEw==", + "dev": true, + "requires": { + "deepmerge": "2.1.0", + "strip-bom": "3.0.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + } + } + }, + "tsconfig-paths-webpack-plugin": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.0.2.tgz", + "integrity": "sha512-a0SDkxWBAJkmcBk1/rRNhrWFCsoQB6W1M/beSJkMKIyFN9FJqPoeCWXzyZWZ2n6K+uCHjRgHmO6iIPuU6BmnqA==", + "dev": true, + "requires": { + "chalk": "2.3.2", + "tsconfig-paths": "3.1.3" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", + "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.3.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", + "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, "tsickle": { "version": "0.26.0", "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.26.0.tgz", diff --git a/src/Squidex/package.json b/src/Squidex/package.json index 1f72c2b58..a520d4798 100644 --- a/src/Squidex/package.json +++ b/src/Squidex/package.json @@ -78,7 +78,7 @@ "karma-sourcemap-loader": "0.3.7", "karma-webpack": "2.0.9", "node-sass": "4.7.2", - "noop-loader": "^1.0.0", + "noop-loader": "1.0.0", "null-loader": "0.1.1", "phantomjs-prebuilt": "2.1.16", "raw-loader": "0.5.1", @@ -86,6 +86,7 @@ "sass-lint": "1.12.1", "sass-loader": "6.0.6", "style-loader": "0.19.1", + "tsconfig-paths-webpack-plugin": "3.0.2", "tslint": "5.9.1", "tslint-loader": "3.5.3", "typemoq": "2.1.0", diff --git a/src/Squidex/tsconfig.json b/src/Squidex/tsconfig.json index 824697758..76e9a508a 100644 --- a/src/Squidex/tsconfig.json +++ b/src/Squidex/tsconfig.json @@ -14,14 +14,8 @@ "suppressImplicitAnyIndexErrors": true, "target": "es5", "paths": { - "framework": [ - "app/framework" - ], - "features": [ - "app/features" - ], - "shared": [ - "app/shared" + "@app*": [ + "app/*" ] } }