diff --git a/actions/editProfile.ts b/actions/editProfile.ts new file mode 100644 index 000000000..812c9a6e5 --- /dev/null +++ b/actions/editProfile.ts @@ -0,0 +1,44 @@ +"use server" + +import { editProfileSchema } from "@/components/MyProfile/Profile/Edit/Form/schema" +import { ZodError } from "zod" + +import { type State, Status } from "@/types/components/myPages/myProfile/edit" + +export async function editProfile(_prevState: State, values: FormData) { + try { + const data = editProfileSchema.parse(Object.fromEntries(values.entries())) + + /** + * TODO: Update profile data when endpoint from + * API team is ready + */ + + console.info(`EditProfileSchema.Parse Data`) + console.log(data) + + return { + message: "All good!", + status: Status.success, + } + } catch (error) { + if (error instanceof ZodError) { + return { + errors: error.issues.map((issue) => ({ + message: `Server validation: ${issue.message}`, + path: issue.path.join("."), + })), + message: "Invalid form data", + status: Status.error, + } + } + + console.info(`EditProfile Server Action Error`) + console.error(error) + + return { + message: "Something went wrong. Please try again.", + status: Status.error, + } + } +} diff --git a/app/[lang]/(live)/(protected)/my-pages/_constants.ts b/app/[lang]/(live)/(protected)/my-pages/_constants.ts index a0669b48b..1ee770976 100644 --- a/app/[lang]/(live)/(protected)/my-pages/_constants.ts +++ b/app/[lang]/(live)/(protected)/my-pages/_constants.ts @@ -1,86 +1,16 @@ -export const challenges = { - journeys: [ +export const breadcrumbs = { + "/my-pages": [ { - tag: "After work queen", - title: "Try 3 Hotel Bars, Pocket 200 Points", - }, - { - tag: "Dine & Shine", - title: "Visit 3 scandic Restaurants, Earn 150 Points", + title: "My Pages", }, ], - victories: [ + "/my-pages/profile": [ { - tag: "Capital Explorer", - title: "Stay in 3 scandic hotels, in three Capitals, Gain 2000 Points", + href: "/my-pages", + title: "My Pages", }, { - tag: "Friends Feast", - title: "Dine with 3 Buddies, Snag a Free Breakfast", - }, - { - tag: "Eco Warrior", - title: "Choose Green, Get 500 Points", + title: "My Profile", }, ], } - -export const shortcuts = [ - { - href: "#", - title: "My Benefit", - }, - { - href: "#", - title: "Program overview", - }, - // { - // href: "#", - // title: "Scandic Friends shop", - // }, - // { - // href: "#", - // title: "Fire and safety", - // }, - // { - // href: "#", - // title: "Our sustainability work", - // }, - // { - // href: "#", - // title: "How you earn points", - // }, - // { - // href: "#", - // title: "How you use points", - // }, - // { - // href: "#", - // title: "Missing points", - // }, - // { - // href: "#", - // title: "Our term and conditions", - // }, -] - -export const stays = [ - { - dateArrive: new Date("04 27 2024"), - dateDepart: new Date("04 28 2024"), - guests: 2, - hotel: "Scandic Helsinki Hub", - }, - { - dateArrive: new Date("05 27 2024"), - dateDepart: new Date("05 28 2024"), - guests: 2, - hotel: "Scandic Örebro Central", - }, - { - dateArrive: new Date("06 27 2024"), - dateDepart: new Date("06 28 2024"), - guests: 2, - hotel: "Scandic Oslo City", - }, -] diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.module.css b/app/[lang]/(live)/(protected)/my-pages/layout.module.css index bc8621afb..bc197d5f7 100644 --- a/app/[lang]/(live)/(protected)/my-pages/layout.module.css +++ b/app/[lang]/(live)/(protected)/my-pages/layout.module.css @@ -1,31 +1,28 @@ -.page { +.layout { --max-width: 101.4rem; + --header-height: 4.5rem; display: grid; font-family: var(--ff-fira-sans); - grid-template-rows: auto 1fr; + grid-template-rows: var(--header-height) auto 1fr; min-height: 100dvh; } .content { display: grid; - padding: 0 0 17.5rem; padding-bottom: 7.7rem; padding-left: 0; padding-right: 0; - padding-top: 0; + position: relative; } @media screen and (min-width: 950px) { - .page { - gap: 5.8rem; - } - .content { gap: 10rem; grid-template-columns: 25rem 1fr; padding-bottom: 17.5rem; padding-left: 2.4rem; padding-right: 2.4rem; + padding-top: 5.8rem; } -} +} \ No newline at end of file diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.tsx b/app/[lang]/(live)/(protected)/my-pages/layout.tsx index 829ee1cd0..e83d541ba 100644 --- a/app/[lang]/(live)/(protected)/my-pages/layout.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/layout.tsx @@ -1,63 +1,26 @@ import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts" +import { breadcrumbs } from "./_constants" +import Breadcrumbs from "@/components/MyPages/Breadcrumbs" import Header from "@/components/MyPages/Header" import Sidebar from "@/components/MyPages/Sidebar" import styles from "./layout.module.css" import type { LangParams, LayoutArgs } from "@/types/params" -import { request } from "@/lib/graphql/request" -import { - GetNavigationMyPagesData, - NavigationItem, - MenuItem, - PageLink, - PageLinkEnum, -} from "@/types/requests/myPages/navigation" -import { GetNavigationMyPages } from "@/lib/graphql/Query/NavigationMyPages.graphql" - -function getURL(node: PageLink) { - switch (node.__typename) { - case PageLinkEnum.ContentPage: - return node.web.url - case PageLinkEnum.AccountPage: - case PageLinkEnum.LoyaltyPage: - return node.url - } -} - -function mapMenuItems(navigationItems: NavigationItem[]) { - return navigationItems.map(({ item }): MenuItem => { - const { node } = item.pageConnection.edges[0] - - return { - uid: node.system.uid, - url: getURL(node), - linkText: item.link_text || node.title, - subItems: item.sub_items ? mapMenuItems(item.sub_items) : null, - } - }) -} export default async function MyPagesLayout({ children, params, }: React.PropsWithChildren>) { - const response = await request( - GetNavigationMyPages, - { - locale: params.lang, - } - ) - // navigation_my_pages is of type Single, hence the hard [0] - const navigation = response.data.all_navigation_my_pages.items[0] - const menuItems = mapMenuItems(navigation.items) - return ( -
+
+
- + {children}
diff --git a/app/[lang]/(live)/(protected)/my-pages/page.module.css b/app/[lang]/(live)/(protected)/my-pages/page.module.css index 3e1bb051a..94d971d2d 100644 --- a/app/[lang]/(live)/(protected)/my-pages/page.module.css +++ b/app/[lang]/(live)/(protected)/my-pages/page.module.css @@ -1,7 +1,6 @@ .blocks { display: grid; gap: 4.2rem; - max-width: var(--max-width); padding-left: 2rem; padding-right: 2rem; } @@ -12,4 +11,4 @@ padding-left: 0; padding-right: 0; } -} +} \ No newline at end of file diff --git a/app/[lang]/(live)/(protected)/my-pages/page.tsx b/app/[lang]/(live)/(protected)/my-pages/page.tsx index f6a5210cd..2a76f5785 100644 --- a/app/[lang]/(live)/(protected)/my-pages/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/page.tsx @@ -1,7 +1,7 @@ +import { _ } from "@/lib/translation" import { serverClient } from "@/lib/trpc/server" -import { challenges, shortcuts, stays } from "./_constants" - +import MaxWidth from "@/components/MaxWidth" import Overview from "@/components/MyPages/Blocks/Overview" import Shortcuts from "@/components/MyPages/Blocks/Shortcuts" import UpcomingStays from "@/components/MyPages/Blocks/UpcomingStays" @@ -11,27 +11,16 @@ import styles from "./page.module.css" import type { LangParams, PageArgs } from "@/types/params" export default async function MyPage({ params }: PageArgs) { - const data = await serverClient().user.get() - const user = { - ...data, - journeys: challenges.journeys, - membershipId: 30812404844732, - nights: 14, - points: 20720, - qualifyingPoints: 5000, - shortcuts, - stays, - victories: challenges.victories, - } + const user = await serverClient().user.get() return ( -
+ -
+ ) } diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@communication/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@communication/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@communication/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx new file mode 100644 index 000000000..cd138565d --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx @@ -0,0 +1,5 @@ +import CommunicationPreferences from "@/components/MyProfile/CommunicationPreferences" + +export default function Communication() { + return +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx new file mode 100644 index 000000000..fc36f789e --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx @@ -0,0 +1,5 @@ +import CreditCards from "@/components/MyProfile/CreditCards" + +export default function CreditCardSlot() { + return +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@edit/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@edit/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@edit/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@edit/edit/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@edit/edit/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@edit/edit/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@edit/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@edit/edit/page.tsx new file mode 100644 index 000000000..70fa4a645 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@edit/edit/page.tsx @@ -0,0 +1,38 @@ +"use client" +import { _ } from "@/lib/translation" +import { profile } from "@/constants/routes/myPages" +import { useProfileStore } from "@/stores/edit-profile" + +import Button from "@/components/TempDesignSystem/Button" +import Link from "@/components/TempDesignSystem/Link" + +import type { LangParams, PageArgs } from "@/types/params" + +export default function EditProfile({ params }: PageArgs) { + const isPending = useProfileStore((store) => store.pending) + const isValid = useProfileStore((store) => store.valid) + return ( + <> + + + + ) +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@edit/page.tsx new file mode 100644 index 000000000..c17431379 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@edit/page.tsx @@ -0,0 +1,3 @@ +export default function Page() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@membershipCard/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@membershipCard/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@membershipCard/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@membershipCard/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@membershipCard/page.tsx new file mode 100644 index 000000000..924d5c4cb --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@membershipCard/page.tsx @@ -0,0 +1,5 @@ +import MembershipCard from "@/components/MyProfile/MembershipCard" + +export default function MembershipCardSlot() { + return +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@password/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@password/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@password/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@password/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@password/page.tsx new file mode 100644 index 000000000..51895bc82 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@password/page.tsx @@ -0,0 +1,5 @@ +import Password from "@/components/MyProfile/Password" + +export default function PasswordSlot() { + return +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@profile/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/page.tsx new file mode 100644 index 000000000..d2ba5182e --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/page.tsx @@ -0,0 +1,8 @@ +import { serverClient } from "@/lib/trpc/server" + +import EditProfile from "@/components/MyProfile/Profile/Edit" + +export default async function EditProfileSlot() { + const user = await serverClient().user.get() + return +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@profile/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/page.tsx new file mode 100644 index 000000000..b1f828678 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/page.tsx @@ -0,0 +1,8 @@ +import { serverClient } from "@/lib/trpc/server" + +import Profile from "@/components/MyProfile/Profile" + +export default async function ProfileInfo() { + const user = await serverClient().user.get() + return +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@view/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@view/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@view/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@view/edit/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@view/edit/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@view/edit/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@view/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@view/page.tsx new file mode 100644 index 000000000..365533f77 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@view/page.tsx @@ -0,0 +1,15 @@ +import { _ } from "@/lib/translation" +import { profileEdit } from "@/constants/routes/myPages" + +import Button from "@/components/TempDesignSystem/Button" +import Link from "@/components/TempDesignSystem/Link" + +import type { LangParams, PageArgs } from "@/types/params" + +export default function ProfileView({ params }: PageArgs) { + return ( + + ) +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@wishes/default.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@wishes/default.tsx new file mode 100644 index 000000000..86b9e9a38 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@wishes/default.tsx @@ -0,0 +1,3 @@ +export default function Default() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@wishes/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@wishes/page.tsx new file mode 100644 index 000000000..d22592741 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@wishes/page.tsx @@ -0,0 +1,5 @@ +import Wishes from "@/components/MyProfile/Wishes" + +export default function WishesSlot() { + return +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx new file mode 100644 index 000000000..fe4978be0 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx @@ -0,0 +1,3 @@ +export default function EditPage() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/layout.module.css b/app/[lang]/(live)/(protected)/my-pages/profile/layout.module.css new file mode 100644 index 000000000..abde89e1c --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/layout.module.css @@ -0,0 +1,23 @@ +.page { + display: grid; + gap: 3rem; +} + +.btns { + align-items: center; + display: flex; + gap: 1rem; + justify-content: flex-end; + position: absolute; + right: 0; + /* Creates the 16px gap from design */ + top: -1.6rem; + /* Moves itself to top of container to avoid calc */ + transform: translateY(-100%); +} + +.cards { + display: grid; + gap: 0.4rem; + grid-template-columns: 1fr 1fr; +} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/layout.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/layout.tsx new file mode 100644 index 000000000..13678b37f --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/profile/layout.tsx @@ -0,0 +1,33 @@ +import MaxWidth from "@/components/MaxWidth" + +import styles from "./layout.module.css" + +import type { ProfileLayoutProps } from "@/types/components/myPages/myProfile/layout" + +export default function ProfileLayout({ + communication, + creditCards, + edit, + membershipCard, + password, + profile, + view, + wishes, +}: React.PropsWithChildren) { + return ( + +
+ {edit} + {view} +
+ {profile} +
+ {communication} + {wishes} + {membershipCard} + {creditCards} + {password} +
+ + ) +} diff --git a/components/Icons/Calendar.tsx b/components/Icons/Calendar.tsx new file mode 100644 index 000000000..f7a086a62 --- /dev/null +++ b/components/Icons/Calendar.tsx @@ -0,0 +1,14 @@ +import Image from "@/components/Image" + +import type { IconProps } from "@/types/components/icon" + +export default function CalendarIcon({ height = 20, width = 20 }: IconProps) { + return ( + Calendar Icon + ) +} diff --git a/components/Icons/ChevronDown.tsx b/components/Icons/ChevronDown.tsx new file mode 100644 index 000000000..c38e3ccf9 --- /dev/null +++ b/components/Icons/ChevronDown.tsx @@ -0,0 +1,17 @@ +import Image from "@/components/Image" + +import type { IconProps } from "@/types/components/icon" + +export default function ChevronDownIcon({ + height = 20, + width = 20, +}: IconProps) { + return ( + Chevron Down Icon + ) +} diff --git a/components/Icons/Email.tsx b/components/Icons/Email.tsx new file mode 100644 index 000000000..0f6e265da --- /dev/null +++ b/components/Icons/Email.tsx @@ -0,0 +1,14 @@ +import Image from "@/components/Image" + +import type { IconProps } from "@/types/components/icon" + +export default function EmailIcon({ height = 20, width = 20 }: IconProps) { + return ( + Email Icon + ) +} diff --git a/components/Icons/House.tsx b/components/Icons/House.tsx new file mode 100644 index 000000000..19f889c19 --- /dev/null +++ b/components/Icons/House.tsx @@ -0,0 +1,9 @@ +import Image from "@/components/Image" + +import type { IconProps } from "@/types/components/icon" + +export default function HouseIcon({ height = 20, width = 20 }: IconProps) { + return ( + House Icon + ) +} diff --git a/components/Icons/Phone.tsx b/components/Icons/Phone.tsx new file mode 100644 index 000000000..a87bb3575 --- /dev/null +++ b/components/Icons/Phone.tsx @@ -0,0 +1,9 @@ +import Image from "@/components/Image" + +import type { IconProps } from "@/types/components/icon" + +export default function PhoneIcon({ height = 20, width = 20 }: IconProps) { + return ( + Phone Icon + ) +} diff --git a/components/Icons/index.tsx b/components/Icons/index.tsx new file mode 100644 index 000000000..5104937a2 --- /dev/null +++ b/components/Icons/index.tsx @@ -0,0 +1,5 @@ +export { default as CalendarIcon } from "./Calendar" +export { default as ChevronDownIcon } from "./ChevronDown" +export { default as EmailIcon } from "./Email" +export { default as HouseIcon } from "./House" +export { default as PhoneIcon } from "./Phone" diff --git a/components/MaxWidth/index.tsx b/components/MaxWidth/index.tsx new file mode 100644 index 000000000..806c06358 --- /dev/null +++ b/components/MaxWidth/index.tsx @@ -0,0 +1,17 @@ +import { cva } from "class-variance-authority" + +import styles from "./maxWidth.module.css" + +import type { MaxWidthProps } from "@/types/components/max-width" + +const maxWidthVariants = cva(styles.container) + +export default function MaxWidth({ + className, + tag = "section", + ...props +}: MaxWidthProps +) { + const Cmp = tag + return +} diff --git a/components/MaxWidth/maxWidth.module.css b/components/MaxWidth/maxWidth.module.css new file mode 100644 index 000000000..5b96e46b0 --- /dev/null +++ b/components/MaxWidth/maxWidth.module.css @@ -0,0 +1,4 @@ +.container { + max-width: var(--max-width); + position: relative; +} diff --git a/components/MyPages/Blocks/Challenges/index.tsx b/components/MyPages/Blocks/Challenges/index.tsx index 52f82e0bb..a3a265e7f 100644 --- a/components/MyPages/Blocks/Challenges/index.tsx +++ b/components/MyPages/Blocks/Challenges/index.tsx @@ -3,7 +3,7 @@ import Title from "@/components/MyPages/Title" import styles from "./challenges.module.css" -import type { ChallengesProps } from "@/types/components/myPages/challenges" +import type { ChallengesProps } from "@/types/components/myPages/myPage/challenges" export default function Challenges({ journeys, victories }: ChallengesProps) { return ( diff --git a/components/MyPages/Blocks/Overview/Friend/index.tsx b/components/MyPages/Blocks/Overview/Friend/index.tsx index 798e92264..6e08f8f45 100644 --- a/components/MyPages/Blocks/Overview/Friend/index.tsx +++ b/components/MyPages/Blocks/Overview/Friend/index.tsx @@ -2,7 +2,7 @@ import Image from "@/components/Image" import styles from "./friend.module.css" -import type { FriendProps } from "@/types/components/myPages/friend" +import type { FriendProps } from "@/types/components/myPages/myPage/friend" export default function Friend({ user }: FriendProps) { return ( diff --git a/components/MyPages/Blocks/Overview/Stats/QualifyingPoints/index.tsx b/components/MyPages/Blocks/Overview/Stats/QualifyingPoints/index.tsx index d7e6ffd25..ce3a29ace 100644 --- a/components/MyPages/Blocks/Overview/Stats/QualifyingPoints/index.tsx +++ b/components/MyPages/Blocks/Overview/Stats/QualifyingPoints/index.tsx @@ -3,7 +3,7 @@ import Image from "@/components/Image" import styles from "./points.module.css" -import type { QualifyingPointsProps } from "@/types/components/myPages/qualifyingPoints" +import type { QualifyingPointsProps } from "@/types/components/myPages/myPage/qualifyingPoints" export default function QualifyingPoints({ user }: QualifyingPointsProps) { return ( diff --git a/components/MyPages/Blocks/Overview/Stats/TotalPoints/index.tsx b/components/MyPages/Blocks/Overview/Stats/TotalPoints/index.tsx index abc52bb61..61f992d7e 100644 --- a/components/MyPages/Blocks/Overview/Stats/TotalPoints/index.tsx +++ b/components/MyPages/Blocks/Overview/Stats/TotalPoints/index.tsx @@ -3,7 +3,7 @@ import Title from "../Title" import styles from "./totalPoints.module.css" -import type { TotalPointsProps } from "@/types/components/myPages/totalPoints" +import type { TotalPointsProps } from "@/types/components/myPages/myPage/totalPoints" export default function TotalPoints({ user }: TotalPointsProps) { return ( diff --git a/components/MyPages/Blocks/Overview/Stats/index.tsx b/components/MyPages/Blocks/Overview/Stats/index.tsx index 22a69bc3e..ea86f6443 100644 --- a/components/MyPages/Blocks/Overview/Stats/index.tsx +++ b/components/MyPages/Blocks/Overview/Stats/index.tsx @@ -3,7 +3,7 @@ import TotalPoints from "./TotalPoints" import styles from "./stats.module.css" -import type { StatsProps } from "@/types/components/myPages/stats" +import type { StatsProps } from "@/types/components/myPages/myPage/stats" export default function Stats({ user }: StatsProps) { return ( diff --git a/components/MyPages/Blocks/Overview/index.tsx b/components/MyPages/Blocks/Overview/index.tsx index 891a477f1..7e7108dbc 100644 --- a/components/MyPages/Blocks/Overview/index.tsx +++ b/components/MyPages/Blocks/Overview/index.tsx @@ -4,7 +4,7 @@ import Title from "@/components/MyPages/Title" import styles from "./overview.module.css" -import type { OverviewProps } from "@/types/components/myPages/overview" +import type { OverviewProps } from "@/types/components/myPages/myPage/overview" export default function Overview({ user }: OverviewProps) { return ( diff --git a/components/MyPages/Blocks/Shortcuts/index.tsx b/components/MyPages/Blocks/Shortcuts/index.tsx index 010821865..615d1223b 100644 --- a/components/MyPages/Blocks/Shortcuts/index.tsx +++ b/components/MyPages/Blocks/Shortcuts/index.tsx @@ -4,7 +4,7 @@ import Title from "@/components/MyPages/Title" import styles from "./shortcuts.module.css" -import type { ShortcutsProps } from "@/types/components/myPages/shortcuts" +import type { ShortcutsProps } from "@/types/components/myPages/myPage/shortcuts" export default function Shortcuts({ shortcuts, diff --git a/components/MyPages/Blocks/UpcomingStays/Stay/index.tsx b/components/MyPages/Blocks/UpcomingStays/Stay/index.tsx index 0cb99c760..dbe53d3bf 100644 --- a/components/MyPages/Blocks/UpcomingStays/Stay/index.tsx +++ b/components/MyPages/Blocks/UpcomingStays/Stay/index.tsx @@ -6,7 +6,7 @@ import Title from "@/components/MyPages/Title" import styles from "./stay.module.css" import type { LangParams } from "@/types/params" -import type { StayProps } from "@/types/components/myPages/stays" +import type { StayProps } from "@/types/components/myPages/myPage/stays" export default function Stay({ dateArrive, @@ -36,7 +36,7 @@ export default function Stay({ />