diff --git a/src/app/(pages)/dashboard/page.tsx b/src/app/(pages)/dashboard/page.tsx index 96a9fda..800bda5 100644 --- a/src/app/(pages)/dashboard/page.tsx +++ b/src/app/(pages)/dashboard/page.tsx @@ -4,8 +4,6 @@ import { ReactElement } from "react"; import { UserState } from "@/app/store/user-store"; import { User } from "@/app/types/user/user"; import { useUserContext } from "@/app/provider/user-provider"; -import { useOrganizationContext } from "@/app/provider/organization-provider"; -import { OrganizationState } from "@/app/store/organization-store"; /** * The dashboard home page. @@ -16,13 +14,9 @@ const DashboardPage = (): ReactElement => { const user: User | undefined = useUserContext( (state: UserState) => state.user ); - const selectedOrganization: string | undefined = useOrganizationContext( - (state: OrganizationState) => state.selected - ); return ( -
- PulseApp Dashboard, hello {user?.email}, selected org:{" "} - {selectedOrganization} +
+ Hi there {user?.username}, welcome to Pulse App!
); }; diff --git a/src/app/(pages)/dashboard/user/billing/page.tsx b/src/app/(pages)/dashboard/user/billing/page.tsx new file mode 100644 index 0000000..2119e3d --- /dev/null +++ b/src/app/(pages)/dashboard/user/billing/page.tsx @@ -0,0 +1,61 @@ +"use client"; + +import { ReactElement } from "react"; +import { + Breadcrumb, + BreadcrumbItem, + BreadcrumbLink, + BreadcrumbList, + BreadcrumbPage, + BreadcrumbSeparator, +} from "@/components/ui/breadcrumb"; +import { User } from "@/app/types/user/user"; +import { useUserContext } from "@/app/provider/user-provider"; +import { UserState } from "@/app/store/user-store"; +import { Separator } from "@/components/ui/separator"; + +/** + * The user billing page. + * + * @return the page jsx + */ +const UserBillingPage = (): ReactElement => ( +
+
+ + {/* Content */} +
+ + Hello World +
+
+); + +const Header = (): ReactElement => { + const user: User | undefined = useUserContext( + (state: UserState) => state.user + ); + return ( +
+

Billing

+ + + + + + Dashboard + + + + {user?.username} + + + Billing + + + +
+ ); +}; + +export default UserBillingPage; diff --git a/src/app/(pages)/dashboard/user/settings/page.tsx b/src/app/(pages)/dashboard/user/settings/page.tsx new file mode 100644 index 0000000..682d8e6 --- /dev/null +++ b/src/app/(pages)/dashboard/user/settings/page.tsx @@ -0,0 +1,61 @@ +"use client"; + +import { ReactElement } from "react"; +import { + Breadcrumb, + BreadcrumbItem, + BreadcrumbLink, + BreadcrumbList, + BreadcrumbPage, + BreadcrumbSeparator, +} from "@/components/ui/breadcrumb"; +import { User } from "@/app/types/user/user"; +import { useUserContext } from "@/app/provider/user-provider"; +import { UserState } from "@/app/store/user-store"; +import { Separator } from "@/components/ui/separator"; + +/** + * The user settings page. + * + * @return the page jsx + */ +const UserSettingsPage = (): ReactElement => ( +
+
+ + {/* Content */} +
+ + Hello World +
+
+); + +const Header = (): ReactElement => { + const user: User | undefined = useUserContext( + (state: UserState) => state.user + ); + return ( +
+

Settings

+ + + + + + Dashboard + + + + {user?.username} + + + Settings + + + +
+ ); +}; + +export default UserSettingsPage; diff --git a/src/components/dashboard/user/tier-setting.tsx b/src/components/dashboard/user/tier-setting.tsx index 403513a..3359293 100644 --- a/src/components/dashboard/user/tier-setting.tsx +++ b/src/components/dashboard/user/tier-setting.tsx @@ -29,7 +29,7 @@ const TierSetting = (): ReactElement => { {/* Setting */}
- + {capitalizeWords(user?.tier)}