diff --git a/src/Squidex/app/app.routes.ts b/src/Squidex/app/app.routes.ts index 66e02f0c9..72ad2d169 100644 --- a/src/Squidex/app/app.routes.ts +++ b/src/Squidex/app/app.routes.ts @@ -28,7 +28,8 @@ export const routes: Routes = [ path: '', component: HomePageComponent, canActivate: [MustBeNotAuthenticatedGuard] - }, { + }, + { path: 'app', component: InternalAreaComponent, canActivate: [MustBeAuthenticatedGuard], @@ -36,10 +37,12 @@ export const routes: Routes = [ { path: '', loadChildren: './features/apps/module#SqxFeatureAppsModule' - }, { + }, + { path: 'administration', loadChildren: './features/administration/module#SqxFeatureAdministrationModule' - }, { + }, + { path: ':appName', component: AppAreaComponent, canActivate: [AppMustExistGuard], @@ -47,16 +50,20 @@ export const routes: Routes = [ { path: '', loadChildren: './features/dashboard/module#SqxFeatureDashboardModule' - }, { + }, + { path: 'content', loadChildren: './features/content/module#SqxFeatureContentModule' - }, { + }, + { path: 'schemas', loadChildren: './features/schemas/module#SqxFeatureSchemasModule' - }, { + }, + { path: 'assets', loadChildren: './features/assets/module#SqxFeatureAssetsModule' - }, { + }, + { path: 'settings', loadChildren: './features/settings/module#SqxFeatureSettingsModule' } diff --git a/src/Squidex/app/features/administration/module.ts b/src/Squidex/app/features/administration/module.ts index 4b8911e70..cf9a6a1c9 100644 --- a/src/Squidex/app/features/administration/module.ts +++ b/src/Squidex/app/features/administration/module.ts @@ -26,13 +26,16 @@ const routes: Routes = [ children: [ { path: '', - children: [{ - path: 'event-consumers', - component: EventConsumersPageComponent - }, { - path: 'users', - component: UsersPageComponent - }] + children: [ + { + path: 'event-consumers', + component: EventConsumersPageComponent + }, + { + path: 'users', + component: UsersPageComponent + } + ] } ] } diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.html b/src/Squidex/app/features/assets/pages/assets-page.component.html index 7a66fab4d..317d8d60b 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-page.component.html @@ -18,7 +18,7 @@

Assets

- + diff --git a/src/Squidex/app/features/content/module.ts b/src/Squidex/app/features/content/module.ts index 778298514..1a852e1d2 100644 --- a/src/Squidex/app/features/content/module.ts +++ b/src/Squidex/app/features/content/module.ts @@ -51,7 +51,8 @@ const routes: Routes = [ loadChildren: './../assets/module#SqxFeatureAssetsModule' } ] - }, { + }, + { path: ':contentId', component: ContentPageComponent, canDeactivate: [CanDeactivateGuard], @@ -65,7 +66,8 @@ const routes: Routes = [ data: { channel: 'contents.{contentId}' } - }, { + }, + { path: 'assets', loadChildren: './../assets/module#SqxFeatureAssetsModule' } 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 061cfe871..64130ad61 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts @@ -42,9 +42,11 @@ export class DashboardPageComponent extends AppComponentBase implements OnInit, public chartOptions = { responsive: true, scales: { - xAxes: [{ - display: true - }] + xAxes: [ + { + display: true + } + ] }, maintainAspectRatio: false }; @@ -94,28 +96,32 @@ export class DashboardPageComponent extends AppComponentBase implements OnInit, .subscribe(dtos => { this.chartStorageCount = { labels: createLabels(dtos), - datasets: [{ - label: 'Number of Assets', - lineTension: 0, - fill: false, - backgroundColor: 'rgba(61, 135, 213, 0.6)', - borderColor: 'rgba(61, 135, 213, 1)', - borderWidth: 1, - data: dtos.map(x => x.count) - }] + datasets: [ + { + label: 'Number of Assets', + lineTension: 0, + fill: false, + backgroundColor: 'rgba(61, 135, 213, 0.6)', + borderColor: 'rgba(61, 135, 213, 1)', + borderWidth: 1, + data: dtos.map(x => x.count) + } + ] }; this.chartStorageSize = { labels: createLabels(dtos), - datasets: [ { - label: 'Size of Assets (MB)', - lineTension: 0, - fill: false, - backgroundColor: 'rgba(61, 135, 213, 0.6)', - borderColor: 'rgba(61, 135, 213, 1)', - borderWidth: 1, - data: dtos.map(x => Math.round(10 * (x.size / (1024 * 1024))) / 10) - }] + datasets: [ + { + label: 'Size of Assets (MB)', + lineTension: 0, + fill: false, + backgroundColor: 'rgba(61, 135, 213, 0.6)', + borderColor: 'rgba(61, 135, 213, 1)', + borderWidth: 1, + data: dtos.map(x => Math.round(10 * (x.size / (1024 * 1024))) / 10) + } + ] }; }); diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts index 985d55dd2..ed94f73c0 100644 --- a/src/Squidex/app/features/settings/module.ts +++ b/src/Squidex/app/features/settings/module.ts @@ -50,7 +50,8 @@ const routes: Routes = [ } } ] - }, { + }, + { path: 'contributors', component: ContributorsPageComponent, children: [ @@ -69,7 +70,8 @@ const routes: Routes = [ } } ] - }, { + }, + { path: 'languages', component: LanguagesPageComponent, children: [ diff --git a/src/Squidex/app/shared/services/app-clients.service.spec.ts b/src/Squidex/app/shared/services/app-clients.service.spec.ts index d68bffd90..83312ac6c 100644 --- a/src/Squidex/app/shared/services/app-clients.service.spec.ts +++ b/src/Squidex/app/shared/services/app-clients.service.spec.ts @@ -38,15 +38,18 @@ describe('AppClientsService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - id: 'client1', - name: 'Client 1', - secret: 'secret1' - }, { - id: 'client2', - name: 'Client 2', - secret: 'secret2' - }] + body: [ + { + id: 'client1', + name: 'Client 1', + secret: 'secret1' + }, + { + id: 'client2', + name: 'Client 2', + secret: 'secret2' + } + ] }) ) )) diff --git a/src/Squidex/app/shared/services/app-contributors.service.spec.ts b/src/Squidex/app/shared/services/app-contributors.service.spec.ts index 047da8cfa..165344245 100644 --- a/src/Squidex/app/shared/services/app-contributors.service.spec.ts +++ b/src/Squidex/app/shared/services/app-contributors.service.spec.ts @@ -32,13 +32,16 @@ describe('AppContributorsService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - contributorId: '123', - permission: 'Owner' - }, { - contributorId: '456', - permission: 'Owner' - }] + body: [ + { + contributorId: '123', + permission: 'Owner' + }, + { + contributorId: '456', + permission: 'Owner' + } + ] }) ) )) diff --git a/src/Squidex/app/shared/services/app-languages.service.spec.ts b/src/Squidex/app/shared/services/app-languages.service.spec.ts index 9014f7beb..708f27479 100644 --- a/src/Squidex/app/shared/services/app-languages.service.spec.ts +++ b/src/Squidex/app/shared/services/app-languages.service.spec.ts @@ -34,14 +34,17 @@ describe('AppLanguagesService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - iso2Code: 'de', - englishName: 'German', - isMasterLanguage: true - }, { - iso2Code: 'en', - englishName: 'English' - }] + body: [ + { + iso2Code: 'de', + englishName: 'German', + isMasterLanguage: true + }, + { + iso2Code: 'en', + englishName: 'English' + } + ] }) ) )) diff --git a/src/Squidex/app/shared/services/apps.service.spec.ts b/src/Squidex/app/shared/services/apps.service.spec.ts index ad944bda6..7ac3e42ac 100644 --- a/src/Squidex/app/shared/services/apps.service.spec.ts +++ b/src/Squidex/app/shared/services/apps.service.spec.ts @@ -33,19 +33,22 @@ describe('AppsService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - id: '123', - name: 'name1', - permission: 'Owner', - created: '2016-01-01', - lastModified: '2016-02-02' - }, { - id: '456', - name: 'name2', - permission: 'Owner', - created: '2017-01-01', - lastModified: '2017-02-02' - }] + body: [ + { + id: '123', + name: 'name1', + permission: 'Owner', + created: '2016-01-01', + lastModified: '2016-02-02' + }, + { + id: '456', + name: 'name2', + permission: 'Owner', + created: '2017-01-01', + lastModified: '2017-02-02' + } + ] }) ) )) diff --git a/src/Squidex/app/shared/services/assets.service.spec.ts b/src/Squidex/app/shared/services/assets.service.spec.ts index 6bf197216..147a924c7 100644 --- a/src/Squidex/app/shared/services/assets.service.spec.ts +++ b/src/Squidex/app/shared/services/assets.service.spec.ts @@ -53,35 +53,38 @@ describe('AssetsService', () => { new ResponseOptions({ body: { total: 10, - items: [{ - id: 'id1', - created: '2016-12-12T10:10', - createdBy: 'Created1', - lastModified: '2017-12-12T10:10', - lastModifiedBy: 'LastModifiedBy1', - fileName: 'my-asset1.png', - fileSize: 1024, - fileVersion: 2000, - mimeType: 'text/plain', - isImage: true, - pixelWidth: 1024, - pixelHeight: 2048, - version: 11 - }, { - id: 'id2', - created: '2016-10-12T10:10', - createdBy: 'Created2', - lastModified: '2017-10-12T10:10', - lastModifiedBy: 'LastModifiedBy2', - fileName: 'my-asset2.png', - fileSize: 1024, - fileVersion: 2000, - mimeType: 'text/plain', - isImage: true, - pixelWidth: 1024, - pixelHeight: 2048, - version: 22 - }] + items: [ + { + id: 'id1', + created: '2016-12-12T10:10', + createdBy: 'Created1', + lastModified: '2017-12-12T10:10', + lastModifiedBy: 'LastModifiedBy1', + fileName: 'my-asset1.png', + fileSize: 1024, + fileVersion: 2000, + mimeType: 'text/plain', + isImage: true, + pixelWidth: 1024, + pixelHeight: 2048, + version: 11 + }, + { + id: 'id2', + created: '2016-10-12T10:10', + createdBy: 'Created2', + lastModified: '2017-10-12T10:10', + lastModifiedBy: 'LastModifiedBy2', + fileName: 'my-asset2.png', + fileSize: 1024, + fileVersion: 2000, + mimeType: 'text/plain', + isImage: true, + pixelWidth: 1024, + pixelHeight: 2048, + version: 22 + } + ] } }) ) diff --git a/src/Squidex/app/shared/services/contents.service.spec.ts b/src/Squidex/app/shared/services/contents.service.spec.ts index 8e5055374..e4fae773b 100644 --- a/src/Squidex/app/shared/services/contents.service.spec.ts +++ b/src/Squidex/app/shared/services/contents.service.spec.ts @@ -36,25 +36,28 @@ describe('ContentsService', () => { new ResponseOptions({ body: { total: 10, - items: [{ - id: 'id1', - isPublished: true, - created: '2016-12-12T10:10', - createdBy: 'Created1', - lastModified: '2017-12-12T10:10', - lastModifiedBy: 'LastModifiedBy1', - version: 11, - data: {} - }, { - id: 'id2', - isPublished: true, - created: '2016-10-12T10:10', - createdBy: 'Created2', - lastModified: '2017-10-12T10:10', - lastModifiedBy: 'LastModifiedBy2', - version: 22, - data: {} - }] + items: [ + { + id: 'id1', + isPublished: true, + created: '2016-12-12T10:10', + createdBy: 'Created1', + lastModified: '2017-12-12T10:10', + lastModifiedBy: 'LastModifiedBy1', + version: 11, + data: {} + }, + { + id: 'id2', + isPublished: true, + created: '2016-10-12T10:10', + createdBy: 'Created2', + lastModified: '2017-10-12T10:10', + lastModifiedBy: 'LastModifiedBy2', + version: 22, + data: {} + } + ] } }) ) diff --git a/src/Squidex/app/shared/services/event-consumers.service.spec.ts b/src/Squidex/app/shared/services/event-consumers.service.spec.ts index fad7b9ae9..aff6f6e6e 100644 --- a/src/Squidex/app/shared/services/event-consumers.service.spec.ts +++ b/src/Squidex/app/shared/services/event-consumers.service.spec.ts @@ -30,19 +30,22 @@ describe('EventConsumersService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - name: 'event-consumer1', - lastHandledEventNumber: 13, - isStopped: true, - isResetting: true, - error: 'an error 1' - }, { - name: 'event-consumer2', - lastHandledEventNumber: 29, - isStopped: true, - isResetting: true, - error: 'an error 2' - }] + body: [ + { + name: 'event-consumer1', + lastHandledEventNumber: 13, + isStopped: true, + isResetting: true, + error: 'an error 1' + }, + { + name: 'event-consumer2', + lastHandledEventNumber: 29, + isStopped: true, + isResetting: true, + error: 'an error 2' + } + ] }) ) )) diff --git a/src/Squidex/app/shared/services/help.service.spec.ts b/src/Squidex/app/shared/services/help.service.spec.ts index c03c0db3c..3f3768cdd 100644 --- a/src/Squidex/app/shared/services/help.service.spec.ts +++ b/src/Squidex/app/shared/services/help.service.spec.ts @@ -27,13 +27,17 @@ describe('AppClientsService', () => { new Response( new ResponseOptions({ body: { - sections: [{ - content: 'A test content with' - }, { - content: 'A test content with a A Link' - }, { - content: 'A test content with a Glossary Link' - }] + sections: [ + { + content: 'A test content with' + }, + { + content: 'A test content with a A Link' + }, + { + content: 'A test content with a Glossary Link' + } + ] } }) ) diff --git a/src/Squidex/app/shared/services/history.service.spec.ts b/src/Squidex/app/shared/services/history.service.spec.ts index 669ac5fdf..dd353d9f5 100644 --- a/src/Squidex/app/shared/services/history.service.spec.ts +++ b/src/Squidex/app/shared/services/history.service.spec.ts @@ -32,17 +32,20 @@ describe('HistoryService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - actor: 'User1', - eventId: '1', - message: 'Message 1', - created: '2016-12-12T10:10' - }, { - actor: 'User2', - eventId: '2', - message: 'Message 2', - created: '2016-12-13T10:10' - }] + body: [ + { + actor: 'User1', + eventId: '1', + message: 'Message 1', + created: '2016-12-12T10:10' + }, + { + actor: 'User2', + eventId: '2', + message: 'Message 2', + created: '2016-12-13T10:10' + } + ] }) ) )) diff --git a/src/Squidex/app/shared/services/languages.service.spec.ts b/src/Squidex/app/shared/services/languages.service.spec.ts index 50bcd9316..471d7e29c 100644 --- a/src/Squidex/app/shared/services/languages.service.spec.ts +++ b/src/Squidex/app/shared/services/languages.service.spec.ts @@ -30,13 +30,16 @@ describe('LanguageService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - iso2Code: 'de', - englishName: 'German' - }, { - iso2Code: 'en', - englishName: 'English' - }] + body: [ + { + iso2Code: 'de', + englishName: 'German' + }, + { + iso2Code: 'en', + englishName: 'English' + } + ] }) ) )) diff --git a/src/Squidex/app/shared/services/schemas.service.spec.ts b/src/Squidex/app/shared/services/schemas.service.spec.ts index 6120e139a..0d2f27af0 100644 --- a/src/Squidex/app/shared/services/schemas.service.spec.ts +++ b/src/Squidex/app/shared/services/schemas.service.spec.ts @@ -45,29 +45,32 @@ describe('SchemasService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - id: 'id1', - name: 'name1', - label: 'label1', - isPublished: true, - created: '2016-12-12T10:10', - createdBy: 'Created1', - lastModified: '2017-12-12T10:10', - lastModifiedBy: 'LastModifiedBy1', - version: 11, - data: {} - }, { - id: 'id2', - name: 'name2', - label: 'label2', - isPublished: true, - created: '2016-10-12T10:10', - createdBy: 'Created2', - lastModified: '2017-10-12T10:10', - lastModifiedBy: 'LastModifiedBy2', - version: 22, - data: {} - }] + body: [ + { + id: 'id1', + name: 'name1', + label: 'label1', + isPublished: true, + created: '2016-12-12T10:10', + createdBy: 'Created1', + lastModified: '2017-12-12T10:10', + lastModifiedBy: 'LastModifiedBy1', + version: 11, + data: {} + }, + { + id: 'id2', + name: 'name2', + label: 'label2', + isPublished: true, + created: '2016-10-12T10:10', + createdBy: 'Created2', + lastModified: '2017-10-12T10:10', + lastModifiedBy: 'LastModifiedBy2', + version: 22, + data: {} + } + ] }) ) )) @@ -109,63 +112,71 @@ describe('SchemasService', () => { lastModified: '2017-12-12T10:10', lastModifiedBy: 'LastModifiedBy1', version: 11, - fields: [{ - fieldId: 1, - name: 'field1', - isHidden: true, - isDisabled: true, - properties: { - fieldType: 'Number' - } - }, { - fieldId: 2, - name: 'field2', - isHidden: true, - isDisabled: true, - properties: { - fieldType: 'String' - } - }, { - fieldId: 3, - name: 'field3', - isHidden: true, - isDisabled: true, - properties: { - fieldType: 'Boolean' - } - }, { - fieldId: 4, - name: 'field4', - isHidden: true, - isDisabled: true, - properties: { - fieldType: 'DateTime' - } - }, { - fieldId: 5, - name: 'field5', - isHidden: true, - isDisabled: true, - properties: { - fieldType: 'Json' - } - }, { - fieldId: 6, - name: 'field6', - isHidden: true, - isDisabled: true, - properties: { - fieldType: 'Geolocation' - } - }, { - fieldId: 7, - name: 'field7', - isHidden: true, - isDisabled: true, - properties: { - fieldType: 'Assets' + fields: [ + { + fieldId: 1, + name: 'field1', + isHidden: true, + isDisabled: true, + properties: { + fieldType: 'Number' + } + }, + { + fieldId: 2, + name: 'field2', + isHidden: true, + isDisabled: true, + properties: { + fieldType: 'String' + } + }, + { + fieldId: 3, + name: 'field3', + isHidden: true, + isDisabled: true, + properties: { + fieldType: 'Boolean' + } + }, + { + fieldId: 4, + name: 'field4', + isHidden: true, + isDisabled: true, + properties: { + fieldType: 'DateTime' + } + }, + { + fieldId: 5, + name: 'field5', + isHidden: true, + isDisabled: true, + properties: { + fieldType: 'Json' + } + }, + { + fieldId: 6, + name: 'field6', + isHidden: true, + isDisabled: true, + properties: { + fieldType: 'Geolocation' + } + }, + { + fieldId: 7, + name: 'field7', + isHidden: true, + isDisabled: true, + properties: { + fieldType: 'Assets' + } } - }] + ] } }) ) diff --git a/src/Squidex/app/shared/services/usages.service.spec.ts b/src/Squidex/app/shared/services/usages.service.spec.ts index bbbeb0e96..580f20d63 100644 --- a/src/Squidex/app/shared/services/usages.service.spec.ts +++ b/src/Squidex/app/shared/services/usages.service.spec.ts @@ -34,15 +34,18 @@ describe('UsagesService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - date: '2017-10-12', - count: 10, - averageMs: 130 - }, { - date: '2017-10-13', - count: 13, - averageMs: 170 - }] + body: [ + { + date: '2017-10-12', + count: 10, + averageMs: 130 + }, + { + date: '2017-10-13', + count: 13, + averageMs: 170 + } + ] }) ) )) @@ -90,15 +93,18 @@ describe('UsagesService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - date: '2017-10-12', - count: 10, - size: 130 - }, { - date: '2017-10-13', - count: 13, - size: 170 - }] + body: [ + { + date: '2017-10-12', + count: 10, + size: 130 + }, + { + date: '2017-10-13', + count: 13, + size: 170 + } + ] }) ) )) diff --git a/src/Squidex/app/shared/services/users.service.spec.ts b/src/Squidex/app/shared/services/users.service.spec.ts index 5fd71eb61..ac3b66e29 100644 --- a/src/Squidex/app/shared/services/users.service.spec.ts +++ b/src/Squidex/app/shared/services/users.service.spec.ts @@ -32,19 +32,22 @@ describe('UsersService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - id: '123', - email: 'mail1@domain.com', - displayName: 'User1', - pictureUrl: 'path/to/image1', - isLocked: true - }, { - id: '456', - email: 'mail2@domain.com', - displayName: 'User2', - pictureUrl: 'path/to/image2', - isLocked: true - }] + body: [ + { + id: '123', + email: 'mail1@domain.com', + displayName: 'User1', + pictureUrl: 'path/to/image1', + isLocked: true + }, + { + id: '456', + email: 'mail2@domain.com', + displayName: 'User2', + pictureUrl: 'path/to/image2', + isLocked: true + } + ] }) ) )) @@ -70,19 +73,22 @@ describe('UsersService', () => { .returns(() => Observable.of( new Response( new ResponseOptions({ - body: [{ - id: '123', - email: 'mail1@domain.com', - displayName: 'User1', - pictureUrl: 'path/to/image1', - isLocked: true - }, { - id: '456', - email: 'mail2@domain.com', - displayName: 'User2', - pictureUrl: 'path/to/image2', - isLocked: true - }] + body: [ + { + id: '123', + email: 'mail1@domain.com', + displayName: 'User1', + pictureUrl: 'path/to/image1', + isLocked: true + }, + { + id: '456', + email: 'mail2@domain.com', + displayName: 'User2', + pictureUrl: 'path/to/image2', + isLocked: true + } + ] }) ) )) @@ -148,19 +154,22 @@ describe('UserManagementService', () => { new ResponseOptions({ body: { total: 100, - items: [{ - id: '123', - email: 'mail1@domain.com', - displayName: 'User1', - pictureUrl: 'path/to/image1', - isLocked: true - }, { - id: '456', - email: 'mail2@domain.com', - displayName: 'User2', - pictureUrl: 'path/to/image2', - isLocked: true - }] + items: [ + { + id: '123', + email: 'mail1@domain.com', + displayName: 'User1', + pictureUrl: 'path/to/image1', + isLocked: true + }, + { + id: '456', + email: 'mail2@domain.com', + displayName: 'User2', + pictureUrl: 'path/to/image2', + isLocked: true + } + ] } }) ) @@ -189,19 +198,22 @@ describe('UserManagementService', () => { new ResponseOptions({ body: { total: 100, - items: [{ - id: '123', - email: 'mail1@domain.com', - displayName: 'User1', - pictureUrl: 'path/to/image1', - isLocked: true - }, { - id: '456', - email: 'mail2@domain.com', - displayName: 'User2', - pictureUrl: 'path/to/image2', - isLocked: true - }] + items: [ + { + id: '123', + email: 'mail1@domain.com', + displayName: 'User1', + pictureUrl: 'path/to/image1', + isLocked: true + }, + { + id: '456', + email: 'mail2@domain.com', + displayName: 'User2', + pictureUrl: 'path/to/image2', + isLocked: true + } + ] } }) )