+
{title && (
-
-
{title}
-
{title}
-
{title}
+
+
+ {title}
+
+
+ {title}
+
+
+ {title}
+
)}
)
}
-const useStyles = makeStyles(theme => ({
- '@keyframes glitch1': {
- '0%': {
- transform: 'none',
- opacity: 1,
- },
- '7%': {
- transform: 'skew(-0.5deg, -0.9deg)',
- opacity: 0.75,
- },
- '10%': {
- transform: 'none',
- opacity: 1,
- },
- '27%': {
- transform: 'none',
- opacity: 1,
- },
- '30%': {
- transform: 'skew(0.8deg, -0.1deg)',
- opacity: 0.75,
- },
- '35%': {
- transform: 'none',
- opacity: 1,
- },
- '52%': {
- transform: 'none',
- opacity: 1,
- },
- '55%': {
- transform: 'skew(-1deg, 0.2deg)',
- opacity: 0.75,
- },
- '50%': {
- transform: 'none',
- opacity: 1,
- },
- '72%': {
- transform: 'none',
- opacity: 1,
- },
- '75%': {
- transform: 'skew(0.4deg, 1deg)',
- opacity: 0.75,
- },
- '80%': {
- transform: 'none',
- opacity: 1,
- },
- '100%': {
- transform: 'none',
- opacity: 1,
- },
- },
- '@keyframes glitch2': {
- '0%': {
- transform: 'none',
- opacity: 0.25,
- },
- '7%': {
- transform: 'translate(-2px, -3px)',
- opacity: 0.5,
- },
- '10%': {
- transform: 'none',
- opacity: 0.25,
- },
- '27%': {
- transform: 'none',
- opacity: 0.25,
- },
- '30%': {
- transform: 'translate(-5px, -2px)',
- opacity: 0.5,
- },
- '35%': {
- transform: 'none',
- opacity: 0.25,
- },
- '52%': {
- transform: 'none',
- opacity: 0.25,
- },
- '55%': {
- transform: 'translate(-5px, -1px)',
- opacity: 0.5,
- },
- '50%': {
- transform: 'none',
- opacity: 0.25,
- },
- '72%': {
- transform: 'none',
- opacity: 0.25,
- },
- '75%': {
- transform: 'translate(-2px, -6px)',
- opacity: 0.5,
- },
- '80%': {
- transform: 'none',
- opacity: 0.25,
- },
- '100%': {
- transform: 'none',
- opacity: 0.25,
- },
- },
- '@keyframes glitch3': {
- '0%': {
- transform: 'none',
- opacity: 0.25,
- },
- '7%': {
- transform: 'translate(2px, 3px)',
- opacity: 0.5,
- },
- '10%': {
- transform: 'none',
- opacity: 0.25,
- },
- '27%': {
- transform: 'none',
- opacity: 0.25,
- },
- '30%': {
- transform: 'translate(5px, 2px)',
- opacity: 0.5,
- },
- '35%': {
- transform: 'none',
- opacity: 0.25,
- },
- '52%': {
- transform: 'none',
- opacity: 0.25,
- },
- '55%': {
- transform: 'translate(5px, 1px)',
- opacity: 0.5,
- },
- '50%': {
- transform: 'none',
- opacity: 0.25,
- },
- '72%': {
- transform: 'none',
- opacity: 0.25,
- },
- '75%': {
- transform: 'translate(2px, 6px)',
- opacity: 0.5,
- },
- '80%': {
- transform: 'none',
- opacity: 0.25,
- },
- '100%': {
- transform: 'none',
- opacity: 0.25,
- },
- },
- svg: {
- position: 'absolute',
- top: 0,
- left: 0,
- width: '100%',
- height: '100%',
- },
- svg1: {
- animation: '$glitch1 2.5s infite',
- '& path': {
- fill: 'white',
- },
- },
- svg2: {
- animation: '$glitch2 2.5s infinite',
- '& path': {
- fill: '#b200b7',
- },
- },
- svg3: {
- animation: '$glitch3 2.5s infinite',
- '& path': {
- fill: 'white',
- },
- },
- logo: ({ size }) => ({
- width: `${size}px`,
- height: `${size}px`,
- position: 'relative',
- }),
- title: {
- color: 'white',
- textTransform: 'uppercase',
- fontWeight: 'bold',
- textAlign: 'center',
- margin: 0,
- lineHeight: 0,
- animation: '$glitch1 2.5s infinite',
- '&:nth-child(2n)': {
- animation: '$glitch2 2.5s infinite',
- color: '#b200b7',
- },
- '&:nth-child(3n)': {
- animation: '$glitch3 2.5s infinite',
- color: 'white',
- },
- },
-}))
+export default GlitchComponent
diff --git a/frontend/src/components/loaders/LoadingOverlay/index.js b/frontend/src/components/loaders/LoadingOverlay/index.js
index eeef3b6ff..ffac43709 100644
--- a/frontend/src/components/loaders/LoadingOverlay/index.js
+++ b/frontend/src/components/loaders/LoadingOverlay/index.js
@@ -1,41 +1,11 @@
import React from 'react'
-
-import { makeStyles } from '@material-ui/core/styles'
import GlitchLoader from 'components/loaders/GlitchLoader'
-const useStyles = makeStyles(theme => ({
- wrapper: {
- position: 'fixed',
- top: 0,
- width: '100%',
- height: '100%',
- flex: 1,
- display: 'flex',
- alignItems: 'center',
- justifyContent: 'center',
- background: 'black',
- zIndex: 1000,
- padding: theme.spacing(5),
- },
- backgroundImage: {
- position: 'absolute',
- objectFit: 'cover',
- objectPosition: 'center',
- top: 0,
- left: 0,
- width: '100%',
- height: '100%',
- filter: 'blur(5px)',
- opacity: 0.5,
- },
-}))
-
const LoadingOverlay = ({ text }) => {
- const classes = useStyles()
return (
-
+
})
diff --git a/frontend/src/components/messaging/alerts/index.js b/frontend/src/components/messaging/alerts/index.js
index dbfbf44c0..14a30a855 100644
--- a/frontend/src/components/messaging/alerts/index.js
+++ b/frontend/src/components/messaging/alerts/index.js
@@ -1,17 +1,14 @@
import React from 'react'
import moment from 'moment-timezone'
-import { Grid, Typography, makeStyles } from '@material-ui/core'
+import { Grid, Typography } from '@mui/material'
import GradientBox from 'components/generic/GradientBox'
-
const useStyles = makeStyles(theme => ({
root: {
height: '90%',
overflow: 'auto',
-
},
-
}))
export function Alerts({ alerts = [] }) {
@@ -20,7 +17,6 @@ export function Alerts({ alerts = [] }) {
)
const classes = useStyles()
-
return (
{sortedAlerts.map(a => (
diff --git a/frontend/src/components/messaging/chat/index.js b/frontend/src/components/messaging/chat/index.js
index 8e5c3a267..e8238b010 100644
--- a/frontend/src/components/messaging/chat/index.js
+++ b/frontend/src/components/messaging/chat/index.js
@@ -6,13 +6,13 @@ import { MY_MESSAGES_QUERY } from 'graphql/queries/messages'
import { MY_MESSAGES_SUBSCRIPTION } from 'graphql/subscriptions/messages'
import { SEND_MESSAGE_MUTATION } from 'graphql/mutations/messageOps'
import { faOldRepublic } from '@fortawesome/free-brands-svg-icons'
-import { TextField } from '@material-ui/core'
+import { TextField } from '@mui/material'
import { Formik } from 'formik'
import schema from '@hackjunction/shared/schemas/validation/messageSchema'
import { fieldNameFromStoreName } from '@apollo/client/cache'
import { Button } from 'antd'
import { useSelector } from 'react-redux'
-import { userProfile } from 'redux/user/selectors'
+import { userProfile } from 'reducers/user/selectors'
/**
* Functioncomponent that renders a chat
diff --git a/frontend/src/components/modals/BulkEditRegistrationModal/index.js b/frontend/src/components/modals/BulkEditRegistrationModal/index.js
index 43743b6a7..fc6bb0f83 100644
--- a/frontend/src/components/modals/BulkEditRegistrationModal/index.js
+++ b/frontend/src/components/modals/BulkEditRegistrationModal/index.js
@@ -4,14 +4,14 @@ import { useDispatch, useSelector } from 'react-redux'
import {
Box,
Typography,
- ExpansionPanel,
- ExpansionPanelSummary,
- ExpansionPanelDetails,
+ Accordion,
+ AccordionSummary,
+ AccordionDetails,
Dialog,
DialogContent,
DialogActions,
-} from '@material-ui/core'
-import Rating from '@material-ui/lab/Rating'
+} from '@mui/material'
+import Rating from '@mui/lab/Rating'
import PageWrapper from 'components/layouts/PageWrapper'
import Container from 'components/generic/Container'
import PageHeader from 'components/generic/PageHeader'
@@ -22,9 +22,9 @@ import RegistrationStatusSelect from 'components/inputs/RegistrationStatusSelect
import ConfirmDialog from 'components/generic/ConfirmDialog'
import Button from 'components/generic/Button'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
-import * as OrganiserActions from 'redux/organiser/actions'
-import * as SnackbarActions from 'redux/snackbar/actions'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
+import * as OrganiserActions from 'reducers/organiser/actions'
+import * as SnackbarActions from 'reducers/snackbar/actions'
import { useFormField } from 'hooks/formHooks'
import { useTranslation } from 'react-i18next'
export default ({ visible, userIds = [], onClose }) => {
@@ -126,11 +126,11 @@ export default ({ visible, userIds = [], onClose }) => {
{t('un_expanded_')}
{t('Edit_selected_registration_cont_')}
-
toggleExpanded('rating')}
>
-
+
{
)}
-
-
+
+
rating.setValue(num)}
/>
-
-
-
+
+ toggleExpanded('assignedTo')}
>
-
+
{
)}
-
-
+
+
{
{t('Change_')}
-
-
-
+
+ toggleExpanded('tags')}
>
-
+
{
)}
-
-
+
+
-
-
-
+
+ toggleExpanded('status')}
>
-
+
{
)}
-
-
+
+
-
-
+
+
diff --git a/frontend/src/components/modals/BulkEmailModal/index.js b/frontend/src/components/modals/BulkEmailModal/index.js
index 590e1468b..a75a39fbc 100644
--- a/frontend/src/components/modals/BulkEmailModal/index.js
+++ b/frontend/src/components/modals/BulkEmailModal/index.js
@@ -8,7 +8,7 @@ import {
Dialog,
DialogContent,
DialogActions,
-} from '@material-ui/core'
+} from '@mui/material'
import PageWrapper from 'components/layouts/PageWrapper'
import Container from 'components/generic/Container'
import PageHeader from 'components/generic/PageHeader'
@@ -17,10 +17,10 @@ import TextAreaInput from 'components/inputs/TextAreaInput'
import ConfirmDialog from 'components/generic/ConfirmDialog'
import Button from 'components/generic/Button'
-import * as AuthSelectors from 'redux/auth/selectors'
-import * as UserSelectors from 'redux/user/selectors'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
-import * as SnackbarActions from 'redux/snackbar/actions'
+import * as AuthSelectors from 'reducers/auth/selectors'
+import * as UserSelectors from 'reducers/user/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
+import * as SnackbarActions from 'reducers/snackbar/actions'
import { useFormField } from 'hooks/formHooks'
import EmailService from 'services/email'
import { useTranslation } from 'react-i18next'
@@ -115,10 +115,20 @@ export default ({ visible, userIds = [], onClose }) => {
if (!validate()) return
setLoading(true)
const fromObject = {
- email: event.emailConfig.senderEmail ? event.emailConfig.senderEmail : 'noreply@hackjunction.com',
- name: event.emailConfig.senderName ? event.emailConfig.senderName : 'Junction',
+ email: event.emailConfig.senderEmail
+ ? event.emailConfig.senderEmail
+ : 'noreply@hackjunction.com',
+ name: event.emailConfig.senderName
+ ? event.emailConfig.senderName
+ : 'Junction',
}
- EmailService.sendPreviewEmail({ idToken: idToken, slug: event.slug, to: user.email, params: params, from: fromObject})
+ EmailService.sendPreviewEmail({
+ idToken: idToken,
+ slug: event.slug,
+ to: user.email,
+ params: params,
+ from: fromObject,
+ })
.then(() => {
dispatch(
SnackbarActions.success(
diff --git a/frontend/src/components/modals/EditProjectModal/index.js b/frontend/src/components/modals/EditProjectModal/index.js
index 4feafbd30..b108b90d5 100644
--- a/frontend/src/components/modals/EditProjectModal/index.js
+++ b/frontend/src/components/modals/EditProjectModal/index.js
@@ -1,24 +1,24 @@
import { useSelector } from 'react-redux'
import React, { useState, useMemo } from 'react'
-import * as AuthSelectors from 'redux/auth/selectors'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as AuthSelectors from 'reducers/auth/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
import {
Dialog,
List,
ListItem,
ListItemText,
- ExpansionPanel,
- ExpansionPanelSummary,
+ Accordion,
+ AccordionSummary,
Typography,
- ExpansionPanelDetails,
+ AccordionDetails,
Box,
Checkbox,
-} from '@material-ui/core'
+} from '@mui/material'
import PageWrapper from 'components/layouts/PageWrapper'
import Container from 'components/generic/Container'
import PageHeader from 'components/generic/PageHeader'
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore'
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
import TeamsTable from 'components/tables/TeamsTable'
import EventsService from 'services/events'
@@ -57,15 +57,15 @@ export default ({ project, onClose = () => {}, onEdited = () => {} }) => {
subheading={project.track}
link={projectURL}
/>
-
-
+ }
aria-controls="panel1a-content"
id="panel1a-header"
>
Project Details
-
-
+
+
{}, onEdited = () => {} }) => {
>
-
-
-
-
+
+
+ }
aria-controls="panel2a-content"
id="panel2a-header"
>
Team Members
-
-
+
+
{}, onEdited = () => {} }) => {
simplifiedView={true}
/>
-
-
+
+
{event.overallReviewMethod ===
'finalsManualSelection' ? (
{
if (errors.length > 0) {
return
}
-
+
onSubmit(formValues)
}, [formFields, formValues, onSubmit])
diff --git a/frontend/src/components/modals/EditRegistrationModal/EditRegistrationContent.js b/frontend/src/components/modals/EditRegistrationModal/EditRegistrationContent.js
index d8e223b6c..55ad7d04a 100644
--- a/frontend/src/components/modals/EditRegistrationModal/EditRegistrationContent.js
+++ b/frontend/src/components/modals/EditRegistrationModal/EditRegistrationContent.js
@@ -3,16 +3,16 @@ import { useSelector } from 'react-redux'
import { RegistrationFields } from '@hackjunction/shared'
import { groupBy, sortBy, find } from 'lodash-es'
import {
- ExpansionPanel,
- ExpansionPanelSummary,
- ExpansionPanelDetails,
+ Accordion,
+ AccordionSummary,
+ AccordionDetails,
Typography,
Grid,
-} from '@material-ui/core'
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore'
+} from '@mui/material'
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
import DescriptionItem from 'components/generic/DescriptionItem'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
export default React.memo(({ registration }) => {
const event = useSelector(OrganiserSelectors.event)
@@ -37,15 +37,15 @@ export default React.memo(({ registration }) => {
return (
<>
{categoryNames.map(name => (
-
-
+ }
aria-controls={`${name}-content`}
id={`${name}-header`}
>
{name}
-
-
+
+
{grouped[name].map(field => {
let label =
@@ -68,20 +68,20 @@ export default React.memo(({ registration }) => {
)
})}
-
-
+
+
))}
{event.customQuestions.map(section => {
return (
-
-
+ }
aria-controls={`${section.name}-content`}
id={`${section.name}-header`}
>
{section.label}
-
-
+
+
{section.questions.map(question => {
return (
@@ -98,8 +98,8 @@ export default React.memo(({ registration }) => {
)
})}
-
-
+
+
)
})}
diff --git a/frontend/src/components/modals/EditRegistrationModal/index.js b/frontend/src/components/modals/EditRegistrationModal/index.js
index bfe488ed2..a674f92e6 100644
--- a/frontend/src/components/modals/EditRegistrationModal/index.js
+++ b/frontend/src/components/modals/EditRegistrationModal/index.js
@@ -1,16 +1,16 @@
import React, { useState, useEffect, useCallback, useMemo } from 'react'
import { useDispatch, useSelector } from 'react-redux'
-import { Dialog } from '@material-ui/core'
+import { Dialog } from '@mui/material'
import PageWrapper from 'components/layouts/PageWrapper'
import Container from 'components/generic/Container'
import PageHeader from 'components/generic/PageHeader'
-import * as AuthSelectors from 'redux/auth/selectors'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
-import * as OrganiserActions from 'redux/organiser/actions'
-import * as SnackbarActions from 'redux/snackbar/actions'
+import * as AuthSelectors from 'reducers/auth/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
+import * as OrganiserActions from 'reducers/organiser/actions'
+import * as SnackbarActions from 'reducers/snackbar/actions'
import RegistrationsService from 'services/registrations'
import MiscUtils from 'utils/misc'
diff --git a/frontend/src/components/modals/EditTeamModal/index.js b/frontend/src/components/modals/EditTeamModal/index.js
index adabbdf31..e4c45150a 100644
--- a/frontend/src/components/modals/EditTeamModal/index.js
+++ b/frontend/src/components/modals/EditTeamModal/index.js
@@ -1,47 +1,39 @@
import React, { useState, useEffect, useCallback, useMemo } from 'react'
import { useDispatch, useSelector } from 'react-redux'
-import { Dialog } from '@material-ui/core'
+import { Dialog } from '@mui/material'
import PageWrapper from 'components/layouts/PageWrapper'
import Container from 'components/generic/Container'
import AdminTeamEdit from 'components/Team/AdminTeamEdit'
-import * as AuthSelectors from 'redux/auth/selectors'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
-
-
+import * as AuthSelectors from 'reducers/auth/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
import TeamsService from 'services/teams'
-export default ({
- teamCode,
- onClose = () => { },
- onEdited = () => { },
-}) => {
+export default ({ teamCode, onClose = () => {}, onEdited = () => {} }) => {
const idToken = useSelector(AuthSelectors.getIdToken)
const event = useSelector(OrganiserSelectors.event)
//const team = useSelector(OrganiserSelectors.teams)
//console.log("team", team.find(t => t.code === teamCode))
-
-
// const teamsMap = useSelector(OrganiserSelectors.teamsMap)
const [loading, setLoading] = useState(false)
const [error, setError] = useState(false)
const [team, setTeam] = useState()
const { slug } = event
- console.log("teamCode", teamCode)
+ console.log('teamCode', teamCode)
useEffect(() => {
if (teamCode) {
setLoading(true)
TeamsService.getTeamWithMetaForEventParticipant(
idToken,
slug,
- teamCode
+ teamCode,
)
.then(data => {
- console.log("data", data)
+ console.log('data', data)
setTeam(data)
})
.catch(err => {
diff --git a/frontend/src/components/modals/OrganiserSelectModal/index.js b/frontend/src/components/modals/OrganiserSelectModal/index.js
index 6cd7fa1d9..d24405c74 100644
--- a/frontend/src/components/modals/OrganiserSelectModal/index.js
+++ b/frontend/src/components/modals/OrganiserSelectModal/index.js
@@ -1,10 +1,10 @@
import React, { useState, useCallback } from 'react'
import { useSelector } from 'react-redux'
-import { Box, List, Button } from '@material-ui/core'
+import { Box, List, Button } from '@mui/material'
import Modal from 'components/generic/Modal'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
import { useTranslation } from 'react-i18next'
import UserListItem from 'components/generic/UserListItem'
diff --git a/frontend/src/components/modals/ProjectReviewModal/ReviewElement.js b/frontend/src/components/modals/ProjectReviewModal/ReviewElement.js
index 27f887902..1263a3070 100644
--- a/frontend/src/components/modals/ProjectReviewModal/ReviewElement.js
+++ b/frontend/src/components/modals/ProjectReviewModal/ReviewElement.js
@@ -6,7 +6,7 @@ import {
DialogTitle,
DialogContent,
Avatar,
-} from '@material-ui/core'
+} from '@mui/material'
const ReviewElement = ({ reviewer, showScore }) => {
console.log('Reviewer from component', reviewer)
diff --git a/frontend/src/components/modals/ProjectReviewModal/index.js b/frontend/src/components/modals/ProjectReviewModal/index.js
index 58d7e5ef5..01f9f336b 100644
--- a/frontend/src/components/modals/ProjectReviewModal/index.js
+++ b/frontend/src/components/modals/ProjectReviewModal/index.js
@@ -1,6 +1,6 @@
import React from 'react'
-import { Dialog, DialogTitle, DialogContent } from '@material-ui/core'
+import { Dialog, DialogTitle, DialogContent } from '@mui/material'
import ReviewElement from './ReviewElement'
const ProjectScoreModal = ({
diff --git a/frontend/src/components/modals/ProjectScoreModal/index.js b/frontend/src/components/modals/ProjectScoreModal/index.js
index e413fae83..64f06d16f 100644
--- a/frontend/src/components/modals/ProjectScoreModal/index.js
+++ b/frontend/src/components/modals/ProjectScoreModal/index.js
@@ -6,11 +6,11 @@ import {
Dialog,
DialogTitle,
DialogContent,
-} from '@material-ui/core'
+} from '@mui/material'
import Button from 'components/generic/Button'
import { useDispatch } from 'react-redux'
-import * as DashboardActions from 'redux/dashboard/actions'
+import * as DashboardActions from 'reducers/dashboard/actions'
const ProjectScoreModal = ({ open, onClose, score }) => {
const dispatch = useDispatch()
diff --git a/frontend/src/components/modals/QRCodeModal/index.js b/frontend/src/components/modals/QRCodeModal/index.js
index f3b1a596d..44bef9a85 100644
--- a/frontend/src/components/modals/QRCodeModal/index.js
+++ b/frontend/src/components/modals/QRCodeModal/index.js
@@ -1,7 +1,7 @@
import React from 'react'
import QRCode from 'qrcode.react'
-import { Box, Typography } from '@material-ui/core'
+import { Box, Typography } from '@mui/material'
import Modal from 'components/generic/Modal'
diff --git a/frontend/src/components/modals/QRCodeReaderModal/index.js b/frontend/src/components/modals/QRCodeReaderModal/index.js
index a139007b9..f6265a9f3 100644
--- a/frontend/src/components/modals/QRCodeReaderModal/index.js
+++ b/frontend/src/components/modals/QRCodeReaderModal/index.js
@@ -1,22 +1,21 @@
import React, { useState, useRef, useCallback } from 'react'
-import QrReader from 'react-qr-reader'
+import QrReader from '@cmdnio/react-qr-reader'
-import { makeStyles } from '@material-ui/core/styles'
import {
Box,
Typography,
Avatar,
Button,
CircularProgress,
-} from '@material-ui/core'
+} from '@mui/material'
import { useDispatch, useSelector } from 'react-redux'
import { RegistrationStatuses } from '@hackjunction/shared'
import Modal from 'components/generic/Modal'
import StatusBadge from 'components/generic/StatusBadge'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
-import * as OrganiserActions from 'redux/organiser/actions'
-import * as SnackbarActions from 'redux/snackbar/actions'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
+import * as OrganiserActions from 'reducers/organiser/actions'
+import * as SnackbarActions from 'reducers/snackbar/actions'
import UserProfilesService from 'services/userProfiles'
const useStyles = makeStyles(theme => ({
diff --git a/frontend/src/components/modals/VisaInvitationDrawer/index.js b/frontend/src/components/modals/VisaInvitationDrawer/index.js
index 906730e52..086fdea3b 100644
--- a/frontend/src/components/modals/VisaInvitationDrawer/index.js
+++ b/frontend/src/components/modals/VisaInvitationDrawer/index.js
@@ -3,7 +3,7 @@ import React, { useState, useCallback, useEffect } from 'react'
import { PDFDownloadLink } from '@react-pdf/renderer'
import { useSelector } from 'react-redux'
import moment from 'moment'
-import { Typography, Grid, Drawer, Box } from '@material-ui/core'
+import { Typography, Grid, Drawer, Box } from '@mui/material'
import TextInput from 'components/inputs/TextInput'
import DateInput from 'components/inputs/DateInput'
@@ -11,7 +11,7 @@ import Button from 'components/generic/Button'
import { useFormField } from 'hooks/formHooks'
import VisaInvitationPDF from './VisaInvitationPDF'
-import * as DashboardSelectors from 'redux/dashboard/selectors'
+import * as DashboardSelectors from 'reducers/dashboard/selectors'
export default () => {
const registration = useSelector(DashboardSelectors.registration)
diff --git a/frontend/src/components/navbars/AccountNavBar/index.js b/frontend/src/components/navbars/AccountNavBar/index.js
index 706e4cbda..3379c201a 100644
--- a/frontend/src/components/navbars/AccountNavBar/index.js
+++ b/frontend/src/components/navbars/AccountNavBar/index.js
@@ -1,48 +1,24 @@
import React from 'react'
-
-import { makeStyles } from '@material-ui/core/styles'
import { useSelector } from 'react-redux'
-
import UserMenu from 'components/UserMenu'
+import * as UserSelectors from 'reducers/user/selectors'
-import * as UserSelectors from 'redux/user/selectors'
-
-const useStyles = makeStyles(theme => ({
- wrapper: {
- width: '100%',
- height: '78px',
- background: 'white',
- padding: theme.spacing(0, 2),
- },
- inner: {
- display: 'flex',
- flexDirection: 'row',
- alignItems: 'center',
- justifyContent: 'space-between',
- margin: '0',
- height: '100%',
- },
- userName: {
- fontSize: '16px',
- color: 'black',
- textTransform: 'uppercase',
- },
-}))
-export default () => {
- const classes = useStyles()
+const Header = () => {
const userProfile = useSelector(UserSelectors.userProfile)
return (
-
-
+
+
-
+
Hi, {userProfile?.firstName}
-
)
}
+
+export default Header
diff --git a/frontend/src/components/navbars/BasicNavBar/index.js b/frontend/src/components/navbars/BasicNavBar/index.js
index 68d326ae6..b61837589 100644
--- a/frontend/src/components/navbars/BasicNavBar/index.js
+++ b/frontend/src/components/navbars/BasicNavBar/index.js
@@ -3,8 +3,7 @@ import UserMenu from 'components/UserMenu'
import UserAvatar from 'components/UserAvatar'
import LanguageMenu from 'components/LanguageMenu'
-import { Typography } from '@material-ui/core'
-import { makeStyles } from '@material-ui/core/styles'
+import { Typography } from '@mui/material'
import navbarWaves from 'assets/images/nawbar_waves.svg'
@@ -13,7 +12,7 @@ const useStyles = makeStyles(theme => ({
width: '100%',
height: '78px',
//background: 'black',
- background: "assets/images/nawbar_waves.svg",
+ background: 'assets/images/nawbar_waves.svg',
padding: theme.spacing(0, 2),
},
inner: {
@@ -23,21 +22,17 @@ const useStyles = makeStyles(theme => ({
margin: '0',
height: '100%',
},
-
}))
const BasicNavBar = ({ text }) => {
const classes = useStyles()
return (
-
//
-
+
)
}
diff --git a/frontend/src/components/navbars/GlobalNavBar/index.js b/frontend/src/components/navbars/GlobalNavBar/index.js
index cb78e8872..976f7c575 100644
--- a/frontend/src/components/navbars/GlobalNavBar/index.js
+++ b/frontend/src/components/navbars/GlobalNavBar/index.js
@@ -1,6 +1,5 @@
import React from 'react'
-import { makeStyles } from '@material-ui/core/styles'
import UserMenu from 'components/UserMenu'
import Button from 'components/generic/Button'
diff --git a/frontend/src/components/organizations/AdminOrganization/index.js b/frontend/src/components/organizations/AdminOrganization/index.js
index ce78d98f5..499955937 100644
--- a/frontend/src/components/organizations/AdminOrganization/index.js
+++ b/frontend/src/components/organizations/AdminOrganization/index.js
@@ -1,17 +1,15 @@
import React from 'react'
-import { Grid, Typography } from '@material-ui/core'
-
-import { makeStyles } from '@material-ui/core/styles'
+import { Grid, Typography } from '@mui/material'
import Button from 'components/generic/Button'
import { useDispatch } from 'react-redux'
-import { push } from 'connected-react-router'
+
import { OutboundLink } from 'react-ga'
import GradientBox from 'components/generic/GradientBox'
-import { IconButton } from '@material-ui/core'
-import DeleteIcon from '@material-ui/icons/Delete'
-import EditIcon from '@material-ui/icons/Edit'
+import { IconButton } from '@mui/material'
+import DeleteIcon from '@mui/icons-material/Delete'
+import EditIcon from '@mui/icons-material/Edit'
const useStyles = makeStyles(theme => ({
outboundLink: {
diff --git a/frontend/src/components/plots/ApplicationsCount.js b/frontend/src/components/plots/ApplicationsCount.js
index 57db8264c..cc51f8f91 100644
--- a/frontend/src/components/plots/ApplicationsCount.js
+++ b/frontend/src/components/plots/ApplicationsCount.js
@@ -2,7 +2,7 @@ import React from 'react'
import Statistic from 'components/generic/Statistic'
import { useSelector } from 'react-redux'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
export default () => {
const value = useSelector(OrganiserSelectors.registrationsCount)
diff --git a/frontend/src/components/plots/ApplicationsLast24h.js b/frontend/src/components/plots/ApplicationsLast24h.js
index 396fbb736..06481eecb 100644
--- a/frontend/src/components/plots/ApplicationsLast24h.js
+++ b/frontend/src/components/plots/ApplicationsLast24h.js
@@ -2,7 +2,7 @@ import React from 'react'
import Statistic from 'components/generic/Statistic'
import { useSelector } from 'react-redux'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
export default () => {
const value = useSelector(OrganiserSelectors.registrationsLast24h)
diff --git a/frontend/src/components/plots/ApplicationsOverTime.js b/frontend/src/components/plots/ApplicationsOverTime.js
index 83332204a..acea8ad1f 100644
--- a/frontend/src/components/plots/ApplicationsOverTime.js
+++ b/frontend/src/components/plots/ApplicationsOverTime.js
@@ -12,7 +12,7 @@ import {
CartesianGrid,
Bar,
} from 'recharts'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
export default () => {
const data = useSelector(OrganiserSelectors.registrationsByDay)
diff --git a/frontend/src/components/plots/RatingsSplit.js b/frontend/src/components/plots/RatingsSplit.js
index 9c8a6770f..499aa0807 100644
--- a/frontend/src/components/plots/RatingsSplit.js
+++ b/frontend/src/components/plots/RatingsSplit.js
@@ -2,7 +2,7 @@ import React, { useMemo } from 'react'
import { sortBy } from 'lodash-es'
import { useSelector } from 'react-redux'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
import {
ResponsiveContainer,
diff --git a/frontend/src/components/plots/RegistrationsByCountry.js b/frontend/src/components/plots/RegistrationsByCountry.js
index b18f1b9dc..fac7267ff 100644
--- a/frontend/src/components/plots/RegistrationsByCountry.js
+++ b/frontend/src/components/plots/RegistrationsByCountry.js
@@ -1,6 +1,6 @@
import React, { useMemo } from 'react'
-import { Box, Typography } from '@material-ui/core'
+import { Box, Typography } from '@mui/material'
import { groupBy, sortBy } from 'lodash-es'
import {
ResponsiveContainer,
diff --git a/frontend/src/components/plots/RegistrationsByGender.js b/frontend/src/components/plots/RegistrationsByGender.js
index 55ba49288..4f6dd5d9d 100644
--- a/frontend/src/components/plots/RegistrationsByGender.js
+++ b/frontend/src/components/plots/RegistrationsByGender.js
@@ -1,6 +1,6 @@
import React, { useMemo } from 'react'
-import { Box, Typography } from '@material-ui/core'
+import { Box, Typography } from '@mui/material'
import { groupBy, sortBy } from 'lodash-es'
import {
ResponsiveContainer,
diff --git a/frontend/src/components/plots/RegistrationsByNationality.js b/frontend/src/components/plots/RegistrationsByNationality.js
index 34b2e919b..6961baf2c 100644
--- a/frontend/src/components/plots/RegistrationsByNationality.js
+++ b/frontend/src/components/plots/RegistrationsByNationality.js
@@ -1,6 +1,6 @@
import React, { useMemo } from 'react'
-import { Box, Typography } from '@material-ui/core'
+import { Box, Typography } from '@mui/material'
import { groupBy, sortBy } from 'lodash-es'
import {
ResponsiveContainer,
diff --git a/frontend/src/components/plots/RegistrationsByStatus.js b/frontend/src/components/plots/RegistrationsByStatus.js
index aceb2e823..cae8a775d 100644
--- a/frontend/src/components/plots/RegistrationsByStatus.js
+++ b/frontend/src/components/plots/RegistrationsByStatus.js
@@ -1,7 +1,7 @@
import React, { useMemo } from 'react'
import { RegistrationStatuses } from '@hackjunction/shared'
-import { Box, Typography } from '@material-ui/core'
+import { Box, Typography } from '@mui/material'
import { groupBy } from 'lodash-es'
import {
ResponsiveContainer,
diff --git a/frontend/src/components/plots/ReviewedAverage.js b/frontend/src/components/plots/ReviewedAverage.js
index 679e1d7fa..bd9dbdbab 100644
--- a/frontend/src/components/plots/ReviewedAverage.js
+++ b/frontend/src/components/plots/ReviewedAverage.js
@@ -1,9 +1,9 @@
import React from 'react'
import Statistic from 'components/generic/Statistic'
-import StarIcon from '@material-ui/icons/Star'
+import StarIcon from '@mui/icons-material/Star'
import { useSelector } from 'react-redux'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
export default () => {
const value = useSelector(OrganiserSelectors.averageRating)
diff --git a/frontend/src/components/plots/ReviewedPercent.js b/frontend/src/components/plots/ReviewedPercent.js
index 2ddc0c39e..151799488 100644
--- a/frontend/src/components/plots/ReviewedPercent.js
+++ b/frontend/src/components/plots/ReviewedPercent.js
@@ -2,7 +2,7 @@ import React from 'react'
import Statistic from 'components/generic/Statistic'
import { useSelector } from 'react-redux'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
export default () => {
const value = useSelector(OrganiserSelectors.percentReviewed) ?? 0
diff --git a/frontend/src/components/plots/TeamsCount.js b/frontend/src/components/plots/TeamsCount.js
index 426d21570..7e4e60717 100644
--- a/frontend/src/components/plots/TeamsCount.js
+++ b/frontend/src/components/plots/TeamsCount.js
@@ -2,7 +2,7 @@ import React from 'react'
import Statistic from 'components/generic/Statistic'
import { useSelector } from 'react-redux'
-import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserSelectors from 'reducers/organiser/selectors'
export default () => {
const value = useSelector(OrganiserSelectors.teamsCount)
diff --git a/frontend/src/components/projects/ProjectDetail/Pagination.js b/frontend/src/components/projects/ProjectDetail/Pagination.js
index 285e66de0..06f4c25c4 100644
--- a/frontend/src/components/projects/ProjectDetail/Pagination.js
+++ b/frontend/src/components/projects/ProjectDetail/Pagination.js
@@ -1,8 +1,8 @@
import React from 'react'
import clsx from 'clsx'
-import { makeStyles } from '@material-ui/core/styles'
-import { Box } from '@material-ui/core'
+
+import { Box } from '@mui/material'
const useStyles = makeStyles(theme => ({
wrapper: {
diff --git a/frontend/src/components/projects/ProjectDetail/ProjectTeam.js b/frontend/src/components/projects/ProjectDetail/ProjectTeam.js
index eb724296e..a676a17cc 100644
--- a/frontend/src/components/projects/ProjectDetail/ProjectTeam.js
+++ b/frontend/src/components/projects/ProjectDetail/ProjectTeam.js
@@ -3,7 +3,7 @@ import ShowIfPermission from 'hocs/ShowIfPermission'
import { Auth as AuthConstants } from '@hackjunction/shared'
import ExternalLink from 'components/generic/ExternalLink'
import { useSelector } from 'react-redux'
-import * as AuthSelectors from 'redux/auth/selectors'
+import * as AuthSelectors from 'reducers/auth/selectors'
import {
CircularProgress,
@@ -13,7 +13,7 @@ import {
ListItemAvatar,
ListItemText,
Avatar,
-} from '@material-ui/core'
+} from '@mui/material'
import UserProfilesService from 'services/userProfiles'
diff --git a/frontend/src/components/projects/ProjectDetail/ShareProject.js b/frontend/src/components/projects/ProjectDetail/ShareProject.js
index db0e86ccf..5e73f8e08 100644
--- a/frontend/src/components/projects/ProjectDetail/ShareProject.js
+++ b/frontend/src/components/projects/ProjectDetail/ShareProject.js
@@ -1,8 +1,8 @@
import React from 'react'
-import { Box, Typography, Grid } from '@material-ui/core'
+import { Box, Typography, Grid } from '@mui/material'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { popupCenter } from '../../../utils/misc'
-import { makeStyles } from '@material-ui/core/styles'
+
import Container from 'components/generic/Container'
import { projectURLgenerator } from 'utils/dataModifiers'
diff --git a/frontend/src/components/projects/ProjectDetail/index.js b/frontend/src/components/projects/ProjectDetail/index.js
index fd1a4e25b..a9a40dda9 100644
--- a/frontend/src/components/projects/ProjectDetail/index.js
+++ b/frontend/src/components/projects/ProjectDetail/index.js
@@ -1,109 +1,20 @@
import React, { useState } from 'react'
-
import { find, filter } from 'lodash-es'
-import { Box, Typography, Button, Tooltip } from '@material-ui/core'
-import { makeStyles } from '@material-ui/core/styles'
-import SwipeableViews from 'react-swipeable-views'
-import { autoPlay } from 'react-swipeable-views-utils'
+import { Box, Typography, Button, Tooltip } from '@mui/material'
+import { SwipeableViews } from 'components/animated/SwipeableViews'
import Image from 'components/generic/Image'
import Container from 'components/generic/Container'
import Markdown from 'components/generic/Markdown'
-import ArrowBackIosIcon from '@material-ui/icons/ArrowBackIos'
+import ArrowBackIosIcon from '@mui/icons-material/ArrowBackIos'
import config from 'constants/config'
import { Helmet } from 'react-helmet'
import ReactPlayer from 'react-player'
import { useDispatch } from 'react-redux'
-import * as DashboardActions from 'redux/dashboard/actions'
+import * as DashboardActions from 'reducers/dashboard/actions'
import ProjectTeam from './ProjectTeam'
import Pagination from './Pagination'
-import theme from 'material-ui-theme'
import Tag from 'components/generic/Tag'
-const AutoPlaySwipeableViews = autoPlay(SwipeableViews)
-
-const useStyles = makeStyles(theme => ({
- wrapper: {
- width: '100%',
- position: 'relative',
- },
- top: {
- width: '100%',
- paddingTop: '50%',
- position: 'relative',
- overflow: 'hidden',
- background: 'black',
- [theme.breakpoints.up('lg')]: {
- paddingTop: theme.breakpoints.values.lg / 2,
- },
- },
- image: {
- position: 'absolute',
- top: 0,
- left: 0,
- width: '100%',
- height: '100%',
- background: 'black',
- objectFit: 'contain',
- },
- placeholderTop: {
- background: 'black',
- padding: theme.spacing(2),
- display: 'flex',
- flexDirection: 'column',
- alignItems: 'center',
- '&:hover': {
- opacity: 0.6,
- },
- },
- placeholderImage: {
- width: '100%',
- maxWidth: '600px',
- },
- content: {
- marginTop: theme.spacing(5),
- },
- backButtonWrapper: {
- background: 'black',
- position: 'absolute',
- top: 0,
- left: 0,
- },
- sectionTitle: {
- textTransform: 'uppercase',
- },
- pagination: {
- position: 'absolute',
- top: 0,
- right: 0,
- background: 'rgba(0,0,0,0.4)',
- zIndex: 100,
- color: 'white',
- padding: theme.spacing(2),
- },
- paginationText: {
- color: 'white',
- },
- doneTitle: {
- color: 'black',
- textAlign: 'center',
- },
- socialIcon: {
- color: 'black',
- width: 'auto',
- margin: '0.10rem',
- cursor: 'pointer',
- },
- playerWrapper: {
- position: 'relative',
- height: '360px',
- },
- reactPlayer: {
- position: 'absolute',
- top: 0,
- left: 0,
- },
-}))
-
const ProjectDetail = ({
project,
event,
@@ -111,12 +22,12 @@ const ProjectDetail = ({
showTableLocation,
showFullTeam,
}) => {
- const classes = useStyles()
const [index, setIndex] = useState(0)
const [pause, setPause] = useState(true)
const dispatch = useDispatch()
if (!project) return null
+
const downloadFile = async fileDataString => {
const parsedValue = JSON.parse(fileDataString)
await dispatch(
@@ -188,25 +99,25 @@ const ProjectDetail = ({
fieldType: question.fieldType,
})
}
- return
+ return null
})
submissionFormAnswersArray.push(sectionGroup)
+ return null
})
}
const statusTag = status => {
switch (status) {
case 'final':
- return
+ return
case 'draft':
- return (
-
- )
+ return
default:
return null
}
}
+
return (
<>
@@ -272,13 +183,10 @@ const ProjectDetail = ({
/>
-
+
- setPause(!pause)}
- >
- setPause(!pause)}>
+ (
))
) : (
-
+
)}
-
-
-