diff --git a/apps/leafcutter/package.json b/apps/leafcutter/package.json index 63e4e25..e1997ed 100644 --- a/apps/leafcutter/package.json +++ b/apps/leafcutter/package.json @@ -17,14 +17,14 @@ "@emotion/react": "^11.11.1", "@emotion/server": "^11.11.0", "@emotion/styled": "^11.11.0", - "@fontsource/playfair-display": "^5.0.12", + "@fontsource/playfair-display": "^5.0.13", "@fontsource/poppins": "^5.0.8", "@fontsource/roboto": "^5.0.8", "@mui/icons-material": "^5", "@mui/lab": "^5.0.0-alpha.146", "@mui/material": "^5", - "@mui/x-data-grid-pro": "^6.15.0", - "@mui/x-date-pickers-pro": "^6.15.0", + "@mui/x-data-grid-pro": "^6.16.0", + "@mui/x-date-pickers-pro": "^6.16.0", "@opensearch-project/opensearch": "^2.3.1", "cryptr": "^6.3.0", "date-fns": "^2.30.0", @@ -40,7 +40,7 @@ "react-cookie-consent": "^8.0.1", "react-dom": "18.2.0", "react-iframe": "^1.8.5", - "react-markdown": "^8.0.7", + "react-markdown": "^9.0.0", "react-polyglot": "^0.7.2", "sharp": "^0.32.6", "swr": "^2.2.4", @@ -49,8 +49,8 @@ }, "devDependencies": { "@babel/core": "^7.23.0", - "@types/node": "^20.7.0", - "@types/react": "18.2.23", + "@types/node": "^20.8.0", + "@types/react": "18.2.24", "@types/uuid": "^9.0.4", "babel-loader": "^9.1.3", "eslint": "^8.50.0", diff --git a/apps/link/app/(main)/_components/Sidebar.tsx b/apps/link/app/(main)/_components/Sidebar.tsx index e328677..ad053f2 100644 --- a/apps/link/app/(main)/_components/Sidebar.tsx +++ b/apps/link/app/(main)/_components/Sidebar.tsx @@ -25,6 +25,7 @@ import { Dvr as DvrIcon, Assessment as AssessmentIcon, LibraryBooks as LibraryBooksIcon, + School as SchoolIcon, } from "@mui/icons-material"; import { usePathname } from "next/navigation"; import Link from "next/link"; @@ -33,6 +34,7 @@ import LinkLogo from "public/link-logo-small.png"; import { useSession, signOut } from "next-auth/react"; import { getTicketOverviewCountsQuery } from "app/_graphql/getTicketOverviewCountsQuery"; +console.log; const openWidth = 270; const closedWidth = 100; @@ -163,7 +165,6 @@ interface SidebarProps { export const Sidebar: FC = ({ open, setOpen }) => { const pathname = usePathname(); const { data: session } = useSession(); - console.log({ session }); const username = session?.user?.name || "User"; // @ts-ignore const roles = session?.user?.roles || []; @@ -436,11 +437,19 @@ export const Sidebar: FC = ({ open, setOpen }) => { + = ({ columns, rows, onRowClick, - height = "calc(100vh - 20px)", + height = "100%", selectedRows, setSelectedRows, }) => { @@ -43,6 +43,9 @@ export const StyledDataGrid: FC = ({ border: 0, width: "100%", height, + ".MuiDataGrid-row": { + cursor: "pointer", + }, ".MuiDataGrid-row:nth-of-type(1n)": { backgroundColor: "#f3f3f3", }, @@ -66,12 +69,14 @@ export const StyledDataGrid: FC = ({ rows={rows} columns={columns} density="compact" - hideFooter + pagination + initialState={{ + pagination: { paginationModel: { pageSize: 20 } }, + }} + pageSizeOptions={[5, 10, 25]} + paginationMode="client" sx={{ height }} rowBuffer={30} - checkboxSelection={!!setSelectedRows} - onRowSelectionModelChange={setSelectedRows} - rowSelectionModel={selectedRows} rowHeight={46} scrollbarSize={0} disableVirtualization diff --git a/apps/link/app/(main)/docs/_components/DocsWrapper.tsx b/apps/link/app/(main)/docs/_components/DocsWrapper.tsx new file mode 100644 index 0000000..2c521e7 --- /dev/null +++ b/apps/link/app/(main)/docs/_components/DocsWrapper.tsx @@ -0,0 +1,24 @@ +"use client"; + +import { FC } from "react"; +import { Grid } from "@mui/material"; +import Iframe from "react-iframe"; + +export const DocsWrapper: FC = () => ( + + +