From 52d4b831aead5d926d2644a6963528ffedabf934 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Mon, 20 Nov 2023 23:46:43 +0000
Subject: [PATCH 1/2] Renamed the Owner to Admin

---
 src/components/Sidebar.tsx               | 11 +++++--
 src/components/UserCard.tsx              |  4 +--
 src/constants/userPermissions.ts         | 42 ++++++++++++------------
 src/dashboards/{Owner.tsx => Admin.tsx}  |  2 +-
 src/interfaces/user.ts                   |  4 +--
 src/pages/(admin)/BatchCodeGenerator.tsx |  8 ++---
 src/pages/(admin)/CodeGenerator.tsx      |  8 ++---
 src/pages/(admin)/Lists/GroupList.tsx    |  4 +--
 src/pages/(admin)/Lists/UserList.tsx     |  6 ++--
 src/pages/api/groups/[id].ts             |  4 +--
 src/pages/index.tsx                      |  6 ++--
 src/pages/{admin.tsx => manage.tsx}      |  2 +-
 src/pages/record.tsx                     |  2 +-
 src/pages/stats.tsx                      |  2 +-
 14 files changed, 56 insertions(+), 49 deletions(-)
 rename src/dashboards/{Owner.tsx => Admin.tsx} (99%)
 rename src/pages/{admin.tsx => manage.tsx} (97%)

diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 77c419b1..01b1d817 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -90,7 +90,14 @@ export default function Sidebar({path, navDisabled = false, focusMode = false, u
 				<Nav disabled={disableNavigation} Icon={BsGraphUp} label="Stats" path={path} keyPath="/stats" isMinimized={isMinimized} />
 				<Nav disabled={disableNavigation} Icon={BsClockHistory} label="Record" path={path} keyPath="/record" isMinimized={isMinimized} />
 				{userType !== "student" && (
-					<Nav disabled={disableNavigation} Icon={BsShieldFill} label="Admin" path={path} keyPath="/admin" isMinimized={isMinimized} />
+					<Nav
+						disabled={disableNavigation}
+						Icon={BsShieldFill}
+						label="Management"
+						path={path}
+						keyPath="/manage"
+						isMinimized={isMinimized}
+					/>
 				)}
 			</div>
 			<div className="xl:hidden -xl:flex flex-col gap-3">
@@ -100,7 +107,7 @@ export default function Sidebar({path, navDisabled = false, focusMode = false, u
 				<Nav disabled={disableNavigation} Icon={BsGraphUp} label="Stats" path={path} keyPath="/stats" isMinimized={true} />
 				<Nav disabled={disableNavigation} Icon={BsClockHistory} label="Record" path={path} keyPath="/record" isMinimized={true} />
 				{userType !== "student" && (
-					<Nav disabled={disableNavigation} Icon={BsShieldFill} label="Admin" path={path} keyPath="/admin" isMinimized={true} />
+					<Nav disabled={disableNavigation} Icon={BsShieldFill} label="Management" path={path} keyPath="/manage" isMinimized={true} />
 				)}
 			</div>
 
diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index cfb03aae..51c97c45 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -234,7 +234,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers}:
 						</div>
 					</div>
 				</div>
-				{(loggedInUser.type === "developer" || loggedInUser.type === "owner") && (
+				{(loggedInUser.type === "developer" || loggedInUser.type === "admin") && (
 					<>
 						<Divider className="w-full" />
 						<div className="flex flex-col md:flex-row gap-8 w-full">
@@ -259,7 +259,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers}:
 									<option value="teacher">Teacher</option>
 									<option value="corporate">Corporate</option>
 									<option value="agent">Country Agent</option>
-									<option value="owner">Owner</option>
+									<option value="admin">Admin</option>
 									<option value="developer">Developer</option>
 								</select>
 							</div>
diff --git a/src/constants/userPermissions.ts b/src/constants/userPermissions.ts
index 0d19a7f9..b75ea983 100644
--- a/src/constants/userPermissions.ts
+++ b/src/constants/userPermissions.ts
@@ -2,38 +2,38 @@ import {Type} from "@/interfaces/user";
 
 export const PERMISSIONS = {
 	generateCode: {
-		student: ["corporate", "developer", "owner"],
-		teacher: ["corporate", "developer", "owner"],
-		corporate: ["owner", "developer"],
-		owner: ["developer", "owner"],
-		agent: ["developer", "owner"],
+		student: ["corporate", "developer", "admin"],
+		teacher: ["corporate", "developer", "admin"],
+		corporate: ["admin", "developer"],
+		admin: ["developer", "admin"],
+		agent: ["developer", "admin"],
 		developer: ["developer"],
 	},
 	deleteUser: {
-		student: ["teacher", "corporate", "developer", "owner"],
-		teacher: ["corporate", "developer", "owner"],
-		corporate: ["owner", "developer"],
-		owner: ["developer", "owner"],
-		agent: ["developer", "owner"],
+		student: ["teacher", "corporate", "developer", "admin"],
+		teacher: ["corporate", "developer", "admin"],
+		corporate: ["admin", "developer"],
+		admin: ["developer", "admin"],
+		agent: ["developer", "admin"],
 		developer: ["developer"],
 	},
 	updateUser: {
-		student: ["teacher", "corporate", "developer", "owner"],
-		teacher: ["corporate", "developer", "owner"],
-		corporate: ["owner", "developer"],
-		owner: ["developer", "owner"],
-		agent: ["developer", "owner"],
+		student: ["teacher", "corporate", "developer", "admin"],
+		teacher: ["corporate", "developer", "admin"],
+		corporate: ["admin", "developer"],
+		admin: ["developer", "admin"],
+		agent: ["developer", "admin"],
 		developer: ["developer"],
 	},
 	updateExpiryDate: {
-		student: ["developer", "owner"],
-		teacher: ["developer", "owner"],
-		corporate: ["owner", "developer"],
-		owner: ["developer", "owner"],
-		agent: ["developer", "owner"],
+		student: ["developer", "admin"],
+		teacher: ["developer", "admin"],
+		corporate: ["admin", "developer"],
+		admin: ["developer", "admin"],
+		agent: ["developer", "admin"],
 		developer: ["developer"],
 	},
 	examManagement: {
-		delete: ["developer", "owner"],
+		delete: ["developer", "admin"],
 	},
 };
diff --git a/src/dashboards/Owner.tsx b/src/dashboards/Admin.tsx
similarity index 99%
rename from src/dashboards/Owner.tsx
rename to src/dashboards/Admin.tsx
index 10d83356..a0737f76 100644
--- a/src/dashboards/Owner.tsx
+++ b/src/dashboards/Admin.tsx
@@ -16,7 +16,7 @@ interface Props {
 	user: User;
 }
 
-export default function OwnerDashboard({user}: Props) {
+export default function AdminDashboard({user}: Props) {
 	const [page, setPage] = useState("");
 	const [selectedUser, setSelectedUser] = useState<User>();
 	const [showModal, setShowModal] = useState(false);
diff --git a/src/interfaces/user.ts b/src/interfaces/user.ts
index 752a320b..ab30c5bc 100644
--- a/src/interfaces/user.ts
+++ b/src/interfaces/user.ts
@@ -80,5 +80,5 @@ export interface Group {
 	disableEditing?: boolean;
 }
 
-export type Type = "student" | "teacher" | "corporate" | "owner" | "developer" | "agent";
-export const userTypes: Type[] = ["student", "teacher", "corporate", "owner", "developer", "agent"];
+export type Type = "student" | "teacher" | "corporate" | "admin" | "developer" | "agent";
+export const userTypes: Type[] = ["student", "teacher", "corporate", "admin", "developer", "agent"];
diff --git a/src/pages/(admin)/BatchCodeGenerator.tsx b/src/pages/(admin)/BatchCodeGenerator.tsx
index a308772e..c1d09349 100644
--- a/src/pages/(admin)/BatchCodeGenerator.tsx
+++ b/src/pages/(admin)/BatchCodeGenerator.tsx
@@ -83,7 +83,7 @@ export default function BatchCodeGenerator({user}: {user: User}) {
 			<Button onClick={openFilePicker} isLoading={isLoading} disabled={isLoading}>
 				{filesContent.length > 0 ? filesContent[0].name : "Choose a file"}
 			</Button>
-			{user && (user.type === "developer" || user.type === "owner") && (
+			{user && (user.type === "developer" || user.type === "admin") && (
 				<>
 					<div className="flex -md:flex-row md:flex-col -md:items-center 2xl:flex-row 2xl:items-center justify-between gap-2">
 						<label className="font-normal text-base text-mti-gray-dim">Expiry Date</label>
@@ -133,9 +133,9 @@ export default function BatchCodeGenerator({user}: {user: User}) {
 					<Button
 						className="w-44 2xl:w-48"
 						variant="outline"
-						onClick={() => generateCode("owner")}
-						disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.owner.includes(user.type)}>
-						Owner
+						onClick={() => generateCode("admin")}
+						disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.admin.includes(user.type)}>
+						Admin
 					</Button>
 				</div>
 			)}
diff --git a/src/pages/(admin)/CodeGenerator.tsx b/src/pages/(admin)/CodeGenerator.tsx
index 16521237..2b610888 100644
--- a/src/pages/(admin)/CodeGenerator.tsx
+++ b/src/pages/(admin)/CodeGenerator.tsx
@@ -82,13 +82,13 @@ export default function CodeGenerator({user}: {user: User}) {
 					<Button
 						className="w-44 md:w-48"
 						variant="outline"
-						onClick={() => generateCode("owner")}
-						disabled={!PERMISSIONS.generateCode.owner.includes(user.type) || (isExpiryDateEnabled && expiryDate === null)}>
-						Owner
+						onClick={() => generateCode("admin")}
+						disabled={!PERMISSIONS.generateCode.admin.includes(user.type) || (isExpiryDateEnabled && expiryDate === null)}>
+						Admin
 					</Button>
 				</div>
 			)}
-			{user && (user.type === "developer" || user.type === "owner") && (
+			{user && (user.type === "developer" || user.type === "admin") && (
 				<>
 					<div className="flex -md:flex-row md:flex-col -md:items-center 2xl:flex-row 2xl:items-center justify-between gap-2">
 						<label className="font-normal text-base text-mti-gray-dim">Expiry Date</label>
diff --git a/src/pages/(admin)/Lists/GroupList.tsx b/src/pages/(admin)/Lists/GroupList.tsx
index d59f9bbb..3c12cb8c 100644
--- a/src/pages/(admin)/Lists/GroupList.tsx
+++ b/src/pages/(admin)/Lists/GroupList.tsx
@@ -51,7 +51,7 @@ const CreatePanel = ({user, users, group, onCreate}: CreateDialogProps) => {
 			const emailUsers = [...new Set(emails)].map((x) => users.find((y) => y.email.toLowerCase() === x)).filter((x) => x !== undefined);
 			const filteredUsers = emailUsers.filter(
 				(x) =>
-					((user.type === "developer" || user.type === "owner" || user.type === "corporate") &&
+					((user.type === "developer" || user.type === "admin" || user.type === "corporate") &&
 						(x?.type === "student" || x?.type === "teacher")) ||
 					(user.type === "teacher" && x?.type === "student"),
 			);
@@ -216,7 +216,7 @@ export default function GroupList({user}: {user: User}) {
 			cell: ({row}: {row: {original: Group}}) => {
 				return (
 					<>
-						{(user?.type === "developer" || user?.type === "owner" || user.id === row.original.admin) && (
+						{(user?.type === "developer" || user?.type === "admin" || user.id === row.original.admin) && (
 							<div className="flex gap-2">
 								{editingID !== row.original.id && (
 									<div data-tip="Edit" className="cursor-pointer tooltip" onClick={() => setEditingID(row.original.id)}>
diff --git a/src/pages/(admin)/Lists/UserList.tsx b/src/pages/(admin)/Lists/UserList.tsx
index 6ff3b5c1..bef8e264 100644
--- a/src/pages/(admin)/Lists/UserList.tsx
+++ b/src/pages/(admin)/Lists/UserList.tsx
@@ -162,10 +162,10 @@ export default function UserList({user, filter}: {user: User; filter?: (user: Us
 										Admin
 									</Button>
 									<Button
-										onClick={() => updateAccountType(row.original, "owner")}
+										onClick={() => updateAccountType(row.original, "admin")}
 										className="text-sm !py-2 !px-4"
-										disabled={row.original.type === "owner" || !PERMISSIONS.generateCode["owner"].includes(user.type)}>
-										Owner
+										disabled={row.original.type === "admin" || !PERMISSIONS.generateCode["admin"].includes(user.type)}>
+										Admin
 									</Button>
 								</div>
 							</Popover.Panel>
diff --git a/src/pages/api/groups/[id].ts b/src/pages/api/groups/[id].ts
index 351a781f..a3fae00f 100644
--- a/src/pages/api/groups/[id].ts
+++ b/src/pages/api/groups/[id].ts
@@ -47,7 +47,7 @@ async function del(req: NextApiRequest, res: NextApiResponse) {
 	const group = {...snapshot.data(), id: snapshot.id} as Group;
 
 	const user = req.session.user;
-	if (user.type === "owner" || user.type === "developer" || user.id === group.admin) {
+	if (user.type === "admin" || user.type === "developer" || user.id === group.admin) {
 		await deleteDoc(snapshot.ref);
 
 		res.status(200).json({ok: true});
@@ -69,7 +69,7 @@ async function patch(req: NextApiRequest, res: NextApiResponse) {
 	const group = {...snapshot.data(), id: snapshot.id} as Group;
 
 	const user = req.session.user;
-	if (user.type === "owner" || user.type === "developer" || user.id === group.admin) {
+	if (user.type === "admin" || user.type === "developer" || user.id === group.admin) {
 		await setDoc(snapshot.ref, req.body, {merge: true});
 
 		res.status(200).json({ok: true});
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 83cdd8d8..9c0659dc 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -23,7 +23,7 @@ import Link from "next/link";
 import {MODULE_ARRAY} from "@/utils/moduleUtils";
 import ProfileSummary from "@/components/ProfileSummary";
 import StudentDashboard from "@/dashboards/Student";
-import OwnerDashboard from "@/dashboards/Owner";
+import AdminDashboard from "@/dashboards/Admin";
 import CorporateDashboard from "@/dashboards/Corporate";
 import TeacherDashboard from "@/dashboards/Teacher";
 
@@ -166,8 +166,8 @@ export default function Home() {
 					{user.type === "student" && <StudentDashboard user={user} />}
 					{user.type === "teacher" && <TeacherDashboard user={user} />}
 					{user.type === "corporate" && <CorporateDashboard user={user} />}
-					{user.type === "owner" && <OwnerDashboard user={user} />}
-					{user.type === "developer" && <OwnerDashboard user={user} />}
+					{user.type === "admin" && <AdminDashboard user={user} />}
+					{user.type === "developer" && <AdminDashboard user={user} />}
 				</Layout>
 			)}
 		</>
diff --git a/src/pages/admin.tsx b/src/pages/manage.tsx
similarity index 97%
rename from src/pages/admin.tsx
rename to src/pages/manage.tsx
index f44a6011..532c5fb0 100644
--- a/src/pages/admin.tsx
+++ b/src/pages/manage.tsx
@@ -50,7 +50,7 @@ export default function Admin() {
 	return (
 		<>
 			<Head>
-				<title>Admin Panel | EnCoach</title>
+				<title>Management Panel | EnCoach</title>
 				<meta
 					name="description"
 					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
diff --git a/src/pages/record.tsx b/src/pages/record.tsx
index 3680bb4d..9a934180 100644
--- a/src/pages/record.tsx
+++ b/src/pages/record.tsx
@@ -296,7 +296,7 @@ export default function History({user}: {user: User}) {
 				<Layout user={user}>
 					<div className="w-full flex -xl:flex-col -xl:gap-4 justify-between items-center">
 						<div className="xl:w-3/4">
-							{(user.type === "developer" || user.type === "owner") && (
+							{(user.type === "developer" || user.type === "admin") && (
 								<Select
 									options={users.map((x) => ({value: x.id, label: `${x.name} - ${x.email}`}))}
 									defaultValue={{value: user.id, label: `${user.name} - ${user.email}`}}
diff --git a/src/pages/stats.tsx b/src/pages/stats.tsx
index 090e31c9..1c8b322d 100644
--- a/src/pages/stats.tsx
+++ b/src/pages/stats.tsx
@@ -169,7 +169,7 @@ export default function Stats() {
 					<section className="flex flex-col gap-3">
 						<div className="w-full flex justify-between gap-8 items-center">
 							<>
-								{(user.type === "developer" || user.type === "owner") && (
+								{(user.type === "developer" || user.type === "admin") && (
 									<Select
 										className="w-full"
 										options={users.map((x) => ({value: x.id, label: `${x.name} - ${x.email}`}))}

From 0e28473c316d29c6c4d1743a95e1263798ee9b47 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Tue, 21 Nov 2023 00:29:58 +0000
Subject: [PATCH 2/2] Changed the mobile menu to the correct one

---
 src/components/MobileMenu.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/MobileMenu.tsx b/src/components/MobileMenu.tsx
index ed294ed0..1ce19c68 100644
--- a/src/components/MobileMenu.tsx
+++ b/src/components/MobileMenu.tsx
@@ -105,12 +105,12 @@ export default function MobileMenu({isOpen, onClose, path, user}: Props) {
 									</Link>
 									{user.type !== "student" && (
 										<Link
-											href="/admin"
+											href="/manage"
 											className={clsx(
 												"transition ease-in-out duration-300 w-fit",
-												path === "/admin" && "text-mti-purple-light font-semibold border-b-2 border-b-mti-purple-light ",
+												path === "/manage" && "text-mti-purple-light font-semibold border-b-2 border-b-mti-purple-light ",
 											)}>
-											Admin
+											Management
 										</Link>
 									)}
 									<Link