diff --git a/src/app/app.component.ts b/src/app/app.component.ts index cc0617f..21599c2 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -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", @@ -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(); + } } diff --git a/src/app/components/dialogs/bottomsheet-profile-menu/bottomsheet-profile-menu.component.html b/src/app/components/dialogs/bottomsheet-profile-menu/bottomsheet-profile-menu.component.html index 6b7334d..fa661c7 100644 --- a/src/app/components/dialogs/bottomsheet-profile-menu/bottomsheet-profile-menu.component.html +++ b/src/app/components/dialogs/bottomsheet-profile-menu/bottomsheet-profile-menu.component.html @@ -2,11 +2,11 @@
diff --git a/src/app/components/dialogs/dialog-add-channel-add-member/dialog-add-channel-add-member.component.html b/src/app/components/dialogs/dialog-add-channel-add-member/dialog-add-channel-add-member.component.html index cfaac9e..37a5563 100644 --- a/src/app/components/dialogs/dialog-add-channel-add-member/dialog-add-channel-add-member.component.html +++ b/src/app/components/dialogs/dialog-add-channel-add-member/dialog-add-channel-add-member.component.html @@ -6,7 +6,7 @@

Leute hinzufügen

(click)="closeDialog()" mat-icon-button > - +
@@ -25,7 +25,7 @@

Leute hinzufügen

} @else { @@ -36,7 +36,7 @@
{{ user.name }}
matChipRemove mat-icon-button > - + } @@ -60,7 +60,7 @@
{{ user.name }}
} @else { diff --git a/src/app/components/dialogs/dialog-add-channel/dialog-add-channel.component.html b/src/app/components/dialogs/dialog-add-channel/dialog-add-channel.component.html index 45945e5..e26a51c 100644 --- a/src/app/components/dialogs/dialog-add-channel/dialog-add-channel.component.html +++ b/src/app/components/dialogs/dialog-add-channel/dialog-add-channel.component.html @@ -6,7 +6,7 @@

Channel erstellen

(click)="closeDialog()" mat-icon-button > - +
Channel-Name [(ngModel)]="channelName" placeholder="z.B. Kooperationsprojekte" /> - + @if (invalidName) { Bitte keine Leerzeichen. } diff --git a/src/app/components/dialogs/dialog-add-member-to-chnl/dialog-add-member-to-chnl.component.html b/src/app/components/dialogs/dialog-add-member-to-chnl/dialog-add-member-to-chnl.component.html index d9fd259..8ce4b53 100644 --- a/src/app/components/dialogs/dialog-add-member-to-chnl/dialog-add-member-to-chnl.component.html +++ b/src/app/components/dialogs/dialog-add-member-to-chnl/dialog-add-member-to-chnl.component.html @@ -7,11 +7,11 @@

Leute hinzufügen

(click)="closeDialog()" mat-icon-button > - + {{ + >{{ chatService.currentChannel.name }} @@ -24,7 +24,7 @@

Leute hinzufügen

} @else { }
{{ user.name }}
@@ -33,7 +33,7 @@
{{ user.name }}
matChipRemove mat-icon-button > - + } @@ -58,7 +58,7 @@
{{ user.name }}
} @else { diff --git a/src/app/components/dialogs/dialog-channel-info/dialog-channel-info.component.html b/src/app/components/dialogs/dialog-channel-info/dialog-channel-info.component.html index 4f3c420..8e810d2 100644 --- a/src/app/components/dialogs/dialog-channel-info/dialog-channel-info.component.html +++ b/src/app/components/dialogs/dialog-channel-info/dialog-channel-info.component.html @@ -1,7 +1,7 @@
- +

{{ chatService.currentChannel.name }}

@if (!editingName) { @@ -19,7 +19,7 @@
Channel-Name
Bearbeiten
- +

{{ chatService.currentChannel.name }}

@@ -39,7 +39,7 @@
Channel-Name
value="{{ this.name }}" placeholder="z.B. Kooperationsprojekte" /> - + @if (invalidName) { Bitte keine Leerzeichen. } diff --git a/src/app/components/dialogs/dialog-edit-message/dialog-edit-message.component.html b/src/app/components/dialogs/dialog-edit-message/dialog-edit-message.component.html index 29f90cb..3946a24 100644 --- a/src/app/components/dialogs/dialog-edit-message/dialog-edit-message.component.html +++ b/src/app/components/dialogs/dialog-edit-message/dialog-edit-message.component.html @@ -3,7 +3,7 @@
diff --git a/src/app/components/dialogs/dialog-edit-profile-edit-profile/dialog-edit-profile-edit-profile.component.html b/src/app/components/dialogs/dialog-edit-profile-edit-profile/dialog-edit-profile-edit-profile.component.html index fc78919..611af4d 100644 --- a/src/app/components/dialogs/dialog-edit-profile-edit-profile/dialog-edit-profile-edit-profile.component.html +++ b/src/app/components/dialogs/dialog-edit-profile-edit-profile/dialog-edit-profile-edit-profile.component.html @@ -11,7 +11,7 @@ (click)="closeDialog()" mat-icon-button > - +
@@ -19,7 +19,7 @@ @if (currentUser.avatar.length > 1) { } @else { - + }
@if (!editing) { @@ -30,12 +30,12 @@

{{ currentUser.name }}

Bearbeiten }
- Aktiv + Aktiv
E-Mail Adresse @@ -50,7 +50,7 @@

{{ currentUser.name }}

- +

Vollständiger Name

Vollständiger Name
- +

E-Mail-Adresse

Mitglieder (click)="closeDialog()" mat-icon-button > - +
@@ -14,22 +14,22 @@

Mitglieder

@for (user of chatService.currentChannel.members; track $index) {
@if (user.avatar.length > 1) { } @else { } - @if (isOnline(user.id)) { - + @if (commonFn.isOnline(user.id)) { + } @else { - + }

{{ user.name }}

@@ -41,7 +41,7 @@

{{ user.name }}

mat-icon-button (click)="openDialogAddMembers()" > - +

Mitglieder hinzufügen

diff --git a/src/app/components/dialogs/dialog-show-channel-member/dialog-show-channel-member.component.ts b/src/app/components/dialogs/dialog-show-channel-member/dialog-show-channel-member.component.ts index c64978d..73a4cb9 100644 --- a/src/app/components/dialogs/dialog-show-channel-member/dialog-show-channel-member.component.ts +++ b/src/app/components/dialogs/dialog-show-channel-member/dialog-show-channel-member.component.ts @@ -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, @@ -20,6 +21,7 @@ export class DialogShowChannelMemberComponent { public dialogRef: MatDialogRef, public chatService: ChatService, public dialog: MatDialog, + public commonFn: CommonFnService ) { } @@ -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; - } } diff --git a/src/app/components/dialogs/pofile-info-card/pofile-info-card.component.html b/src/app/components/dialogs/pofile-info-card/pofile-info-card.component.html index 3f443b3..dd733a0 100644 --- a/src/app/components/dialogs/pofile-info-card/pofile-info-card.component.html +++ b/src/app/components/dialogs/pofile-info-card/pofile-info-card.component.html @@ -6,24 +6,24 @@ (click)="closeDialog()" mat-icon-button > - +
@if (data.avatar.length > 1) { } @else { - + }

{{ data.name }}

@if (data.online) { - + Aktiv } @else { - + Abwesend }
@@ -31,7 +31,7 @@

{{ data.name }}

E-Mail Adresse @@ -45,7 +45,7 @@

{{ data.name }}

class="submit" (click)="openDM(data)" > - + Nachricht diff --git a/src/app/components/main/chat/chat.component.html b/src/app/components/main/chat/chat.component.html index acdc7f4..448dccc 100644 --- a/src/app/components/main/chat/chat.component.html +++ b/src/app/components/main/chat/chat.component.html @@ -1,9 +1,9 @@
@@ -52,7 +52,7 @@

{{ commonFnService.dayDate(message.value.time) }}

@@ -156,7 +156,7 @@
{{ message.value.name}}
- +

{{ chatService.currentChannel.name }}

@@ -183,7 +183,7 @@

{{ chatService.currentChannel.name }}

Image Preview
@@ -192,25 +192,25 @@

{{ chatService.currentChannel.name }}

@@ -219,7 +219,7 @@

{{ chatService.currentChannel.name }}

@if (option.avatar && option.avatar.length > 1) { } @else { - } diff --git a/src/app/components/main/conversations/conversations.component.html b/src/app/components/main/conversations/conversations.component.html index ba8fbea..81664d1 100644 --- a/src/app/components/main/conversations/conversations.component.html +++ b/src/app/components/main/conversations/conversations.component.html @@ -2,8 +2,8 @@

Devspace

@@ -16,7 +16,7 @@

Devspace

class="new-message" mat-icon-button > - +
@@ -28,7 +28,7 @@

Devspace

- +

Channels

@@ -60,7 +60,7 @@

Channels

class="channel" value="{{ channel.id }}" > - +

{{ channel.channelData.name }}

} @@ -69,7 +69,7 @@

{{ channel.channelData.name }}

class="new-channel" (click)="openDialog($event)" > - + Channel hinzufügen
@@ -83,7 +83,7 @@

{{ channel.channelData.name }}

Direktnachrichten

@@ -112,18 +112,18 @@

Direktnachrichten

} @else { } @if (user.online) { } @else { }
diff --git a/src/app/components/main/direct-message/direct-message.component.html b/src/app/components/main/direct-message/direct-message.component.html index c7b7fbe..a256856 100644 --- a/src/app/components/main/direct-message/direct-message.component.html +++ b/src/app/components/main/direct-message/direct-message.component.html @@ -1,20 +1,20 @@
-
@if (chatService.selectedUser.avatar.length > 1) { } @else { - } @if (chatService.selectedUser.online) { - + } @else { - + }

{{ chatService.selectedUser.name }}

@@ -48,11 +48,11 @@

{{ commonFnService.dayDate(message.value.time) }}

@@ -133,14 +133,14 @@
{{ message.value.name }}
@if (chatService.selectedUser.avatar.length > 1) { } @else { - }

{{ chatService.selectedUser.name }}

Diese Unterhaltung findet nur zwischen - und dir statt. @@ -155,7 +155,7 @@

{{ chatService.selectedUser.name }}

[formControl]="formCtrl">
Image Preview
@@ -164,11 +164,11 @@

{{ chatService.selectedUser.name }}

{{ chatService.selectedUser.name }}
@@ -189,7 +189,7 @@

{{ chatService.selectedUser.name }}

@if (option.avatar && option.avatar.length > 1) { } @else { - } diff --git a/src/app/components/main/header/header.component.html b/src/app/components/main/header/header.component.html index 82da0b4..eb82987 100644 --- a/src/app/components/main/header/header.component.html +++ b/src/app/components/main/header/header.component.html @@ -5,19 +5,19 @@ class="mobile-header-open" (click)="mobileGoBack()" > - +
- - + +
- + } @else { }
@@ -39,7 +39,7 @@ } @else { @@ -54,7 +54,7 @@

{{ option.name }}

} @else { @@ -68,7 +68,7 @@

{{ option.name }}

- +
{{ option.name }}

{{ currentuser.currentUser.name }}

- + @if (currentuser.currentUser.avatar.length > 1) { } @else { @@ -94,7 +94,7 @@

{{ currentuser.currentUser.name }}

(click)="openDialog($event)" mat-icon-button > - +
@@ -125,7 +125,7 @@

{{ currentuser.currentUser.name }}

} @else { @@ -140,7 +140,7 @@

{{ option.name }}

} @else { @@ -152,7 +152,7 @@

{{ option.name }}

- +
diff --git a/src/app/components/main/main.component.html b/src/app/components/main/main.component.html index 45883e1..321fa40 100644 --- a/src/app/components/main/main.component.html +++ b/src/app/components/main/main.component.html @@ -18,10 +18,10 @@ @if (showMenu) { Workspace-Menü schließen + > } @else { Workspace-Menü öffen + > } @if (!chatService.mobileOpen) { @@ -62,7 +62,7 @@ type="submit" (click)="openMobileComponent('newMessage')" > - + } @case ("chat") { diff --git a/src/app/components/main/new-message/new-message.component.html b/src/app/components/main/new-message/new-message.component.html index df2b2c4..2b9f870 100644 --- a/src/app/components/main/new-message/new-message.component.html +++ b/src/app/components/main/new-message/new-message.component.html @@ -21,7 +21,7 @@

Neue Nachricht

} @else { @@ -30,7 +30,7 @@

{{ option.name }}

} @else { - +

{{ option.name }}

} @@ -52,7 +52,7 @@

{{ option.name }}

@@ -62,7 +62,7 @@

{{ option.name }}

(click)="togglePicker()" > Add emoji @@ -73,14 +73,14 @@

{{ option.name }}

diff --git a/src/app/components/main/thread/thread.component.html b/src/app/components/main/thread/thread.component.html index a19b716..b9f33f7 100644 --- a/src/app/components/main/thread/thread.component.html +++ b/src/app/components/main/thread/thread.component.html @@ -3,12 +3,12 @@

Thread

- + {{ chatService.currentChannel.name }}
@@ -16,11 +16,11 @@

Thread

- +
@@ -83,7 +83,7 @@
{{ initialMessage.name }}
@@ -97,11 +97,11 @@
{{ initialMessage.name }}
- @@ -165,7 +165,7 @@
{{ message.name }}
@@ -183,7 +183,7 @@
{{ message.name }}
placeholder="Antworten...">
Image Preview
@@ -192,22 +192,22 @@
{{ message.name }}
@@ -216,7 +216,7 @@
{{ message.name }}
@if (option.avatar && option.avatar.length > 1) { } @else { - } diff --git a/src/app/components/start/avatar/avatar.component.html b/src/app/components/start/avatar/avatar.component.html index bae68fd..be1ad19 100644 --- a/src/app/components/start/avatar/avatar.component.html +++ b/src/app/components/start/avatar/avatar.component.html @@ -7,11 +7,11 @@

Wähle deinen Avatar

} @else if (this.avatar){
- +
} @else {
- +
} @@ -25,14 +25,14 @@

Frederik Beck

} @else { diff --git a/src/app/components/start/legal-notice/legal-notice.component.html b/src/app/components/start/legal-notice/legal-notice.component.html index e8c75ae..c2eb53c 100644 --- a/src/app/components/start/legal-notice/legal-notice.component.html +++ b/src/app/components/start/legal-notice/legal-notice.component.html @@ -5,7 +5,7 @@ (click)="this.location.back()" > Go back diff --git a/src/app/components/start/login/login.component.html b/src/app/components/start/login/login.component.html index 02b2a66..0e1ea98 100644 --- a/src/app/components/start/login/login.component.html +++ b/src/app/components/start/login/login.component.html @@ -16,7 +16,7 @@

Anmeldung

placeholder="beispielname@email.com" id="email" /> - + @if (invalidEmail) { Diese E-Mail-Adresse ist leider ungültig.Anmeldung placeholder="Passwort" id="password" /> - + @if (invalidPasswordOrEmail) { Falsches Passwort oder E-Mail. Bitte noch einmal @@ -59,7 +59,7 @@

Anmeldung

type="button" (click)="loginWithGoogle()" > - + Anmelden mit Google
diff --git a/src/app/components/start/privacy-policy/privacy-policy.component.html b/src/app/components/start/privacy-policy/privacy-policy.component.html index 94947c0..54f98a9 100644 --- a/src/app/components/start/privacy-policy/privacy-policy.component.html +++ b/src/app/components/start/privacy-policy/privacy-policy.component.html @@ -5,7 +5,7 @@ (click)="this.location.back()" > Go back diff --git a/src/app/components/start/recovery/recovery.component.html b/src/app/components/start/recovery/recovery.component.html index 0ae93a2..5a58152 100644 --- a/src/app/components/start/recovery/recovery.component.html +++ b/src/app/components/start/recovery/recovery.component.html @@ -5,7 +5,7 @@ (click)="location.back()" > Go back @@ -22,7 +22,7 @@

Passwort zurücksetzen

placeholder="beispielname@email.com" id="email" /> - + @if (invalidEmail) { Diese E-Mail-Adresse ist leider ungültig.Passwort zurücksetzen @if (emailSent) {

E-Mail gesendet

diff --git a/src/app/components/start/reset-password/reset-password.component.html b/src/app/components/start/reset-password/reset-password.component.html index 683c70d..4de02d8 100644 --- a/src/app/components/start/reset-password/reset-password.component.html +++ b/src/app/components/start/reset-password/reset-password.component.html @@ -5,7 +5,7 @@ (click)="goBack()" > Go back diff --git a/src/app/components/start/signup/signup.component.html b/src/app/components/start/signup/signup.component.html index 5d4b616..6ca65a0 100644 --- a/src/app/components/start/signup/signup.component.html +++ b/src/app/components/start/signup/signup.component.html @@ -5,7 +5,7 @@ (click)="this.location.back()" > Go back @@ -34,7 +34,7 @@

Konto erstellen

required pattern="^[A-ZÄÖÜ][a-zäöüß]+ [A-ZÄÖÜ][a-zäöüß]+$" /> - + @if (!name.valid && (accountForm.submitted || name.touched)) { Konto erstellen required pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}" /> - + @if (!email.valid && (accountForm.submitted || email.touched)) { Konto erstellen pattern="^\S{6,}$" required /> - + @if ( !password.valid && diff --git a/src/app/components/start/start.component.html b/src/app/components/start/start.component.html index d5c5e73..211d892 100644 --- a/src/app/components/start/start.component.html +++ b/src/app/components/start/start.component.html @@ -3,12 +3,12 @@