Merged in feat/LOY-315-Membership-Status-Card (pull request #2712)
Feat(LOY-315): Membership Overview Card * fix(LOY-315): new divider variants * feat(LOY-315): Add MembershipOverviewCard * refactor(LOY-315): abstract sasbooststatus * fix(LOY-315): correct space vars * fix(LOY-315): date formatting fixes Approved-by: Erik Tiekstra
This commit is contained in:
@@ -2,7 +2,7 @@ import { Divider } from "@scandic-hotels/design-system/Divider"
|
||||
import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
|
||||
|
||||
import { env } from "@/env/server"
|
||||
import { getProfile } from "@/lib/trpc/memoizedRequests"
|
||||
import { getProfileWithExtendedPartnerData } from "@/lib/trpc/memoizedRequests"
|
||||
|
||||
import { TeamMemberCardTrigger } from "@/components/DigitalTeamMemberCard/Trigger"
|
||||
import DigitalTeamMemberCard from "@/components/MyPages/DigitalTeamMemberCard"
|
||||
@@ -15,6 +15,7 @@ import { getIntl } from "@/i18n"
|
||||
import Hero from "./Friend/Hero"
|
||||
import MembershipNumber from "./Friend/MembershipNumber"
|
||||
import Friend from "./Friend"
|
||||
import MembershipOverviewCard from "./MembershipOverviewCard"
|
||||
import Stats from "./Stats"
|
||||
import UserBaseInfo from "./UserBaseInfo"
|
||||
|
||||
@@ -28,7 +29,7 @@ export default async function Overview({
|
||||
title,
|
||||
}: AccountPageComponentProps) {
|
||||
const intl = await getIntl()
|
||||
const user = await getProfile()
|
||||
const user = await getProfileWithExtendedPartnerData()
|
||||
if (!user || "error" in user) {
|
||||
return null
|
||||
}
|
||||
@@ -58,8 +59,17 @@ export default async function Overview({
|
||||
</>
|
||||
</TeamMemberCardTrigger>
|
||||
</DigitalTeamMemberCard>
|
||||
{env.ENABLE_NEW_OVERVIEW_SECTION ? <UserBaseInfo user={user} /> : null}
|
||||
{/*TODO: Replace Hero Section Cards with New ones. */}
|
||||
{env.ENABLE_NEW_OVERVIEW_SECTION ? (
|
||||
<>
|
||||
<UserBaseInfo user={user} />
|
||||
<div className={styles.membershipCardsContainer}>
|
||||
<MembershipOverviewCard user={user} />
|
||||
{/* LevelProgressCard will be added here in the next iteration */}
|
||||
</div>
|
||||
</>
|
||||
) : null}
|
||||
|
||||
{/*TODO: Replace hero section with new section above. */}
|
||||
<Hero color="red">
|
||||
<Friend membership={user.membership} name={user.name}>
|
||||
<MembershipNumber color="burgundy" membership={user.membership} />
|
||||
|
||||
Reference in New Issue
Block a user