Merge branch 'CarlySecondNewFilter' of https://github.com/hack4impact…

…-upenn/west-park-cultural into CarlySecondNewFilter
hack4impact-upenn · Apr 7, 2024 · 5d37c0a · 5d37c0a
2 parents 8e47368 + 13d31db
commit 5d37c0a
Show file tree

Hide file tree

Showing 14 changed files with 10,480 additions and 9,600 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/package.json b/client/package.json
@@ -36,11 +36,12 @@
     "@emotion/styled": "^11.11.0",
     "@material-ui/icons": "^4.11.2",
     "@mui/icons-material": "^5.15.9",
-    "@mui/material": "^5.15.9",
+    "@mui/material": "^5.5.3",
     "@mui/system": "^5.5.2",
-    "@mui/x-charts": "^6.19.4",
+    "@mui/x-date-pickers": "^6.19.6",
     "@reduxjs/toolkit": "^1.8.1",
     "axios": "^1.1.2",
+    "dayjs": "^1.11.10",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -25,6 +25,7 @@ import InviteRegisterPage from './Authentication/InviteRegisterPage';
 import DonorProfilePage from './donorProfile/DonorProfilePage';
 import ReportsPage from './Reports/ReportsPage';
 import HomeDashboardPage from './HomeDashboard/HomeDashboard';
+import NewDonationPage from './NewDonation/NewDonationPage';
 
 function App() {
   return (
@@ -36,6 +37,7 @@ function App() {
               <CssBaseline>
                 <AlertPopup />
                 <Routes>
+                  <Route path="/new-donation" element={<NewDonationPage />} />
                   {/* Routes accessed only if user is not authenticated */}
                   <Route element={<UnauthenticatedRoutesWrapper />}>
                     <Route path="/login" element={<LoginPage />} />