fix: refactor away subtitleParam

2024-09-06 11:34:58 +02:00
parent 7d39ca587e
commit 54995d2f71
4 changed files with 29 additions and 28 deletions
--- a/components/MyPages/Blocks/Overview/Stats/Points/PointsColumn/index.tsx
+++ b/components/MyPages/Blocks/Overview/Stats/Points/PointsColumn/index.tsx
@@ -17,34 +17,24 @@ export const YourPointsColumn = ({ points }: PointsColumn) =>
    subtitle: "as of today",
  })

-export const NextLevelPointsColumn = ({
-  points,
-  subtitleParam,
-}: PointsColumn) =>
+export const NextLevelPointsColumn = ({ points, subtitle }: PointsColumn) =>
  PointsColumn({
    points,
    title: "Points needed to level up",
-    subtitleParam,
-    subtitle: "next level:",
+    subtitle,
  })

-export const StayOnLevelColumn = ({ points, subtitleParam }: PointsColumn) =>
+export const StayOnLevelColumn = ({ points, subtitle }: PointsColumn) =>
  PointsColumn({
    points,
    title: "Points needed to stay on level",
-    subtitleParam,
-    subtitle: "by",
+    subtitle,
  })

-export const NextLevelNightsColumn = ({
-  nights,
-  subtitleParam,
-  subtitle = "by",
-}: NightsColumn) =>
+export const NextLevelNightsColumn = ({ nights, subtitle }: NightsColumn) =>
  PointsColumn({
    nights,
    title: "Nights needed to level up",
-    subtitleParam,
    subtitle,
  })

@@ -53,7 +43,6 @@ async function PointsColumn({
  nights,
  title,
  subtitle,
-  subtitleParam,
 }: PointsColumnProps) {
  const { formatMessage } = await getIntl()

@@ -72,9 +61,11 @@ async function PointsColumn({
      <Title color="white" level="h2" textAlign="center">
        {points ?? nights ?? "N/A"}
      </Title>
-      <Body color="white" textAlign="center">
-        {subtitle ? formatMessage({ id: subtitle }) : ""} {subtitleParam}
-      </Body>
+      {subtitle ? (
+        <Body color="white" textAlign="center">
+          {subtitle}
+        </Body>
+      ) : null}
    </article>
  )
 }
--- a/components/MyPages/Blocks/Overview/Stats/Points/index.tsx
+++ b/components/MyPages/Blocks/Overview/Stats/Points/index.tsx
@@ -1,5 +1,6 @@
 import { MembershipLevelEnum } from "@/constants/membershipLevels"

+import { getIntl } from "@/i18n"
 import { getLang } from "@/i18n/serverContext"
 import { getMembershipLevelObject } from "@/utils/membershipLevel"
 import { getMembership } from "@/utils/user"
@@ -14,6 +15,8 @@ import {
 import { UserProps } from "@/types/components/myPages/user"

 export default async function Points({ user }: UserProps) {
+  const { formatMessage } = await getIntl()
+
  const membership = getMembership(user.memberships)
  const nextLevel = getMembershipLevelObject(
    membership?.nextLevel as MembershipLevelEnum,
@@ -26,14 +29,16 @@ export default async function Points({ user }: UserProps) {
      {nextLevel && (
        <NextLevelPointsColumn
          points={membership?.pointsRequiredToNextlevel}
-          subtitleParam={nextLevel.name}
+          subtitle={`${formatMessage({ id: "next level:" })} ${nextLevel.name}`}
        />
      )}
      {membership?.nightsToTopTier && (
        <NextLevelNightsColumn
          nights={membership.nightsToTopTier}
-          subtitleParam={membership.tierExpirationDate}
-          subtitle={membership.tierExpirationDate ? "by" : ""}
+          subtitle={
+            membership.tierExpirationDate &&
+            `by ${membership.tierExpirationDate}`
+          }
        />
      )}
    </PointsContainer>
--- a/components/MyPages/Blocks/Points/Overview/Points/index.tsx
+++ b/components/MyPages/Blocks/Points/Overview/Points/index.tsx
@@ -10,6 +10,7 @@ import {
  StayOnLevelColumn,
  YourPointsColumn,
 } from "@/components/MyPages/Blocks/Overview/Stats/Points/PointsColumn"
+import { getIntl } from "@/i18n"
 import { getMembershipLevelObject } from "@/utils/membershipLevel"
 import { getMembership } from "@/utils/user"

@@ -18,6 +19,8 @@ import { LangParams } from "@/types/params"

 /* TODO */
 export default async function Points({ user, lang }: UserProps & LangParams) {
+  const { formatMessage } = await getIntl()
+
  const membership = getMembership(user.memberships)
  const nextLevel = getMembershipLevelObject(
    membership?.nextLevel as MembershipLevelEnum,
@@ -32,18 +35,21 @@ export default async function Points({ user, lang }: UserProps & LangParams) {
          {membership?.currentPoints ? (
            <StayOnLevelColumn
              points={membership?.currentPoints} //TODO
-              subtitleParam={membership?.expirationDate}
+              subtitle={`${formatMessage({ id: "by" })} ${membership?.expirationDate}`}
            />
          ) : (
            <>
              <NextLevelPointsColumn
                points={membership?.pointsRequiredToNextlevel}
-                subtitleParam={nextLevel.name}
+                subtitle={`${formatMessage({ id: "next level:" })} ${nextLevel.name}`}
              />
-              {nextLevel?.level === membershipLevels.L7 && (
+              {membership?.nightsToTopTier && (
                <NextLevelNightsColumn
-                  nights={100} //TODO
-                  subtitleParam={membership?.expirationDate}
+                  nights={membership.nightsToTopTier}
+                  subtitle={
+                    membership.tierExpirationDate &&
+                    `by ${membership.tierExpirationDate}`
+                  }
                />
              )}
            </>
--- a/types/components/myPages/points.ts
+++ b/types/components/myPages/points.ts
@@ -1,7 +1,6 @@
 interface PointsOrNightColumn {
  title?: string
  subtitle?: string
-  subtitleParam?: string
 }

 export interface PointsColumn extends PointsOrNightColumn {