feat update

myclubapp · Dec 20, 2023 · ece11c8 · ece11c8
1 parent 6d38e1d
commit ece11c8
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 81 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "@fortawesome/fontawesome-svg-core": "6.4.2",
     "@fortawesome/free-brands-svg-icons": "6.4.2",
     "@fortawesome/free-solid-svg-icons": "6.4.2",
-    "@ionic/angular": "7.6.0",
+    "@ionic/angular": "7.6.1",
     "@ionic/pwa-elements": "^3.1.1",
     "@ngx-translate/core": "^15.0.0",
     "@ngx-translate/http-loader": "^8.0.0",

diff --git a/src/app/pages/club/club.page.html b/src/app/pages/club/club.page.html
@@ -33,7 +33,9 @@
 -->
     </ion-list>
     <ion-list [inset]="true" *ngIf="club['clubRequests'].length > 0">
-      <ion-list-header> {{"common.requests" | translate}} </ion-list-header>
+      <ion-list-header>
+        <ion-label> {{"common.requests" | translate}} </ion-label>
+      </ion-list-header>
       <ion-item *ngFor="let request of club['clubRequests']" detail="true">
         <ion-icon
           slot="start"
@@ -47,7 +49,9 @@
     </ion-list>
 
     <ion-list [inset]="true">
-      <ion-list-header> {{"common.members" | translate}} </ion-list-header>
+      <ion-list-header>
+        <ion-label> {{"common.members" | translate}} </ion-label>
+      </ion-list-header>
       <ion-item *ngFor="let member of club['clubMembers']" detail="true">
         <ion-avatar slot="start">
           <img src="{{member?.profilePicture}}" />

diff --git a/src/app/pages/club/club.page.ts b/src/app/pages/club/club.page.ts
@@ -40,10 +40,6 @@ export class ClubPage implements OnInit {
   club$: Observable<any>;
   subscribeMember: Subscription;
 
-  memberList$: Observable<Profile[]>;
-  adminList$: Observable<Profile[]>;
-  requestList$: Observable<Profile[]>;
-
   user$: Observable<User>;
   user: User;
 
@@ -59,12 +55,11 @@ export class ClubPage implements OnInit {
     private readonly authService: AuthService,
     private cdr: ChangeDetectorRef,
     private translate: TranslateService
-  ) { }
+  ) {}
 
   ngOnInit() {
     this.club = this.navParams.get("data");
-    this.club.clubAdmins = [];
-    this.club.clubMembers = [];
+
     this.club$ = of(this.club);
     this.club$ = this.getClub(this.club.id);
   }
@@ -175,44 +170,44 @@ export class ClubPage implements OnInit {
   async addAdministrator() {
     let memberSelect = [];
 
-    this.subscribeMember = this.club$.pipe(
-      take(1),
-      tap((club) => {
-        console.log(club);
-        club.clubMembers.forEach((member) => {
-          if (!club.clubAdmins.find((element) => element.id === member.id)) {
-            memberSelect.push({
-              type: "checkbox",
-              name: member.id,
-              label: `${member.firstName} ${member.lastName}`,
-              value: member,
-              checked: false,
+    this.subscribeMember = this.club$
+      .pipe(
+        take(1),
+        tap((club) => {
+          console.log(club);
+          club.clubMembers.forEach((member) => {
+            if (!club.clubAdmins.find((element) => element.id === member.id)) {
+              memberSelect.push({
+                type: "checkbox",
+                name: member.id,
+                label: `${member.firstName} ${member.lastName}`,
+                value: member,
+                checked: false,
+              });
+            }
+          });
+        }),
+        finalize(async () => {
+          if (memberSelect.length > 0) {
+            const alert = await this.alertCtrl.create({
+              header: "Administrator hinzufügen",
+              inputs: memberSelect,
+              buttons: [
+                {
+                  text: "Abbrechen",
+                  handler: () => console.log("Cancel clicked"),
+                },
+                {
+                  text: "Hinzufügen",
+                  handler: (data) => console.log(data),
+                },
+              ],
             });
+            await alert.present();
           }
-
-        });
-      }),
-      finalize(async () => {
-        if (memberSelect.length > 0) {
-          const alert = await this.alertCtrl.create({
-            header: "Administrator hinzufügen",
-            inputs: memberSelect,
-            buttons: [
-              {
-                text: "Abbrechen",
-                handler: () => console.log("Cancel clicked"),
-              },
-              {
-                text: "Hinzufügen",
-                handler: (data) => console.log(data),
-              },
-            ],
-          });
-          await alert.present();
-        }
-      })
-    ).subscribe();
-
+        })
+      )
+      .subscribe();
 
     /*
         let memberSelect = [];

diff --git a/src/app/services/firebase/user-profile.service.ts b/src/app/services/firebase/user-profile.service.ts
@@ -82,7 +82,7 @@ export class UserProfileService {
   }
 
   async addPushSubscriber(
-    sub: PushSubscription,  // WebPush
+    sub: PushSubscription, // WebPush
     deviceId: DeviceId,
     deviceInfo: DeviceInfo,
     token: string // native
@@ -91,17 +91,19 @@ export class UserProfileService {
     const pushObject = JSON.stringify(sub);
     const userProfileRef: DocumentReference<DocumentData> = doc(
       this.firestore,
-      `userProfile/${user.uid}/push/${deviceId.identifier}`
+      // `userProfile/${user.uid}/push/${deviceId.identifier}`
+      `userProfile/${user.uid}/push/${deviceInfo.model}`
     );
 
     return setDoc(userProfileRef, {
-      pushObject: pushObject && "{}",
-      updated: new Date(),
+      identifier: deviceId.identifier,
+      token: token || "", // Set token for native Web Push
+      pushObject: pushObject || "{}", // Set token for web push
       model: deviceInfo.model || "",
       operatingSystem: deviceInfo.operatingSystem || "",
       osVersion: deviceInfo.osVersion || "",
       platform: deviceInfo.platform || "", // --> set to "Web" for Web Push from Backend or "Native" for Native Push from firebase
-      token: token || "", // Set token for native Web Push
+      updated: new Date(),
     });
   }
 
@@ -122,7 +124,7 @@ export class UserProfileService {
   async changeSettingsPushModule(state: boolean, module) {
     const user = this.authService.auth.currentUser;
     const userProfileRef = doc(this.firestore, `userProfile/${user.uid}`);
-    return updateDoc(userProfileRef, { ['settingsPush' + module]: state });
+    return updateDoc(userProfileRef, { ["settingsPush" + module]: state });
   }
 
   async changeSettingsEmail(state: boolean) {