Skip to content

Commit 3005f30

Browse files
committed
fix: added some adjustments after review
TRACEFOSS-893
1 parent 9963817 commit 3005f30

File tree

7 files changed

+18
-62
lines changed

7 files changed

+18
-62
lines changed

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The domain of the corresponding backend should be used here.
3131
An example value could be: `catena-x.net`
3232

3333
`CATENAX_PORTAL_URL`
34-
This variable points to the CX Portal instance
34+
This variable is optional and points to the CX Portal instance
3535

3636
# Helm deployment
3737

docs/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ The domain of the corresponding backend should be used here.
312312
An example value could be: `catena-x.net`
313313

314314
`CATENAX_PORTAL_URL`
315-
This variable points to the CX Portal instance
315+
This variable is optional and points to the CX Portal instance
316316

317317
## Deployment
318318

src/app/modules/core/layout/header/header.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</div>
3333

3434
<div class="header--user">
35-
<app-button variant="flat" color="primary" class="pr-5" (click)="openDocumentation()">
35+
<app-button variant="flat" color="primary" (click)="openDocumentation()">
3636
<app-text-with-icon iconName="help">{{ 'actions.help' | i18n }}</app-text-with-icon>
3737
</app-button>
3838

src/app/modules/core/layout/header/user-navigation/user-menu.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</div>
3131
<div
3232
*ngIf="this.isExpanded"
33-
[class.fade-in]="isExpanded"
33+
[class.expand]="isExpanded"
3434
class="user-menu-items-container"
3535
role="menu"
3636
aria-orientation="vertical"
@@ -45,7 +45,7 @@
4545

4646
<mat-divider></mat-divider>
4747

48-
<div class="user-menu-items" (click)="openPortalPage()">
48+
<div *ngIf="portalUrl" (click)="openPortalPage()" class="user-menu-items">
4949
<p class="regular-text user-menu-items__label" role="menuitem">
5050
{{ 'layout.nav.goToPortal' | i18n }}
5151
</p>
@@ -68,8 +68,8 @@
6868

6969
<mat-divider></mat-divider>
7070

71-
<div class="user-menu-items">
72-
<p class="regular-text user-menu-items__label">
71+
<div class="user-menu-language">
72+
<p class="user-menu-language__items">
7373
<app-language-selector></app-language-selector>
7474
</p>
7575
</div>

src/app/modules/core/layout/header/user-navigation/user-menu.component.scss

Lines changed: 9 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@
6969
@apply block px-4 py-2 cursor-pointer focus:outline-none;
7070
}
7171

72+
.user-menu-language {
73+
@apply flex items-center space-x-2 p-1;
74+
}
75+
76+
.user-menu-language__items {
77+
@apply block px-4 py-2 focus:outline-none;
78+
}
79+
7280
.user-menu-items__badge {
7381
@apply ml-4 text-dangerLight font-bold;
7482
}
@@ -78,59 +86,6 @@
7886
border-radius: 32px;
7987
}
8088

81-
.fade-in {
89+
.expand {
8290
opacity: 1;
8391
}
84-
.fade-inn {
85-
-webkit-animation: fade-in 0.25s cubic-bezier(0.39, 0.575, 0.565, 1) both;
86-
animation: fade-in 0.25s cubic-bezier(0.39, 0.575, 0.565, 1) both;
87-
}
88-
89-
.fade-out {
90-
-webkit-animation: fade-in 0.2s cubic-bezier(1, 0.565, 0.575, 0.39) both;
91-
animation: fade-in 0.2s cubic-bezier(1, 0.565, 0.575, 0.39) both;
92-
}
93-
94-
/**
95-
* ----------------------------------------
96-
* animation fade-in
97-
* ----------------------------------------
98-
*/
99-
@-webkit-keyframes fade-in {
100-
0% {
101-
opacity: 0;
102-
}
103-
100% {
104-
opacity: 1;
105-
}
106-
}
107-
@keyframes fade-in {
108-
0% {
109-
opacity: 0;
110-
}
111-
100% {
112-
opacity: 1;
113-
}
114-
}
115-
116-
/**
117-
* ----------------------------------------
118-
* animation fade-in
119-
* ----------------------------------------
120-
*/
121-
@-webkit-keyframes fade-out {
122-
100% {
123-
opacity: 1;
124-
}
125-
0% {
126-
opacity: 0;
127-
}
128-
}
129-
@keyframes fade-out {
130-
100% {
131-
opacity: 1;
132-
}
133-
0% {
134-
opacity: 0;
135-
}
136-
}

src/app/modules/core/layout/header/user-navigation/user-menu.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export class UserMenuComponent {
3636
public userInitials = '';
3737
public userDetails = { name: '', email: '', role: '' };
3838
public activeItem: string = '';
39+
public portalUrl = environment.portalUrl;
3940

4041
constructor(private readonly layoutFacade: LayoutFacade, private readonly router: Router) {
4142
this.userInitials = this.layoutFacade.realName;

src/assets/locales/de/common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"nav": {
2424
"openUserMenu": "Benutzermenü öffnen",
2525
"signOut": "Abmelden",
26-
"goToPortal": "TBD: Go to CX Portal"
26+
"goToPortal": "Öffne CX Portal"
2727
}
2828
},
2929
"actions": {

0 commit comments

Comments
 (0)