From 56d0222f3d1ba77ada0e33700b877fc1403721b0 Mon Sep 17 00:00:00 2001
From: Javier <javidx@gmail.com>
Date: Tue, 16 Apr 2024 18:36:24 +0300
Subject: [PATCH 1/3] Updated package-lock

---
 frontend/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 8f3a7f40..4a915b1b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4196,16 +4196,6 @@
             "requires": {
                 "legacy-swc-helpers": "npm:@swc/helpers@=0.4.14",
                 "tslib": "^2.4.0"
-            },
-            "dependencies": {
-                "legacy-swc-helpers": {
-                    "version": "npm:@swc/helpers@0.4.14",
-                    "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz",
-                    "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==",
-                    "requires": {
-                        "tslib": "^2.4.0"
-                    }
-                }
             }
         },
         "@types/babel__core": {
@@ -11960,6 +11950,14 @@
             "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
             "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="
         },
+        "legacy-swc-helpers": {
+            "version": "npm:@swc/helpers@0.4.14",
+            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz",
+            "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==",
+            "requires": {
+                "tslib": "^2.4.0"
+            }
+        },
         "leven": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",

From 3f63cf5e583decabb38fee498f83db25bc3b5c75 Mon Sep 17 00:00:00 2001
From: wickathou <javier@enddesign.co>
Date: Wed, 24 Apr 2024 14:52:18 +0300
Subject: [PATCH 2/3] Updated event model to disable meetings by default and
 added base config for scoreCriteria Removed multiple console logs and unused
 or commented code Deleted old team creation redux action, and replaced it
 with the newer version of the team creation workflow Started removal process
 of file attachment

---
 backend/modules/event/model.js                |  11 +-
 frontend/package-lock.json                    |  18 +-
 .../layouts/MaterialTabsLayout/index.js       |   4 -
 .../components/layouts/SidebarLayout/index.js |  31 ----
 frontend/src/graphql/queries/events.js        |   3 -
 frontend/src/graphql/queries/registrations.js |   1 -
 frontend/src/hocs/RequiresPermission.js       |   1 -
 .../default/events/Organizer.js               |  36 +---
 .../default/events/Participant.js             |  20 +--
 .../renderDashboard/default/events/index.js   |   7 +-
 .../renderDashboard/default/index.js          | 123 +++-----------
 .../default/Blocks/SocialMediaBlock.js        |   2 +-
 .../renderDashboard/participant/index.js      |   1 -
 .../participant/team/profile/index.js         |   2 +-
 frontend/src/redux/dashboard/actions.js       | 156 +++++++-----------
 frontend/src/redux/dashboard/reducer.js       |   1 -
 frontend/src/services/analytics.js            |   6 -
 17 files changed, 114 insertions(+), 309 deletions(-)

diff --git a/backend/modules/event/model.js b/backend/modules/event/model.js
index a072f21e..f5c62099 100644
--- a/backend/modules/event/model.js
+++ b/backend/modules/event/model.js
@@ -407,7 +407,10 @@ const EventSchema = new mongoose.Schema({
         type: [EventPageScriptSchema.mongoose],
         default: [],
     },
-    meetingsEnabled: false,
+    meetingsEnabled: {
+        type: Boolean,
+        default: false,
+    },
     meetingRooms: {
         type: [MeetingRoomSchema.mongoose],
         default: [],
@@ -426,6 +429,12 @@ const EventSchema = new mongoose.Schema({
     //New fields for score criteria and score settings
     scoreCriteriaSettings: {
         type: ScoreCriteriaSettingsSchema.mongoose,
+        default: {
+            scoreCriteria: [{criteria: 'overall', label: 'Overall'}],
+            showScore: false,
+            showFeedback: false,
+            reviewAnyChallenge: false,
+        },
     },
     experimental: {
         type: Boolean,
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 4a915b1b..8f3a7f40 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4196,6 +4196,16 @@
             "requires": {
                 "legacy-swc-helpers": "npm:@swc/helpers@=0.4.14",
                 "tslib": "^2.4.0"
+            },
+            "dependencies": {
+                "legacy-swc-helpers": {
+                    "version": "npm:@swc/helpers@0.4.14",
+                    "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz",
+                    "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==",
+                    "requires": {
+                        "tslib": "^2.4.0"
+                    }
+                }
             }
         },
         "@types/babel__core": {
@@ -11950,14 +11960,6 @@
             "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
             "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="
         },
-        "legacy-swc-helpers": {
-            "version": "npm:@swc/helpers@0.4.14",
-            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz",
-            "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==",
-            "requires": {
-                "tslib": "^2.4.0"
-            }
-        },
         "leven": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
diff --git a/frontend/src/components/layouts/MaterialTabsLayout/index.js b/frontend/src/components/layouts/MaterialTabsLayout/index.js
index 2613ac8c..1a010371 100644
--- a/frontend/src/components/layouts/MaterialTabsLayout/index.js
+++ b/frontend/src/components/layouts/MaterialTabsLayout/index.js
@@ -57,7 +57,6 @@ export default ({ tabs, location, baseRoute, transparent = false }) => {
 
     const pushRoute = useCallback(
         path => {
-            console.log("pushing", `${baseRoute}${path}`)
             dispatch(push(`${baseRoute}${path}`))
         },
         [baseRoute, dispatch],
@@ -69,15 +68,12 @@ export default ({ tabs, location, baseRoute, transparent = false }) => {
 
     const activeIndex = useMemo(() => {
         const relativePath = location.pathname.replace(baseRoute, '')
-        console.log("relativePath matTab", relativePath)
         const idx = findIndex(tabs, item => item.path === relativePath)
-        console.log("safeIndex matTab", idx, idx !== -1)
         return idx
     }, [baseRoute, location.pathname, tabs])
 
     useEffect(() => {
         if (activeIndex === -1) {
-            console.log("pushRoute(tabs[0].path)", pushRoute(tabs[0].path))
             pushRoute(tabs[0].path)
         }
     }, [tabs, activeIndex, pushRoute])
diff --git a/frontend/src/components/layouts/SidebarLayout/index.js b/frontend/src/components/layouts/SidebarLayout/index.js
index 629d3d9a..045e6b83 100644
--- a/frontend/src/components/layouts/SidebarLayout/index.js
+++ b/frontend/src/components/layouts/SidebarLayout/index.js
@@ -130,7 +130,6 @@ export default React.memo(
     }) => {
         const dispatch = useDispatch()
         const routes = _routes.filter(route => !route.hidden)
-        console.log("ROUTES", routes)
 
         const activeIndex = useMemo(() => {
             const relativePath = location.pathname.replace(baseRoute, '')
@@ -141,21 +140,16 @@ export default React.memo(
                     return relativePath.indexOf(item.path) !== -1
                 }
             })
-            console.log("INDEX", idx)
-            console.log(relativePath)
             if (idx === -1) {
                 switch (relativePath) {
                     case '/events':
                         idx = routes.length
-                        console.log('/events', idx)
                         break
                     case '/events/organize':
                         idx = routes.length
-                        console.log('/events', idx)
                         break
                     case '/events/partner':
                         idx = routes.length
-                        console.log('/events', idx)
                         break
                     case '/profile':
                         idx = routes.length + 1
@@ -166,13 +160,11 @@ export default React.memo(
                     default: idx = -1
                 }
             }
-            console.log("IDX", idx)
             return idx
         }, [baseRoute, location.pathname, routes])
 
         const pushRoute = useCallback(
             path => {
-                console.log(`push(${baseRoute}${path})`)
                 dispatch(push(`${baseRoute}${path}`))
             },
             [baseRoute, dispatch],
@@ -180,7 +172,6 @@ export default React.memo(
 
         useEffect(() => {
             if (activeIndex === -1) {
-                console.log("PUSHING ", routes, "activeIndex", activeIndex)
                 //pushRoute(routes[0].path)
             }
         }, [routes, activeIndex, pushRoute])
@@ -271,7 +262,6 @@ export default React.memo(
                                 selected: classes.listItemSelected,
                             }}
                             onClick={() => {
-                                console.log("safeIndex", safeIndex)
                                 pushRoute('/events')
                             }}
                         >
@@ -340,11 +330,6 @@ export default React.memo(
                                 primary={'Log Out'}
                             />
                         </ListItem>
-                        <ListItem>
-                            {/*TODO: language menu */}
-                            {/* <img src={FlagUK} width="40" height="30" ></img> */}
-
-                        </ListItem>
                     </div>
                 </List>
             </>
@@ -426,24 +411,8 @@ export default React.memo(
                                     },
                                     index,
                                 ) => {
-                                    // console.log("PROPS: ", "key", key,
-                                    //     "path", `${baseRoute}${path}`,
-                                    //     "hidden", hidden,
-                                    //     "component", component,
-                                    //     exact = false,
-                                    //     "locked", locked,
-                                    //     "index", index)
                                     if (hidden || locked) {
                                         return null
-                                        // } else if (index === 5) {
-                                        //     console.log("ROUTING EVENT_ID")
-                                        //     return (< Route
-                                        //         key={'eventId2'}
-                                        //         exact={false}
-                                        //         path={`${baseRoute}/event-id`
-                                        //         }
-                                        //         component={LogoutPage}
-                                        //     />)
 
                                     } else {
                                         return (
diff --git a/frontend/src/graphql/queries/events.js b/frontend/src/graphql/queries/events.js
index 65e9386a..5647c265 100644
--- a/frontend/src/graphql/queries/events.js
+++ b/frontend/src/graphql/queries/events.js
@@ -84,7 +84,6 @@ export const useActiveEvents = ({ limit }) => {
             limit,
         },
     })
-    console.log("data", data)
 
     return [data?.activeEvents, loading, error]
 }
@@ -104,7 +103,6 @@ export const usePastEvents = ({ limit }) => {
             limit,
         },
     })
-    console.log("usePastEvents", data)
     return [data?.pastEvents, loading, error]
 }
 
@@ -119,7 +117,6 @@ export const GET_MY_EVENTS = gql`
 
 export const useMyEvents = () => {
     const { data, loading, error } = useQuery(GET_MY_EVENTS)
-    console.log("data", data)
 
     return [data?.myEvents, loading, error]
 }
diff --git a/frontend/src/graphql/queries/registrations.js b/frontend/src/graphql/queries/registrations.js
index efaa36d7..b2bcc58d 100644
--- a/frontend/src/graphql/queries/registrations.js
+++ b/frontend/src/graphql/queries/registrations.js
@@ -37,6 +37,5 @@ export const useRegistrationsByUser = userId => {
             userId,
         },
     })
-    console.log('useRegistrationsByUser', userId, data, loading, error)
     return [data?.registrationsByUser, loading, error]
 }
diff --git a/frontend/src/hocs/RequiresPermission.js b/frontend/src/hocs/RequiresPermission.js
index e5ac0b20..6e72e904 100644
--- a/frontend/src/hocs/RequiresPermission.js
+++ b/frontend/src/hocs/RequiresPermission.js
@@ -19,7 +19,6 @@ export default (ComposedComponent, requiredPermissions = []) => {
         const hasProfile = useSelector(UserSelectors.hasProfile)
 
         const hasRequiredPermissions = useMemo(() => {
-            console.log(permissions, requiredPermissions)
             return (
                 requiredPermissions.filter(x => !permissions?.includes(x))
                     .length === 0
diff --git a/frontend/src/pages/_dashboard/renderDashboard/default/events/Organizer.js b/frontend/src/pages/_dashboard/renderDashboard/default/events/Organizer.js
index cf5b256b..5837a85c 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/default/events/Organizer.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/default/events/Organizer.js
@@ -76,36 +76,6 @@ export default () => {
         ['Organiser', 'AssistantOrganiser', 'SuperAdmin'].includes(r),
     )
 
-    // useEffect(() => {
-    //     if (hasError) {
-    //         if (name.length < 5) {
-    //             setError(t('Name_must_five_'))
-    //         } else if (name.length >= 50) {
-    //             setError(t('Name_must_under_'))
-    //         } else if (name === 'default') {
-    //             setError(t('Name_not_default_'))
-    //         } else {
-    //             setError()
-    //         }
-    //     }
-    // }, [name, hasError, t])
-
-    // const checkName = useCallback(() => {
-    //     if (name.length < 5) {
-    //         setError(t('Name_must_five_'))
-    //         return false
-    //     } else if (name.length >= 50) {
-    //         setError(t('Name_must_under_'))
-    //         return false
-    //     } else if (name === 'default') {
-    //         setError(t('Name_not_default_'))
-    //         return false
-    //     }
-    //     return true
-    // }, [name.length, t])
-
-    console.log('organizerEvents', organizerEvents)
-
     //TODO implement pagination to improve performance of organize tab
 
     useEffect(() => {
@@ -140,7 +110,7 @@ export default () => {
                 <Grid
                     container
                     direction="row"
-                    justify="flex-start"
+                    justifyContent="flex-start"
                     alignItems="center"
                     spacing={3}
                 >
@@ -157,8 +127,8 @@ export default () => {
                 </Grid>
                 <Grid container spacing={3}>
                     <CreateEventCard />
-                    {searchResults.map(event => (
-                        <Grid item xs={12} md={6} lg={4}>
+                    {searchResults.map((event, index) => (
+                        <Grid key={index} item xs={12} md={6} lg={4}>
                             <div className={classes.statusText}>
                                 {event.published && event.approved ? (
                                     <span className={classes.green}>
diff --git a/frontend/src/pages/_dashboard/renderDashboard/default/events/Participant.js b/frontend/src/pages/_dashboard/renderDashboard/default/events/Participant.js
index 314b1fb6..5fdf20e6 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/default/events/Participant.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/default/events/Participant.js
@@ -23,11 +23,6 @@ export default () => {
     const activeEvents = useSelector(DashboardSelectors.activeEvents)
     const pastEvents = useSelector(DashboardSelectors.pastEvents)
     const [registrations, loading, error] = useRegistrationsByUser(userId)
-    //useSelector(UserSelectors.registrations)
-
-    console.log('activeEvents', activeEvents)
-    console.log('pastEvents', pastEvents)
-    console.log('registrations', registrations)
 
     const dispatch = useDispatch()
     const { t } = useTranslation()
@@ -53,9 +48,10 @@ export default () => {
                                 )}
                         </Grid>
 
-                        {registrations?.map(registration => (
-                            <Grid key={registration.id} item xs={12} md={6}>
+                        {registrations?.map((registration, index) => (
+                            <Grid key={`${registration.id}-${index}`} item xs={12} md={6}>
                                 <EventCardSmall
+                                    key={index}
                                     event={registration.event}
                                     handleClick={event => {
                                         dispatch(
@@ -92,12 +88,6 @@ export default () => {
                                     isodate > event.registrationStartTime
 
                                 const eventStarted = isodate > event.startTime
-                                console.log(
-                                    'button render',
-                                    event.slug,
-                                    canApply && !event.galleryOpen,
-                                    event.galleryOpen && eventStarted,
-                                )
                                 return (
                                     <NewEventCard
                                         event={event}
@@ -136,10 +126,6 @@ export default () => {
                                                     <Button
                                                         size="small"
                                                         onClick={() => {
-                                                            console.log(
-                                                                '/projects/' +
-                                                                    event.slug,
-                                                            )
                                                             dispatch(
                                                                 push(
                                                                     '/projects/' +
diff --git a/frontend/src/pages/_dashboard/renderDashboard/default/events/index.js b/frontend/src/pages/_dashboard/renderDashboard/default/events/index.js
index 286895ea..b5770f2e 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/default/events/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/default/events/index.js
@@ -2,7 +2,6 @@ import React from 'react'
 
 import { useRouteMatch, useLocation } from 'react-router'
 import { useSelector } from 'react-redux'
-import { useTranslation } from 'react-i18next'
 
 import MaterialTabsLayout from 'components/layouts/MaterialTabsLayout'
 import PageWrapper from 'components/layouts/PageWrapper'
@@ -16,8 +15,6 @@ import Partner from './Partner'
 export default () => {
     const match = useRouteMatch()
     const location = useLocation()
-    const { t } = useTranslation()
-    console.log("base", match.url)
 
     const isPartner = useSelector(AuthSelectors.idTokenData)?.roles?.some(r =>
         ["Recruiter", "SuperAdmin"].includes(r)
@@ -34,7 +31,7 @@ export default () => {
                     tabs={[
                         {
                             label: 'Your Events',
-                            key: 'YourEvents',
+                            key: 'events',
                             path: '',
                             component: Participant,
                         },
@@ -66,7 +63,7 @@ export default () => {
                         tabs={[
                             {
                                 label: 'Your Events',
-                                key: 'YourEvents',
+                                key: 'events',
                                 path: '',
                                 component: Participant,
                             },
diff --git a/frontend/src/pages/_dashboard/renderDashboard/default/index.js b/frontend/src/pages/_dashboard/renderDashboard/default/index.js
index ab786477..efe2e2ea 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/default/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/default/index.js
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react'
 
 import { useRouteMatch, useLocation } from 'react-router'
-import { push } from 'connected-react-router'
+// import { push } from 'connected-react-router'
 import { useDispatch, useSelector } from 'react-redux'
-import { makeStyles } from '@material-ui/core/styles'
+// import { makeStyles } from '@material-ui/core/styles'
 
 
 import SidebarLayout from 'components/layouts/SidebarLayout' //TODO: make normal sidepar work with default view
@@ -13,7 +13,7 @@ import defaultImage from 'assets/images/dashboardDefault.jpg'
 
 
 
-import * as DashboardSelectors from 'redux/dashboard/selectors'
+// import * as DashboardSelectors from 'redux/dashboard/selectors'
 import * as DashboardActions from 'redux/dashboard/actions'
 import * as AuthSelectors from 'redux/auth/selectors'
 import * as UserSelectors from 'redux/user/selectors'
@@ -23,24 +23,24 @@ import { useTranslation } from 'react-i18next'
 import { useMyEvents, useActiveEvents, usePastEvents } from 'graphql/queries/events'
 // import { Chat } from 'components/messaging/chat'
 
-const useStyles = makeStyles(theme => ({
-    sidebarTop: {
-        padding: theme.spacing(3),
-        height: '100%',
-        display: 'flex',
-        flexDirection: 'column',
-        alignItems: 'center',
-        justifyContent: 'center',
-    },
-    sidebarLogo: {
-        width: '100%',
-        objectFit: 'contain',
-    },
-}))
+// const useStyles = makeStyles(theme => ({
+//     sidebarTop: {
+//         padding: theme.spacing(3),
+//         height: '100%',
+//         display: 'flex',
+//         flexDirection: 'column',
+//         alignItems: 'center',
+//         justifyContent: 'center',
+//     },
+//     sidebarLogo: {
+//         width: '100%',
+//         objectFit: 'contain',
+//     },
+// }))
 
 export default () => {
 
-    const classes = useStyles()
+    // const classes = useStyles()
     const match = useRouteMatch()
     const location = useLocation()
 
@@ -52,28 +52,16 @@ export default () => {
     const [activeEvents, loadingActive] = useActiveEvents({}) //active events, from these we select where to rediret, or default
     const [pastEvents, loadingPast] = usePastEvents({ limit: 3 })//TODO: is undefined, fix
     const [loading, setLoading] = useState(true)
-    const userAccessRight = useSelector(UserSelectors.userAccessRight)
-    const stateActiveEvents = useSelector(DashboardSelectors.activeEvents)
-    const statePastEvents = useSelector(DashboardSelectors.pastEvents)
-
-
-
-    console.log("activeEvents", activeEvents)
-    console.log("recruiterEvents", recruiterEvents)
-    console.log("organizerEvents", organizerEvents)
-    console.log("participantEvents", participantEvents)
-    console.log("userAccessRight", userAccessRight)
+    // const userAccessRight = useSelector(UserSelectors.userAccessRight)
+    // const stateActiveEvents = useSelector(DashboardSelectors.activeEvents)
+    // const statePastEvents = useSelector(DashboardSelectors.pastEvents)
 
     useEffect(() => {
         dispatch(UserActions.organizerEvents(organizerEvents))
-        console.log(" dispatch(UserActions.organizerEvents)")
-        console.log(loadingActive, loadingPast)
         if (!loadingActive) {
             dispatch(DashboardActions.activeEvents(activeEvents))
         }
-        console.log("dipatch past?", loadingPast, pastEvents)
         if (!loadingPast) {
-            console.log("dipatch past", pastEvents)
             dispatch(DashboardActions.pastEvents(pastEvents))
         }
         if (!(loadingActive || loadingEvents || loadingPast)) {
@@ -96,36 +84,21 @@ export default () => {
     let accessRight = ""
 
     useEffect(() => {
-        //TODO: needs more testing
-        console.log("loading active", loadingActive, "loading organiser", loadingEvents, "loading past", loadingPast)
         if (page === "") {
             const partnerPage = activeEvents?.find(active => recruiterEvents?.some(e => e.eventId === active._id))?.slug
-            //console.log("partnerPage", partnerPage)
 
-            //console.log("page", page)
             if (partnerPage && isPartner) {
                 page = partnerPage
                 accessRight = 'partner'
-
-                //dispatch(UserActions.setAccessRight('partner'))
-                //console.log("redirect", partnerPage)
-                //dispatch(push(`/dashboard/event/${partnerPage}`))
             }
         }
 
         if (page === "") {
             const orgPage = activeEvents?.find(active => organizerEvents?.some(e => e._id === active._id))?.slug
-            //console.log("orgPage", orgPage)
 
-            //console.log("page orgPage", page)
             if (orgPage && isOrganizer) {
                 page = orgPage
                 accessRight = 'organizer'
-
-
-                // dispatch(UserActions.setAccessRight('organizer'))
-                // console.log("redirect", orgPage)
-                //dispatch(push(`/dashboard/event/${orgPage}`))
             }
 
 
@@ -133,21 +106,13 @@ export default () => {
 
         if (page === "") {
             const participantPage = activeEvents?.find(active => {
-                //console.log("active._id", active._id, participantEvents?.some(e => e.event === active._id))
                 return participantEvents?.some(e => e.event === active._id)
             })?.slug
-            //console.log("participantPage", participantPage)
 
-            //console.log("page participantPage", page)
 
             if (participantPage) {
                 page = participantPage
                 accessRight = 'participant'
-
-
-                // dispatch(UserActions.setAccessRight('participant'))
-                // console.log("redirect", participantPage)
-                // dispatch(push(`/dashboard/event/${participantPage}`))
             }
 
 
@@ -159,20 +124,12 @@ export default () => {
 
         if (page !== "" && accessRight !== "") {
 
-            console.log(`dispatch(UserActions.setAccessRight(${accessRight})`)
-            console.log(`/dashboard/event/${page}`)
-
-            //dispatch(UserActions.setAccessRight(accessRight))
-            //dispatch(push(`/dashboard/event/${page}`))
         }
 
 
     }, [loading])
 
 
-    //TODO: fix all `/dashboard/${ calls
-
-    console.log("DEFAULT PAGE")
 
     const { t } = useTranslation()
 
@@ -186,45 +143,9 @@ export default () => {
                 baseRoute={match.url}
                 location={location}
                 sidebarTopContent={<img src={defaultImage} width={250} height={250} ></img>
-                    // <div className={classes.sidebarTop}>
-                    //     <Image
-                    //         className={classes.sidebarLogo || waves}
-                    //         publicId={
-                    //             defaultPage && defaultPage['logo'] ? defaultPage['logo']['publicId'] : ''
-                    //         }
-                    //         transformation={{
-                    //             width: 200,
-                    //         }}
-                    //     />
-                    // </div>
                 }
                 topContent={<BasicNavBar text={""} />}
-                routes={[
-                    // {
-                    //     key: 'events',
-                    //     path: '',
-                    //     exact: true,
-                    //     icon: <ExitToAppIcon />,
-                    //     label: 'Events',
-                    //     component: EventsPage,
-                    // },
-                    // {
-                    //     key: 'profile',
-                    //     path: '/profile',
-                    //     exact: true,
-                    //     icon: <ExitToAppIcon />,
-                    //     label: t('Log_out_'),
-                    //     component: ProfilePage,
-                    // },
-                    // {
-                    //     key: 'logout',
-                    //     path: '/logout',
-                    //     exact: true,
-                    //     icon: <ExitToAppIcon />,
-                    //     label: t('Log_out_'),
-                    //     component: LogoutPage,
-                    // },
-                ]}
+                routes={[]}
             />
         </PageWrapper>
 
diff --git a/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/SocialMediaBlock.js b/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/SocialMediaBlock.js
index 795bb7ad..3217ea5a 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/SocialMediaBlock.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/SocialMediaBlock.js
@@ -34,7 +34,7 @@ const SocialMediaBlock = () => {
                     container
                     spacing={1}
                     direction="row"
-                    justify="center"
+                    justifyContent="center"
                     alignItems="center"
                 >
                     <Grid item>
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/index.js b/frontend/src/pages/_dashboard/renderDashboard/participant/index.js
index 16a5c73c..414b3081 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/index.js
@@ -110,7 +110,6 @@ export default ({
                     ),
                     label: t('Dashboard_'),
                     component: () => {
-                        setAlertCount(0)
                         return DefaultPage({ alerts })
                     },
                 },
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/team/profile/index.js b/frontend/src/pages/_dashboard/renderDashboard/participant/team/profile/index.js
index 69275968..14668d84 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/team/profile/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/team/profile/index.js
@@ -74,7 +74,7 @@ export default () => {
     const handleCreate = useCallback(
         (values, formikBag) => {
             setLoading(true)
-            dispatch(DashboardActions.createNewTeam(slug, values))
+            dispatch(DashboardActions.createTeam(slug, values))
                 .then(() => {
                     dispatch(SnackbarActions.success('Created new team'))
                 })
diff --git a/frontend/src/redux/dashboard/actions.js b/frontend/src/redux/dashboard/actions.js
index 4e693d0d..67849d38 100644
--- a/frontend/src/redux/dashboard/actions.js
+++ b/frontend/src/redux/dashboard/actions.js
@@ -60,7 +60,6 @@ export const updateRegistrationChecklist =
 
 export const updateRecruitersForEvent =
     recruiters => async (dispatch, getState) => {
-        const idToken = AuthSelectors.getIdToken(getState())
         const userIds = recruiters?.map(rec => {
             return rec.recruiterId
         })
@@ -171,13 +170,11 @@ export const createPartnerRegistration =
             idToken,
             userId,
         )
-        console.log('createPartnerRegistration', user)
         const registration = await RegistrationsService.addPartnerToRegistrated(
             idToken,
             user,
             slug,
         )
-        console.log('created registration', registration)
         return registration
     }
 
@@ -255,19 +252,6 @@ export const updateTeam = slug => (dispatch, getState) => {
     })
 }
 
-// TODO createTeam action to be depreciated and deleted, replaced by createNewTeam
-export const createTeam = slug => async (dispatch, getState) => {
-    const idToken = AuthSelectors.getIdToken(getState())
-    const team = await TeamsService.createTeamForEvent(idToken, slug, true)
-
-    dispatch({
-        type: ActionTypes.EDIT_TEAM,
-        payload: team,
-    })
-
-    return team
-}
-
 export const editTeam = (slug, data) => async (dispatch, getState) => {
     const idToken = AuthSelectors.getIdToken(getState())
     const team = await TeamsService.editTeamForEvent(idToken, slug, data, true)
@@ -280,9 +264,7 @@ export const editTeam = (slug, data) => async (dispatch, getState) => {
     return team
 }
 
-//TODO when createTeam is deleted, rename this to createTeam
-export const createNewTeam = (slug, data) => async (dispatch, getState) => {
-    console.log('createNewTeam action received:', slug, data)
+export const createTeam = (slug, data) => async (dispatch, getState) => {
     const idToken = AuthSelectors.getIdToken(getState())
     const team = await TeamsService.createNewTeamForEvent(
         idToken,
@@ -301,9 +283,7 @@ export const createNewTeam = (slug, data) => async (dispatch, getState) => {
 
 export const joinTeam = (slug, code) => async (dispatch, getState) => {
     const idToken = AuthSelectors.getIdToken(getState())
-
     const team = await TeamsService.joinTeamForEvent(idToken, slug, code, true)
-
     dispatch({
         type: ActionTypes.EDIT_TEAM,
         payload: team,
@@ -328,7 +308,6 @@ export const getCandidateProfileById = userId => async (dispatch, getState) => {
 export const candidateApplyToTeam =
     (slug, code, applicationData) => async (dispatch, getState) => {
         const idToken = AuthSelectors.getIdToken(getState())
-        console.log('submitted with:', applicationData)
         const team = await TeamsService.candidateApplyToTeam(
             idToken,
             slug,
@@ -350,7 +329,6 @@ export const candidateApplyToTeam =
 export const acceptCandidateToTeam =
     (slug, code, userId) => async (dispatch, getState) => {
         const idToken = AuthSelectors.getIdToken(getState())
-        // const team = await TeamsService.editTeam(idToken, slug, code, userId)
         const team = await TeamsService.acceptCandidateToTeam(
             idToken,
             slug,
@@ -480,10 +458,6 @@ export const updateProjects = slug => async (dispatch, getState) => {
 export const createProject = (slug, data) => async (dispatch, getState) => {
     try {
         const idToken = AuthSelectors.getIdToken(getState())
-        // const fileData = await fileAttachmentFinder(data, idToken)
-
-        // if (fileData) {
-        // }
         await ProjectsService.createProjectForEventAndTeam(idToken, slug, data)
         const projects = await ProjectsService.getProjectsForEventAndTeam(
             idToken,
@@ -502,40 +476,40 @@ export const createProject = (slug, data) => async (dispatch, getState) => {
         throw new Error(error)
     }
 }
-
-const fileAttachmentFinder = async (Projectdata, idToken) => {
-    console.log('Project data to check for files', Projectdata)
-    const fileKeys = []
-    _.forOwn(Projectdata, (value, key) => {
-        console.log(key, value)
-        if (value && Object.getPrototypeOf(value) === File.prototype) {
-            console.log('File found: ', value)
-            fileKeys.push(key)
-        }
-    })
-    console.log('File keys: ', fileKeys)
-    if (fileKeys.length > 0) {
-        const fileMetadataArray = await Promise.all(
-            fileKeys.map(async key => {
-                console.log('File key: ', key)
-                const fileMetadata = await handleFile(Projectdata[key], idToken)
-                console.log('File metadata: ', fileMetadata)
-                if (fileMetadata.toString() === '[object Object]') {
-                    return Error('File upload failed')
-                }
-                Projectdata[key] = fileMetadata.toString()
-                const index = Projectdata['submissionFormAnswers'].findIndex(
-                    ans => ans['key'] === key,
-                )
-                Projectdata['submissionFormAnswers'][index].value =
-                    fileMetadata.toString()
-                return fileMetadata
-            }),
-        )
-        console.log('File metadata array', fileMetadataArray)
-    }
-    return Projectdata
-}
+// TODO delete file upload and file attachement
+// const fileAttachmentFinder = async (Projectdata, idToken) => {
+//     console.log('Project data to check for files', Projectdata)
+//     const fileKeys = []
+//     _.forOwn(Projectdata, (value, key) => {
+//         console.log(key, value)
+//         if (value && Object.getPrototypeOf(value) === File.prototype) {
+//             console.log('File found: ', value)
+//             fileKeys.push(key)
+//         }
+//     })
+//     console.log('File keys: ', fileKeys)
+//     if (fileKeys.length > 0) {
+//         const fileMetadataArray = await Promise.all(
+//             fileKeys.map(async key => {
+//                 console.log('File key: ', key)
+//                 const fileMetadata = await handleFile(Projectdata[key], idToken)
+//                 console.log('File metadata: ', fileMetadata)
+//                 if (fileMetadata.toString() === '[object Object]') {
+//                     return Error('File upload failed')
+//                 }
+//                 Projectdata[key] = fileMetadata.toString()
+//                 const index = Projectdata['submissionFormAnswers'].findIndex(
+//                     ans => ans['key'] === key,
+//                 )
+//                 Projectdata['submissionFormAnswers'][index].value =
+//                     fileMetadata.toString()
+//                 return fileMetadata
+//             }),
+//         )
+//         console.log('File metadata array', fileMetadataArray)
+//     }
+//     return Projectdata
+// }
 
 const getFile = async (fileId, filename, token) => {
     console.log('File to download: ', fileId)
@@ -588,33 +562,33 @@ const deleteFile = async (fileId, token) => {
     }
 }
 
-const handleFile = async (file, token) => {
-    console.log('File handling from dashboard actions', file)
-    const formData = new FormData()
-    formData.append('file', file)
-    console.log('File to upload: ', file)
-    console.log('Form data', formData)
-    try {
-        const response = await fetch('/api/upload/files', {
-            method: 'POST',
-            body: formData,
-            headers: {
-                Authorization: `Bearer ${token}`,
-            },
-        })
-        console.log('File upload response: ', response)
-        if (response.ok) {
-            const fileMetadata = await response.json()
-            console.log('File uploaded successfully')
-            console.log('File data', fileMetadata)
-            return JSON.stringify(fileMetadata)
-        } else {
-            throw new Error('Failed to upload file')
-        }
-    } catch (error) {
-        throw error
-    }
-}
+// const handleFile = async (file, token) => {
+//     console.log('File handling from dashboard actions', file)
+//     const formData = new FormData()
+//     formData.append('file', file)
+//     console.log('File to upload: ', file)
+//     console.log('Form data', formData)
+//     try {
+//         const response = await fetch('/api/upload/files', {
+//             method: 'POST',
+//             body: formData,
+//             headers: {
+//                 Authorization: `Bearer ${token}`,
+//             },
+//         })
+//         console.log('File upload response: ', response)
+//         if (response.ok) {
+//             const fileMetadata = await response.json()
+//             console.log('File uploaded successfully')
+//             console.log('File data', fileMetadata)
+//             return JSON.stringify(fileMetadata)
+//         } else {
+//             throw new Error('Failed to upload file')
+//         }
+//     } catch (error) {
+//         throw error
+//     }
+// }
 
 export const getFileForProject =
     (fileId, filename) => async (dispatch, getState) => {
@@ -677,8 +651,6 @@ export const editProject = (slug, data) => async (dispatch, getState) => {
 
 export const updateAnnotator = slug => async (dispatch, getState) => {
     const idToken = AuthSelectors.getIdToken(getState())
-    //get idToken for gavel start voting stress test
-    console.log(idToken)
     const { error } = await dispatch({
         type: ActionTypes.UPDATE_ANNOTATOR,
         promise: GavelService.getAnnotator(idToken, slug), //,
@@ -754,8 +726,6 @@ export const setFirstProjectSeen = slug => async (dispatch, getState) => {
 export const submitVote = (slug, winnerId) => async (dispatch, getState) => {
     const idToken = AuthSelectors.getIdToken(getState())
 
-    //get idToken and winnerId for gavel voting stress test
-    console.log(slug, winnerId)
     try {
         const annotator = await GavelService.submitVote(idToken, slug, winnerId)
         console.log(annotator)
@@ -769,7 +739,6 @@ export const submitVote = (slug, winnerId) => async (dispatch, getState) => {
     }
 }
 export const activeEvents = activeEvents => dispatch => {
-    console.log('action activeEvents', activeEvents)
     dispatch({
         type: ActionTypes.ACTIVE_EVENTS,
         payload: {
@@ -779,7 +748,6 @@ export const activeEvents = activeEvents => dispatch => {
 }
 
 export const pastEvents = pastEvents => dispatch => {
-    console.log('action pastEvents', pastEvents)
     dispatch({
         type: ActionTypes.PAST_EVENTS,
         payload: {
diff --git a/frontend/src/redux/dashboard/reducer.js b/frontend/src/redux/dashboard/reducer.js
index 6fe5db81..f2013115 100644
--- a/frontend/src/redux/dashboard/reducer.js
+++ b/frontend/src/redux/dashboard/reducer.js
@@ -135,7 +135,6 @@ export default function reducer(state = initialState, action) {
         //     return updateSeletecUserHandler(state, action)
         // }
         case ActionTypes.ACTIVE_EVENTS: {
-            console.log('ACTIVE_EVENTS', state, action.payload)
             return {
                 ...state,
                 activeEvents: action.payload.activeEvents,
diff --git a/frontend/src/services/analytics.js b/frontend/src/services/analytics.js
index edc128b9..17707107 100644
--- a/frontend/src/services/analytics.js
+++ b/frontend/src/services/analytics.js
@@ -5,7 +5,6 @@ import config from 'constants/config'
 const AnalyticsService = {}
 
 AnalyticsService.init = () => {
-    console.log('Analytics -> initialize')
     if (config.GOOGLE_ANALYTICS_ID) {
         ReactGA.initialize(config.GOOGLE_ANALYTICS_ID)
     }
@@ -23,7 +22,6 @@ AnalyticsService.init = () => {
 }
 
 AnalyticsService.pageView = location => {
-    console.log('Analytics -> pageView')
     if (config.GOOGLE_ANALYTICS_ID) {
         ReactGA.pageview(location.pathname)
     }
@@ -31,14 +29,12 @@ AnalyticsService.pageView = location => {
 
 AnalyticsService.events = {
     LOG_IN: () => {
-        console.log('Analytics -> events -> LOG_IN')
         ReactPixel.track('CompleteRegistration', {
             value: 0.1,
             currency: 'EUR',
         })
     },
     VIEW_EVENT: slug => {
-        console.log('Analytics -> events -> VIEW_EVENT')
         ReactPixel.track('ViewContent', {
             value: 0.1,
             currency: 'EUR',
@@ -47,7 +43,6 @@ AnalyticsService.events = {
         })
     },
     BEGIN_REGISTRATION: slug => {
-        console.log('Analytics -> events -> BEGIN_REGISTRATION')
         ReactPixel.track('AddToCart', {
             value: 0.5,
             currency: 'EUR',
@@ -61,7 +56,6 @@ AnalyticsService.events = {
         })
     },
     COMPLETE_REGISTRATION: slug => {
-        console.log('Analytics -> events -> COMPLETE_REGISTRATION')
         ReactPixel.track('Purchase', {
             value: 1,
             currency: 'EUR',

From cc61940cbbff946d966cc73a12448c78dce60835 Mon Sep 17 00:00:00 2001
From: wickathou <javier@enddesign.co>
Date: Mon, 6 May 2024 15:27:32 +0300
Subject: [PATCH 3/3] Removed sslRedirect for Heroku Disabled RedisPubSub and
 Redis from alerts graphql config Disabled Redis from graphql config for
 message Modified addGavelLoginToRegistrations to perform only one iterations
 on gavelData, before it was done twice Modified teams page tabs label copy

---
 backend/index.js                              | 36 ++++++++++---------
 backend/modules/alert/graphql.js              | 34 ++++++++----------
 backend/modules/message/graphql.js            | 29 ++++++++-------
 backend/modules/registration/controller.js    | 23 ++++++------
 .../renderDashboard/participant/team/index.js |  7 ++--
 5 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/backend/index.js b/backend/index.js
index 4e186a2a..faa2ddb7 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -3,7 +3,7 @@ const bodyParser = require('body-parser')
 const { errors } = require('celebrate')
 const path = require('path')
 const helmet = require('helmet')
-const sslRedirect = require('heroku-ssl-redirect')
+// const sslRedirect = require('heroku-ssl-redirect')
 
 /** Create Express application */
 const app = express()
@@ -76,19 +76,27 @@ const migrations = require('./migrations/index')
 const throng = require('./misc/throng')
 
 const memoryUsage = () => {
-    const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`
+    const formatMemoryUsage = data =>
+        `${Math.round((data / 1024 / 1024) * 100) / 100} MB`
 
     const memoryData = process.memoryUsage()
 
     const memoryUsage = {
-        rss: `${formatMemoryUsage(memoryData.rss)} -> Resident Set Size - total memory allocated for the process execution`,
-        heapTotal: `${formatMemoryUsage(memoryData.heapTotal)} -> total size of the allocated heap`,
-        heapUsed: `${formatMemoryUsage(memoryData.heapUsed)} -> actual memory used during the execution`,
-        external: `${formatMemoryUsage(memoryData.external)} -> V8 external memory`,
+        rss: `${formatMemoryUsage(
+            memoryData.rss,
+        )} -> Resident Set Size - total memory allocated for the process execution`,
+        heapTotal: `${formatMemoryUsage(
+            memoryData.heapTotal,
+        )} -> total size of the allocated heap`,
+        heapUsed: `${formatMemoryUsage(
+            memoryData.heapUsed,
+        )} -> actual memory used during the execution`,
+        external: `${formatMemoryUsage(
+            memoryData.external,
+        )} -> V8 external memory`,
     }
 
     console.log(memoryUsage)
-
 }
 
 throng({
@@ -109,21 +117,15 @@ throng({
 
         httpServer.listen(PORT, () => {
             logger.info(
-                `Worker ${process.pid} started, listening on port ${httpServer.address().port}`,
-
+                `Worker ${process.pid} started, listening on port ${
+                    httpServer.address().port
+                }`,
             )
-
         })
 
         memoryUsage()
-
-
-
-
     },
 
-
-
     /** This is run only if the master function errors out, which means the
      *  server could not start properly. Workers are automatically revived on failure, if e.g.
      *  the app crashes or runs out of memory while processing a request.
@@ -138,4 +140,4 @@ throng({
         })
         process.exit(1)
     },
-})
\ No newline at end of file
+})
diff --git a/backend/modules/alert/graphql.js b/backend/modules/alert/graphql.js
index 9c6e4674..5915495a 100644
--- a/backend/modules/alert/graphql.js
+++ b/backend/modules/alert/graphql.js
@@ -1,5 +1,5 @@
 const { withFilter } = require('graphql-subscriptions')
-const { RedisPubSub } = require('graphql-redis-subscriptions')
+// const { RedisPubSub } = require('graphql-redis-subscriptions')
 const {
     GraphQLString,
     GraphQLObjectType,
@@ -11,16 +11,12 @@ const {
 const { GraphQLDate } = require('graphql-iso-date')
 const RegistrationController = require('../registration/controller')
 const Event = require('../event/model')
-const Redis = require('ioredis')
-//const client = new Redis("rediss://default:JSVhlHFiXTnFo1Z1IVok05TOQqccA2qB@redis-11912.c226.eu-west-1-3.ec2.cloud.redislabs.com:11912");
-//console.log(client,"##")
-
-
-const pubsub = new RedisPubSub({
-    publisher: new Redis(process.env.REDISCLOUD_URL),
-    subscriber: new Redis(process.env.REDISCLOUD_URL)
-})
+// const Redis = require('ioredis')
 
+// const pubsub = new RedisPubSub({
+//     publisher: new Redis(process.env.REDISCLOUD_URL),
+//     subscriber: new Redis(process.env.REDISCLOUD_URL),
+// })
 
 const AlertInput = new GraphQLInputObjectType({
     name: 'AlertInput',
@@ -120,13 +116,13 @@ const Resolvers = {
                 throw new Error('You are not an organiser of this event')
             }
 
-            pubsub.publish('ALERT_SENT', {
-                newAlert: {
-                    ...args.alert,
-                    sentAt: new Date(),
-                    sender: userId,
-                },
-            })
+            // pubsub.publish('ALERT_SENT', {
+            //     newAlert: {
+            //         ...args.alert,
+            //         sentAt: new Date(),
+            //         sender: userId,
+            //     },
+            // })
 
             return context.controller('Alert').send(args.alert, userId)
         },
@@ -135,9 +131,9 @@ const Resolvers = {
         newAlert: {
             subscribe: withFilter(
                 () => {
-                    return pubsub.asyncIterator('ALERT_SENT')
+                    // return pubsub.asyncIterator('ALERT_SENT')
                 },
-                async ({newAlert}, { eventId, slug }, { user }) => {
+                async ({ newAlert }, { eventId, slug }, { user }) => {
                     // Check authentication from context
                     const userId = user ? user.sub : null
                     if (!userId) {
diff --git a/backend/modules/message/graphql.js b/backend/modules/message/graphql.js
index 43f2bce5..78a9b439 100644
--- a/backend/modules/message/graphql.js
+++ b/backend/modules/message/graphql.js
@@ -1,6 +1,6 @@
 const { GraphQLBoolean } = require('graphql')
 const { withFilter } = require('graphql-subscriptions')
-const { RedisPubSub } = require('graphql-redis-subscriptions')
+// const { RedisPubSub } = require('graphql-redis-subscriptions')
 const {
     GraphQLString,
     GraphQLObjectType,
@@ -10,13 +10,12 @@ const {
     GraphQLInputObjectType,
 } = require('graphql')
 const { GraphQLDate } = require('graphql-iso-date')
-const Redis = require('ioredis')
+// const Redis = require('ioredis')
 
-
-const pubsub = new RedisPubSub({
-    publisher: new Redis(process.env.REDISCLOUD_URL),
-    subscriber: new Redis(process.env.REDISCLOUD_URL)
-})
+// const pubsub = new RedisPubSub({
+//     publisher: new Redis(process.env.REDISCLOUD_URL),
+//     subscriber: new Redis(process.env.REDISCLOUD_URL)
+// })
 const MessageInput = new GraphQLInputObjectType({
     name: 'MessageInput',
     fields: {
@@ -119,13 +118,13 @@ const Resolvers = {
             const userId = context.req.user ? context.req.user.sub : null
             if (!userId) return null
 
-            pubsub.publish('MESSAGE_SENT', {
-                newMessage: {
-                    ...args.message,
-                    sentAt: new Date(),
-                    sender: userId,
-                },
-            })
+            // pubsub.publish('MESSAGE_SENT', {
+            //     newMessage: {
+            //         ...args.message,
+            //         sentAt: new Date(),
+            //         sender: userId,
+            //     },
+            // })
 
             return context.controller('Message').send(args.message, userId)
         },
@@ -146,7 +145,7 @@ const Resolvers = {
         newMessage: {
             subscribe: withFilter(
                 () => {
-                    return pubsub.asyncIterator('MESSAGE_SENT')
+                    // return pubsub.asyncIterator('MESSAGE_SENT')
                 },
                 ({ newMessage }, _, { user }) => {
                     // Check authentication from context
diff --git a/backend/modules/registration/controller.js b/backend/modules/registration/controller.js
index 1f7ac5d0..c355ca61 100644
--- a/backend/modules/registration/controller.js
+++ b/backend/modules/registration/controller.js
@@ -522,8 +522,13 @@ controller.rejectSoftRejected = async eventId => {
     return rejected
 }
 
+// TODO optimize how gavelData and registrations are matched to avoid O(n^2) complexity
 controller.addGavelLoginToRegistrations = async (eventId, gavelData) => {
-    console.log('Gavel data received', gavelData, typeof gavelData)
+    let updateCount = 0
+    const registrations = await Registration.find({
+        event: eventId,
+        status: RegistrationStatuses.asObject.checkedIn.id,
+    })
     gavelData.forEach(gavel => {
         if (
             typeof gavel.registration !== 'string' ||
@@ -531,17 +536,6 @@ controller.addGavelLoginToRegistrations = async (eventId, gavelData) => {
         ) {
             throw new Error('Gavel data is invalid')
         }
-    })
-    let updateCount = 0
-    const registrations = await Registration.find({
-        event: eventId,
-        status: RegistrationStatuses.asObject.checkedIn.id,
-    })
-    console.log('Registrations found', registrations.length)
-    console.log('Registrations data', registrations)
-    const registrationCount = registrations.length
-
-    gavelData.forEach(gavel => {
         const registration = registrations.find(
             r => r._id.toString() === gavel.registration,
         )
@@ -552,7 +546,10 @@ controller.addGavelLoginToRegistrations = async (eventId, gavelData) => {
             registration.save()
         }
     })
-
+    console.log('Registrations found', registrations.length)
+    console.log('Registrations data', registrations)
+    const registrationCount = registrations.length
+    
     console.log(
         'Modified counts, updated/total',
         updateCount,
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/team/index.js b/frontend/src/pages/_dashboard/renderDashboard/participant/team/index.js
index e2f6e082..36586ffa 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/team/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/team/index.js
@@ -10,6 +10,9 @@ import PageHeader from 'components/generic/PageHeader'
 export default () => {
     const match = useRouteMatch()
     const location = useLocation()
+
+    // const hasTeam = useSelector(DashboardSelectors.hasTeam)
+    // TODO make tab "my team" and "Team candidates" visible only if user has a team
     return (
         <Container>
             <PageHeader heading="Team management" />
@@ -17,13 +20,13 @@ export default () => {
                 transparent
                 tabs={[
                     {
-                        label: 'Join a team',
+                        label: 'All teams',
                         key: 'teams',
                         path: '',
                         component: TeamsPage,
                     },
                     {
-                        label: 'Your team',
+                        label: 'My team',
                         key: 'profile',
                         path: '/profile',
                         component: ProfilePage,