Merge branch 'development' into filteredPermissionsDataComp

backend/routers/recurringEvents.router.js

@@ -13,6 +13,8 @@ router.get('/', cors(), (req, res) => {
     RecurringEvent
         // .find(query.checkInReady === 'true' ? query : undefined)
         .find()
+        // This will deselect the video conference link field
+        .select("-videoConferenceLink")
         .populate('project')
         .then(recurringEvents => {
             return res.status(200).send(recurringEvents);
@@ -23,6 +25,19 @@ router.get('/', cors(), (req, res) => {
         });
 });
 
+router.get("/internal", (req, res) => {
+    RecurringEvent
+        .find()
+        .populate('project')
+        .then(recurringEvents => {
+            return res.status(200).send(recurringEvents)
+        })
+        .catch(err => {
+            console.error(err)
+            return res.status(400);
+        })
+} )
+
 router.get('/:id', (req, res) => {
     RecurringEvent
         .findById(req.params.id)

client/package.json

@@ -5,10 +5,11 @@
   "homepage": "https://www.vrms.io",
   "dependencies": {
     "@babel/plugin-transform-react-jsx-self": "^7.10.4",
-    "@emotion/react": "^11.10.6",
-    "@emotion/styled": "^11.10.6",
+    "@emotion/react": "^11.13.3",
+    "@emotion/styled": "^11.13.0",
     "@mui/icons-material": "^5.14.19",
-    "@mui/material": "^5.11.12",
+    "@mui/material": "^5.16.7",
+    "@mui/x-date-pickers": "^7.21.0",
     "@vitejs/plugin-react": "^4.0.3",
     "@vitejs/plugin-react-swc": "^3.3.2",
     "classnames": "^2.2.6",

client/src/api/RecurringEventsApiService.js

@@ -11,7 +11,7 @@ class RecurringEventsApiService {
 
   async fetchRecurringEvents() {
     try {
-      const res = await fetch(this.baseUrl, {
+      const res = await fetch(`${this.baseUrl}/internal`, {
         headers: this.headers,
       });
       return await res.json();