From 74a67236a08e9b67d9d59e85ec181e8fb5aee6db Mon Sep 17 00:00:00 2001 From: mchouliara Date: Tue, 17 Sep 2024 11:50:12 +0300 Subject: [PATCH] refactor dashboard, top navbar --- .../guided-tour/guided-tour.component.html | 4 +- .../popup/popup-notification.component.html | 2 +- ...ion-template-preview-dialog.component.html | 2 +- ...description-template.dialog.component.html | 2 +- ...mport-plan-blueprint.dialog.component.html | 2 +- ...ser-invite-to-tenant-dialog.component.html | 2 +- .../annotation-dialog.component.html | 2 +- .../contact-dialog.component.html | 2 +- .../app/ui/dashboard/dashboard.component.html | 20 ++- .../app/ui/dashboard/dashboard.component.scss | 6 +- .../description-copy-dialog.component.html | 2 +- ...description-template-dialog.component.html | 4 +- ...form-fieldset-editor-dialog.component.html | 2 +- .../new-description.component.html | 2 +- .../description-listing.component.html | 2 +- ...tart-new-description-dialog.component.html | 2 +- .../ui/faq/dialog/faq-dialog.component.html | 4 +- .../dialog/glossary-dialog.component.html | 2 +- .../dialog/language-dialog.component.html | 2 +- .../language-content/language.component.html | 6 +- .../language-content/language.component.scss | 7 +- .../src/app/ui/navbar/navbar.component.html | 163 +++++++++--------- .../src/app/ui/navbar/navbar.component.scss | 22 ++- .../user-dialog/user-dialog.component.html | 24 +-- .../user-dialog/user-dialog.component.scss | 51 +----- .../plan-clone-dialog.component.html | 2 +- .../plan-invitation-dialog.component.html | 2 +- .../plan/listing/plan-listing.component.html | 2 +- .../plan-new-version-dialog.component.html | 2 +- .../start-new-plan-dialog.component.html | 4 +- .../start-new-plan-dialog.component.scss | 2 +- .../plan-upload-dialog.component.html | 2 +- .../plan-delete-dialog.component.html | 6 +- .../plan-finalize-dialog.component.html | 2 +- .../reference-dialog-editor.component.html | 2 +- .../sidebar-footer.component.html | 2 +- .../tenant-switch.component.html | 6 +- .../tenant-switch.component.scss | 7 +- .../dialog/user-guide-dialog.component.html | 2 +- .../add-account-dialog.component.html | 2 +- frontend/src/assets/scss/core/_navbar.scss | 18 -- ...rm-validation-errors-dialog.component.html | 4 +- .../confirmation-dialog.component.html | 4 +- .../multiple-choice-dialog.component.html | 4 +- frontend/src/index.html | 2 +- ...notification-listing-dialog.component.html | 46 +++-- ...p-notification-listing-dialog.component.ts | 21 +++ frontend/src/styles.scss | 33 +++- 48 files changed, 257 insertions(+), 259 deletions(-) diff --git a/frontend/src/app/library/guided-tour/guided-tour.component.html b/frontend/src/app/library/guided-tour/guided-tour.component.html index f451098de..c03115851 100644 --- a/frontend/src/app/library/guided-tour/guided-tour.component.html +++ b/frontend/src/app/library/guided-tour/guided-tour.component.html @@ -30,14 +30,14 @@ (click)="guidedTourService.nextStep()"> {{ nextText }} -
- + cartoon tour pointing to text with raised arm
diff --git a/frontend/src/app/library/notification/popup/popup-notification.component.html b/frontend/src/app/library/notification/popup/popup-notification.component.html index 50fe15b38..13f3e871d 100644 --- a/frontend/src/app/library/notification/popup/popup-notification.component.html +++ b/frontend/src/app/library/notification/popup/popup-notification.component.html @@ -14,6 +14,6 @@
- +
diff --git a/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html b/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html index 9a235e0dd..557ea49ae 100644 --- a/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html +++ b/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html @@ -2,7 +2,7 @@
{{'DESCRIPTION-TEMPLATE-PREVIEW.TEMPLATE' | translate}} - {{descriptionTemplate.label}}
- +
diff --git a/frontend/src/app/ui/admin/description-template/listing/import-description-template/import-description-template.dialog.component.html b/frontend/src/app/ui/admin/description-template/listing/import-description-template/import-description-template.dialog.component.html index 19f71e4e7..e8938987a 100644 --- a/frontend/src/app/ui/admin/description-template/listing/import-description-template/import-description-template.dialog.component.html +++ b/frontend/src/app/ui/admin/description-template/listing/import-description-template/import-description-template.dialog.component.html @@ -4,7 +4,7 @@

{{ data.message }}

-
diff --git a/frontend/src/app/ui/admin/plan-blueprint/listing/import-plan-blueprint/import-plan-blueprint.dialog.component.html b/frontend/src/app/ui/admin/plan-blueprint/listing/import-plan-blueprint/import-plan-blueprint.dialog.component.html index 8cb7d434d..2a6ae3542 100644 --- a/frontend/src/app/ui/admin/plan-blueprint/listing/import-plan-blueprint/import-plan-blueprint.dialog.component.html +++ b/frontend/src/app/ui/admin/plan-blueprint/listing/import-plan-blueprint/import-plan-blueprint.dialog.component.html @@ -4,7 +4,7 @@

{{ data.message }}

-
diff --git a/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html b/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html index eb3ea830a..56f7eb069 100644 --- a/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html +++ b/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html @@ -4,7 +4,7 @@

{{'USER-INVITE-TO-TENANT-DIALOG.TITLE' | translate}}

- +
diff --git a/frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html b/frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html index 4cadec168..766ebd2c4 100644 --- a/frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html +++ b/frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html @@ -14,7 +14,7 @@
-
diff --git a/frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.html b/frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.html index 46410c7a2..59ad07930 100644 --- a/frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.html +++ b/frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.html @@ -4,7 +4,7 @@ {{'CONTACT.SUPPORT.SUBTITLE' | translate}}
-
diff --git a/frontend/src/app/ui/dashboard/dashboard.component.html b/frontend/src/app/ui/dashboard/dashboard.component.html index ad4614a5c..0734d849e 100644 --- a/frontend/src/app/ui/dashboard/dashboard.component.html +++ b/frontend/src/app/ui/dashboard/dashboard.component.html @@ -5,8 +5,10 @@
-
- clear +
+

{{'NEW-RELEASE-NOTIFICATION.HINT' | translate}}

@@ -24,8 +26,10 @@
-
- clear +
+

{{'DASHBOARD.PLAN-QUESTION' | translate}}

{{'DASHBOARD.INFO-PLAN-TEXT' | translate}}

@@ -50,7 +54,7 @@
- + colorful art of a person working on an oversized computer
@@ -164,13 +168,15 @@
- clear +

{{'DASHBOARD.TITLE' | translate}}

{{'DASHBOARD.INFO-TEXT' | translate}}

- + colorful art of a person working on an oversized computer
diff --git a/frontend/src/app/ui/dashboard/dashboard.component.scss b/frontend/src/app/ui/dashboard/dashboard.component.scss index abebdf212..7380ff239 100644 --- a/frontend/src/app/ui/dashboard/dashboard.component.scss +++ b/frontend/src/app/ui/dashboard/dashboard.component.scss @@ -90,7 +90,7 @@ font-weight: 300; font-size: 1.25rem; letter-spacing: 0px; - color: #212121; + color: #000000; opacity: 0.6; } @@ -98,8 +98,8 @@ text-align: left; font: Bold 48px/30px Roboto; letter-spacing: 0px; - color: #212121; - opacity: 0.36; + color: #000000; + opacity: 0.6; padding-top: 2.5rem; padding-bottom: 0.5rem; } diff --git a/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.html b/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.html index 26cb12dd9..c94bfb2b2 100644 --- a/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.html +++ b/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.html @@ -2,7 +2,7 @@
{{'DESCRIPTION-COPY-DIALOG.TITLE' | translate}}
- +
diff --git a/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.html b/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.html index f2838029b..1da1b173c 100644 --- a/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.html +++ b/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.html @@ -4,7 +4,7 @@

{{ 'DESCRIPTION-EDITOR.DEPRECATED-DESCRIPTION-TEMPLATE.TITLE' | translate}} {{ data.label }}

- +
@@ -18,7 +18,7 @@
- +
diff --git a/frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html b/frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html index 30e07a255..5036c6f91 100644 --- a/frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html +++ b/frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html @@ -4,7 +4,7 @@
{{numberingText}} {{fieldSet.title}}
-
diff --git a/frontend/src/app/ui/description/editor/new-description/new-description.component.html b/frontend/src/app/ui/description/editor/new-description/new-description.component.html index 7e4478535..55e535c59 100644 --- a/frontend/src/app/ui/description/editor/new-description/new-description.component.html +++ b/frontend/src/app/ui/description/editor/new-description/new-description.component.html @@ -2,7 +2,7 @@
{{'NEW-DESCRIPTION-DIALOG.TITLE' | translate}} - diff --git a/frontend/src/app/ui/description/listing/description-listing.component.html b/frontend/src/app/ui/description/listing/description-listing.component.html index 16ae2f0dc..1c8cef090 100644 --- a/frontend/src/app/ui/description/listing/description-listing.component.html +++ b/frontend/src/app/ui/description/listing/description-listing.component.html @@ -9,7 +9,7 @@ - + colorful art of a person working on an oversized computer
diff --git a/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html b/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html index b5ad57253..a4ddec44b 100644 --- a/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html +++ b/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html @@ -4,7 +4,7 @@ {{'DASHBOARD.SELECT-PLAN' | translate}}
- +
diff --git a/frontend/src/app/ui/faq/dialog/faq-dialog.component.html b/frontend/src/app/ui/faq/dialog/faq-dialog.component.html index 05893af52..4eb87109d 100644 --- a/frontend/src/app/ui/faq/dialog/faq-dialog.component.html +++ b/frontend/src/app/ui/faq/dialog/faq-dialog.component.html @@ -4,13 +4,13 @@ {{'FAQ.TITLE' | translate}}
- +
-
+
diff --git a/frontend/src/app/ui/glossary/dialog/glossary-dialog.component.html b/frontend/src/app/ui/glossary/dialog/glossary-dialog.component.html index 05640d396..6d7600ee3 100644 --- a/frontend/src/app/ui/glossary/dialog/glossary-dialog.component.html +++ b/frontend/src/app/ui/glossary/dialog/glossary-dialog.component.html @@ -4,7 +4,7 @@ {{'GLOSSARY.TITLE' | translate}}
-
diff --git a/frontend/src/app/ui/language/dialog/language-dialog.component.html b/frontend/src/app/ui/language/dialog/language-dialog.component.html index a3151ffa9..7562c977d 100644 --- a/frontend/src/app/ui/language/dialog/language-dialog.component.html +++ b/frontend/src/app/ui/language/dialog/language-dialog.component.html @@ -4,7 +4,7 @@ {{'LANGUAGE.TITLE' | translate}}
-
diff --git a/frontend/src/app/ui/language/language-content/language.component.html b/frontend/src/app/ui/language/language-content/language.component.html index 2515aebc1..5fc0c1778 100644 --- a/frontend/src/app/ui/language/language-content/language.component.html +++ b/frontend/src/app/ui/language/language-content/language.component.html @@ -1,5 +1,5 @@ -
- {{'GENERAL.LANGUAGES.' + lang | translate}} -
+ @for(lang of languages; track lang){ + {{'GENERAL.LANGUAGES.' + lang | translate}} + } diff --git a/frontend/src/app/ui/language/language-content/language.component.scss b/frontend/src/app/ui/language/language-content/language.component.scss index aea7dec4f..2cddc2c4d 100644 --- a/frontend/src/app/ui/language/language-content/language.component.scss +++ b/frontend/src/app/ui/language/language-content/language.component.scss @@ -1,9 +1,4 @@ ::ng-deep.lang-menu { border-color: transparent; padding: 8px; -} - -::ng-deep.lang-button { - padding-top: 15px; - padding-bottom: 15px; -} +} \ No newline at end of file diff --git a/frontend/src/app/ui/navbar/navbar.component.html b/frontend/src/app/ui/navbar/navbar.component.html index 7371d2d5d..2c777c8bd 100644 --- a/frontend/src/app/ui/navbar/navbar.component.html +++ b/frontend/src/app/ui/navbar/navbar.component.html @@ -1,106 +1,109 @@ diff --git a/frontend/src/app/ui/navbar/navbar.component.scss b/frontend/src/app/ui/navbar/navbar.component.scss index e021e42db..638d4ba54 100644 --- a/frontend/src/app/ui/navbar/navbar.component.scss +++ b/frontend/src/app/ui/navbar/navbar.component.scss @@ -1,5 +1,22 @@ $mat-card-header-size: 40px !default; +@media (max-width: 991px) { + .navbar-item-sm { + display: block; + } + .navbar-item-lg { + display: none; + } +} + +@media (min-width: 991px) { + .navbar-item-sm { + display: none; + } + .navbar-item-lg { + display: block; + } +} .my-mat-card-avatar { height: $mat-card-header-size; width: $mat-card-header-size; @@ -66,6 +83,7 @@ $mat-card-header-size: 40px !default; } .hamburger { + all:unset; display: inline-block; cursor: pointer; padding: 0.6rem; @@ -73,7 +91,7 @@ $mat-card-header-size: 40px !default; margin-right: 0.8rem; } -.hamburger:hover { +.hamburger:hover, .hamburger:focus { background-color: #ececec !important; border-radius: 50%; } @@ -166,4 +184,4 @@ $mat-card-header-size: 40px !default; .mat-mdc-menu-content { padding: 0 !important; } -} +} \ No newline at end of file diff --git a/frontend/src/app/ui/navbar/user-dialog/user-dialog.component.html b/frontend/src/app/ui/navbar/user-dialog/user-dialog.component.html index d33a4a52b..db0e8e534 100644 --- a/frontend/src/app/ui/navbar/user-dialog/user-dialog.component.html +++ b/frontend/src/app/ui/navbar/user-dialog/user-dialog.component.html @@ -1,17 +1,9 @@ -
+ + + + + + -
-
- -
- {{'USER-DIALOG.USER-PROFILE-SETTINGS' | translate}} - {{'USER-PROFILE.ASSOCIATED-PLANS' | translate}} -
- - -
-
diff --git a/frontend/src/app/ui/navbar/user-dialog/user-dialog.component.scss b/frontend/src/app/ui/navbar/user-dialog/user-dialog.component.scss index 0a04ff11c..d91f7b9b3 100644 --- a/frontend/src/app/ui/navbar/user-dialog/user-dialog.component.scss +++ b/frontend/src/app/ui/navbar/user-dialog/user-dialog.component.scss @@ -1,56 +1,13 @@ -$mat-card-header-size: 40px !default; -.my-mat-card-avatar { - height: $mat-card-header-size; - width: $mat-card-header-size; - border-radius: 50%; - flex-shrink: 0; -} .top-divider { border-top-style: none !important; } -.profile, .logout { - padding-left: 1.1875rem; - font-weight: 300; +.profile-settings { color: #212121; - height: 1.875rem; - line-height: 1.875rem; text-align: left; } -.email-btn { - cursor: auto; - display: inline-block; - line-height: 2.25rem; - font-size: 0.875rem; -} - -.dropdown-top { - width: 0rem; - border-bottom: 0.625rem solid #FFFFFF; - border-left: 0.625rem solid transparent; - border-right: 0.625rem solid transparent; - position: fixed; - transform: translate(11.85rem, -0.6rem); -} - -.dropdown-options { - background-color: #FFFFFF; - min-width: 10rem; - width: 13.625rem; -} - -.dropdown-options a:hover { - background-color: #ececec8c !important; -} - -.dropdown-options a:hover { - background-color: #ddd; -} - -.check-icon { - color: var(--primary-color); - transform: scale(0.7); -} - +.mdc-list-item__primary-text{ + font-size: unset; +} \ No newline at end of file diff --git a/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html b/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html index be4d6192b..a256db761 100644 --- a/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html +++ b/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html @@ -2,7 +2,7 @@
{{'PLAN-CLONE-DIALOG.TITLE' | translate}}
- +
diff --git a/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html b/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html index c95aeafdd..d81741f97 100644 --- a/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html +++ b/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html @@ -4,7 +4,7 @@

{{'PLAN-USER-INVITATION-DIALOG.TITLE' | translate}}

- +
diff --git a/frontend/src/app/ui/plan/listing/plan-listing.component.html b/frontend/src/app/ui/plan/listing/plan-listing.component.html index 4e09a71ea..a2b214e82 100644 --- a/frontend/src/app/ui/plan/listing/plan-listing.component.html +++ b/frontend/src/app/ui/plan/listing/plan-listing.component.html @@ -7,7 +7,7 @@

{{'PLAN-LISTING.TEXT-INFO-QUESTION' | translate}} {{'PLAN-LISTING.LINK-ZENODO' | translate}} {{'PLAN-LISTING.GET-IDEA' | translate}}

{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}
- + colorful art of a person working on an oversized computer
diff --git a/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.html b/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.html index fdbe308b7..d189968ce 100644 --- a/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.html +++ b/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.html @@ -2,7 +2,7 @@
{{'PLAN-NEW-VERSION-DIALOG.TITLE' | translate}}
- +
diff --git a/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html b/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html index 842f32995..0b20d774d 100644 --- a/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html +++ b/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html @@ -2,7 +2,7 @@
- +
@@ -17,7 +17,7 @@
- diff --git a/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss b/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss index e9fa54f0d..8d201b43f 100644 --- a/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss +++ b/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss @@ -20,7 +20,7 @@ } .content { - margin: 2.17rem 2.304rem 1.1875rem 3.065rem; + margin: 0.5rem 2rem; } .title, diff --git a/frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.html b/frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.html index 351e06117..bcb277966 100644 --- a/frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.html +++ b/frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.html @@ -4,7 +4,7 @@

{{'PLAN-UPLOAD.TITLE' | translate}}

-
diff --git a/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html b/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html index 22488d7fe..1e75d4cce 100644 --- a/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html +++ b/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html @@ -1,7 +1,7 @@
{{'PLAN-DELETE-DIALOG.WARNING' | translate}}
- +
@@ -16,7 +16,7 @@
-
-
+
+
diff --git a/frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html b/frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html index 606677774..4e4e67e72 100644 --- a/frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html +++ b/frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html @@ -2,7 +2,7 @@
{{ 'PLAN-FINALISE-DIALOG.TITLE' | translate }}
-
diff --git a/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.html b/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.html index 636135c67..7a6948271 100644 --- a/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.html +++ b/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.html @@ -5,7 +5,7 @@ {{'REFERENCE-FIELD.REFERENCE-DIALOG-EDITOR.TITLE' | translate}} {{label}}
- +
diff --git a/frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html b/frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html index 61677a266..c270d8ade 100644 --- a/frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html +++ b/frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html @@ -1,7 +1,7 @@
-
+

{{ item.title | translate}}

diff --git a/frontend/src/app/ui/tenant/tenant-switch/tenant-switch.component.html b/frontend/src/app/ui/tenant/tenant-switch/tenant-switch.component.html index 9a36ad797..602d7ba80 100644 --- a/frontend/src/app/ui/tenant/tenant-switch/tenant-switch.component.html +++ b/frontend/src/app/ui/tenant/tenant-switch/tenant-switch.component.html @@ -1,5 +1,5 @@ -
- {{ tenant.name }} -
+ @for(tenant of (tenants | async); track tenant){ + {{ tenant.name }} + } diff --git a/frontend/src/app/ui/tenant/tenant-switch/tenant-switch.component.scss b/frontend/src/app/ui/tenant/tenant-switch/tenant-switch.component.scss index 5e19e49da..7cc532181 100644 --- a/frontend/src/app/ui/tenant/tenant-switch/tenant-switch.component.scss +++ b/frontend/src/app/ui/tenant/tenant-switch/tenant-switch.component.scss @@ -1,9 +1,4 @@ ::ng-deep.tenant-menu { border-color: transparent; padding: 8px; -} - -::ng-deep.tenant-button { - padding-top: 15px; - padding-bottom: 15px; -} +} \ No newline at end of file diff --git a/frontend/src/app/ui/user-guide/dialog/user-guide-dialog.component.html b/frontend/src/app/ui/user-guide/dialog/user-guide-dialog.component.html index f51a186d2..f7b8150e3 100644 --- a/frontend/src/app/ui/user-guide/dialog/user-guide-dialog.component.html +++ b/frontend/src/app/ui/user-guide/dialog/user-guide-dialog.component.html @@ -4,7 +4,7 @@ {{'GUIDE.TITLE' | translate}}
-
diff --git a/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html b/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html index 92fd453dd..95b069397 100644 --- a/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html +++ b/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html @@ -5,7 +5,7 @@ {{'USER-PROFILE.ACTIONS.LINK-NEW-ACCOUNT' | translate}}
- +
diff --git a/frontend/src/assets/scss/core/_navbar.scss b/frontend/src/assets/scss/core/_navbar.scss index 810d60605..ed200dcc0 100644 --- a/frontend/src/assets/scss/core/_navbar.scss +++ b/frontend/src/assets/scss/core/_navbar.scss @@ -81,24 +81,6 @@ margin-bottom: 0; } - .navbar-toggler{ - cursor: pointer; - outline: 0; - - .navbar-toggler-icon{ - width: 22px; - height: 2px; - vertical-align: middle; - outline: 0; - display: block; - border-radius: 1px; - - & + .navbar-toggler-icon{ - margin-top: 4px; - } - } - } - &.navbar-absolute{ position: absolute; width: 100%; diff --git a/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.html b/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.html index 9b3c459e3..8c40388aa 100644 --- a/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.html +++ b/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.html @@ -4,7 +4,7 @@ {{'GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.WARNING' | translate}}
- +
@@ -21,7 +21,7 @@
- +
diff --git a/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.html b/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.html index e806546ed..1a8433298 100644 --- a/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.html +++ b/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.html @@ -5,12 +5,12 @@
{{ data.warning }}
- +
- +
diff --git a/frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html b/frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html index 7ca5c2093..a8ff22378 100644 --- a/frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html +++ b/frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html @@ -5,7 +5,7 @@
{{ data.warning }}
-
@@ -14,7 +14,7 @@
{{ data.message }}
-
diff --git a/frontend/src/index.html b/frontend/src/index.html index 01bec80b2..9353526ff 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -1,5 +1,5 @@ - + diff --git a/frontend/src/notification-service/ui/inapp-notification/listing-dialog/mine-inapp-notification-listing-dialog.component.html b/frontend/src/notification-service/ui/inapp-notification/listing-dialog/mine-inapp-notification-listing-dialog.component.html index c7182685d..34cfc1451 100644 --- a/frontend/src/notification-service/ui/inapp-notification/listing-dialog/mine-inapp-notification-listing-dialog.component.html +++ b/frontend/src/notification-service/ui/inapp-notification/listing-dialog/mine-inapp-notification-listing-dialog.component.html @@ -2,32 +2,30 @@
- + - -
-
- drafts - mail -
-
- {{ inappNotification.subject }} -
- -
- {{ inappNotification.createdAt | date : 'short'}} -
-
- - + + - - {{'NAV-BAR.INAPP-NOTIFICATIONS' | translate}} - - - {{'NAV-BAR.READ-ALL-INAPP-NOTIFICATIONS' | translate}} - - + @if(authService.hasPermission(authService.permissionEnum.ViewMineInAppNotificationPage)){ + + + } +
\ No newline at end of file diff --git a/frontend/src/notification-service/ui/inapp-notification/listing-dialog/mine-inapp-notification-listing-dialog.component.ts b/frontend/src/notification-service/ui/inapp-notification/listing-dialog/mine-inapp-notification-listing-dialog.component.ts index a234fad79..834e50ebe 100644 --- a/frontend/src/notification-service/ui/inapp-notification/listing-dialog/mine-inapp-notification-listing-dialog.component.ts +++ b/frontend/src/notification-service/ui/inapp-notification/listing-dialog/mine-inapp-notification-listing-dialog.component.ts @@ -15,6 +15,8 @@ import { IsActive } from '@notification-service/core/enum/is-active.enum'; import { NotificationInAppTracking } from "@notification-service/core/enum/notification-inapp-tracking.enum"; import { InAppNotification } from "@notification-service/core/model/inapp-notification.model"; import { RouterUtilsService } from "@app/core/services/router/router-utils.service"; +import { Guid } from "@common/types/guid"; +import moment from "moment"; @Component({ selector: 'app-mine-inapp-notification-listing-dialog', @@ -120,6 +122,25 @@ export class MineInAppNotificationListingDialogComponent extends BaseComponent i .subscribe( data => { this.inappNotifications = data.items; + this.inappNotifications = [{ + id: Guid.create(), + user: { + name: 'User Name', + additionalInfo: null, + contacts: null, + globalRoles: null, + tenantRoles: null, + credentials: null, + }, + isActive: IsActive.Active, + type: Guid.create(), + trackingState: NotificationInAppTracking.Delivered, + subject: 'Hi', + body: 'Hello World', + createdAt: moment().toDate(), + updatedAt: moment().toDate(), + hash: '56565', + }] }, error => this.httpErrorHandlingService.handleBackedRequestError(error) ); diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 573e06c58..ac471132b 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -610,4 +610,35 @@ button, .mdc-button, .mat-mdc-button, .mdc-button:has(.material-icons,mat-icon,[ max-width: 1204px !important; } } -////////*//////// \ No newline at end of file +////////*//////// +/// +/// +ul.horizontal-list { + list-style-type: none; + margin: 0; + padding: 0; + overflow: hidden; + display: flex; + align-items: center; + li { + float: left; + } +} + +ul.unstyled-list { + list-style-type: none; + margin: 0; + padding: 0; + +} + +.mat-mdc-action-list.unset-font-size { + .mdc-list-item__primary-text{ + font-size: unset; + } +} + +.mat-button-toggle.no-borders{ + border-top: none !important; + border: none; +}