From fff35ac33ef71a1f70e7116bf7d09a3ebf20b20a Mon Sep 17 00:00:00 2001 From: Akhileshwar Shriram <112577383+AkhilTheBoss@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:58:31 -0700 Subject: [PATCH 1/6] feat: added account creation banner to support ticket form --- .../conductor/support/SupportCreateTicket.tsx | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/client/src/screens/conductor/support/SupportCreateTicket.tsx b/client/src/screens/conductor/support/SupportCreateTicket.tsx index 821faab3..d77dcc6e 100644 --- a/client/src/screens/conductor/support/SupportCreateTicket.tsx +++ b/client/src/screens/conductor/support/SupportCreateTicket.tsx @@ -5,6 +5,7 @@ import AuthHelper from "../../../components/util/AuthHelper"; import CreateTicketFlow from "../../../components/support/CreateTicketFlow"; import useSystemAnnouncement from "../../../hooks/useSystemAnnouncement"; import SystemAnnouncement from "../../../components/util/SystemAnnouncement"; +import { Message } from 'semantic-ui-react'; const SupportCreateTicket = () => { const user = useTypedSelector((state) => state.user); @@ -48,6 +49,27 @@ const SupportCreateTicket = () => {

Submit a support ticket to get help from our team.

+
+ + +
+ Important: +

+ Please do not submit a support ticket for account creation. You can visit {' '} + + https://register.libretexts.org + + {' '} to create an account and complete instructor verification (if applicable). +

+
+
+
+
<> {!isLoggedIn && !guestMode && (
From 07c4588c766241795a0fefb59571e6c94d18a468 Mon Sep 17 00:00:00 2001 From: Akhileshwar Shriram <112577383+AkhilTheBoss@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:50:29 -0700 Subject: [PATCH 2/6] feat: removed recently edited projects --- .../Home/PinnedProjects/PinnedProjects.tsx | 21 ++++++--- client/src/screens/conductor/Home/index.tsx | 44 ++----------------- 2 files changed, 18 insertions(+), 47 deletions(-) diff --git a/client/src/components/Home/PinnedProjects/PinnedProjects.tsx b/client/src/components/Home/PinnedProjects/PinnedProjects.tsx index f667eae0..6372c646 100644 --- a/client/src/components/Home/PinnedProjects/PinnedProjects.tsx +++ b/client/src/components/Home/PinnedProjects/PinnedProjects.tsx @@ -40,7 +40,7 @@ const PinnedProjects: React.FC = () => { const panes = useMemo(() => { if (!data) return []; - const classList = "xl:!ml-24 2xl:!ml-4 3xl:!ml-0 !max-h-[500px] overflow-y-auto xl:!mr-1" + const classList = "xl:!ml-24 2xl:!ml-4 3xl:!ml-0 !max-h-[500px] xl:!mr-1 !pt-1" const allItemsLength = data ?.map((i) => i.projects?.length) .reduce((acc, curr) => acc + (curr || 0), 0); @@ -99,12 +99,11 @@ const PinnedProjects: React.FC = () => { ); }, }); - return items; }, [data]); return ( - 0} loading={isLoading} className="!pb-10"> + 0} loading={isLoading} className="!pb-10 mt-4">

@@ -128,10 +127,18 @@ const PinnedProjects: React.FC = () => { />

- +
+
+ +
+
); }; diff --git a/client/src/screens/conductor/Home/index.tsx b/client/src/screens/conductor/Home/index.tsx index 7fd58aec..2e03cc6f 100644 --- a/client/src/screens/conductor/Home/index.tsx +++ b/client/src/screens/conductor/Home/index.tsx @@ -199,11 +199,11 @@ const Home = () => { )} -
-
+
+
-
+
-
+

Announcements

From dff926354d8d95f7acdd93d00628abb51f745433 Mon Sep 17 00:00:00 2001 From: Akhileshwar Shriram <112577383+AkhilTheBoss@users.noreply.github.com> Date: Thu, 12 Jun 2025 14:14:25 -0700 Subject: [PATCH 3/6] chore(ui): hide Student ID column from Central Identity Users list --- .../CentralIdentity/CentralIdentityUsers.tsx | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/client/src/screens/conductor/controlpanel/CentralIdentity/CentralIdentityUsers.tsx b/client/src/screens/conductor/controlpanel/CentralIdentity/CentralIdentityUsers.tsx index e21af40d..2af0ec4f 100644 --- a/client/src/screens/conductor/controlpanel/CentralIdentity/CentralIdentityUsers.tsx +++ b/client/src/screens/conductor/controlpanel/CentralIdentity/CentralIdentityUsers.tsx @@ -44,7 +44,6 @@ const CentralIdentityUsers = () => { { key: "email", text: "Email" }, { key: "userType", text: "User Type" }, { key: "verification", text: "Verification Status" }, - { key: "studentId", text: "Student ID" }, { key: "Auth Source", text: "Auth Source" }, { key: "Actions", text: "Actions" }, ]; @@ -166,7 +165,7 @@ const CentralIdentityUsers = () => { { setSearchInput(e.target.value); getUsersDebounced(e.target.value); @@ -254,13 +253,6 @@ const CentralIdentityUsers = () => { N/A )} - - {user.student_id ? ( - {user.student_id} - ) : ( - N/A - )} - {user.external_idp From 663aba44bfd0885a51147469e2b22b27eae0cc6c Mon Sep 17 00:00:00 2001 From: Akhileshwar Shriram <112577383+AkhilTheBoss@users.noreply.github.com> Date: Mon, 16 Jun 2025 14:27:56 -0700 Subject: [PATCH 4/6] fix(support): added horizontal scrollbar in support dashboard --- client/src/components/support/StaffDashboard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/support/StaffDashboard.tsx b/client/src/components/support/StaffDashboard.tsx index 6aed9376..3e4db606 100644 --- a/client/src/components/support/StaffDashboard.tsx +++ b/client/src/components/support/StaffDashboard.tsx @@ -255,7 +255,7 @@ const StaffDashboard = () => { ); return ( -
+

Staff Dashboard

From 2c31f1ccc801090f399dfa82e1f3179b1ec2ac12 Mon Sep 17 00:00:00 2001 From: Akhileshwar Shriram <112577383+AkhilTheBoss@users.noreply.github.com> Date: Thu, 3 Jul 2025 00:29:51 -0700 Subject: [PATCH 5/6] fix(home): add a 3-row layout for XL-screens --- .../Home/PinnedProjects/PinnedProjects.tsx | 14 ++++++++------ .../src/components/projects/ProjectCard/index.tsx | 2 +- client/src/screens/conductor/Home/index.tsx | 8 ++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/client/src/components/Home/PinnedProjects/PinnedProjects.tsx b/client/src/components/Home/PinnedProjects/PinnedProjects.tsx index 6372c646..ce7ce072 100644 --- a/client/src/components/Home/PinnedProjects/PinnedProjects.tsx +++ b/client/src/components/Home/PinnedProjects/PinnedProjects.tsx @@ -20,6 +20,8 @@ interface PinnedProjectsInterface {} const PinnedProjects: React.FC = () => { const { openModal, closeAllModals } = useModals(); const isTailwindLg = useMediaQuery({ minWidth: 1024 }); + const isXL = useMediaQuery({ minWidth: 1280 }); + console.log("isXL", isXL); const { data, isLoading } = usePinnedProjects(); const onShowPinnedModal = () => { @@ -64,7 +66,7 @@ const PinnedProjects: React.FC = () => { return ; } return ( - + {i.projects?.map((item) => typeof item === "string" ? null : ( @@ -86,7 +88,7 @@ const PinnedProjects: React.FC = () => { return ; } return ( - + {data?.map((i) => { if (typeof i.projects === "string") return null; return i.projects?.map((item) => @@ -100,10 +102,10 @@ const PinnedProjects: React.FC = () => { }, }); return items; - }, [data]); + }, [data, isXL]); return ( - 0} loading={isLoading} className="!pb-10 mt-4"> + 0} loading={isLoading} className="!pb-10 mt-4 flex-1 flex flex-col min-h-0">

@@ -127,8 +129,8 @@ const PinnedProjects: React.FC = () => { />

-
-
+
+
-
+
{
)} -
-
+
+
-
+
-
+

Announcements

From 6ffbd1b4f046fb5b3dc38b6d5fc812affe5a6167 Mon Sep 17 00:00:00 2001 From: Akhileshwar Shriram <112577383+AkhilTheBoss@users.noreply.github.com> Date: Thu, 3 Jul 2025 00:31:43 -0700 Subject: [PATCH 6/6] refactor: removed debugging statements --- client/src/components/Home/PinnedProjects/PinnedProjects.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/components/Home/PinnedProjects/PinnedProjects.tsx b/client/src/components/Home/PinnedProjects/PinnedProjects.tsx index ce7ce072..36d75692 100644 --- a/client/src/components/Home/PinnedProjects/PinnedProjects.tsx +++ b/client/src/components/Home/PinnedProjects/PinnedProjects.tsx @@ -21,7 +21,6 @@ const PinnedProjects: React.FC = () => { const { openModal, closeAllModals } = useModals(); const isTailwindLg = useMediaQuery({ minWidth: 1024 }); const isXL = useMediaQuery({ minWidth: 1280 }); - console.log("isXL", isXL); const { data, isLoading } = usePinnedProjects(); const onShowPinnedModal = () => {