devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/exam-generation

Browse Source
This commit is contained in:
Tiago Ribeiro
2023-11-21 00:31:51 +00:00
parent cdc8cfe46e 0e28473c31
commit 8de60aeb32
15 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/MobileMenu.tsx
View File

@@ -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

11
src/components/Sidebar.tsx
View File

@@ -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}
/>
)}
{userType === "developer" && (
<Nav
@@ -110,7 +117,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} />
)}
{userType === "developer" && (
<Nav disabled={disableNavigation} Icon={BsCloudFill} label="Generation" path={path} keyPath="/generation" isMinimized={true} />

4
src/components/UserCard.tsx
View File

@@ -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>