feat(SW-66, SW-348): search functionality and ui

types/components/myPages/friend.ts

@@ -0,0 +1,4 @@
+import { User } from "@/types/user"
+
+export interface FriendProps
+  extends React.PropsWithChildren<Pick<User, "membership" | "name">> {}

types/components/myPages/membershipNumber.ts

@@ -0,0 +1,10 @@
+import { VariantProps } from "class-variance-authority"
+
+import { membershipNumberVariants } from "@/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants"
+
+import type { User } from "@/types/user"
+
+export interface MembershipNumberProps
+  extends Omit<React.HTMLAttributes<HTMLDivElement>, "color">,
+    VariantProps<typeof membershipNumberVariants>,
+    Pick<User, "membership"> {}

types/components/myPages/myPage/accountPage.ts

@@ -1,22 +1,20 @@
-import { AccountPageContentItem } from "@/server/routers/contentstack/accountPage/output"
+import { z } from "zod"
 
-import { DynamicContentComponents } from "@/types/components/myPages/myPage/enums"
+import { blocksSchema } from "@/server/routers/contentstack/accountPage/output"
 
-export type AccountPageContentProps = {
-  component: DynamicContentComponents
-  props: {
-    title: string | null
-    subtitle: string | null
-    link?: { href: string; text: string }
-  }
-}
+import { DynamicContent } from "@/types/trpc/routers/contentstack/blocks"
 
-export type AccountPageComponentProps = {
+export interface AccountPageContentProps
+  extends Pick<DynamicContent, "dynamic_content"> {}
+
+export interface AccountPageComponentProps {
   title: string | null
   subtitle: string | null
   link?: { href: string; text: string }
 }
 
+type Content = z.output<typeof blocksSchema>
+
 export type ContentProps = {
-  content: AccountPageContentItem[]
+  content: Content[]
 }

types/components/myPages/myPage/challenges.ts

@@ -1,6 +0,0 @@
-import type { User } from "@/types/user"
-
-export type ChallengesProps = {
-  journeys: User["journeys"]
-  victories: User["victories"]
-}

types/components/myPages/myPage/earnAndBurn.ts

@@ -1,4 +1,4 @@
-import { awardPointsVariants } from "@/components/MyPages/Blocks/Points/EarnAndBurn/AwardPoints/awardPointsVariants"
+import { awardPointsVariants } from "@/components/Blocks/DynamicContent/Points/EarnAndBurn/AwardPoints/awardPointsVariants"
 
 import type { VariantProps } from "class-variance-authority"
 

types/components/myPages/myPage/enums.ts

@@ -1,32 +0,0 @@
-export enum DynamicContentComponents {
-  membership_overview = "membership_overview",
-  points_overview = "points_overview",
-  soonest_stays = "soonest_stays",
-  previous_stays = "previous_stays",
-  upcoming_stays = "upcoming_stays",
-  current_benefits = "current_benefits",
-  next_benefits = "next_benefits",
-  my_points = "my_points",
-  expiring_points = "expiring_points",
-  earn_and_burn = "earn_and_burn",
-}
-
-export enum ContentEntries {
-  AccountPageContentDynamicContent = "AccountPageContentDynamicContent",
-  AccountPageContentShortcuts = "AccountPageContentShortcuts",
-  AccountPageContentTextContent = "AccountPageContentTextContent",
-}
-
-export enum RewardTransactionTypes {
-  stay = "stay",
-  rewardNight = "rewardnight",
-  enrollment = "enrollment",
-  expired = "expired",
-  redgift = "redgift",
-  ancillary = "ancillary",
-  pointShop = "pointshop",
-  tui_points = "tui_points",
-  mastercard_points = "mastercard_points",
-  stayAdj = "stay/adj",
-  othersAdj = "others/adj",
-}

types/components/myPages/myPage/shortcuts.ts

@@ -1,12 +1,5 @@
-export type ShortcutsProps = {
+import type { Shortcut } from "@/types/trpc/routers/contentstack/blocks"
+
+export interface ShortcutsProps extends Shortcut {
   firstItem?: boolean
-  openInNewTab?: boolean
-  shortcuts: {
-    url: string
-    title: string
-    openInNewTab?: boolean
-    text?: string
-  }[]
-  subtitle: string | null
-  title: string | null
 }

types/components/myPages/stays/previous.ts

@@ -1,4 +1,3 @@
-import type { Lang } from "@/constants/languages"
 import type { UserQueryRouter } from "../user"
 
 export type PreviousStaysResponse = Awaited<