From 19b370d89bc5ca0b56589dec2d18dd6a7da46514 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sat, 7 Feb 2026 00:49:49 +0000
Subject: [PATCH] initial commit

---
 client/src/Pages/Account/TabPassword.tsx      |  5 +++
 client/src/Pages/Account/TabProfile.tsx       | 44 +++++++++++++++++++
 client/src/Pages/Account/TabTeam.tsx          |  5 +++
 client/src/Pages/Account/index.tsx            | 39 ++++++++++++++++
 .../src/Pages/Account/{index.jsx => old.jsx}  |  0
 client/src/Routes/index.jsx                   | 20 +++++++--
 client/src/locales/en.json                    | 31 +++++++++++++
 7 files changed, 140 insertions(+), 4 deletions(-)
 create mode 100644 client/src/Pages/Account/TabPassword.tsx
 create mode 100644 client/src/Pages/Account/TabProfile.tsx
 create mode 100644 client/src/Pages/Account/TabTeam.tsx
 create mode 100644 client/src/Pages/Account/index.tsx
 rename client/src/Pages/Account/{index.jsx => old.jsx} (100%)

diff --git a/client/src/Pages/Account/TabPassword.tsx b/client/src/Pages/Account/TabPassword.tsx
new file mode 100644
index 000000000..0acecd35a
--- /dev/null
+++ b/client/src/Pages/Account/TabPassword.tsx
@@ -0,0 +1,5 @@
+import { Box } from "@mui/material";
+
+export const TabPassword = () => {
+	return <Box>{/* TODO: Implement TabPassword */}</Box>;
+};
diff --git a/client/src/Pages/Account/TabProfile.tsx b/client/src/Pages/Account/TabProfile.tsx
new file mode 100644
index 000000000..5cc21cb9a
--- /dev/null
+++ b/client/src/Pages/Account/TabProfile.tsx
@@ -0,0 +1,44 @@
+import { Stack } from "@mui/material";
+import { useTranslation } from "react-i18next";
+import { ConfigBox } from "@/Components/v2/design-elements";
+import { TextField, Button } from "@/Components/v2/inputs";
+import { ImageUpload } from "@/Components/v2/inputs";
+
+export const TabProfile = () => {
+	const { t } = useTranslation();
+
+	return (
+		<Stack gap={4}>
+			<ConfigBox
+				title={t("pages.account.profile.name.title")}
+				subtitle={t("pages.account.profile.name.subtitle")}
+				rightContent={
+					<Stack gap={3}>
+						<TextField
+							fieldLabel={t("pages.account.profile.name.firstName")}
+							placeholder={t("pages.account.profile.name.firstNamePlaceholder")}
+							autoComplete="given-name"
+						/>
+						<TextField
+							fieldLabel={t("pages.account.profile.name.lastName")}
+							placeholder={t("pages.account.profile.name.lastNamePlaceholder")}
+							autoComplete="family-name"
+						/>
+					</Stack>
+				}
+			/>
+			<ConfigBox
+				title={t("pages.account.profile.photo.title")}
+				subtitle={t("pages.account.profile.photo.subtitle")}
+				rightContent={<ImageUpload />}
+			/>
+			<Button
+				variant="contained"
+				color="primary"
+				sx={{ alignSelf: "flex-end" }}
+			>
+				{t("common.buttons.save")}
+			</Button>
+		</Stack>
+	);
+};
diff --git a/client/src/Pages/Account/TabTeam.tsx b/client/src/Pages/Account/TabTeam.tsx
new file mode 100644
index 000000000..0babcad86
--- /dev/null
+++ b/client/src/Pages/Account/TabTeam.tsx
@@ -0,0 +1,5 @@
+import { Box } from "@mui/material";
+
+export const TabTeam = () => {
+	return <Box>{/* TODO: Implement TabTeam */}</Box>;
+};
diff --git a/client/src/Pages/Account/index.tsx b/client/src/Pages/Account/index.tsx
new file mode 100644
index 000000000..b0fd6554e
--- /dev/null
+++ b/client/src/Pages/Account/index.tsx
@@ -0,0 +1,39 @@
+import { BasePage, Tabs, Tab } from "@/Components/v2/design-elements";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { TabProfile } from "./TabProfile";
+import { TabPassword } from "./TabPassword";
+import { TabTeam } from "./TabTeam";
+
+interface AccountProps {
+	open?: "profile" | "password" | "team";
+}
+
+const TAB_MAP = {
+	profile: 0,
+	password: 1,
+	team: 2,
+} as const;
+
+const Account = ({ open = "profile" }: AccountProps) => {
+	const { t } = useTranslation();
+	const [activeTab, setActiveTab] = useState<number>(TAB_MAP[open]);
+
+	return (
+		<BasePage>
+			<Tabs
+				value={activeTab}
+				onChange={(_, newValue: number) => setActiveTab(newValue)}
+			>
+				<Tab label={t("pages.account.tabs.profile")} />
+				<Tab label={t("pages.account.tabs.password")} />
+				<Tab label={t("pages.account.tabs.team")} />
+			</Tabs>
+			{activeTab === 0 && <TabProfile />}
+			{activeTab === 1 && <TabPassword />}
+			{activeTab === 2 && <TabTeam />}
+		</BasePage>
+	);
+};
+
+export default Account;
diff --git a/client/src/Pages/Account/index.jsx b/client/src/Pages/Account/old.jsx
similarity index 100%
rename from client/src/Pages/Account/index.jsx
rename to client/src/Pages/Account/old.jsx
diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index 936258595..282a5db56 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -45,7 +45,7 @@ import Notifications from "../Pages/Notifications";
 import CreateNotifications from "../Pages/Notifications/create";
 
 // Settings
-import Account from "../Pages/Account/index.jsx";
+import Account from "@/Pages/Account";
 import EditUser from "../Pages/Account/EditUser/index.jsx";
 import Settings from "../Pages/Settings";
 
@@ -328,15 +328,27 @@ const Routes = () => {
 				/>
 				<Route
 					path="account/profile"
-					element={<Account open={"profile"} />}
+					element={
+						<ThemeProvider theme={v2theme}>
+							<Account open={"profile"} />
+						</ThemeProvider>
+					}
 				/>
 				<Route
 					path="account/password"
-					element={<Account open={"password"} />}
+					element={
+						<ThemeProvider theme={v2theme}>
+							<Account open={"password"} />
+						</ThemeProvider>
+					}
 				/>
 				<Route
 					path="account/team"
-					element={<Account open={"team"} />}
+					element={
+						<ThemeProvider theme={v2theme}>
+							<Account open={"team"} />
+						</ThemeProvider>
+					}
 				/>
 				<Route
 					path="account/team/:userId"
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 305b3cf90..21a8e8e0a 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -498,6 +498,37 @@
 	"now": "Now",
 	"os": "OS",
 	"pages": {
+		"account": {
+			"tabs": {
+				"profile": "Profile",
+				"password": "Password",
+				"team": "Team"
+			},
+			"form": {
+				"name": {
+					"title": "Name",
+					"description": "Update your personal information",
+					"option": {
+						"firstName": {
+							"label": "First name",
+							"placeholder": "Enter your first name"
+						},
+						"lastName": {
+							"label": "Last name",
+							"placeholder": "Enter your last name"
+						}
+					}
+				},
+				"photo": {
+					"title": "Profile photo",
+					"description": "Upload a profile picture"
+				},
+				"deleteAccount": {
+					"title": "Delete account",
+					"description": "This action is permanent and cannot be undone"
+				}
+			}
+		},
 		"auth": {
 			"common": {
 				"form": {