chore: migrate tables to mui, clean up old queries

Author: natalierobbins

client/src/App.tsx

@@ -4,7 +4,6 @@ import AdminDashboard from '@/pages/AdminDashboard/StaffDashboard';
 import QrPage from '@/pages/CompletedSurvey/QrPage';
 import LandingPage from '@/pages/LandingPage/LandingPage';
 import Login from '@/pages/Login/Login';
-import PastEntries from '@/pages/PastEntries/PastEntries';
 import SurveyDetails from '@/pages/PastEntries/SurveyDetails';
 import Profile from '@/pages/Profile/Profile';
 import ApplyReferral from '@/pages/QRCodeScanAndReferral/ApplyReferral';
@@ -38,88 +37,100 @@ function App() {
 						<Route
 							path="/survey/:id/continue"
 							element={
-								<ProtectedRoute
-									children={<SurveyComponent />}
-								/>
+								<ProtectedRoute>
+									<SurveyComponent />
+								</ProtectedRoute>
 							}
 						/>
 						<Route path="/signup" element={<Signup />} />
 						<Route
 							path="/dashboard"
 							element={
-								<ProtectedRoute children={<LandingPage />} />
+								<ProtectedRoute>
+									<LandingPage />
+								</ProtectedRoute>
 							}
 						/>
 						<Route
 							path="/survey"
 							element={
-								<ProtectedRoute
-									children={<SurveyComponent />}
-								/>
+								<ProtectedRoute>
+									<SurveyComponent />
+								</ProtectedRoute>
 							}
 						/>
 						<Route
 							path="/admin-dashboard"
 							element={
-								<ProtectedRoute children={<AdminDashboard />} />
+								<ProtectedRoute>
+									<AdminDashboard />
+								</ProtectedRoute>
 							}
 						/>
 						<Route
 							path="/profile/:id"
-							element={<ProtectedRoute children={<Profile />} />}
+							element={
+								<ProtectedRoute>
+									<Profile />
+								</ProtectedRoute>
+							}
 						/>
 						<Route
 							path="/add-new-user"
-							element={<ProtectedRoute children={<NewUser />} />}
+							element={
+								<ProtectedRoute>
+									<NewUser />
+								</ProtectedRoute>
+							}
 						/>
 						<Route
 							path="/survey-entries"
 							element={
-								<ProtectedRoute
-									children={<SurveyEntryDashboard />}
-								/>
+								<ProtectedRoute>
+									<SurveyEntryDashboard />
+								</ProtectedRoute>
 							}
 						/>
 						<Route
 							path="/qrcode"
-							element={<ProtectedRoute children={<QrPage />} />}
+							element={
+								<ProtectedRoute>
+									<QrPage />
+								</ProtectedRoute>
+							}
 						/>
-						<Route
+						{/* <Route
 							path="/past-entries"
 							element={
-								<ProtectedRoute children={<PastEntries />} />
+								<ProtectedRoute>
+									<PastEntries />
+								</ProtectedRoute>
 							}
-						/>
+						/> */}
 						<Route
 							path="/survey/:id"
 							element={
-								<ProtectedRoute children={<SurveyDetails />} />
+								<ProtectedRoute>
+									<SurveyDetails />
+								</ProtectedRoute>
 							}
 						/>
 						<Route
 							path="/survey/:id/edit"
 							element={
-								<ProtectedRoute
-									children={<SurveyComponent />}
-								/>
+								<ProtectedRoute>
+									<SurveyComponent />
+								</ProtectedRoute>
 							}
 						/>
 						<Route
 							path="/apply-referral"
 							element={
-								<ProtectedRoute children={<ApplyReferral />} />
+								<ProtectedRoute>
+									<ApplyReferral />
+								</ProtectedRoute>
 							}
 						/>
-						{/* <Route
-								path="/view-profile"
-								element={
-									<ProtectedRoute
-										children={
-											<ViewProfile />
-										}
-									/>
-								}
-							/> */}
 					</Routes>
 				</Router>
 			</ThemeProvider>

client/src/pages/AdminDashboard/NewUser.tsx

@@ -1,8 +1,7 @@
 import { useState } from 'react';
 
-import { useApi, useAuth } from '@/hooks';
+import { useApi } from '@/hooks';
 import { Alert, Box, Button, Stack, Typography } from '@mui/material';
-import { useNavigate } from 'react-router-dom';
 
 import {
 	FormInput,
@@ -12,7 +11,6 @@ import {
 } from '@/components/forms';
 
 export default function NewUser() {
-	const { handleLogout } = useAuth();
 	const { userService } = useApi();
 	const [firstName, setFirstName] = useState('');
 	const [lastName, setLastName] = useState('');
@@ -21,13 +19,12 @@ export default function NewUser() {
 	const [phone, setPhone] = useState('');
 	const [role, setRole] = useState('');
 	const [message, setMessage] = useState('');
-	const navigate = useNavigate();
 
 	const handleSubmit = async (e: { preventDefault: () => void }) => {
 		e.preventDefault();
 
 		try {
-			const response = await userService.createUser({
+			const createdUser = await userService.createUser({
 				locationObjectId,
 				firstName,
 				lastName,
@@ -36,17 +33,10 @@ export default function NewUser() {
 				role
 			});
 
-			const data = await response.json();
-
-			if (response.ok) {
-				setMessage('User registered successfully!');
-			} else if (response.status == 401) {
-				// Token Error, either expired or invalid for some other reason.
-				// Log user out so they can relogin to generate a new valid token
-				handleLogout();
-				navigate('/login');
+			if (createdUser) {
+				setMessage(createdUser.message ?? 'User created successfully!');
 			} else {
-				setMessage(data.message || 'Failed to register user.');
+				setMessage(createdUser?.message ?? 'Failed to create user.');
 			}
 		} catch (error) {
 			console.error('Error creating user:', error);