diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.html b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.html index 193232188..f132cc2cf 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.html +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.html @@ -5,7 +5,53 @@
-
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+
diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.scss b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.scss index e69de29bb..b4a5b79ac 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.scss +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.scss @@ -0,0 +1,24 @@ +@use 'variables'; +@use 'common-mixins'; + +.dialog { + width: 100%; + min-height: unset; +} + +.content-container { + background-color: variables.$grey-2; + justify-content: center; + @include common-mixins.scroll-bar; + overflow: auto; +} + +.full-height { + display: flex; + flex-direction: row; + position: absolute; + bottom: 0; + width: 100%; + height: calc(100% + 50px); + z-index: 1; +} diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.ts index 8f3846757..37017e8b8 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen.component.ts @@ -1,8 +1,17 @@ import { Component } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; @Component({ selector: 'redaction-notifications-screen', templateUrl: './notifications-screen.component.html', styleUrls: ['./notifications-screen.component.scss'] }) -export class NotificationsScreenComponent {} +export class NotificationsScreenComponent { + formGroup: FormGroup; + + constructor(private readonly _formBuilder: FormBuilder) { + this.formGroup = this._formBuilder.group({}); + } + + save() {} +} diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.html b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.html index 77c930363..aa7f830f5 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.html +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.html @@ -36,6 +36,11 @@ +
+ + {{ 'user-profile-screen.actions.change-password' | translate }} +
@@ -48,9 +53,6 @@ > {{ 'user-profile-screen.actions.save' | translate }} - - {{ 'user-profile-screen.actions.change-password' | translate }} diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.scss b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.scss index a0f740599..e145e5430 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.scss +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.scss @@ -21,3 +21,7 @@ height: calc(100% + 50px); z-index: 1; } + +a { + color: black; +} diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.ts index 98f8866d7..196555f2c 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen.component.ts @@ -4,11 +4,11 @@ import { languagesTranslations } from '../../translations/languages-translations import { ProfileModel, UserService } from '../../../../services/user.service'; import { PermissionsService } from '../../../../services/permissions.service'; import { ConfigService } from '../../../../services/config.service'; -import { UserControllerService } from '../../../../../../../../libs/red-ui-http/src'; +import { UserControllerService } from '@redaction/red-ui-http'; import { LanguageService } from '../../../../i18n/language.service'; import { DomSanitizer } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { LoadingService } from '../../../../../../../../libs/common-ui/src'; +import { LoadingService } from '@iqser/common-ui'; @Component({ selector: 'redaction-user-profile-screen', diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts index 14e31d540..f54adcb99 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts @@ -127,7 +127,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple label: fileStatusTranslations[FileStatuses.UNASSIGNED], key: FileStatuses.UNASSIGNED, enterFn: this.unassignFn, - enterPredicate: (entity: File) => false, + enterPredicate: () => false, color: '#D3D5DA' }, { diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 5da5171d4..8e95d43ce 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1233,6 +1233,10 @@ "user-promoted-to-approver": "{user} promoted to approver in dossier: {dossierName}!", "user-removed-as-dossier-member": "{user} removed as a member of: {dossierName} !" }, + "notifications": "Notifications", + "notifications-screen": { + "title": "Notifications Preferences" + }, "overwrite-files-dialog": { "options": { "cancel": "Cancel all uploads", @@ -1485,16 +1489,11 @@ } }, "user-management": "User Management", - "notifications": "Notifications", - "notifications-screen": { - "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}", - "no-data": "You have no notifications." - }, "user-profile": "My Profile", "user-profile-screen": { "actions": { "change-password": "Change Password", - "save": "Save profile" + "save": "Save Changes" }, "form": { "email": "Email",