From 4d917f488d0c582a30e8b242d0244d769325ac2e Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 28 Mar 2018 23:36:41 +0200 Subject: [PATCH] Settings fixed --- src/Squidex/app/features/settings/module.ts | 74 +--------- .../pages/backups/backups-page.component.html | 130 ++++++++--------- .../pages/clients/clients-page.component.html | 86 ++++------- .../pages/clients/clients-page.component.ts | 4 +- .../contributors-page.component.html | 136 +++++++----------- .../contributors-page.component.ts | 3 - .../languages/languages-page.component.html | 72 +++------- .../patterns/patterns-page.component.html | 46 ++---- .../pages/plans/plans-page.component.html | 100 ++++++------- .../settings/settings-area.component.html | 108 +++++++------- .../framework/angular/panel.component.html | 2 +- 11 files changed, 287 insertions(+), 474 deletions(-) diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts index db1a914ab..d9a30da06 100644 --- a/src/Squidex/app/features/settings/module.ts +++ b/src/Squidex/app/features/settings/module.ts @@ -10,8 +10,6 @@ import { RouterModule, Routes } from '@angular/router'; import { DndModule } from 'ng2-dnd'; import { - HelpComponent, - HistoryComponent, SqxFrameworkModule, SqxSharedModule } from '@app/shared'; @@ -52,83 +50,19 @@ const routes: Routes = [ }, { path: 'clients', - component: ClientsPageComponent, - children: [ - { - path: 'history', - component: HistoryComponent, - data: { - channel: 'settings.clients' - } - }, - { - path: 'help', - component: HelpComponent, - data: { - helpPage: '05-integrated/clients' - } - } - ] + component: ClientsPageComponent }, { path: 'contributors', - component: ContributorsPageComponent, - children: [ - { - path: 'history', - component: HistoryComponent, - data: { - channel: 'settings.contributors' - } - }, - { - path: 'help', - component: HelpComponent, - data: { - helpPage: '05-integrated/contributors' - } - } - ] + component: ContributorsPageComponent }, { path: 'languages', - component: LanguagesPageComponent, - children: [ - { - path: 'history', - component: HistoryComponent, - data: { - channel: 'settings.languages' - } - }, - { - path: 'help', - component: HelpComponent, - data: { - helpPage: '05-integrated/languages' - } - } - ] + component: LanguagesPageComponent }, { path: 'patterns', - component: PatternsPageComponent, - children: [ - { - path: 'history', - component: HistoryComponent, - data: { - channel: 'settings.patterns' - } - }, - { - path: 'help', - component: HelpComponent, - data: { - helpPage: '05-integrated/patterns' - } - } - ] + component: PatternsPageComponent } ] } diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html index 6c7c35bf8..8b30d4b88 100644 --- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html @@ -1,82 +1,78 @@ -
-
-
- -
+ + Backups + -

Backups

-
+ + + - - - -
+ +
+ Your have reached the maximum number of backups: 10. +
-
-
-
- Your have reached the maximum number of backups: 10. -
- -
-
-
-
- -
-
- -
-
- -
+
+ No backups created yet. +
+ +
+
+
+
+
-
-
- Started: -
-
- Duration: -
+
+
-
-
- {{backup.started.toISOString()}} -
-
- {{getDuration(backup) | sqxDuration}} -
+
+
-
-
- - Events: {{backup.handledEvents | sqxKNumber}} - , - - Assets: {{backup.handledAssets | sqxKNumber}} - -
-
- Download: - - - Ready - -
+
+
+
+ Started:
-
- +
+ Duration:
+
+
+ {{backup.started.toISOString()}} +
+
+ {{getDuration(backup) | sqxDuration}} +
+
+
+
+ + Events: {{backup.handledEvents | sqxKNumber}} + , + + Assets: {{backup.handledAssets | sqxKNumber}} + +
+
+ Download: + + + Ready + +
+
+
+ +
-
+ \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html index eaf9e5077..48db8faf7 100644 --- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html +++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html @@ -1,64 +1,38 @@ -
-
-

Clients

+ + Clients + + + +
+ No client created yet.
- - - -
- -
-
-
- No client created yet. -
- -
- -
- -
-
-
-
- - - -
-
- -
-
- -
-
-
-
+
+
-
- - - - - - - - The sidebar navigation contains useful context specific links. Here you can view the history how this schema has changed over time. - - - - Click the help icon to show a context specific help page. Go to https://docs.squidex.io for the full documentation. - +
+
+
+
+ + + +
+
+ +
+
+ +
+
+
-
- - - \ No newline at end of file + + \ No newline at end of file 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 4c42e00df..64f7c7469 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 @@ -14,7 +14,6 @@ import { AppClientsService, AppContext, CreateAppClientDto, - HistoryChannelUpdated, UpdateAppClientDto, ValidatorsEx } from '@app/shared'; @@ -108,6 +107,7 @@ export class ClientsPageComponent implements OnInit { this.resetClientForm(); }, error => { this.ctx.notifyError(error); + this.resetClientForm(); }); } @@ -125,7 +125,5 @@ export class ClientsPageComponent implements OnInit { private updateClients(appClients: AppClientsDto) { this.appClients = appClients; - - this.ctx.bus.emit(new HistoryChannelUpdated()); } } \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html index 95c0e541b..440820346 100644 --- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html +++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html @@ -1,88 +1,62 @@ -
-
-

Contributors

-
- - - - -
+ + Contributors + -
-
-
- Your plan allows up to {{maxContributors}} contributors. -
- - - - - - - - - - - - - - -
- - - {{contributor.contributorId | sqxUserName}} - - {{contributor.contributorId | sqxUserEmail}} - - - - -
- -
-
-
-
- - - + +
+ Your plan allows up to {{maxContributors}} contributors. +
+ + + + + + + + + + + + + + +
+ + + {{contributor.contributorId | sqxUserName}} + + {{contributor.contributorId | sqxUserEmail}} + + + + +
+ +
+ +
+
+ + + - {{user.displayName}} - {{user.email}} - - -
-
- -
+ {{user.displayName}} + {{user.email}} + +
- -
-
-
- - - - - - - - - The sidebar navigation contains useful context specific links. Here you can view the history how this schema has changed over time. - - - - Click the help icon to show a context specific help page. Go to https://docs.squidex.io for the full documentation. - +
+ +
+
+
-
- - - \ No newline at end of file + + \ No newline at end of file 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 e9edfdc0f..74bf46436 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 @@ -15,7 +15,6 @@ import { AppContributorsDto, AppContributorsService, AutocompleteSource, - HistoryChannelUpdated, UsersService } from '@app/shared'; @@ -135,7 +134,5 @@ export class ContributorsPageComponent implements OnInit { private updateContributors(appContributors: AppContributorsDto) { this.appContributors = appContributors; - - this.ctx.bus.emit(new HistoryChannelUpdated()); } } diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html index 9ebf675d8..a8c86460d 100644 --- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html +++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html @@ -1,56 +1,30 @@ -
-
-

Languages

-
- - - - -
+ + Contributors + -
-
-
- -
- -
-
-
-
- -
-
- -
-
-
-
+ +
+
-
- - - - - - - - The sidebar navigation contains useful context specific links. Here you can view the history how this schema has changed over time. - - - - Click the help icon to show a context specific help page. Go to https://docs.squidex.io for the full documentation. - +
+
+
+
+ +
+
+ +
+
+
-
- - - \ No newline at end of file + + \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html index 433c42aa8..b609ca655 100644 --- a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html +++ b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html @@ -1,41 +1,23 @@  -
-
-

Patterns

-
+ + Contributors + - - - -
- -
-
-
-
- - -
- + + +
+
-
- - -
- - - - - - -
-
+ + + + \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html index 0d29550a5..368ee6c78 100644 --- a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html +++ b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html @@ -1,70 +1,62 @@ -
-
-
- - - + + Contributors + + + + + + + + + +
+
+ You have not created the subscription. Therefore you cannot change the plan.
- -

Update Plan

-
- - - - -
-
-
-
-
- You have not created the subscription. Therefore you cannot change the plan. -
- -
- No plan configured, this app has unlimited usage. -
+
+ No plan configured, this app has unlimited usage. +
-
-
-
-

{{plan.name}}

-
{{plan.costs}}
+
+
+
+

{{plan.name}}

+
{{plan.costs}}
- Per Month + Per Month +
+
+
+ {{plan.maxApiCalls | sqxKNumber}} API Calls
-
-
- {{plan.maxApiCalls | sqxKNumber}} API Calls -
-
- {{plan.maxAssetSize | sqxFileSize}} Storage -
-
- {{plan.maxContributors}} Contributors -
+
+ {{plan.maxAssetSize | sqxFileSize}} Storage
-
- - - +
+ {{plan.maxContributors}} Contributors
+
+ + + +
+
-
- Go to Billing Portal for payment history and subscription overview. -
+
+ Go to Billing Portal for payment history and subscription overview.
-
+ \ No newline at end of file diff --git a/src/Squidex/app/features/settings/settings-area.component.html b/src/Squidex/app/features/settings/settings-area.component.html index 7b3900ea5..483b53bf8 100644 --- a/src/Squidex/app/features/settings/settings-area.component.html +++ b/src/Squidex/app/features/settings/settings-area.component.html @@ -1,64 +1,56 @@ -
-
-

Settings

-
- - - - -
- -
-
- -
-
+ + Settings + + + + + \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/panel.component.html b/src/Squidex/app/framework/angular/panel.component.html index 3783c0563..162b46631 100644 --- a/src/Squidex/app/framework/angular/panel.component.html +++ b/src/Squidex/app/framework/angular/panel.component.html @@ -24,7 +24,7 @@
- > +