diff --git a/client/src/components/Home/PinnedProjects/PinnedProjects.tsx b/client/src/components/Home/PinnedProjects/PinnedProjects.tsx index f667eae0..36d75692 100644 --- a/client/src/components/Home/PinnedProjects/PinnedProjects.tsx +++ b/client/src/components/Home/PinnedProjects/PinnedProjects.tsx @@ -20,6 +20,7 @@ interface PinnedProjectsInterface {} const PinnedProjects: React.FC = () => { const { openModal, closeAllModals } = useModals(); const isTailwindLg = useMediaQuery({ minWidth: 1024 }); + const isXL = useMediaQuery({ minWidth: 1280 }); const { data, isLoading } = usePinnedProjects(); const onShowPinnedModal = () => { @@ -40,7 +41,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); @@ -64,7 +65,7 @@ const PinnedProjects: React.FC = () => { return ; } return ( - + {i.projects?.map((item) => typeof item === "string" ? null : ( @@ -86,7 +87,7 @@ const PinnedProjects: React.FC = () => { return ; } return ( - + {data?.map((i) => { if (typeof i.projects === "string") return null; return i.projects?.map((item) => @@ -99,12 +100,11 @@ const PinnedProjects: React.FC = () => { ); }, }); - return items; - }, [data]); + }, [data, isXL]); return ( - 0} loading={isLoading} className="!pb-10"> + 0} loading={isLoading} className="!pb-10 mt-4 flex-1 flex flex-col min-h-0">

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

- +
+
+ +
+
); }; diff --git a/client/src/components/projects/ProjectCard/index.tsx b/client/src/components/projects/ProjectCard/index.tsx index ebce355e..3402f824 100644 --- a/client/src/components/projects/ProjectCard/index.tsx +++ b/client/src/components/projects/ProjectCard/index.tsx @@ -38,7 +38,7 @@ const ProjectCard = ({ return ( -
+
{ ); return ( -
+

Staff Dashboard

diff --git a/client/src/screens/conductor/Home/index.tsx b/client/src/screens/conductor/Home/index.tsx index 7fd58aec..665cf6b9 100644 --- a/client/src/screens/conductor/Home/index.tsx +++ b/client/src/screens/conductor/Home/index.tsx @@ -199,11 +199,11 @@ const Home = () => {
)} -
+
-
+
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 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 && (