Merge pull request #52 from odevine/feat/decks-datagrid

Update decks table to use mui x datagrid for better filtering/sorting
odevine · Jan 25, 2025 · d5dd9dd · d5dd9dd
2 parents ffd8e66 + a76cde2
commit d5dd9dd
Show file tree

Hide file tree

Showing 33 changed files with 966 additions and 849 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "edh-tracker",
   "private": true,
-  "version": "1.3.1",
+  "version": "1.4.0",
   "type": "module",
   "scripts": {
     "start": "vite",
@@ -15,6 +15,7 @@
     "@fontsource-variable/noto-sans-mono": "^5.0.20",
     "@mui/icons-material": "^5.15.15",
     "@mui/material": "^5.15.15",
+    "@mui/x-data-grid": "^7.23.3",
     "@mui/x-date-pickers": "^7.4.0",
     "aws-amplify": "^6.1.4",
     "axios": "^1.7.7",

diff --git a/src/App.tsx b/src/App.tsx
@@ -57,19 +57,20 @@ export const App = () => {
   const showLoading = usersLoading || matchesLoading || decksLoading;
 
   return (
-    <>
+    <Stack flexDirection="column" height="100vh" overflow="hidden">
       <Toolbar />
       <Box
         sx={{
-          height: "calc(100% - 64px)",
+          flex: 1,
           overflowY: "auto",
-          scrollbarGutter: 8,
+          scrollbarGutter: "stable",
+          p: 3,
         }}
       >
         {routeResult || <h1>404 Not Found</h1>}
       </Box>
       {showLoading && <LoadingBackdrop />}
       <AppAlertList messages={appMessages} onDelete={deleteAppMessage} />
-    </>
+    </Stack>
   );
 };
diff --git a/src/Components/AppAlerts.tsx → src/Components/Common/AppAlerts.tsx b/src/Components/AppAlerts.tsx → src/Components/Common/AppAlerts.tsx
diff --git a/src/Components/LoadingBackdrop.tsx → src/Components/Common/LoadingBackdrop.tsx b/src/Components/LoadingBackdrop.tsx → src/Components/Common/LoadingBackdrop.tsx
diff --git a/src/Components/Common/index.ts b/src/Components/Common/index.ts
@@ -0,0 +1,2 @@
+export * from "./AppAlerts";
+export * from "./LoadingBackdrop";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from "./AppAlerts";
		export * from "./LoadingBackdrop";