Merge Develop and Restructure Files

package.json

@@ -18,7 +18,6 @@
     "date-fns": "^3.3.1",
     "history": "^5.3.0",
     "lodash": "^4.17.21",
-    "luxon": "^3.4.4",
     "prop-types": ">=15.7.2",
     "react": "^18.3.1",
     "react-big-calendar": "^1.10.3",
@@ -42,10 +41,10 @@
   },
   "devDependencies": {
     "@types/lodash": "^4.14.202",
-    "@types/luxon": "^3.4.2",
     "@types/react-big-calendar": "^1.8.8",
     "@types/react-dom": "^18.3.0",
     "@types/react-router-dom": "^5.3.3",
+    "@types/react-router-hash-link": "^2.4.9",
     "@vitejs/plugin-react": "^4.2.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-import": "^2.29.1",

src/components/Loader/index.tsx

@@ -5,12 +5,12 @@ type Props = CircularProgressProps & {
   inline?: boolean;
 };
 
-const GordonLoader = ({ size = 100, color = 'primary', inline = false }: Props) => {
+const GordonLoader = ({ size = 100, color = 'primary', inline = false, ...otherProps }: Props) => {
   if (inline) return <CircularProgress size={size} color={color} />;
   return (
     <Grid className={styles.gordon_loader} container justifyContent="center" alignItems="center">
       <Grid item>
-        <CircularProgress size={size} color={color} />
+        <CircularProgress size={size} color={color} {...otherProps} />
       </Grid>
     </Grid>
   );

src/components/Profile/components/SchedulePanel/components/ScheduleCalendar/index.tsx

@@ -1,9 +1,19 @@
-import { Calendar, luxonLocalizer } from 'react-big-calendar';
+import { Calendar, dateFnsLocalizer } from 'react-big-calendar';
 import { CourseEvent, Schedule, scheduleCalendarResources } from 'services/schedule';
 import './ScheduleCalendar.css';
-import { DateTime } from 'luxon';
+import { format, getDay, startOfWeek } from 'date-fns';
+import { enUS } from 'date-fns/locale';
 
-const localizer = luxonLocalizer(DateTime, { firstDayOfWeek: 1 });
+const locales = {
+  'en-US': enUS,
+};
+
+const localizer = dateFnsLocalizer({
+  format,
+  startOfWeek,
+  getDay,
+  locales,
+});
 
 type Props = {
   schedule: Schedule;

src/routes.jsx

@@ -5,7 +5,6 @@ import BannerSubmission from './views/BannerSubmission';
 import CoCurricularTranscript from './views/CoCurricularTranscript';
 import EnrollmentCheckIn from './views/EnrollmentCheckIn';
 import Events from './views/Events';
-import EventsAttended from './views/EventsAttended';
 import Feedback from './views/Feedback';
 import Help from './views/Help';
 import Home from './views/Home';
@@ -23,9 +22,7 @@ import PublicProfile from './views/PublicProfile';
 import Timesheets from './views/Timesheets';
 import RecIM from './views/RecIM';
 import RoomRanges from 'views/ResLife/components/RDView/components/RoomRanges';
-import { element } from 'prop-types';
-import { Room } from '@mui/icons-material';
-import CampusSafety from './views/CampusSafety';
+import CampusSafety from './views/LostAndFound';
 
 // Route order must be from most specific to least specific (i.e. `/user/:username` before `/user`)
 const routes = [
@@ -69,11 +66,6 @@ const routes = [
     path: '/events',
     element: <Events />,
   },
-  {
-    name: 'Attended',
-    path: '/attended',
-    element: <EventsAttended />,
-  },
   {
     name: 'Feedback',
     path: '/feedback',