Chneemann/dabubble
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Variable & array with the name “user” changed to “users”

Browse source
This commit is contained in:
Chneemann 2024-09-19 04:37:29 +02:00
parent 9cd1090583
commit 32b4d18ffe
6 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/components/main-chat/channel-information/channel-information.component.html
View file

@ -155,11 +155,10 @@
dBlock: openUserWindowBoolean,
dNone: !openUserWindowBoolean
}"
[user]="user"
[users]="users"
[openUserWindowBoolean]="openUserWindowBoolean"
(closeUserWindow)="changeOpenUserWindowBoolean($event)"
></app-open-send-prv-message-window>
@if (!publicChannelsList.includes(currentChannel)) {
<div class="leaveChannel">
<button
[disabled]="openEditNameInput || openEditNameDescription"
@ -168,7 +167,6 @@
{{ "channel-information.leave" | translate }}
</button>
</div>
}
</div>
</div>
</div>

4
src/app/components/main-chat/channel-information/channel-information.component.ts
View file

@ -36,7 +36,7 @@ export class ChannelInformationComponent {
descriptionValue: string = '';
getCurrentChannel: Channel[] = [];
openUserWindowBoolean: boolean = false;
user: User[] = [];
users: User[] = [];
publicChannelsList: string[] = [];
constructor(
@ -145,7 +145,7 @@ export class ChannelInformationComponent {
* @param {User} user - The user to display information about.
*/
openUserWindow(user: User) {
this.user = [user];
this.users = [user];
this.openUserWindowBoolean = !this.openUserWindowBoolean;
}

26
src/app/components/main-chat/show-channel-member/open-send-prv-message-window/open-send-prv-message-window.component.html
View file

@ -2,7 +2,7 @@
<div class="darkBackground" (click)="closeWindow()"></div>
@if (showProfil) {
<!----- show prvProfil ----->
@for(i of talkToUser; track i){
@for(user of talkToUser; track user){
<div class="whiteBox">
<div class="boxHeader">
<p>{{ "open-send-prv-message.profil" | translate }}</p>
@ -10,20 +10,20 @@
<img src="./assets/img/closeIcon.svg" class="closeIcon" />
</div>
</div>
<img src="{{ i.avatar }}" class="profileImg" />
<img src="{{ user.avatar }}" class="profileImg" />
<div class="detailsBox">
<div class="editBtnPosition">
<p class="name">{{ i.firstName }} {{ i.lastName }}</p>
<p class="name">{{ user.firstName }} {{ user.lastName }}</p>
</div>
<div class="statusBox">
<img
src="./assets/img/{{
i.status ? 'onlineRing.svg' : 'offlineRing.svg'
user.status ? 'onlineRing.svg' : 'offlineRing.svg'
}}"
class="onlineIcon"
/>
@if (i.status) {
@if (user.status) {
<p class="fontColorGreen">
{{ "open-send-prv-message.aktiv" | translate }}
</p>
@ -37,7 +37,7 @@
<div class="email">
<p>{{ "open-send-prv-message.address" | translate }}</p>
<a href="mailto:wwweewefeff&#64;dede.de" target="_blank">{{
i.email
user.email
}}</a>
</div>
</div>
@ -45,7 +45,7 @@
</div>
} } @else {
<!----- show channelMember ----->
@for(i of user; track i){
@for(user of users; track user){
<div class="whiteBox">
<div class="boxHeader">
<p>{{ "open-send-prv-message.profil" | translate }}</p>
@ -53,20 +53,20 @@
<img src="./assets/img/closeIcon.svg" class="closeIcon" />
</div>
</div>
<img src="{{ i.avatar }}" class="profileImg" />
<img src="{{ user.avatar }}" class="profileImg" />
<div class="detailsBox">
<div class="editBtnPosition">
<p class="name">{{ i.firstName }} {{ i.lastName }}</p>
<p class="name">{{ user.firstName }} {{ user.lastName }}</p>
</div>
<div class="statusBox">
<img
src="./assets/img/{{
i.status ? 'onlineRing.svg' : 'offlineRing.svg'
user.status ? 'onlineRing.svg' : 'offlineRing.svg'
}}"
class="onlineIcon"
/>
@if (i.status) {
@if (user.status) {
<p class="fontColorGreen">
{{ "open-send-prv-message.aktiv" | translate }}
</p>
@ -79,11 +79,11 @@
<img src="./assets/img/mail-icon.svg" />
<div class="email">
<p>E-Mail-Address</p>
<a href="mailto:{{ i.email }}" target="_blank">{{ i.email }}</a>
<a href="mailto:{{ user.email }}" target="_blank">{{ user.email }}</a>
</div>
</div>
</div>
<button (click)="routeToUser(user)">
<button (click)="routeToUser(users)">
<img src="./assets/img/messageIcon.svg" />
{{ "open-send-prv-message.message" | translate }}
</button>

2
src/app/components/main-chat/show-channel-member/open-send-prv-message-window/open-send-prv-message-window.component.ts
View file

@ -15,7 +15,7 @@ import { TranslateModule } from '@ngx-translate/core';
styleUrl: './open-send-prv-message-window.component.scss',
})
export class OpenSendPrvMessageWindowComponent {
@Input() user: User[] = [];
@Input() users: User[] = [];
@Input() talkToUser: User[] = [];
@Input() openUserWindowBoolean: boolean = false;
@Input() showProfil: boolean = false;

2
src/app/components/main-chat/show-channel-member/show-channel-member.component.html
View file

@ -132,7 +132,7 @@
</section>
<app-open-send-prv-message-window
[ngClass]="{ dBlock: openUserWindowBoolean, dNone: !openUserWindowBoolean }"
[user]="user"
[users]="users"
[openUserWindowBoolean]="openUserWindowBoolean"
(closeUserWindow)="changeOpenUserWindowBoolean($event)"
></app-open-send-prv-message-window>

4
src/app/components/main-chat/show-channel-member/show-channel-member.component.ts
View file

@ -32,7 +32,7 @@ export class ShowChannelMemberComponent {
getSelectedUsers: User[] = [];
selectedUsers: string[] = [];
openUserWindowBoolean: boolean = false;
user: User[] = [];
users: User[] = [];
@Input() getFiltertUsers!: User[];
@Input() currentChannel!: string;
@ -166,7 +166,7 @@ export class ShowChannelMemberComponent {
* @returns {void}
*/
openUserWindow(user: User) {
this.user = [user];
this.users = [user];
this.openUserWindowBoolean = !this.openUserWindowBoolean;
}