diff --git a/src/app/pages/register/register.component.html b/src/app/pages/register/register.component.html index e870fb0..b799915 100644 --- a/src/app/pages/register/register.component.html +++ b/src/app/pages/register/register.component.html @@ -65,6 +65,16 @@ + +
+

{{'permissions' | i18n}}

+ +
+
+

{{'quotas' | i18n}}

+ +
+

{{'register.success.title' | i18n}}

@@ -75,4 +85,5 @@ {{'register.login' | i18n}} -
\ No newline at end of file + + diff --git a/src/app/pages/register/register.component.ts b/src/app/pages/register/register.component.ts index 8fa6b76..1f9da9b 100644 --- a/src/app/pages/register/register.component.ts +++ b/src/app/pages/register/register.component.ts @@ -8,6 +8,8 @@ import {UserService} from './../../services/user.service'; import {ItemService} from './../../services/item.service'; import {I18nService} from './../../services/i18n.service'; import {MatchingValidator} from './../../utils/matching.validator'; +import { PermissionService } from './../../services/permission.service'; +import { QuotaService } from './../../services/quota.service'; import {uniqueNamesGenerator, Config, adjectives, colors, animals} from 'unique-names-generator'; @@ -25,6 +27,8 @@ export class RegisterComponent implements OnInit { public success: boolean; public working: boolean; items = []; + permissions = []; + quotas = []; currentLocale: String; model: any = { username: '', @@ -37,6 +41,8 @@ export class RegisterComponent implements OnInit { private userService: UserService, private itemService: ItemService, private i18n: I18nService, + private permissionService: PermissionService, + private quotaService: QuotaService, public dialog: MatDialog) { this.currentLocale = this.i18n.getLocale(); } @@ -55,6 +61,14 @@ export class RegisterComponent implements OnInit { this.itemService.items().subscribe((data: any) => { this.items = data; }); + + this.permissionService.permissionsNew().subscribe((data: any) => { + this.permissions = data; + }) + + this.quotaService.quotasNew().subscribe((data: any) => { + this.quotas = data; + }) } onPrimaryChange() { diff --git a/src/assets/i18n/de-informal.json b/src/assets/i18n/de-informal.json index 87eeb3c..a162f86 100644 --- a/src/assets/i18n/de-informal.json +++ b/src/assets/i18n/de-informal.json @@ -104,6 +104,9 @@ "openBlob": "Anzeigen", "type": { ".": "Typ", + "BLOB": { + ".": "Binärblob" + }, "BOOL": { ".": "Boolean" }, diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index fc836e3..8395f44 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -104,6 +104,9 @@ "openBlob": "Display", "type": { ".": "Type", + "BLOB": { + ".": "Binary blob" + }, "BOOL": { ".": "Boolean" }, diff --git a/src/styles.scss b/src/styles.scss index 0012ab6..0ec1c2a 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -22,7 +22,7 @@ $light-theme: mat-light-theme((color: (primary: $light-primary, // Define an alternate dark theme. $dark-theme: mat-dark-theme((color: (primary: $dark-primary, accent: $light-accent, - warn: $dark-warn, + warn: $light-warn, ))); // Include theme styles for core and each component used in your app. diff --git a/src/variables.scss b/src/variables.scss index 21fc989..1167dae 100644 --- a/src/variables.scss +++ b/src/variables.scss @@ -15,6 +15,6 @@ $dark-warn: mat-palette($mat-deep-orange); .dark-theme { $primary: mat-color($dark-primary); - $accent: mat-color($dark-accent); - $warn: mat-color($dark-warn); + $accent: mat-color($light-accent); + $warn: mat-color($light-warn); } \ No newline at end of file