Skip to content

Commit f88f716

Browse files
fix(april): final changes (#563)
* Removed random salary * snackbar more conspicuous Co-authored-by: Daniel Habenicht <daniel-habenicht@outlook.de>
1 parent 07e7d1d commit f88f716

File tree

3 files changed

+10
-22
lines changed

3 files changed

+10
-22
lines changed

Phonebook.Frontend/src/app/shared/components/user/user-detail/user-detail.component.html

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,18 +139,6 @@ <h4 mat-line i18n="Datapoint|Label for Person.Fax data@@DataPersonFax">
139139
<app-interactive-attribute-field [value]="person.Contacts.Fax"></app-interactive-attribute-field>
140140
</p>
141141
</mat-list-item>
142-
<mat-list-item
143-
*featureFlag="'firstApril'"
144-
matTooltip="Happy April Fools' Day."
145-
matTooltipPosition="below"
146-
i18n-matTooltip="Datapoint|Tooltip for april fools' day information Information@@UserDetailComponentAprilFoolDayTooltip"
147-
>
148-
<mat-icon mat-list-icon>attach_money</mat-icon>
149-
<h4 mat-line i18n="Datapoint|Label for Person.Money data@@DataPersonMoney">
150-
Salary
151-
</h4>
152-
<p mat-line>{{ randomMoney }} €</p>
153-
</mat-list-item>
154142
</mat-list>
155143
<mat-list *ngIf="!person.isOfStatus(status.Fremdkraft)">
156144
<h3

Phonebook.Frontend/src/app/shared/components/user/user-detail/user-detail.component.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export class UserDetailComponent implements OnInit, OnDestroy {
3030
public columns: typeof ColumnDefinitions = ColumnDefinitions;
3131
@Select(BookmarksState)
3232
public bookmarks$: Observable<Person[]>;
33-
public randomMoney: string;
3433
public vCardEncoding: typeof VCardEncoding = VCardEncoding;
3534
public get address(): string[] {
3635
return this.person.Location.RoomCollection[0].Description.split(',');
@@ -47,10 +46,9 @@ export class UserDetailComponent implements OnInit, OnDestroy {
4746
private windowRef: WindowRef,
4847
private store: Store,
4948
private dialog: MatDialog
50-
) {}
49+
) { }
5150

5251
public ngOnInit() {
53-
this.getRandomMoney();
5452
this.rocketChatLink = this.getRocketChatLink();
5553
this.bookmarks$.pipe(untilComponentDestroyed(this)).subscribe(bookmarks => {
5654
const index = bookmarks.findIndex(p => p.Id === this.person.Id);
@@ -119,14 +117,10 @@ export class UserDetailComponent implements OnInit, OnDestroy {
119117
: null;
120118
}
121119

122-
public ngOnDestroy() {}
123-
124-
@HostListener('click')
125-
public getRandomMoney(): void {
126-
this.randomMoney = (Math.random() * 1000000).toFixed(2);
127-
}
120+
public ngOnDestroy() { }
128121
}
129122

123+
130124
enum Bookmarked {
131125
isBookmarked = 'bookmark',
132126
isNotBookmarked = 'bookmark_border'

Phonebook.Frontend/src/styles/themes.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,23 @@ $custom-typography: mat-typography-config(
7070
.mat-tab-group {
7171
background-color: $unicorn_mat-color;
7272
}
73+
.mat-button,
7374
.mat-option.mat-selected,
7475
.mat-button.mat-primary,
7576
.mat-snack-bar-container {
7677
color: $unicorn_darkHighlight !important;
7778
}
79+
7880
.search,
7981
.mat-drawer-inner-container,
80-
.mat-snack-bar-container,
8182
.mat-toolbar {
8283
background-color: $unicorn_secondary;
8384
}
85+
86+
.mat-snack-bar-container {
87+
background-color: #a2edff;
88+
}
89+
8490
.mat-card-subtitle {
8591
color: black;
8692
}

0 commit comments

Comments
 (0)