diff --git a/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx b/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx index 05abd5962..9ce6ff871 100644 --- a/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx @@ -7,7 +7,6 @@ import styles from "./page.module.css" import type { LangParams, PageArgs } from "@/types/params" export default async function BenefitsPage({ params }: PageArgs) { - const user = await serverClient().user.get() const accountPage = await serverClient().contentstack.accountPage.getBenefits( { lang: params.lang, @@ -16,7 +15,7 @@ export default async function BenefitsPage({ params }: PageArgs) { return (
- +
) } diff --git a/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx b/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx index c396d9b20..e4b1e4477 100644 --- a/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx @@ -1,15 +1,14 @@ import { _ } from "@/lib/translation" import { serverClient } from "@/lib/trpc/server" -import Content from "@/components/MyPages/AccountPage/Content" import MaxWidth from "@/components/MaxWidth" +import Content from "@/components/MyPages/AccountPage/Content" import styles from "./page.module.css" import type { LangParams, PageArgs } from "@/types/params" export default async function MyPageOverview({ params }: PageArgs) { - const user = await serverClient().user.get() const accountPage = await serverClient().contentstack.accountPage.getOverview( { lang: params.lang, @@ -18,7 +17,7 @@ export default async function MyPageOverview({ params }: PageArgs) { return ( - + ) } diff --git a/components/MyPages/AccountPage/Content.tsx b/components/MyPages/AccountPage/Content.tsx index 1b6a67218..2adafd6ba 100644 --- a/components/MyPages/AccountPage/Content.tsx +++ b/components/MyPages/AccountPage/Content.tsx @@ -18,10 +18,10 @@ import { DynamicContentComponents, } from "@/types/requests/myPages/accountpage" -function DynamicComponent({ user, component, props }: AccountPageContentProps) { +function DynamicComponent({ component, props }: AccountPageContentProps) { switch (component) { case DynamicContentComponents.membership_overview: - return + return case DynamicContentComponents.previous_stays: return case DynamicContentComponents.soonest_stays: @@ -37,7 +37,7 @@ function DynamicComponent({ user, component, props }: AccountPageContentProps) { } } -export default function Content({ user, lang, content }: ContentProps) { +export default function Content({ lang, content }: ContentProps) { return ( <> {content.map((item) => { @@ -61,7 +61,6 @@ export default function Content({ user, lang, content }: ContentProps) { return ( ) diff --git a/components/MyPages/Blocks/Overview/index.tsx b/components/MyPages/Blocks/Overview/index.tsx index dc8f2dc30..c23e045e2 100644 --- a/components/MyPages/Blocks/Overview/index.tsx +++ b/components/MyPages/Blocks/Overview/index.tsx @@ -1,3 +1,5 @@ +import { serverClient } from "@/lib/trpc/server" + import Title from "@/components/Title" import Friend from "./Friend" @@ -7,7 +9,9 @@ import styles from "./overview.module.css" import type { OverviewProps } from "@/types/components/myPages/myPage/overview" -export default function Overview({ user, title }: OverviewProps) { +export default async function Overview({ title }: OverviewProps) { + const user = await serverClient().user.get() + return (
diff --git a/types/components/myPages/myPage/accountPage.ts b/types/components/myPages/myPage/accountPage.ts index 9229a3e70..d7609758a 100644 --- a/types/components/myPages/myPage/accountPage.ts +++ b/types/components/myPages/myPage/accountPage.ts @@ -1,9 +1,9 @@ import { Lang } from "@/constants/languages" + import { AccountPageContentItem, DynamicContentComponents, } from "@/types/requests/myPages/accountpage" -import { User } from "@/types/user" export type AccountPageContentProps = { component: DynamicContentComponents @@ -13,7 +13,6 @@ export type AccountPageContentProps = { link?: { href: string; text: string } lang: Lang } - user: User } export type AccountPageComponentProps = { @@ -24,7 +23,6 @@ export type AccountPageComponentProps = { } export type ContentProps = { - user: User lang: Lang content: AccountPageContentItem[] } diff --git a/types/components/myPages/myPage/overview.ts b/types/components/myPages/myPage/overview.ts index e37d9ee0c..bae28c8aa 100644 --- a/types/components/myPages/myPage/overview.ts +++ b/types/components/myPages/myPage/overview.ts @@ -2,5 +2,4 @@ import type { User } from "@/types/user" export type OverviewProps = { title?: string - user: User }