fix(front): use correct xp calculations on profile page

momentum-mod · Oct 23, 2024 · f24be95 · f24be95
1 parent 75ee2ad
commit f24be95
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/apps/frontend/src/app/components/player-card/player-card.component.ts b/apps/frontend/src/app/components/player-card/player-card.component.ts
@@ -36,7 +36,7 @@ export class PlayerCardComponent implements OnInit {
         if (!user) return;
         this.user = user;
         this.level = user.userStats.level;
-        this.xp = user.userStats.cosXP as number;
+        this.xp = user.userStats.cosXP;
         this.currLevelXp = this.xpService.getCosmeticXpForLevel(this.level);
         this.nextLevelXp = this.xpService.getCosmeticXpForLevel(this.level + 1);
       });

diff --git a/apps/frontend/src/app/pages/profile/profile.component.html b/apps/frontend/src/app/pages/profile/profile.component.html
@@ -74,8 +74,8 @@
           @if (!hasRole(Role.DELETED)) {
             <div class="flex w-full gap-2 font-display text-2xl">
               <div class="flex-grow">
-                <p class="pb-1 leading-none">{{ currXp }} / {{ nextXp }} xp</p>
-                <p-progressBar class="h-2 w-full" [showValue]="false" [value]="(100 * currXp) / nextXp" />
+                <p class="pb-1 leading-none">{{ xp - currLevelXp }} / {{ nextLevelXp - currLevelXp }} xp</p>
+                <p-progressBar class="h-2 w-full" [showValue]="false" [value]="(100 * (xp - currLevelXp)) / (nextLevelXp - currLevelXp)" />
               </div>
               <m-level-indicator class="mt-auto" [totalLevel]="user.userStats.level" />
             </div>

diff --git a/apps/frontend/src/app/pages/profile/profile.component.ts b/apps/frontend/src/app/pages/profile/profile.component.ts
@@ -81,8 +81,10 @@ export class ProfileComponent implements OnInit {
   followingUsers: Follow[] = [];
   followedByUsers: Follow[] = [];
   localFollowStatus = new BehaviorSubject<Follow>(null);
-  currXp: number;
-  nextXp: number;
+  level: number;
+  xp: number;
+  currLevelXp: number;
+  nextLevelXp: number;
   protected credits: MapCredit[];
   protected creditMap: Partial<Record<MapCreditType, MapCredit[]>>;
 
@@ -132,12 +134,13 @@ export class ProfileComponent implements OnInit {
 
           this.avatarLoaded = true;
           this.countryDisplayName = ISOCountryCode[this.user.country];
-          this.currXp =
-            (user.userStats.cosXP as number) -
-            this.xpService.getCosmeticXpForLevel(user.userStats.level);
-          this.nextXp =
-            this.xpService.getCosmeticXpForLevel(user.userStats.level + 1) -
-            this.xpService.getCosmeticXpForLevel(user.userStats.level);
+
+          this.level = user.userStats.level;
+          this.xp = user.userStats.cosXP;
+          this.currLevelXp = this.xpService.getCosmeticXpForLevel(this.level);
+          this.nextLevelXp = this.xpService.getCosmeticXpForLevel(
+            this.level + 1
+          );
 
           this.usersService.getUserFollows(this.user).subscribe({
             next: (response) => (this.followingUsers = response.data),