Skip to content

Commit

Permalink
small bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kakar21
Kakar21 committed Sep 17, 2024
1 parent 01825a3 commit 7ed7fa1
Show file tree
Hide file tree
Showing 28 changed files with 164 additions and 164 deletions.
5 changes: 5 additions & 0 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Component } from "@angular/core";
import { RouterOutlet } from "@angular/router";
import { trigger, style, animate, transition } from "@angular/animations";
import { FirestoreService } from "./shared/firestore.service";

@Component({
selector: "app-root",
Expand All @@ -12,4 +13,8 @@ import { trigger, style, animate, transition } from "@angular/animations";
})
export class AppComponent {
title = "DABubble";

constructor(private firestore: FirestoreService) {
this.firestore.currentUser$.subscribe();
}
}
4 changes: 2 additions & 2 deletions src/app/components/dialogs/bottomsheet-profile-menu/bottomsheet-profile-menu.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<div class="handle"></div>
<div class="menu">
<div (click)="openProfile()">
<img src="../../assets/img/icons/account_circle.svg" />
<img src="assets/img/icons/account_circle.svg" />
<h2>Profil</h2>
</div>
<div (click)="logout()">
<img src="../../assets/img/icons/logout.svg" />
<img src="assets/img/icons/logout.svg" />
<h2>Abmelden</h2>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions ...onents/dialogs/dialog-add-channel-add-member/dialog-add-channel-add-member.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h2 mat-dialog-title>Leute hinzufügen</h2>
(click)="closeDialog()"
mat-icon-button
>
<img src="../../../assets/img/icons/close.svg" />
<img src="assets/img/icons/close.svg" />
</button>
</div>
<div class="dialog-content-container">
Expand All @@ -25,7 +25,7 @@ <h2 mat-dialog-title>Leute hinzufügen</h2>
<img src="{{ user.avatar }}" />
} @else {
<img
src="../../assets/img/avatar/{{
src="assets/img/avatar/{{
user.avatar
}}.svg"
/>
Expand All @@ -36,7 +36,7 @@ <h6>{{ user.name }}</h6>
matChipRemove
mat-icon-button
>
<img src="../../assets/img/icons/close.svg" />
<img src="assets/img/icons/close.svg" />
</button>
</mat-chip-row>
}
Expand All @@ -60,7 +60,7 @@ <h6>{{ user.name }}</h6>
<img src="{{ user.avatar }}" />
} @else {
<img
src="../../assets/img/avatar/{{
src="assets/img/avatar/{{
user.avatar
}}.svg"
/>
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/dialogs/dialog-add-channel/dialog-add-channel.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h2 mat-dialog-title>Channel erstellen</h2>
(click)="closeDialog()"
mat-icon-button
>
<img src="../../../assets/img/icons/close.svg" />
<img src="assets/img/icons/close.svg" />
</button>
</div>
<span
Expand All @@ -20,7 +20,7 @@ <h3>Channel-Name</h3>
[(ngModel)]="channelName"
placeholder="z.B. Kooperationsprojekte"
/>
<img src="../../assets/img/icons/tag-gray.svg" />
<img src="assets/img/icons/tag-gray.svg" />
@if (invalidName) {
<span class="error">Bitte keine Leerzeichen.</span>
}
Expand Down
10 changes: 5 additions & 5 deletions ...app/components/dialogs/dialog-add-member-to-chnl/dialog-add-member-to-chnl.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ <h2 mat-dialog-title>Leute hinzufügen</h2>
(click)="closeDialog()"
mat-icon-button
>
<img src="../../../assets/img/icons/close.svg" />
<img src="assets/img/icons/close.svg" />
</button>
</div>
<span
><img src="../../assets/img/icons/tag-purple-2.svg" />{{
><img src="assets/img/icons/tag-purple-2.svg" />{{
chatService.currentChannel.name
}}</span
>
Expand All @@ -24,7 +24,7 @@ <h2 mat-dialog-title>Leute hinzufügen</h2>
<img src="{{ user.avatar }}" />
} @else {
<img
src="../../assets/img/avatar/{{ user.avatar }}.svg"
src="assets/img/avatar/{{ user.avatar }}.svg"
/>
}
<h6>{{ user.name }}</h6>
Expand All @@ -33,7 +33,7 @@ <h6>{{ user.name }}</h6>
matChipRemove
mat-icon-button
>
<img src="../../assets/img/icons/close.svg" />
<img src="assets/img/icons/close.svg" />
</button>
</mat-chip-row>
}
Expand All @@ -58,7 +58,7 @@ <h6>{{ user.name }}</h6>
<img src="{{ user.avatar }}" />
} @else {
<img
src="../../assets/img/avatar/{{
src="assets/img/avatar/{{
user.avatar
}}.svg"
/>
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/dialogs/dialog-channel-info/dialog-channel-info.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<main>
<section class="title">
<div>
<img src="../../assets/img/icons/tag-black.svg" />
<img src="assets/img/icons/tag-black.svg" />
<h1>{{ chatService.currentChannel.name }}</h1>
</div>
<button
class="closeButton"
(click)="closeDialog()"
mat-icon-button
>
<img src="../../../assets/img/icons/close.svg" />
<img src="assets/img/icons/close.svg" />
</button>
</section>
@if (!editingName) {
Expand All @@ -19,7 +19,7 @@ <h6>Channel-Name</h6>
<span (click)="editName()">Bearbeiten</span>
</div>
<div>
<img src="../../assets/img/icons/tag-black.svg" />
<img src="assets/img/icons/tag-black.svg" />
<p>{{ chatService.currentChannel.name }}</p>
</div>
</section>
Expand All @@ -39,7 +39,7 @@ <h6>Channel-Name</h6>
value="{{ this.name }}"
placeholder="z.B. Kooperationsprojekte"
/>
<img src="../../assets/img/icons/tag-black.svg" />
<img src="assets/img/icons/tag-black.svg" />
@if (invalidName) {
<span class="error">Bitte keine Leerzeichen.</span>
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/dialogs/dialog-edit-message/dialog-edit-message.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="action-buttons">
<div class="button-wrapper">
<button class="input-emoji" mat-icon-button (click)="togglePicker($event); $event.stopPropagation()">
<img src="../../../assets/img/icons/sentiment_satisfied.svg" alt="Add emoji" />
<img src="assets/img/icons/sentiment_satisfied.svg" alt="Add emoji" />
</button>

<div class="emoji-picker" *ngIf="isPickerVisible">
Expand Down
12 changes: 6 additions & 6 deletions .../dialogs/dialog-edit-profile-edit-profile/dialog-edit-profile-edit-profile.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
(click)="closeDialog()"
mat-icon-button
>
<img src="../../../assets/img/icons/close.svg" />
<img src="assets/img/icons/close.svg" />
</button>
</div>
<div class="image-section" [ngClass]="{'not-guest': currentUserUid !== 'mMqjWie0OWa6lWCnq5hStLQqXow1'}" (click)="onAvatarClick()">
<input type="file" #avatarInput style="display: none;" (change)="onFileSelected($event)" accept="image/*" />
@if (currentUser.avatar.length > 1) {
<img src="{{ currentUser.avatar }}" />
} @else {
<img src="./../../assets/img/avatar/{{ currentUser.avatar }}.svg" />
<img src="assets/img/avatar/{{ currentUser.avatar }}.svg" />
}
</div>
@if (!editing) {
Expand All @@ -30,12 +30,12 @@ <h1>{{ currentUser.name }}</h1>
<span (click)="editProfile()">Bearbeiten</span>
}
</div>
<span><img src="../../assets/img/icons/online-1.svg" />Aktiv</span>
<span><img src="assets/img/icons/online-1.svg" />Aktiv</span>
</div>
<div class="profile-mail-section">
<div class="profile-mail">
<img
src="../../assets/img/icons/mail-black.svg"
src="assets/img/icons/mail-black.svg"
alt=""
/>
<span>E-Mail Adresse</span>
Expand All @@ -50,7 +50,7 @@ <h1>{{ currentUser.name }}</h1>
<div class="editing-container">
<div class="edit-name">
<div>
<img src="../../assets/img/icons/account_circle.svg" />
<img src="assets/img/icons/account_circle.svg" />
<h2>Vollständiger Name</h2>
</div>
<input
Expand All @@ -61,7 +61,7 @@ <h2>Vollständiger Name</h2>
</div>
<div class="edit-email">
<div>
<img src="../../assets/img/icons/mail-black.svg" />
<img src="assets/img/icons/mail-black.svg" />
<h2>E-Mail-Adresse</h2>
</div>
<input
Expand Down
14 changes: 7 additions & 7 deletions ...p/components/dialogs/dialog-show-channel-member/dialog-show-channel-member.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@ <h3>Mitglieder</h3>
(click)="closeDialog()"
mat-icon-button
>
<img src="../../../assets/img/icons/close.svg" />
<img src="assets/img/icons/close.svg" />
</button>
</div>
<main>
<div class="dialog-content">
@for (user of chatService.currentChannel.members; track $index) {
<div
class="channel-member"
(click)="openProfileCard(user)"
(click)="commonFn.openProfileCardByUser(user)"
>
<div class="avatar">
@if (user.avatar.length > 1) {
<img src="{{ user.avatar }}" />
} @else {
<img
src="../../assets/img/avatar/{{
src="assets/img/avatar/{{
user.avatar
}}.svg"
/>
}
@if (isOnline(user.id)) {
<img src="../../../assets/img/icons/online.svg" />
@if (commonFn.isOnline(user.id)) {
<img src="assets/img/icons/online.svg" />
} @else {
<img src="../../../assets/img/icons/offline.svg" />
<img src="assets/img/icons/offline.svg" />
}
</div>
<h4>{{ user.name }}</h4>
Expand All @@ -41,7 +41,7 @@ <h4>{{ user.name }}</h4>
mat-icon-button
(click)="openDialogAddMembers()"
>
<img src="../../../assets/img/icons/person-add.svg" />
<img src="assets/img/icons/person-add.svg" />
</button>
<p>Mitglieder hinzufügen</p>
</div>
Expand Down
18 changes: 2 additions & 16 deletions ...app/components/dialogs/dialog-show-channel-member/dialog-show-channel-member.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { MatButtonModule } from "@angular/material/button";
import { DialogAddMemberToChnlComponent } from "../dialog-add-member-to-chnl/dialog-add-member-to-chnl.component";
import { PofileInfoCardComponent } from "../pofile-info-card/pofile-info-card.component";
import { UsersList } from "../../../interfaces/users-list";
import { CommonFnService } from "../../../shared/common-fn.service";
@Component({
selector: "app-dialog-show-channel-member",
standalone: true,
Expand All @@ -20,6 +21,7 @@ export class DialogShowChannelMemberComponent {
public dialogRef: MatDialogRef<DialogShowChannelMemberComponent>,
public chatService: ChatService,
public dialog: MatDialog,
public commonFn: CommonFnService
) { }


Expand All @@ -33,20 +35,4 @@ export class DialogShowChannelMemberComponent {
panelClass: "custom-dialog-mid",
});
}


openProfileCard(user: UsersList) {
user.online = this.isOnline(user.id);
this.dialog.open(PofileInfoCardComponent, {
data: user,
});
}


isOnline(userId: string): boolean {
const user = this.chatService.usersList.find(
(user) => user.id === userId,
);
return user ? user.online : false;
}
}
12 changes: 6 additions & 6 deletions src/app/components/dialogs/pofile-info-card/pofile-info-card.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
(click)="closeDialog()"
mat-icon-button
>
<img src="../../../assets/img/icons/close.svg" />
<img src="assets/img/icons/close.svg" />
</button>
</div>
<div class="image-section">
@if (data.avatar.length > 1) {
<img src="{{ data.avatar }}" />
} @else {
<img src="./../../assets/img/avatar/{{ data.avatar }}.svg" />
<img src="assets/img/avatar/{{ data.avatar }}.svg" />
}
</div>
<div class="profile-active-section">
<h1>{{ data.name }}</h1>
<div class="status">
@if (data.online) {
<img src="../../assets/img/icons/online-1.svg" />
<img src="assets/img/icons/online-1.svg" />
<span style="color: var(--online-green)">Aktiv</span>
} @else {
<img src="../../assets/img/icons/offline-1.svg" />
<img src="assets/img/icons/offline-1.svg" />
<span style="color: var(--text-gray)">Abwesend</span>
}
</div>
</div>
<div class="profile-mail-section">
<div class="profile-mail">
<img
src="../../assets/img/icons/mail-black.svg"
src="assets/img/icons/mail-black.svg"
alt=""
/>
<span>E-Mail Adresse</span>
Expand All @@ -45,7 +45,7 @@ <h1>{{ data.name }}</h1>
class="submit"
(click)="openDM(data)"
>
<img src="../../assets/img/icons/mode_comment.svg" />
<img src="assets/img/icons/mode_comment.svg" />
Nachricht
</button>
</section>
Loading

0 comments on commit 7ed7fa1

Please sign in to comment.