+
{
{showDescription ? (
-
+
{dayOfWeek}, {month}. {dayOfMonth} {startTime}-{endTime}
diff --git a/src/components/LoginAccess/LoginAccess.js b/src/components/LoginAccess/LoginAccess.js
index 9fe20d0b..503929b3 100644
--- a/src/components/LoginAccess/LoginAccess.js
+++ b/src/components/LoginAccess/LoginAccess.js
@@ -1,8 +1,18 @@
-import React, { useState } from 'react'
-import { connect } from 'react-redux'
-import { Auth } from 'aws-amplify'
-import { Helmet } from 'react-helmet'
-import { Link, useHistory } from 'react-router-dom'
+import React, {
+ useState
+} from "react";
+import {
+ connect
+} from "react-redux";
+import {
+ Auth
+} from "aws-amplify";
+import {
+ Helmet
+} from "react-helmet";
+import {
+ Link, useHistory
+} from "react-router-dom";
import {
Button,
@@ -10,185 +20,193 @@ import {
CardContent,
CssBaseline,
Typography
-} from '@material-ui/core'
-import { Alert } from "@material-ui/lab";
+} from "@material-ui/core";
+import {
+ Alert
+} from "@material-ui/lab";
-import LoginImage from 'assets/login.svg'
-import { COLORS } from 'constants/index'
-import { setUser } from 'store/user/userActions'
+import LoginImage from "assets/login.svg";
+import {
+ COLORS
+} from "constants/index";
+import {
+ setUser
+} from "store/user/userActions";
const styles = {
main: {
- display: 'flex',
- flexDirection: 'column',
- height: '100vh',
- alignItems: 'center',
+ display: "flex",
+ flexDirection: "column",
+ height: "100vh",
+ alignItems: "center",
},
columns: {
- maxWidth: '1100px',
- margin: 'auto',
+ maxWidth: "1100px",
+ margin: "auto",
marginTop: 32,
- display: 'flex',
- flexDirection: 'row',
- alignItems: 'center',
- justifyContent: 'space-between',
+ display: "flex",
+ flexDirection: "row",
+ alignItems: "center",
+ justifyContent: "space-between",
},
access: {
- marginTop: 'auto',
- fontWeight: 'bold',
- fontSize: '24px'
+ marginTop: "auto",
+ fontWeight: "bold",
+ fontSize: "24px"
},
card: {
borderRadius: 10,
minWidth: 400,
padding: 42,
margin: 30,
- marginBottom: '30%',
+ marginBottom: "30%",
flex: 1
},
left: {
- float: 'left'
+ float: "left"
},
socialIcon: {
- marginTop: '5px',
- marginRight: '8px',
- width: '19px'
+ marginTop: "5px",
+ marginRight: "8px",
+ width: "19px"
},
googleButton: {
- marginTop: '15px',
- textTransform: 'none',
- textAlign: 'left',
- fontWeight: 'bold',
- backgroundColor: 'white',
- color: 'black',
- width: '100%',
- '&:hover': {
- backgroundColor: '#eeeeee'
+ marginTop: "15px",
+ textTransform: "none",
+ textAlign: "left",
+ fontWeight: "bold",
+ backgroundColor: "white",
+ color: "black",
+ width: "100%",
+ "&:hover": {
+ backgroundColor: "#eeeeee"
}
},
submitButton: {
- marginTop: '15px',
- textTransform: 'none',
- textAlign: 'left',
- fontWeight: 'bold',
+ marginTop: "15px",
+ textTransform: "none",
+ textAlign: "left",
+ fontWeight: "bold",
backgroundColor: COLORS.BIZTECH_GREEN,
color: COLORS.BLACK,
- width: '100%',
- '&:hover': {
- backgroundColor: '#eeeeee'
+ width: "100%",
+ "&:hover": {
+ backgroundColor: "#eeeeee"
}
},
facebookButton: {
- marginTop: '12px',
- textTransform: 'none',
- textAlign: 'left',
- fontWeight: 'bold',
- backgroundColor: '#1778F2',
+ marginTop: "12px",
+ textTransform: "none",
+ textAlign: "left",
+ fontWeight: "bold",
+ backgroundColor: "#1778F2",
color: COLORS.WHITE,
- width: '100%',
- '&:hover': {
- backgroundColor: '#1470E4'
+ width: "100%",
+ "&:hover": {
+ backgroundColor: "#1470E4"
}
},
loginImage: {
maxWidth: 500,
flex: 1,
margin: 50,
- marginBottom: '30%',
+ marginBottom: "30%",
},
notAMember: {
- marginTop: '30px'
+ marginTop: "30px"
},
loginMember: {
- marginTop: '20px',
+ marginTop: "20px",
color: COLORS.BIZTECH_GREEN
},
emailLogin: {
- marginTop: '5px'
+ marginTop: "5px"
},
passwordLogin: {
- marginTop: '5px'
+ marginTop: "5px"
},
signUpLink: {
color: COLORS.BIZTECH_GREEN,
- marginLeft: '5px'
+ marginLeft: "5px"
},
inputText: {
- width: '100%',
- height: '30px',
+ width: "100%",
+ height: "30px",
borderRadius: 10
},
errors: {
- color: 'red'
+ color: "red"
}
-}
+};
function Login (props) {
- const [email, setEmail] = useState('')
- const [password, setPassword] = useState('')
+ const [email, setEmail] = useState("");
+ const [password, setPassword] = useState("");
const [errors, setErrors] = useState({
- emailError: '',
- passwordError: ''
- })
+ emailError: "",
+ passwordError: ""
+ });
const [isLoading, setIsLoading] = useState(false);
- const history = useHistory()
+ const history = useHistory();
const validateEmail = (value) => {
- let error = ''
+ let error = "";
if (!email) {
- error = 'Email is required'
+ error = "Email is required";
// eslint-disable-next-line
} else if (!/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(value)) {
- error = 'Please enter a valid email address'
+ error = "Please enter a valid email address";
}
- return error
- }
+ return error;
+ };
const validatePassword = (value) => {
- let error = ''
+ let error = "";
if (!value) {
- error = 'Password is required'
+ error = "Password is required";
}
- return error
- }
+ return error;
+ };
const handleSubmit = async () => {
- const emailError = validateEmail(email)
- const passwordError = validatePassword(password)
+ const emailError = validateEmail(email);
+ const passwordError = validatePassword(password);
setIsLoading(true);
if (emailError || passwordError) {
// if any errors with inputs, set state and rerender (don't call signin/signup)
setErrors({
- emailError: emailError,
- passwordError: passwordError
- })
+ emailError,
+ passwordError
+ });
} else {
try {
await Auth.signIn({
username: email,
- password: password
- })
- history.push('/login-redirect', { redirect: props.redirect })
+ password
+ });
+ history.push("/login-redirect", {
+ redirect: props.redirect
+ });
} catch (error) {
- console.log('caught error', error)
- if (error.name === 'UserNotFoundException') {
+ console.log("caught error", error);
+ if (error.name === "UserNotFoundException") {
setErrors({
- emailError: '',
- passwordError: 'Incorrect username or password.'
- })
+ emailError: "",
+ passwordError: "Incorrect username or password."
+ });
} else {
setErrors({
- emailError: '',
+ emailError: "",
passwordError: error.message
- })
+ });
}
- setPassword('')
+ setPassword("");
}
}
setIsLoading(false);
- }
+ };
const handleKeyPress = (event) => {
if (event.key === "Enter") {
@@ -204,7 +222,7 @@ function Login (props) {
- {props.header}
+ {props.header}
{/* TODO: Maintenance message here for MinVP */}
- )
+ );
}
const mapStateToProps = (state) => {
return {
user: state.userState.user.data
- }
-}
+ };
+};
-export default connect(mapStateToProps, { setUser })(Login)
+export default connect(mapStateToProps, {
+ setUser
+})(Login);
diff --git a/src/components/Nav.js b/src/components/Nav.js
index b310673a..1bd750c9 100644
--- a/src/components/Nav.js
+++ b/src/components/Nav.js
@@ -1,10 +1,22 @@
-import React, { useState, useEffect } from "react";
-import { useHistory, withRouter } from "react-router-dom";
-import { connect } from "react-redux";
-import { Auth } from "aws-amplify";
+import React, {
+ useState, useEffect
+} from "react";
+import {
+ useHistory, withRouter
+} from "react-router-dom";
+import {
+ connect
+} from "react-redux";
+import {
+ Auth
+} from "aws-amplify";
-import { List, ListItem, Divider } from "@material-ui/core";
-import { useTheme, withStyles } from "@material-ui/styles";
+import {
+ List, ListItem, Divider
+} from "@material-ui/core";
+import {
+ useTheme, withStyles
+} from "@material-ui/styles";
import useMediaQuery from "@material-ui/core/useMediaQuery";
import AddBoxIcon from "@material-ui/icons/AddBox";
@@ -16,9 +28,15 @@ import Biztech from "./Icons/Biztech";
import Logout from "./Icons/Logout";
import "./Nav.scss";
-import { logout } from "../actions/UserActions";
-import { COLOR } from "../constants/Constants";
-import { checkFeatureFlag } from "../utils/checkFeatureFlag";
+import {
+ logout
+} from "../actions/UserActions";
+import {
+ COLOR
+} from "../constants/Constants";
+import {
+ checkFeatureFlag
+} from "../utils/checkFeatureFlag";
const ICON_SIZE = "32px";
@@ -41,10 +59,20 @@ function Nav(props) {
const renderDesktopOnly = useMediaQuery(theme.breakpoints.up("md"));
const history = useHistory();
- const selected = { color: COLOR.BIZTECH_GREEN, fontSize: ICON_SIZE };
- const unselected = { color: COLOR.WHITE, fontSize: ICON_SIZE };
- const barSelected = { borderLeft: `6px solid ${COLOR.BIZTECH_GREEN}` };
- const barUnselected = { borderLeft: `6px solid ${COLOR.BACKGROUND_COLOR}` };
+ const selected = {
+ color: COLOR.BIZTECH_GREEN,
+ fontSize: ICON_SIZE
+ };
+ const unselected = {
+ color: COLOR.WHITE,
+ fontSize: ICON_SIZE
+ };
+ const barSelected = {
+ borderLeft: `6px solid ${COLOR.BIZTECH_GREEN}`
+ };
+ const barUnselected = {
+ borderLeft: `6px solid ${COLOR.BACKGROUND_COLOR}`
+ };
const pathname = history.location.pathname;
const [selectedItem, setSelectedItem] = useState(pathname);
@@ -69,12 +97,17 @@ function Nav(props) {
};
function MenuItem(props) {
- const { label, icon, onClick, bar, featureFlag } = props;
+ const {
+ label, icon, onClick, bar, featureFlag
+ } = props;
const isFeatureEnabled = checkFeatureFlag(featureFlag);
return isFeatureEnabled ? (
{
const email = authUser.attributes.email;
if (
@@ -54,7 +68,7 @@ class Router extends Component {
admin: true,
});
} else {
- const email = authUser.attributes["email"];
+ const email = authUser.attributes.email;
if (email) {
// Perform redux actions to update user and registration states at the same time
await Promise.all([
@@ -69,7 +83,7 @@ class Router extends Component {
// save only essential info to redux
this.props.setUser({
- email: email,
+ email,
fname,
lname,
});
@@ -92,17 +106,25 @@ class Router extends Component {
// also get events at the same time
Promise.all([this.getAuthenticatedUser()]).then(() => {
// Ultimately, after all is loaded, set the "loaded" state and render the component
- this.setState({ loaded: true });
+ this.setState({
+ loaded: true
+ });
});
} else {
// If the user already exists, update the events and render the page
- this.setState({ loaded: true });
+ this.setState({
+ loaded: true
+ });
}
}
render() {
- const { user, registrations } = this.props;
- const { loaded } = this.state;
+ const {
+ user, registrations
+ } = this.props;
+ const {
+ loaded
+ } = this.state;
// Alert the user about the need to register if they haven't
const userNeedsRegister = user && !user.admin && !user.id;
@@ -217,4 +239,6 @@ const mapStateToProps = (state) => {
};
};
-export default connect(mapStateToProps, { setUser })(Router);
+export default connect(mapStateToProps, {
+ setUser
+})(Router);
diff --git a/src/components/alerts/MemberAlert.js b/src/components/alerts/MemberAlert.js
index 52731b05..8d6795c5 100644
--- a/src/components/alerts/MemberAlert.js
+++ b/src/components/alerts/MemberAlert.js
@@ -1,7 +1,13 @@
-import React, { useState, useEffect } from "react";
-import { Link, useLocation } from "react-router-dom";
+import React, {
+ useState, useEffect
+} from "react";
+import {
+ Link, useLocation
+} from "react-router-dom";
-import { Alert } from "@material-ui/lab";
+import {
+ Alert
+} from "@material-ui/lab";
import "./RegisterAlert.scss";
export default function MemberAlert() {
@@ -28,7 +34,7 @@ export default function MemberAlert() {
{!ignoreAlertPaths.find((p) => path.includes(p)) && (
You are currently not a member!
- Register here to become a
+ Register here to become a
member for this academic year!
)}
diff --git a/src/components/alerts/UserAlert.js b/src/components/alerts/UserAlert.js
index 69205932..e7a7659a 100644
--- a/src/components/alerts/UserAlert.js
+++ b/src/components/alerts/UserAlert.js
@@ -1,23 +1,29 @@
-import React, { useState, useEffect } from "react";
-import { Link, useLocation } from "react-router-dom";
+import React, {
+ useState, useEffect
+} from "react";
+import {
+ Link, useLocation
+} from "react-router-dom";
-import { Alert } from "@material-ui/lab";
+import {
+ Alert
+} from "@material-ui/lab";
import "./RegisterAlert.scss";
export default function UserAlert() {
- const ignoreAlertPaths = ['/login', '/login-redirect', '/signup', '/signup/success']
+ const ignoreAlertPaths = ["/login", "/login-redirect", "/signup", "/signup/success"];
- const location = useLocation()
- const [path, setPath] = useState(location.pathname)
+ const location = useLocation();
+ const [path, setPath] = useState(location.pathname);
useEffect(() => {
- setPath(location.pathname)
- }, [location.pathname])
+ setPath(location.pathname);
+ }, [location.pathname]);
return (
<>
- {!ignoreAlertPaths.find((p) => (path.includes(p) || path.slice(-7) === "partner")) &&
+ {!ignoreAlertPaths.find((p) => (path.includes(p) || path.slice(-7) === "partner")) &&
You are not logged in and are currently viewing as guest.
Login or Signup to be able to register for
diff --git a/src/components/buttons/RadioGroupButtons.js b/src/components/buttons/RadioGroupButtons.js
index 90663fe3..56764673 100644
--- a/src/components/buttons/RadioGroupButtons.js
+++ b/src/components/buttons/RadioGroupButtons.js
@@ -1,4 +1,6 @@
-import React, { useState } from "react";
+import React, {
+ useState
+} from "react";
import {
FormControlLabel,
FormHelperText,
diff --git a/src/components/icons/BiztechIcon.js b/src/components/icons/BiztechIcon.js
index 2559263c..5c9459cd 100644
--- a/src/components/icons/BiztechIcon.js
+++ b/src/components/icons/BiztechIcon.js
@@ -1,8 +1,12 @@
import React from "react";
import BiztechLogo from "../../assets/biztech_logo_2022.svg";
-const Biztech = ({ size, margin }) => (
- 
+const Biztech = ({
+ size, margin
+}) => (
+
);
export default Biztech;
diff --git a/src/components/icons/DateComponent.js b/src/components/icons/DateComponent.js
index 923b1baf..f35dcb20 100644
--- a/src/components/icons/DateComponent.js
+++ b/src/components/icons/DateComponent.js
@@ -1,7 +1,13 @@
import React from "react";
-import { Typography } from "@material-ui/core";
-import { makeStyles } from "@material-ui/core/styles";
-import { COLORS } from "../../constants/_constants/theme";
+import {
+ Typography
+} from "@material-ui/core";
+import {
+ makeStyles
+} from "@material-ui/core/styles";
+import {
+ COLORS
+} from "../../constants/_constants/theme";
const useStyles = makeStyles((theme) => ({
container: {
@@ -66,7 +72,9 @@ const useStyles = makeStyles((theme) => ({
export default function DateComponent(props) {
const classes = useStyles();
- const { month, dayOfMonth, dayOfWeek } = props;
+ const {
+ month, dayOfMonth, dayOfWeek
+ } = props;
return (
@@ -221,9 +239,8 @@ function Login (props) {
setEmail(e.target.value)}
+ onChange={(e) => setEmail(e.target.value)}
onKeyPress={handleKeyPress}
/>
{errors.emailError}
@@ -235,9 +252,8 @@ function Login (props) {
setPassword(e.target.value)}
- onKeyPress={handleKeyPress}
+ onKeyPress={handleKeyPress}
/>
{errors.passwordError}
diff --git a/src/components/icons/LogoutIcon.js b/src/components/icons/LogoutIcon.js
index 7da12a74..2899366c 100644
--- a/src/components/icons/LogoutIcon.js
+++ b/src/components/icons/LogoutIcon.js
@@ -1,6 +1,8 @@
import React from "react";
-const Logout = ({ fill, size }) => (
+const Logout = ({
+ fill, size
+}) => (
+
\ No newline at end of file
diff --git a/src/components/inputs/CustomSelect.js b/src/components/inputs/CustomSelect.js
index 96953877..0534932f 100644
--- a/src/components/inputs/CustomSelect.js
+++ b/src/components/inputs/CustomSelect.js
@@ -1,22 +1,30 @@
-import React from 'react'
-import { COLORS } from '../../constants/_constants/theme'
+import React from "react";
+import {
+ COLORS
+} from "../../constants/_constants/theme";
-import { Typography, MenuItem, Select, FormHelperText } from '@material-ui/core'
-import { makeStyles } from '@material-ui/core/styles'
-import { useTheme } from '@material-ui/styles'
-import useMediaQuery from '@material-ui/core/useMediaQuery'
+import {
+ Typography, MenuItem, Select, FormHelperText
+} from "@material-ui/core";
+import {
+ makeStyles
+} from "@material-ui/core/styles";
+import {
+ useTheme
+} from "@material-ui/styles";
+import useMediaQuery from "@material-ui/core/useMediaQuery";
const useStyles = makeStyles((theme) => ({
errorSelect: {
backgroundColor: COLORS.TEXTFIELD,
- borderRadius: '4px',
- paddingLeft: '10px',
+ borderRadius: "4px",
+ paddingLeft: "10px",
border: `1px solid ${COLORS.ERROR_RED}`
},
select: {
backgroundColor: COLORS.TEXTFIELD,
- borderRadius: '4px',
- paddingLeft: '10px'
+ borderRadius: "4px",
+ paddingLeft: "10px"
},
errorMsg: {
color: COLORS.ERROR_RED
@@ -28,16 +36,16 @@ const useStyles = makeStyles((theme) => ({
borderRadius: "4px",
},
menuItem: {
- [theme.breakpoints.down('sm')]: {
- overflowX: 'scroll'
+ [theme.breakpoints.down("sm")]: {
+ overflowX: "scroll"
}
}
-}))
+}));
export default function CustomSelect (props) {
- const classes = useStyles()
- const theme = useTheme()
- const renderMobileOnly = useMediaQuery(theme.breakpoints.down('sm'))
+ const classes = useStyles();
+ const theme = useTheme();
+ const renderMobileOnly = useMediaQuery(theme.breakpoints.down("sm"));
const {
errors,
@@ -48,17 +56,17 @@ export default function CustomSelect (props) {
label,
listOfOptions,
initialValues
- } = props
+ } = props;
const handleSelectChange = (e, groupName) => {
- e.preventDefault()
- const value = e.target.value
+ e.preventDefault();
+ const value = e.target.value;
if (value) {
- setFieldTouched(groupName, true, false)
- setFieldValue(groupName, value)
+ setFieldTouched(groupName, true, false);
+ setFieldValue(groupName, value);
}
- }
+ };
return (
{label}
{createTextField(renderMobileOnly, label)}
- )
+ );
}
diff --git a/src/components/layout/Footer.js b/src/components/layout/Footer.js
index 0199b7f5..f22781b2 100644
--- a/src/components/layout/Footer.js
+++ b/src/components/layout/Footer.js
@@ -1,12 +1,20 @@
-import React, { useState, useEffect } from "react";
+import React, {
+ useState, useEffect
+} from "react";
import Heart from "../../assets/heart.svg";
-import { COLORS } from "../../constants/_constants/theme";
+import {
+ COLORS
+} from "../../constants/_constants/theme";
-import { useLocation } from "react-router-dom";
+import {
+ useLocation
+} from "react-router-dom";
import IconContainer from "./IconContainer";
-import { makeStyles } from "@material-ui/core/styles";
+import {
+ makeStyles
+} from "@material-ui/core/styles";
import Typography from "@material-ui/core/Typography";
@@ -42,17 +50,17 @@ const useStyles = makeStyles((theme) => ({
function Footer() {
const classes = useStyles();
- const ignoreFooterPaths = ["/redeem", "/redemption", "/companion"]
+ const ignoreFooterPaths = ["/redeem", "/redemption", "/companion"];
- const location = useLocation()
- const [path, setPath] = useState(location.pathname)
+ const location = useLocation();
+ const [path, setPath] = useState(location.pathname);
useEffect(() => {
- setPath(location.pathname)
- }, [location.pathname])
+ setPath(location.pathname);
+ }, [location.pathname]);
if (ignoreFooterPaths.find((p) => path.includes(p))) {
- return <>
+ return <>;
}
return (
diff --git a/src/components/layout/Header.js b/src/components/layout/Header.js
index fdea9a08..672a7094 100644
--- a/src/components/layout/Header.js
+++ b/src/components/layout/Header.js
@@ -1,7 +1,9 @@
import React from "react";
import BiztechIcon from "../icons/BiztechIcon";
-import { makeStyles } from "@material-ui/core/styles";
+import {
+ makeStyles
+} from "@material-ui/core/styles";
import Typography from "@material-ui/core/Typography";
const ICON_SIZE = "28px";
diff --git a/src/components/layout/IconContainer.js b/src/components/layout/IconContainer.js
index 2cf464d6..000db04f 100644
--- a/src/components/layout/IconContainer.js
+++ b/src/components/layout/IconContainer.js
@@ -2,11 +2,15 @@ import React from "react";
import BiztechIcon from "../icons/BiztechIcon";
import Discord from "../icons/discord.svg";
-import { makeStyles } from "@material-ui/core/styles";
+import {
+ makeStyles
+} from "@material-ui/core/styles";
import FacebookIcon from "@material-ui/icons/Facebook";
import InstagramIcon from "@material-ui/icons/Instagram";
import LinkedInIcon from "@material-ui/icons/LinkedIn";
-import { useTheme } from "@material-ui/styles";
+import {
+ useTheme
+} from "@material-ui/styles";
import useMediaQuery from "@material-ui/core/useMediaQuery";
const ICON_SIZE = "24px";
diff --git a/src/components/layout/Markdown.js b/src/components/layout/Markdown.js
index 7c20fbd7..2aea7ab5 100644
--- a/src/components/layout/Markdown.js
+++ b/src/components/layout/Markdown.js
@@ -1,6 +1,8 @@
import React from "react";
import ReactMarkdown from "markdown-to-jsx";
-import { Link, Typography } from "@material-ui/core";
+import {
+ Link, Typography
+} from "@material-ui/core";
const options = {
overrides: {
@@ -10,18 +12,37 @@ const options = {
gutterBottom: true,
},
},
- h2: { component: Typography, props: { gutterBottom: true, variant: "h6" } },
+ h2: {
+ component: Typography,
+ props: {
+ gutterBottom: true,
+ variant: "h6"
+ }
+ },
h3: {
component: Typography,
- props: { gutterBottom: true, variant: "subtitle1" },
+ props: {
+ gutterBottom: true,
+ variant: "subtitle1"
+ },
},
h4: {
component: Typography,
- props: { gutterBottom: true, variant: "caption", paragraph: true },
+ props: {
+ gutterBottom: true,
+ variant: "caption",
+ paragraph: true
+ },
+ },
+ p: {
+ component: Typography
+ },
+ span: {
+ component: Typography
+ },
+ a: {
+ component: Link
},
- p: { component: Typography },
- span: { component: Typography },
- a: { component: Link },
li: {
// eslint-disable-next-line
component: ({ classes, ...props }) => (
diff --git a/src/components/layout/Navigation.js b/src/components/layout/Navigation.js
index 6e3224b3..73c4bb41 100644
--- a/src/components/layout/Navigation.js
+++ b/src/components/layout/Navigation.js
@@ -1,10 +1,22 @@
-import React, { useState, useEffect } from "react";
-import { useHistory } from "react-router-dom";
-import { connect } from "react-redux";
-import { Auth } from "aws-amplify";
+import React, {
+ useState, useEffect
+} from "react";
+import {
+ useHistory
+} from "react-router-dom";
+import {
+ connect
+} from "react-redux";
+import {
+ Auth
+} from "aws-amplify";
-import { makeStyles } from "@material-ui/styles";
-import { List, ListItem, Divider } from "@material-ui/core";
+import {
+ makeStyles
+} from "@material-ui/styles";
+import {
+ List, ListItem, Divider
+} from "@material-ui/core";
// import useMediaQuery from "@material-ui/core/useMediaQuery";
import {
@@ -19,9 +31,15 @@ import AssessmentIcon from "@material-ui/icons/Assessment";
import PetsIcon from "@material-ui/icons/Pets";
import "./Navigation.scss";
-import { COLORS } from "constants/index";
-import { logout } from "store/user/userActions";
-import { checkFeatureFlag } from "utils";
+import {
+ COLORS
+} from "constants/index";
+import {
+ logout
+} from "store/user/userActions";
+import {
+ checkFeatureFlag
+} from "utils";
const ICON_SIZE = "32px";
@@ -45,13 +63,23 @@ function Nav(props) {
const history = useHistory();
const classes = useStyles();
- const selected = { color: COLORS.BIZTECH_GREEN, fontSize: ICON_SIZE };
- const unselected = { color: COLORS.WHITE, fontSize: ICON_SIZE };
- const barSelected = { borderLeft: `6px solid ${COLORS.BIZTECH_GREEN}` };
- const barUnselected = { borderLeft: `6px solid ${COLORS.BACKGROUND_COLOR}` };
+ const selected = {
+ color: COLORS.BIZTECH_GREEN,
+ fontSize: ICON_SIZE
+ };
+ const unselected = {
+ color: COLORS.WHITE,
+ fontSize: ICON_SIZE
+ };
+ const barSelected = {
+ borderLeft: `6px solid ${COLORS.BIZTECH_GREEN}`
+ };
+ const barUnselected = {
+ borderLeft: `6px solid ${COLORS.BACKGROUND_COLOR}`
+ };
const pathname = history.location.pathname;
- const ignoreNavPaths = ["/redeem", "/redemption", "/companion"]
+ const ignoreNavPaths = ["/redeem", "/redemption", "/companion"];
const [selectedItem, setSelectedItem] = useState(pathname);
useEffect(() => {
history.listen((location) => {
@@ -63,7 +91,7 @@ function Nav(props) {
Auth.signOut()
.then(() => {
props.logout();
- history.push('/login');
+ history.push("/login");
})
.catch((err) => console.log(err));
};
@@ -77,7 +105,9 @@ function Nav(props) {
};
function MenuItem(props) {
- const { label, icon, onClick, bar, featureFlag } = props;
+ const {
+ label, icon, onClick, bar, featureFlag
+ } = props;
const isFeatureEnabled = checkFeatureFlag(featureFlag);
return isFeatureEnabled ? (
selectedItem.includes(p))) {
- return <>
+ return <>;
}
return (
@@ -205,4 +235,6 @@ function Nav(props) {
);
}
-export default connect(null, { logout })(Nav);
+export default connect(null, {
+ logout
+})(Nav);
diff --git a/src/components/layout/ScrollToTop.js b/src/components/layout/ScrollToTop.js
index a0436a19..7cac63f2 100644
--- a/src/components/layout/ScrollToTop.js
+++ b/src/components/layout/ScrollToTop.js
@@ -1,10 +1,16 @@
-import { useEffect } from "react";
-import { useLocation } from "react-router-dom";
+import {
+ useEffect
+} from "react";
+import {
+ useLocation
+} from "react-router-dom";
// Helper component to scroll to top
// React router doesn't automatically scroll to top when navigating to a different route
export default function ScrollToTop() {
- const { pathname } = useLocation();
+ const {
+ pathname
+ } = useLocation();
useEffect(() => {
window.scrollTo(0, 0);
diff --git a/src/components/links/CustomLink.js b/src/components/links/CustomLink.js
index 84774cde..68c1c6fa 100644
--- a/src/components/links/CustomLink.js
+++ b/src/components/links/CustomLink.js
@@ -1,8 +1,12 @@
import React from "react";
-import { Link } from "@material-ui/core";
+import {
+ Link
+} from "@material-ui/core";
export default function CustomLink(props) {
- const { href, target, rel, children } = props;
+ const {
+ href, target, rel, children
+ } = props;
return (
{
diff --git a/src/components/routing/Logout.js b/src/components/routing/Logout.js
index d4d6b8b1..7c365328 100644
--- a/src/components/routing/Logout.js
+++ b/src/components/routing/Logout.js
@@ -1,9 +1,17 @@
import React from "react";
-import { connect } from "react-redux";
-import { Auth } from "aws-amplify";
+import {
+ connect
+} from "react-redux";
+import {
+ Auth
+} from "aws-amplify";
-import { Button } from "@material-ui/core";
-import { logout } from "store/user/userActions";
+import {
+ Button
+} from "@material-ui/core";
+import {
+ logout
+} from "store/user/userActions";
export function Logout(props) {
return (
@@ -23,4 +31,6 @@ export function Logout(props) {
);
}
-export default connect(null, { logout })(Logout);
+export default connect(null, {
+ logout
+})(Logout);
diff --git a/src/components/routing/Route.js b/src/components/routing/Route.js
index c356b67e..56179492 100644
--- a/src/components/routing/Route.js
+++ b/src/components/routing/Route.js
@@ -1,10 +1,16 @@
import React from "react";
-import { Route } from "react-router-dom";
-import { checkFeatureFlag } from "utils";
+import {
+ Route
+} from "react-router-dom";
+import {
+ checkFeatureFlag
+} from "utils";
// CustomRoute accepts "featureFlag", causes the route to not be instantiated
// The "featureFlag" flag should be used to disable certain routes related to features we don't want on production yet
-const CustomRoute = ({ children, featureFlag, ...rest }) => {
+const CustomRoute = ({
+ children, featureFlag, ...rest
+}) => {
const isFeatureEnabled = checkFeatureFlag(featureFlag);
return isFeatureEnabled ? {children} : null;
};
diff --git a/src/constants/_constants/companion.js b/src/constants/_constants/companion.js
index c711866a..89423e01 100644
--- a/src/constants/_constants/companion.js
+++ b/src/constants/_constants/companion.js
@@ -2,7 +2,13 @@ export const constantStyles = {
titleFontSize: 50,
titleMobileFontSize: 25,
fontSize: 16,
- mobileFontSize: 12,
- textColor: "#172442",
- backgroundGradient: "linear-gradient(180deg, #e3edf7, #e3edf7)",
-}
\ No newline at end of file
+ mobileFontSize: 15,
+ textColor: "white",
+ backgroundGradient: "linear-gradient(0.5turn, #060818, #0A0B25, #060818)"
+};
+
+export const QRCodeTypes = {
+ PARTNER: "Partner",
+ WORKSHOP: "Workshop",
+ BOOTH: "Booth",
+};
diff --git a/src/constants/_constants/config.js b/src/constants/_constants/config.js
index d06515a8..68058069 100644
--- a/src/constants/_constants/config.js
+++ b/src/constants/_constants/config.js
@@ -4,16 +4,18 @@
// : aws_exports
export const API_URL =
- process.env.REACT_APP_STAGE === "production"
- ? "https://api.ubcbiztech.com"
+process.env.REACT_APP_STAGE === "production"
+ ? "https://api.ubcbiztech.com"
+ : process.env.REACT_APP_STAGE === "local"
+ ? "http://localhost:4000"
: "https://api-dev.ubcbiztech.com";
export const CLIENT_URL =
process.env.REACT_APP_STAGE === "production"
? "https://app.ubcbiztech.com/"
: process.env.REACT_APP_STAGE === "local"
- ? "http://localhost:3000/"
- : "https://dev.app.ubcbiztech.com/";
+ ? "http://localhost:3000/"
+ : "https://dev.app.ubcbiztech.com/";
export const AWS_CONFIG = {
Auth: {
diff --git a/src/constants/_constants/emails.js b/src/constants/_constants/emails.js
new file mode 100644
index 00000000..5ba5d9fc
--- /dev/null
+++ b/src/constants/_constants/emails.js
@@ -0,0 +1,535 @@
+// list of unstandardized emails in our DB and their standardized counterparts
+// @TODO replace these emails in the db permanently, and remove this
+
+const CAPITALIZED_EMAILS = process.env.REACT_APP_STAGE === "production" ? [
+ {
+ "email": "Hashaamzafar2003@Gmail.com",
+ "lowercaseEmail": "hashaamzafar2003@gmail.com"
+ },
+ {
+ "email": "Andrii.maxurmc@gmail.com",
+ "lowercaseEmail": "andrii.maxurmc@gmail.com"
+ },
+ {
+ "email": "Kcgroulx@gmail.com",
+ "lowercaseEmail": "kcgroulx@gmail.com"
+ },
+ {
+ "email": "Amyxcao17007@gmail.com",
+ "lowercaseEmail": "amyxcao17007@gmail.com"
+ },
+ {
+ "email": "Mingxin.gong2@gmail.com",
+ "lowercaseEmail": "mingxin.gong2@gmail.com"
+ },
+ {
+ "email": "Tejyashwarsingh72@gmail.com",
+ "lowercaseEmail": "tejyashwarsingh72@gmail.com"
+ },
+ {
+ "email": "Henryleungj@gmail.com",
+ "lowercaseEmail": "henryleungj@gmail.com"
+ },
+ {
+ "email": "Setimalek@gmail.com",
+ "lowercaseEmail": "setimalek@gmail.com"
+ },
+ {
+ "email": "Genaelhemely@aol.com",
+ "lowercaseEmail": "genaelhemely@aol.com"
+ },
+ {
+ "email": "Zhaotongchen03@icloud.com",
+ "lowercaseEmail": "zhaotongchen03@icloud.com"
+ },
+ {
+ "email": "Isoldevyy@gmail.com",
+ "lowercaseEmail": "isoldevyy@gmail.com"
+ },
+ {
+ "email": "Shuklarohan@live.com",
+ "lowercaseEmail": "shuklarohan@live.com"
+ },
+ {
+ "email": "Jakeyeozh@gmail.com",
+ "lowercaseEmail": "jakeyeozh@gmail.com"
+ },
+ {
+ "email": "Lidonna318@gmail.com",
+ "lowercaseEmail": "lidonna318@gmail.com"
+ },
+ {
+ "email": "Tate.carterp@gmail.com",
+ "lowercaseEmail": "tate.carterp@gmail.com"
+ },
+ {
+ "email": "Vitorwak2@gmail.com",
+ "lowercaseEmail": "vitorwak2@gmail.com"
+ },
+ {
+ "email": "Stellawan38@gmail.com",
+ "lowercaseEmail": "stellawan38@gmail.com"
+ },
+ {
+ "email": "Lindyg2000@gmail.com",
+ "lowercaseEmail": "lindyg2000@gmail.com"
+ },
+ {
+ "email": "Nikarasahad@gmail.com",
+ "lowercaseEmail": "nikarasahad@gmail.com"
+ },
+ {
+ "email": "J.xue0816@gmail.com",
+ "lowercaseEmail": "j.xue0816@gmail.com"
+ },
+ {
+ "email": "Phillip_li@hotmail.com",
+ "lowercaseEmail": "phillip_li@hotmail.com"
+ },
+ {
+ "email": "Sallin.koutev@gmail.com",
+ "lowercaseEmail": "sallin.koutev@gmail.com"
+ },
+ {
+ "email": "Shenkobe.111@gmail.com",
+ "lowercaseEmail": "shenkobe.111@gmail.com"
+ },
+ {
+ "email": "Jamesk020711@gmail.com",
+ "lowercaseEmail": "jamesk020711@gmail.com"
+ },
+ {
+ "email": "Kkmin123446@gmail.com",
+ "lowercaseEmail": "kkmin123446@gmail.com"
+ },
+ {
+ "email": "SAMANTHAYEUNG0430@GMAIL.COM",
+ "lowercaseEmail": "samanthayeung0430@gmail.com"
+ },
+ {
+ "email": "Deolaa40@gmail.com",
+ "lowercaseEmail": "deolaa40@gmail.com"
+ },
+ {
+ "email": "Erpingsun@gmail.com",
+ "lowercaseEmail": "erpingsun@gmail.com"
+ },
+ {
+ "email": "Armanmeh0973@gmail.com",
+ "lowercaseEmail": "armanmeh0973@gmail.com"
+ },
+ {
+ "email": "Jonathon.liu@outlook.com",
+ "lowercaseEmail": "jonathon.liu@outlook.com"
+ },
+ {
+ "email": "M.mousaei@outlook.com",
+ "lowercaseEmail": "m.mousaei@outlook.com"
+ },
+ {
+ "email": "Khuranasahaj3@gmail.com",
+ "lowercaseEmail": "khuranasahaj3@gmail.com"
+ },
+ {
+ "email": "Tarun.bhambhani7663@gmail.com",
+ "lowercaseEmail": "tarun.bhambhani7663@gmail.com"
+ },
+ {
+ "email": "Suryanshh111@gmail.com",
+ "lowercaseEmail": "suryanshh111@gmail.com"
+ },
+ {
+ "email": "Romanechose@gmail.com",
+ "lowercaseEmail": "romanechose@gmail.com"
+ },
+ {
+ "email": "Pantea1381@gmail.com",
+ "lowercaseEmail": "pantea1381@gmail.com"
+ },
+ {
+ "email": "Simonzhou3@hotmail.com",
+ "lowercaseEmail": "simonzhou3@hotmail.com"
+ },
+ {
+ "email": "Rahejasarah04@gmail.com",
+ "lowercaseEmail": "rahejasarah04@gmail.com"
+ },
+ {
+ "email": "Alex.leon.limin@gmail.com",
+ "lowercaseEmail": "alex.leon.limin@gmail.com"
+ },
+ {
+ "email": "Nayeshakhurana123@gmail.com",
+ "lowercaseEmail": "nayeshakhurana123@gmail.com"
+ },
+ {
+ "email": "Nathanr8@student.ubc.ca",
+ "lowercaseEmail": "nathanr8@student.ubc.ca"
+ },
+ {
+ "email": "Eeshasm7@gmail.com",
+ "lowercaseEmail": "eeshasm7@gmail.com"
+ },
+ {
+ "email": "Ryandouglascarr@gmail.com",
+ "lowercaseEmail": "ryandouglascarr@gmail.com"
+ },
+ {
+ "email": "Weenawibowo@hotmail.com",
+ "lowercaseEmail": "weenawibowo@hotmail.com"
+ },
+ {
+ "email": "Simrandaya.4@gmail.com",
+ "lowercaseEmail": "simrandaya.4@gmail.com"
+ },
+ {
+ "email": "Lara.kardouh@gmail.com",
+ "lowercaseEmail": "lara.kardouh@gmail.com"
+ },
+ {
+ "email": "Benyapabenjasiriwan@gmail.com",
+ "lowercaseEmail": "benyapabenjasiriwan@gmail.com"
+ },
+ {
+ "email": "Sophia.shanshan.li@icloud.com",
+ "lowercaseEmail": "sophia.shanshan.li@icloud.com"
+ },
+ {
+ "email": "Jessicazwliu@gmail.com",
+ "lowercaseEmail": "jessicazwliu@gmail.com"
+ },
+ {
+ "email": "Rachelwang0432@gmail.com",
+ "lowercaseEmail": "rachelwang0432@gmail.com"
+ },
+ {
+ "email": "Antonia.capricee@gmail.com",
+ "lowercaseEmail": "antonia.capricee@gmail.com"
+ },
+ {
+ "email": "Annette.wong1317@gmail.com",
+ "lowercaseEmail": "annette.wong1317@gmail.com"
+ },
+ {
+ "email": "Omar.ankit2001@gmail.com",
+ "lowercaseEmail": "omar.ankit2001@gmail.com"
+ },
+ {
+ "email": "Janeliu2022@gmail.com",
+ "lowercaseEmail": "janeliu2022@gmail.com"
+ },
+ {
+ "email": "Evanxnawfal@gmail.com",
+ "lowercaseEmail": "evanxnawfal@gmail.com"
+ },
+ {
+ "email": "Rythemshah2004@gmail.com",
+ "lowercaseEmail": "rythemshah2004@gmail.com"
+ },
+ {
+ "email": "Amelijaolson@gmail.com",
+ "lowercaseEmail": "amelijaolson@gmail.com"
+ },
+ {
+ "email": "ANGK0064@e.ntu.edu.sg",
+ "lowercaseEmail": "angk0064@e.ntu.edu.sg"
+ },
+ {
+ "email": "Gilmanalice555@gmail.com",
+ "lowercaseEmail": "gilmanalice555@gmail.com"
+ },
+ {
+ "email": "Jasmxnechen113@gmail.com",
+ "lowercaseEmail": "jasmxnechen113@gmail.com"
+ },
+ {
+ "email": "Patriciaduong10@gmail.com",
+ "lowercaseEmail": "patriciaduong10@gmail.com"
+ },
+ {
+ "email": "DavidCclaremont@gmail.com",
+ "lowercaseEmail": "davidcclaremont@gmail.com"
+ },
+ {
+ "email": "Adamjhardy96@gmail.com",
+ "lowercaseEmail": "adamjhardy96@gmail.com"
+ },
+ {
+ "email": "Barakahmedd@gmail.com",
+ "lowercaseEmail": "barakahmedd@gmail.com"
+ },
+ {
+ "email": "Dantanwork23@gmail.com",
+ "lowercaseEmail": "dantanwork23@gmail.com"
+ },
+ {
+ "email": "Ashleykchan@gmail.com",
+ "lowercaseEmail": "ashleykchan@gmail.com"
+ },
+
+ {
+ "email": "Billyxwn@gmail.com",
+ "lowercaseEmail": "billyxwn@gmail.com"
+ },
+
+ {
+ "email": "Bogosi@gmail.com",
+ "lowercaseEmail": "bogosi@gmail.com"
+ },
+
+ {
+ "email": "Bxa25@sfu.ca",
+ "lowercaseEmail": "bxa25@sfu.ca"
+ },
+
+ {
+ "email": "Erpingsun@gmail.com",
+ "lowercaseEmail": "erpingsun@gmail.com"
+ },
+
+ {
+ "email": "Jaskirat880singh@gmail.com",
+ "lowercaseEmail": "jaskirat880singh@gmail.com"
+ },
+
+ {
+ "email": "Lara.kardouh@gmail.com",
+ "lowercaseEmail": "lara.kardouh@gmail.com"
+ },
+
+ {
+ "email": "Nathanr8@student.ubc.ca",
+ "lowercaseEmail": "nathanr8@student.ubc.ca"
+ },
+
+ {
+ "email": "Nhashemzadeh2003@gmail.com",
+ "lowercaseEmail": "nhashemzadeh2003@gmail.com"
+ },
+
+ {
+ "email": "Omar.ankit2001@gmail.com",
+ "lowercaseEmail": "omar.ankit2001@gmail.com"
+ },
+ {
+ "email": "Romanechose@gmail.com",
+ "lowercaseEmail": "romanechose@gmail.com"
+ },
+ {
+ "email": "Suryanshh111@gmail.com",
+ "lowercaseEmail": "suryanshh111@gmail.com"
+ },
+ {
+ "email": "Deolaa40@gmail.com",
+ "lowercaseEmail": "deolaa40@gmail.com"
+ },
+ {
+ "email": "Ethanchok@hotmail.com",
+ "lowercaseEmail": "ethanchok@hotmail.com"
+ },
+ {
+ "email": "Jacquelinefei00@gmail.com",
+ "lowercaseEmail": "jacquelinefei00@gmail.com"
+ },
+ {
+ "email": "Madison.lee@shaw.ca",
+ "lowercaseEmail": "madison.lee@shaw.ca"
+ },
+ {
+ "email": "Matthew.situ.pluto@gmail.com",
+ "lowercaseEmail": "matthew.situ.pluto@gmail.com"
+ },
+ {
+ "email": "Navneet1552@gmail.com",
+ "lowercaseEmail": "navneet1552@gmail.com"
+ },
+ {
+ "email": "Yasin.gazala@gmail.com",
+ "lowercaseEmail": "yasin.gazala@gmail.com"
+ },
+] : [
+ {
+ "email": "Hashaamzafar2003@Gmail.com",
+ "lowercaseEmail": "hashaamzafar2003@gmail.com"
+ },
+ {
+ "email": "Mingxin.gong2@gmail.com",
+ "lowercaseEmail": "mingxin.gong2@gmail.com"
+ },
+ {
+ "email": "Tejyashwarsingh72@gmail.com",
+ "lowercaseEmail": "tejyashwarsingh72@gmail.com"
+ },
+ {
+ "email": "Setimalek@gmail.com",
+ "lowercaseEmail": "setimalek@gmail.com"
+ },
+ {
+ "email": "Zhaotongchen03@icloud.com",
+ "lowercaseEmail": "zhaotongchen03@icloud.com"
+ },
+ {
+ "email": "Isoldevyy@gmail.com",
+ "lowercaseEmail": "isoldevyy@gmail.com"
+ },
+ {
+ "email": "Lidonna318@gmail.com",
+ "lowercaseEmail": "lidonna318@gmail.com"
+ },
+ {
+ "email": "Lindyg2000@gmail.com",
+ "lowercaseEmail": "lindyg2000@gmail.com"
+ },
+ {
+ "email": "Phillip_li@hotmail.com",
+ "lowercaseEmail": "phillip_li@hotmail.com"
+ },
+ {
+ "email": "Jamesk020711@gmail.com",
+ "lowercaseEmail": "jamesk020711@gmail.com"
+ },
+ {
+ "email": "Erpingsun@gmail.com",
+ "lowercaseEmail": "erpingsun@gmail.com"
+ },
+ {
+ "email": "Jonathon.liu@outlook.com",
+ "lowercaseEmail": "jonathon.liu@outlook.com"
+ },
+ {
+ "email": "Khuranasahaj3@gmail.com",
+ "lowercaseEmail": "khuranasahaj3@gmail.com"
+ },
+ {
+ "email": "Tarun.bhambhani7663@gmail.com",
+ "lowercaseEmail": "tarun.bhambhani7663@gmail.com"
+ },
+ {
+ "email": "EdwardliaNgedli@gmail.com",
+ "lowercaseEmail": "edwardliangedli@gmail.com"
+ },
+ {
+ "email": "Simonzhou3@hotmail.com",
+ "lowercaseEmail": "simonzhou3@hotmail.com"
+ },
+ {
+ "email": "Nathanr8@student.ubc.ca",
+ "lowercaseEmail": "nathanr8@student.ubc.ca"
+ },
+ {
+ "email": "Eeshasm7@gmail.com",
+ "lowercaseEmail": "eeshasm7@gmail.com"
+ },
+ {
+ "email": "Ryandouglascarr@gmail.com",
+ "lowercaseEmail": "ryandouglascarr@gmail.com"
+ },
+ {
+ "email": "Simrandaya.4@gmail.com",
+ "lowercaseEmail": "simrandaya.4@gmail.com"
+ },
+ {
+ "email": "Lara.kardouh@gmail.com",
+ "lowercaseEmail": "lara.kardouh@gmail.com"
+ },
+ {
+ "email": "Benyapabenjasiriwan@gmail.com",
+ "lowercaseEmail": "benyapabenjasiriwan@gmail.com"
+ },
+ {
+ "email": "Rachelwang0432@gmail.com",
+ "lowercaseEmail": "rachelwang0432@gmail.com"
+ },
+ {
+ "email": "Annette.wong1317@gmail.com",
+ "lowercaseEmail": "annette.wong1317@gmail.com"
+ },
+ {
+ "email": "Janeliu2022@gmail.com",
+ "lowercaseEmail": "janeliu2022@gmail.com"
+ },
+ {
+ "email": "Rythemshah2004@gmail.com",
+ "lowercaseEmail": "rythemshah2004@gmail.com"
+ },
+ {
+ "email": "Patriciaduong10@gmail.com",
+ "lowercaseEmail": "patriciaduong10@gmail.com"
+ },
+ {
+ "email": "DavidCclaremont@gmail.com",
+ "lowercaseEmail": "davidcclaremont@gmail.com"
+ },
+ {
+ "email": "Adamjhardy96@gmail.com",
+ "lowercaseEmail": "adamjhardy96@gmail.com"
+ },
+ {
+ "email": "Barakahmedd@gmail.com",
+ "lowercaseEmail": "barakahmedd@gmail.com"
+ },
+ {
+ "email": "Dantanwork23@gmail.com",
+ "lowercaseEmail": "dantanwork23@gmail.com"
+ },
+ {
+ "email": "Ashleykchan@gmail.com",
+ "lowercaseEmail": "ashleykchan@gmail.com"
+ },
+
+ {
+ "email": "Billyxwn@gmail.com",
+ "lowercaseEmail": "billyxwn@gmail.com"
+ },
+
+ {
+ "email": "Bogosi@gmail.com",
+ "lowercaseEmail": "bogosi@gmail.com"
+ },
+
+ {
+ "email": "Bxa25@sfu.ca",
+ "lowercaseEmail": "bxa25@sfu.ca"
+ },
+
+ {
+ "email": "Erpingsun@gmail.com",
+ "lowercaseEmail": "erpingsun@gmail.com"
+ },
+
+ {
+ "email": "Jaskirat880singh@gmail.com",
+ "lowercaseEmail": "jaskirat880singh@gmail.com"
+ },
+
+ {
+ "email": "Lara.kardouh@gmail.com",
+ "lowercaseEmail": "lara.kardouh@gmail.com"
+ },
+
+ {
+ "email": "Nathanr8@student.ubc.ca",
+ "lowercaseEmail": "nathanr8@student.ubc.ca"
+ },
+
+ {
+ "email": "Nhashemzadeh2003@gmail.com",
+ "lowercaseEmail": "nhashemzadeh2003@gmail.com"
+ },
+
+ {
+ "email": "Omar.ankit2001@gmail.com",
+ "lowercaseEmail": "omar.ankit2001@gmail.com"
+ },
+ {
+ "email": "Romanechose@gmail.com",
+ "lowercaseEmail": "romanechose@gmail.com"
+ },
+ {
+ "email": "Suryanshh111@gmail.com",
+ "lowercaseEmail": "suryanshh111@gmail.com"
+ }
+];
+
+export default CAPITALIZED_EMAILS;
+
diff --git a/src/constants/_constants/eventRegisterForm.js b/src/constants/_constants/eventRegisterForm.js
index a057b3ff..7a58bf07 100644
--- a/src/constants/_constants/eventRegisterForm.js
+++ b/src/constants/_constants/eventRegisterForm.js
@@ -36,7 +36,7 @@ export const BASIC_QUESTIONS = [
required: true,
},
{
- questionType: "SELECT",
+ questionType: "CHECKBOX",
question: "Preferred Pronouns",
choices: "He/Him/His,She/Her/Hers,They/Them/Their,Other/Prefer not to say",
required: true,
@@ -53,10 +53,10 @@ export const BASIC_QUESTIONS = [
choices: "Boothing,Facebook,Instagram,LinkedIn,Friends/Word of Mouth,BizTech Newsletter,Other",
required: true,
},
-]
+];
export const QUESTION_DOMAINS = {
SWE: "SWE",
PM: "PM",
UX: "UX"
-}
\ No newline at end of file
+};
diff --git a/src/constants/_constants/eventStatsStatusFields.js b/src/constants/_constants/eventStatsStatusFields.js
new file mode 100644
index 00000000..63157ff1
--- /dev/null
+++ b/src/constants/_constants/eventStatsStatusFields.js
@@ -0,0 +1,63 @@
+import {
+ COLORS
+} from "./theme";
+
+export const APPLICATION_STATUS = {
+ "accepted": {
+ dbValue: "accepted",
+ label: "Accepted",
+ color: COLORS.LIGHT_GREEN,
+ getWindowMessage: (fname, lname) => `Do you want to accept ${fname} ${lname}?\nThis will send an email to the user.`
+ },
+ "rejected": {
+ dbValue: "rejected",
+ label: "Rejected",
+ color: COLORS.LIGHT_RED,
+ getWindowMessage: (fname, lname) => `Do you want to reject ${fname} ${lname}?\nThis will send an email to the user.`
+ },
+ "waitlist": {
+ dbValue: "waitlist",
+ label: "Waitlisted",
+ color: COLORS.LIGHT_YELLOW,
+ getWindowMessage: (fname, lname) => `Do you want to waitlist ${fname} ${lname}?\nThis will send an email to the user.`
+ },
+ "reviewing": {
+ dbValue: "reviewing",
+ label: "Reviewing",
+ color: COLORS.LIGHT_BACKGROUND_COLOR,
+ getWindowMessage: (fname, lname) => `Do you want to set ${fname} ${lname} to be reviewing again?\nThis will send an email to the user.`
+ }
+};
+
+export const REGISTRATION_STATUS = {
+ "registered": {
+ dbValue: "registered",
+ label: "Registered",
+ color: COLORS.LIGHT_BACKGROUND_COLOR,
+ getWindowMessage: (fname, lname) => `Do you want to register ${fname} ${lname}?\nThis will send an email to the user.`
+ },
+ "checkedIn": {
+ dbValue: "checkedIn",
+ label: "Checked In",
+ color: COLORS.LIGHT_GREEN,
+ getWindowMessage: (fname, lname) => `Do you want to check in ${fname} ${lname}?\nThis will NOT send an email to the user.`
+ },
+ "waitlist": {
+ dbValue: "waitlist",
+ label: "Waitlisted",
+ color: COLORS.LIGHT_YELLOW,
+ getWindowMessage: (fname, lname) => `Do you want to waitlist ${fname} ${lname}?\nThis will send an email to the user.`
+ },
+ "cancelled": {
+ dbValue: "cancelled",
+ label: "Cancelled",
+ color: COLORS.LIGHT_RED,
+ getWindowMessage: (fname, lname) => `Did ${fname} ${lname} cancel?\nThis will send an email to the user.`
+ },
+ "incomplete": {
+ dbValue: "incomplete",
+ label: "Incomplete",
+ color: COLORS.LIGHT_BACKGROUND_COLOR,
+ getWindowMessage: (fname, lname) => `This status is only used when the registrant has not paid. Are you sure ${fname} ${lname} has not paid?`
+ }
+};
diff --git a/src/constants/_constants/registration.js b/src/constants/_constants/registration.js
index db9f56ef..733df54c 100644
--- a/src/constants/_constants/registration.js
+++ b/src/constants/_constants/registration.js
@@ -1,20 +1,26 @@
+export const ATTENDEE_TABLE_TYPE = "attendee";
+export const PARTNER_TABLE_TYPE = "partner";
+export const APPLICATION_TABLE_TYPE = "applicationView";
+export const REGISTRATION_STATUS_KEY = "registrationStatus";
+export const APPLICATION_STATUS_KEY = "applicationStatus";
+
export const REGISTRATION_STATUS = {
- REGISTERED: 'registered',
- CHECKED_IN: 'checkedIn',
- WAITLISTED: 'waitlist',
- CANCELLED: 'cancelled',
- INCOMPLETE: 'incomplete'
-}
+ REGISTERED: "registered",
+ CHECKED_IN: "checkedIn",
+ WAITLISTED: "waitlist",
+ CANCELLED: "cancelled",
+ INCOMPLETE: "incomplete"
+};
export const REGISTRATION_LABELS = {
- registered: 'Registered',
- checkedIn: 'Checked In',
- waitlist: 'Waitlisted',
- cancelled: 'Cancelled',
- incomplete: 'Incomplete',
- 1: '1st Year',
- 2: '2nd Year',
- 3: '3rd Year',
- 4: '4th Year',
- 5: '5th+ Year'
-}
-export const EMAIL_REGEX = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+ registered: "Registered",
+ checkedIn: "Checked In",
+ waitlist: "Waitlisted",
+ cancelled: "Cancelled",
+ incomplete: "Incomplete",
+ 1: "1st Year",
+ 2: "2nd Year",
+ 3: "3rd Year",
+ 4: "4th Year",
+ 5: "5th+ Year"
+};
+export const EMAIL_REGEX = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
diff --git a/src/constants/index.js b/src/constants/index.js
index cd187941..e5f6464c 100644
--- a/src/constants/index.js
+++ b/src/constants/index.js
@@ -7,3 +7,5 @@ export * from "./_constants/registration";
export * from "./_constants/theme";
export * from "./_constants/eventRegisterForm";
+
+export * from "./_constants/companion";
diff --git a/src/context/ThemeContext.js b/src/context/ThemeContext.js
index 52a57f50..97b893df 100644
--- a/src/context/ThemeContext.js
+++ b/src/context/ThemeContext.js
@@ -1,9 +1,13 @@
-import React, { createContext, useState } from "react"
+import React, {
+ createContext, useState
+} from "react";
import {
- createMuiTheme,
+ createTheme,
ThemeProvider as MuiThemeProvider
-} from "@material-ui/core/styles"
-import { COLORS } from "constants/index"
+} from "@material-ui/core/styles";
+import {
+ COLORS
+} from "constants/index";
export const fontFamily = [
"Gilroy",
@@ -11,9 +15,9 @@ export const fontFamily = [
"\"Helvetica Neue\"",
"Arial",
"sans-serif"
-].join(",")
+].join(",");
-const darkTheme = createMuiTheme({
+const darkTheme = createTheme({
overrides: {
MuiPickersCalendarHeader: {
iconButton: {
@@ -197,7 +201,7 @@ const darkTheme = createMuiTheme({
"0px 8px 12px rgba(34, 34, 34, 0.12)",
"0px 8px 12px rgba(34, 34, 34, 0.12)"
]
-})
+});
// context allows us to change "darkMode" state from anywhere in the app
// to do this, import and use "ThemeConsumer" like so:
@@ -210,16 +214,16 @@ const darkTheme = createMuiTheme({
const ThemeContext = createContext({
darkMode: true,
setDarkMode: () => {}
-})
+});
// Provider is used to initialize at the root of the app
function ThemeProvider (props) {
- const [darkMode, setDarkMode] = useState(true)
+ const [darkMode, setDarkMode] = useState(true);
const value = {
darkMode,
setDarkMode
- }
+ };
return (
@@ -227,9 +231,11 @@ function ThemeProvider (props) {
- )
+ );
}
-const ThemeConsumer = ThemeContext.Consumer
+const ThemeConsumer = ThemeContext.Consumer;
-export { ThemeProvider, ThemeConsumer }
+export {
+ ThemeProvider, ThemeConsumer
+};
diff --git a/src/index.js b/src/index.js
index 515c4567..ed18e014 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,15 +1,20 @@
import React from "react";
import ReactDOM from "react-dom";
-import Amplify from "aws-amplify";
+import Amplify, {
+ Auth
+} from "aws-amplify";
import App from "./App";
import * as serviceWorker from "./serviceWorker";
import "./index.scss";
import "./overwrites.scss";
-import { AWS_CONFIG } from "./constants";
+import {
+ AWS_CONFIG
+} from "./constants";
Amplify.configure(AWS_CONFIG);
+Auth.configure(AWS_CONFIG);
ReactDOM.render(
-
-
+ )}
+
);
};
diff --git a/src/pages/admin/DynamicForm/FormCreate.js b/src/pages/admin/DynamicForm/FormCreate.js
index 51572672..448d9c93 100644
--- a/src/pages/admin/DynamicForm/FormCreate.js
+++ b/src/pages/admin/DynamicForm/FormCreate.js
@@ -1,20 +1,38 @@
-import React, { useEffect, useState } from "react";
-import { Helmet } from "react-helmet";
-import { makeStyles } from "@material-ui/core/styles";
+import React, {
+ useEffect, useState
+} from "react";
+import {
+ Helmet
+} from "react-helmet";
+import {
+ makeStyles
+} from "@material-ui/core/styles";
import DateFnsUtils from "@date-io/date-fns";
-import { Checkbox, Button, Fab, Grid, TextField, Tooltip } from "@material-ui/core";
-import { Add } from "@material-ui/icons";
+import {
+ Checkbox, Button, Fab, Grid, TextField, Tooltip
+} from "@material-ui/core";
+import {
+ Add
+} from "@material-ui/icons";
import {
KeyboardDateTimePicker,
MuiPickersUtilsProvider
} from "@material-ui/pickers";
-import { useParams, useHistory, Link } from "react-router-dom";
+import {
+ useParams, useHistory, Link
+} from "react-router-dom";
import CustomQuestion from "./components/CustomQuestion";
import FormCreatePreview from "./FormCreatePreview";
-import { FieldArray, Formik } from "formik";
+import {
+ FieldArray, Formik
+} from "formik";
import * as Yup from "yup";
-import { fetchBackend, log } from "utils";
-import { fetchEvents } from "store/event/eventActions";
+import {
+ fetchBackend, log
+} from "utils";
+import {
+ fetchEvents
+} from "store/event/eventActions";
// Styling Material UI Components
@@ -130,12 +148,18 @@ const styles = {
},
previewButton: {
marginBottom: 24,
+ },
+ applicationBasedCheckbox: {
+ padding: "1rem",
+ color: "white",
}
};
const FormCreateForm = (props) => {
const classes = useStyles();
- const { id: eventId, year: eventYear } = useParams();
+ const {
+ id: eventId, year: eventYear
+ } = useParams();
const [viewUserForm, setViewUserForm] = useState(true);
const {
@@ -153,6 +177,7 @@ const FormCreateForm = (props) => {
price,
nonMembersPrice,
nonMembersAllowed,
+ isApplicationBased,
feedback,
registrationQuestions,
partnerRegistrationQuestions,
@@ -166,8 +191,10 @@ const FormCreateForm = (props) => {
setFieldTouched,
submitCount,
handlePublish,
+ handleComplete,
isSaved,
- isPublished
+ isPublished,
+ isCompleted
} = props;
const defaultQuestion = {
@@ -198,7 +225,9 @@ const FormCreateForm = (props) => {
const CustomQuestions = (
- {({ push, swap, remove }) => {
+ {({
+ push, swap, remove
+ }) => {
return (
<>
{registrationQuestions.map((question, index) => {
@@ -209,6 +238,7 @@ const FormCreateForm = (props) => {
key={index}
index={index}
length={registrationQuestions.length}
+ formType={"ATTENDEE"}
data={question}
fnMove={swap}
fnDelete={remove}
@@ -218,7 +248,10 @@ const FormCreateForm = (props) => {
{/* Add question */}
push({ ...defaultQuestion })}
+ onClick={() => push({
+
+ ...defaultQuestion
+ })}
className={classes.fab}
color="primary"
aria-label="add"
@@ -234,7 +267,9 @@ const FormCreateForm = (props) => {
const partnerCustomQuestions = (
- {({ push, swap, remove }) => {
+ {({
+ push, swap, remove
+ }) => {
return (
<>
{partnerRegistrationQuestions.map((question, index) => {
@@ -245,6 +280,7 @@ const FormCreateForm = (props) => {
key={index}
index={index}
length={partnerRegistrationQuestions.length}
+ formType={"PARTNER"}
data={question}
fnMove={swap}
fnDelete={remove}
@@ -254,7 +290,9 @@ const FormCreateForm = (props) => {
{/* Add question */}
push({ ...defaultQuestion })}
+ onClick={() => push({
+ ...defaultQuestion
+ })}
className={classes.fab}
color="primary"
aria-label="add"
@@ -299,16 +337,16 @@ const FormCreateForm = (props) => {
description={description}
questionsData={registrationQuestions}
/>
- ) :
- (
-
@@ -322,10 +360,20 @@ const FormCreateForm = (props) => {
{/* Editor Pane */}
@@ -73,8 +81,8 @@ export default function CustomSelect (props) {
MenuProps={{
getContentAnchorEl: null,
anchorOrigin: {
- vertical: 'bottom',
- horizontal: 'left'
+ vertical: "bottom",
+ horizontal: "left"
}
}}
inputProps={{
@@ -84,9 +92,9 @@ export default function CustomSelect (props) {
}}
fullWidth
onClick={(e) => {
- handleSelectChange(e, groupName)
+ handleSelectChange(e, groupName);
}}
- defaultValue={initialValues ? initialValues[groupName] : ''}
+ defaultValue={initialValues ? initialValues[groupName] : ""}
>
{listOfOptions.map((option) => (
- )
+ );
}
diff --git a/src/components/inputs/CustomTextField.js b/src/components/inputs/CustomTextField.js
index 43af228b..fa73fe8a 100644
--- a/src/components/inputs/CustomTextField.js
+++ b/src/components/inputs/CustomTextField.js
@@ -1,66 +1,74 @@
-import React from 'react'
-import { COLORS } from '../../constants/_constants/theme'
+import React from "react";
+import {
+ COLORS
+} from "../../constants/_constants/theme";
-import { Typography, TextField } from '@material-ui/core'
-import { makeStyles } from '@material-ui/core/styles'
-import { useTheme } from '@material-ui/styles'
-import useMediaQuery from '@material-ui/core/useMediaQuery'
+import {
+ Typography, TextField
+} from "@material-ui/core";
+import {
+ makeStyles
+} from "@material-ui/core/styles";
+import {
+ useTheme
+} from "@material-ui/styles";
+import useMediaQuery from "@material-ui/core/useMediaQuery";
const useStyles = makeStyles(() => ({
textField: {
- '& label.Mui-focused': {
+ "& label.Mui-focused": {
color: COLORS.TEXTFIELD
},
- '& .MuiOutlinedInput-root': {
+ "& .MuiOutlinedInput-root": {
backgroundColor: COLORS.TEXTFIELD,
- borderRadius: '4px',
- '& fieldset': {
+ borderRadius: "4px",
+ "& fieldset": {
borderColor: COLORS.TEXTFIELD
},
- '&:hover fieldset': {
+ "&:hover fieldset": {
borderColor: COLORS.TEXTFIELD
},
- '&.Mui-focused fieldset': {
+ "&.Mui-focused fieldset": {
borderColor: COLORS.TEXTFIELD
}
},
- '& .MuiOutlinedInput-multiline': {
- padding: '5px",'
+ "& .MuiOutlinedInput-multiline": {
+ padding: "5px\","
}
},
mobileTextField: {
- borderRadius: '4px',
- '& .MuiInputBase-root': {
+ borderRadius: "4px",
+ "& .MuiInputBase-root": {
backgroundColor: COLORS.TEXTFIELD
},
- '& .MuiFilledInput-multiline': {
- padding: '35px 0'
+ "& .MuiFilledInput-multiline": {
+ padding: "35px 0"
}
},
input: {
- '&:-webkit-autofill': {
+ "&:-webkit-autofill": {
WebkitBoxShadow: `0 0 0 1000px ${COLORS.TEXTFIELD} inset`,
WebkitTextFillColor: COLORS.WHITE,
caretColor: COLORS.WHITE,
backgroundColor: COLORS.CARD_PAPER_COLOR,
- borderRadius: '0px'
+ borderRadius: "0px"
}
},
mobileInput: {
- '&:-webkit-autofill': {
+ "&:-webkit-autofill": {
WebkitBoxShadow: `0 0 0 1000px ${COLORS.TEXTFIELD} inset`,
WebkitTextFillColor: COLORS.WHITE,
caretColor: COLORS.WHITE,
backgroundColor: `${COLORS.TEXTFIELD} !important`,
- borderRadius: '0px'
+ borderRadius: "0px"
}
}
-}))
+}));
export default function CustomTextField (props) {
- const classes = useStyles()
- const theme = useTheme()
- const renderMobileOnly = useMediaQuery(theme.breakpoints.down('sm'))
+ const classes = useStyles();
+ const theme = useTheme();
+ const renderMobileOnly = useMediaQuery(theme.breakpoints.down("sm"));
const {
errors,
@@ -75,13 +83,13 @@ export default function CustomTextField (props) {
type,
initialValues,
readOnly
- } = props
+ } = props;
const change = (name, e) => {
- e.persist()
- handleChange(e)
- setFieldTouched(name, true, false)
- }
+ e.persist();
+ handleChange(e);
+ setFieldTouched(name, true, false);
+ };
function createTextField (renderMobileOnly) {
return (
@@ -91,36 +99,36 @@ export default function CustomTextField (props) {
renderMobileOnly ? classes.mobileTextField : classes.textField
}
autoComplete={autoComplete}
- helperText={touched[groupName] ? errors[groupName] : ''}
+ helperText={touched[groupName] ? errors[groupName] : ""}
error={touched[groupName] && Boolean(errors[groupName])}
id={groupName}
onChange={change.bind(null, groupName)}
fullWidth
- variant={'outlined'}
+ variant={"outlined"}
size='small'
multiline={multiline}
InputLabelProps={{
shrink: true
}}
InputProps={{
- classes: classes,
+ classes,
inputProps: {
classes: renderMobileOnly ? classes.mobileInput : classes.input
},
- readOnly: readOnly
+ readOnly
}}
rows={rows}
- defaultValue={initialValues ? initialValues[groupName] : ''}
- type={type || ''}
+ defaultValue={initialValues ? initialValues[groupName] : ""}
+ type={type || ""}
padding='7px'
/>
- )
+ );
}
-
+
return (
{props.children}
-
+
Companion QRs
@@ -164,7 +222,10 @@ const Companion = () => {
Create New QR
-
+
{
margin="normal"
variant="filled"
onChange={(e) => {
- setErrors({...errors, id: false})
- setNewQR({...newQR, id: e.target.value})}
- }
+ setErrors({
+ ...errors,
+ id: false
+ });
+ setNewQR({
+ ...newQR,
+ id: e.target.value
+ });
+ }}
value={newQR.id}
error={errors.id}
helperText={errors.id && "Missing value is required"}
@@ -190,9 +257,15 @@ const Companion = () => {
margin="normal"
variant="filled"
onChange={(e) => {
- setErrors({...errors, eventID: false})
- setNewQR({...newQR, eventID: e.target.value})}
- }
+ setErrors({
+ ...errors,
+ eventID: false
+ });
+ setNewQR({
+ ...newQR,
+ eventID: e.target.value
+ });
+ }}
value={newQR.eventID}
error={errors.eventID}
helperText={errors.eventID && "Missing value is required"}
@@ -207,14 +280,23 @@ const Companion = () => {
margin="normal"
variant="filled"
onChange={(e) => {
- setErrors({...errors, year: false})
- setNewQR({...newQR, year: e.target.value})}
- }
+ setErrors({
+ ...errors,
+ year: false
+ });
+ setNewQR({
+ ...newQR,
+ year: e.target.value
+ });
+ }}
value={newQR.year}
error={errors.year}
helperText={errors.year && "Missing value is required"}
/>
-
+
{
margin="normal"
variant="filled"
onChange={(e) => {
- setErrors({...errors, points: false})
- setNewQR({...newQR, points: e.target.value})}
- }
+ setErrors({
+ ...errors,
+ points: false
+ });
+ setNewQR({
+ ...newQR,
+ points: e.target.value
+ });
+ }}
value={newQR.points}
error={errors.points}
helperText={errors.points && "Missing value is required"}
/>
+
+
+ Type
+
+ {errors.type && (
+ Type is required
+ )}
+
+
+ {newQR.type === "Partner" && (
+ <>
+
+ {
+ setErrors({
+ ...errors,
+ id: false
+ });
+ setNewQR({
+ ...newQR,
+ partnerID: e.target.value
+ });
+ }}
+ value={newQR?.partnerID}
+ error={errors.partnerID}
+ helperText={
+ errors.partnerID && "Missing value is required"
+ }
+ />
+
+
+ {
+ setErrors({
+ ...errors,
+ id: false
+ });
+ setNewQR({
+ ...newQR,
+ linkedin: e.target.value
+ });
+ }}
+ value={newQR?.linkedin}
+ error={errors.linkedin}
+ helperText={
+ errors.linkedin && "Missing value is required"
+ }
+ />
+
+
+ )}
+ {newQR.type === "Workshop" && (
+
+ {
+ setErrors({
+ ...errors,
+ id: false
+ });
+ setNewQR({
+ ...newQR,
+ workshopID: e.target.value
+ });
+ }}
+ value={newQR.workshopID}
+ error={errors.workshopID}
+ helperText={
+ errors.workshopID && "Missing value is required"
+ }
+ />
+
+ )}
@@ -242,7 +446,12 @@ const Companion = () => {
color="primary"
aria-label="Unlimited Scans?"
checked={newQR.isUnlimitedScans}
- onChange={() => setNewQR({...newQR, isUnlimitedScans: !newQR.isUnlimitedScans})}
+ onChange={() =>
+ setNewQR({
+ ...newQR,
+ isUnlimitedScans: !newQR.isUnlimitedScans
+ })
+ }
/>
- {QRs.map((QR) =>
+
@@ -272,18 +495,51 @@ const Companion = () => {
Event: {QR["eventID;year"]}
Points: {QR.points}
{QR.isActive ? "Active" : "Inactive"}
- {QR.isUnlimitedScans ? "Unlimited Scans" : "One-time Scan"}
+
+ {QR.isUnlimitedScans
+ ? "Unlimited Scans"
+ : "One-time Scan"}
+
+ Type: {QR.type}
+ {QR.type === "Partner" && (
+ <>
+
+ Partner LinkedIn: {QR.data ? QR.data.linkedin : ""}{" "}
+
+
+ Partner Email: {QR.data ? QR.data.partnerID : ""}
+
+
+ )}
+ {QR.type === "Workshop" && (
+
+ Workshop Name: {QR.data ? QR.data.workshopID : ""}
+
+ )}
- 
+ 
-
+
+ ))}
+
-
+
{type === "partner" ? (
@@ -147,18 +163,32 @@ const EventRegisterSuccess = ({
You've successfully registered to the event. Our directors will review the information and coordinate with you further.
+ {/* We've sent you an email with a confirmation and a QR code to check-in to our event!
Please be sure to check your Spam or Promotions inboxes as well. */}
+
+ Thank you for your registration and support in BizTech's events! We'll be in touch with you soon.
+
- ) : (
+ ) : type === "application" ?
- See you soon!
+ We've got your application!
- You've successfully registered to the event.
+ Thanks for applying! We'll be reviewing your application soon and will email you soon about your application status!
+
Click here to view your application statusWe've sent you two emails, one with a calendar invite and one with a QR code to check-in to our event! Please be sure to check your Spam or Promotions inboxes as well.
+ : (
+
{type !== "partner" && (
Please be sure to check your Spam or Promotions inboxes as well.
Click here to view your application status
+
+ See you soon!
+
+
+ You've successfully registered to the event.
+
+ We've sent you two emails, one with a calendar invite and one with a QR code to check-in to our event!
Please be sure to check your Spam or Promotions inboxes as well.
+
+ )}
Please be sure to check your Spam or Promotions inboxes as well.
@@ -191,65 +221,65 @@ const EventRegisterSuccess = ({
)}
- 
- 
-
- {type !== "partner" && upcomingEvents.length > 0 && (
-
-
- Upcoming Events:
-
+
+
- )}
-
+
+
+
+ {type !== "partner" && upcomingEvents.length > 0 && (
+
+
+ Upcoming Events:
+
- {upcomingEvents.map((event) => {
- const eventStart =
- event.startDate &&
- new Date(event.startDate).toLocaleDateString("en-US", {
- day: "numeric",
- month: "long",
- year: "numeric"
- });
- const eventEnd =
- event.endDate &&
- new Date(event.endDate).toLocaleDateString("en-US", {
- day: "numeric",
- month: "long",
- year: "numeric"
- });
+ {upcomingEvents.map((event) => {
+ const eventStart =
+ event.startDate &&
+ new Date(event.startDate).toLocaleDateString("en-US", {
+ day: "numeric",
+ month: "long",
+ year: "numeric"
+ });
+ const eventEnd =
+ event.endDate &&
+ new Date(event.endDate).toLocaleDateString("en-US", {
+ day: "numeric",
+ month: "long",
+ year: "numeric"
+ });
- return (
-
);
})}
+ redirectEvent(event.id, event.year)}
+ >
+ {event.ename}
+
+
- redirectEvent(event.id, event.year)}
- >
- {event.ename}
-
-
- {eventStart}
- {eventEnd && eventEnd !== eventStart ? ` - ${eventEnd}` : ""}
-
-
+ {eventStart}
+ {eventEnd && eventEnd !== eventStart ? ` - ${eventEnd}` : ""}
+
+
{/* Editor Head */}
-
+
{eventName || "New Event"}
-
-
+
+
{isSaved &&
(isPublished ? (
))
}
+ {isSaved && (isCompleted ? (
+
+ ) : (
+
+ )
+ )}
-
- {isSaved ?
+
@@ -432,14 +520,18 @@ const FormCreateForm = (props) => {
value={slug}
error={showError("slug")}
helperText={showError("slug") && errors.slug}
+ disabled={isSaved} // Don't allow changes if slug has been saved
/>
{slug && (
-
@@ -644,6 +736,9 @@ const FormCreateForm = (props) => {
- TEXT
- SELECT
- CHECKBOX
+ - UPLOAD
+ - WORKSHOP SELECTION
+ - Skills question
Below is the data struct for registrationQuestions
@@ -671,14 +766,14 @@ const dummyData = [
questionImageUrl: "",
},
{
- type: "SELECT",
- label: "How interested are you in this event?",
- choices: "1,2,3,4,5",
+ type: "UPLOAD",
+ label: "Upload a profile picture",
required: true,
questionImageUrl: "",
}
];
+
const partnerDummyData = [
{
type: "CHECKBOX",
@@ -686,12 +781,25 @@ const partnerDummyData = [
choices: "Keynote Speaker,Workshop Lead,Boothing,Networking Delegate",
required: true,
questionImageUrl: "",
+ },
+ {
+ type: "SKILLS",
+ label: "What skills are you familiar with?",
+ choices: "",
+ required: true,
+ charLimit: 200,
+ questionImageUrl: "",
+ isSkillsQuestion: true
}
-]
+];
const FormCreate = (props) => {
- const { events } = props;
- const { id: eventId, year: eventYear } = useParams();
+ const {
+ events
+ } = props;
+ const {
+ id: eventId, year: eventYear
+ } = useParams();
const history = useHistory();
const [event, setEvent] = useState(null);
@@ -709,47 +817,50 @@ const FormCreate = (props) => {
const initialValues = event
? {
- imageUrl: event.imageUrl || "",
- eventName: event.ename || "",
- slug: event.id || "",
- description: event.description || "",
- partnerDescription: event.partnerDescription || "",
- capacity: event.capac || "",
- start: event.startDate ? new Date(event.startDate) : new Date(),
- end: event.endDate ? new Date(event.endDate) : new Date(),
- location: event.elocation || "",
- deadline: event.deadline ? new Date(event.deadline) : new Date(),
- price: event.pricing?.members || 0,
- nonMembersAllowed: event.pricing?.nonMembers !== undefined,
- nonMembersPrice: event.pricing?.nonMembers || 0,
- registrationQuestions: event.registrationQuestions || dummyData,
- feedback: event.feedback || "",
- partnerRegistrationQuestions: event.partnerRegistrationQuestions || partnerDummyData,
- }
+ imageUrl: event.imageUrl || "",
+ eventName: event.ename || "",
+ slug: event.id || "",
+ description: event.description || "",
+ partnerDescription: event.partnerDescription || "",
+ capacity: event.capac || "",
+ start: event.startDate ? new Date(event.startDate) : new Date(),
+ end: event.endDate ? new Date(event.endDate) : new Date(),
+ location: event.elocation || "",
+ deadline: event.deadline ? new Date(event.deadline) : new Date(),
+ price: event.pricing?.members || 0,
+ nonMembersAllowed: event.pricing?.nonMembers !== undefined,
+ nonMembersPrice: event.pricing?.nonMembers || 0,
+ registrationQuestions: event.registrationQuestions || dummyData,
+ feedback: event.feedback || "",
+ partnerRegistrationQuestions: event.partnerRegistrationQuestions || partnerDummyData,
+ isApplicationBased: event?.isApplicationBased
+ }
: {
- imageUrl: "",
- eventName: "",
- slug: "",
- description: "",
- partnerDescription: "",
- capacity: "",
- start: new Date(),
- end: new Date(),
- location: "",
- deadline: new Date(),
- price: 0,
- nonMembersAllowed: false,
- nonMembersPrice: 0,
- registrationQuestions: dummyData,
- feedback: "",
- partnerRegistrationQuestions: partnerDummyData,
- };
+ imageUrl: "",
+ eventName: "",
+ slug: "",
+ description: "",
+ partnerDescription: "",
+ capacity: "",
+ start: new Date(),
+ end: new Date(),
+ location: "",
+ deadline: new Date(),
+ price: 0,
+ nonMembersAllowed: false,
+ nonMembersPrice: 0,
+ registrationQuestions: dummyData,
+ feedback: "",
+ partnerRegistrationQuestions: partnerDummyData,
+ isApplicationBased: false
+ };
const regQuestionSchema = Yup.object({
- type: Yup.mixed().oneOf(["TEXT", "SELECT", "CHECKBOX", "UPLOAD"]).required(),
+ type: Yup.mixed().oneOf(["TEXT", "SELECT", "CHECKBOX", "UPLOAD", "WORKSHOP SELECTION", "SKILLS"]).required(),
label: Yup.string().required("Question is a required field"),
choices: Yup.string(),
- required: Yup.boolean().required()
+ required: Yup.boolean().required(),
+ isSkillsQuestion: Yup.boolean()
});
const validationSchema = Yup.object({
@@ -763,22 +874,28 @@ const FormCreate = (props) => {
capacity: Yup.number("Valid number required")
.min(0, "Valid capacity required")
.required(),
- start: Yup.date().required(),
+ start: Yup.date().test("is-same-year", "Start date's year must be the same as eventYear", function (value) {
+ if (!eventYear || !value) {
+ return true; // Skip the test if eventYear or start date is not provided
+ }
+ const startYear = value.getFullYear();
+ return startYear === parseInt(eventYear);
+ }).required(),
end: Yup.date()
.min(Yup.ref("start"), "End must be later than Start")
.required(),
location: Yup.string().required(),
deadline: Yup.date()
- .max(Yup.ref("end"), "Deadline cannot be later than End")
- .required(),
+ .max(Yup.ref("end"), "Deadline cannot be later than End")
+ .required(),
price: Yup.number("Valid number required")
.min(0, "Valid pricing required"),
- nonMembersPrice: Yup.number("Valid number required").when("nonMembersAllowed", {
- is: true,
- then: Yup.number().min(Yup.ref("price"), "Non-members price must be greater or equal to members price")
- }),
+ nonMembersAllowed: Yup.bool(),
+ nonMembersPrice: Yup.number("Valid number required")
+ .min(0, "Valid pricing required"),
registrationQuestions: Yup.array().of(regQuestionSchema),
- partnerRegistrationQuestions: Yup.array().of(regQuestionSchema)
+ partnerRegistrationQuestions: Yup.array().of(regQuestionSchema),
+ isApplicationBase: Yup.bool(),
});
async function submitValues(values) {
@@ -796,8 +913,10 @@ const FormCreate = (props) => {
const pricing = {
members: Number(values.price) || 0,
- ...(values.nonMembersAllowed) && {nonMembers: values.nonMembersPrice ? Number(values.nonMembersPrice) : Number(values.price) || 0}
- }
+ ...(values.nonMembersAllowed) && {
+ nonMembers: values.nonMembersPrice ? Number(values.nonMembersPrice) : Number(values.price) || 0
+ }
+ };
const body = {
ename: values.eventName,
@@ -812,7 +931,8 @@ const FormCreate = (props) => {
pricing,
registrationQuestions: values.registrationQuestions,
feedback: values.feedback,
- partnerRegistrationQuestions: values.partnerRegistrationQuestions
+ partnerRegistrationQuestions: values.partnerRegistrationQuestions,
+ isApplicationBased: values.isApplicationBased
};
fetchBackend(`/events/${eventId}/${parseInt(eventYear)}`, "PATCH", body)
@@ -835,8 +955,10 @@ const FormCreate = (props) => {
const pricing = {
members: Number(values.price) || 0,
- ...(values.nonMembersAllowed) && {nonMembers: values.nonMembersPrice ? Number(values.nonMembersPrice) : Number(values.price) || 0}
- }
+ ...(values.nonMembersAllowed) && {
+ nonMembers: values.nonMembersPrice ? Number(values.nonMembersPrice) : Number(values.price) || 0
+ }
+ };
const body = {
id,
@@ -852,9 +974,11 @@ const FormCreate = (props) => {
deadline: values.deadline,
pricing,
isPublished: false,
+ isCompleted: false,
registrationQuestions: values.registrationQuestions,
feedback: values.feedback,
- partnerRegistrationQuestions: values.partnerRegistrationQuestions
+ partnerRegistrationQuestions: values.partnerRegistrationQuestions,
+ isApplicationBased: values.isApplicationBased
};
fetchBackend("/events", "POST", body)
@@ -872,10 +996,13 @@ const FormCreate = (props) => {
}
const isPublished = (event && event.isPublished) || false;
+ const isCompleted = (event && event.isCompleted) || false;
const isSaved = !!(eventId && eventYear);
async function handlePublish(publish = false) {
- const body = { isPublished: publish };
+ const body = {
+ isPublished: publish
+ };
fetchBackend(`/events/${eventId}/${parseInt(eventYear)}`, "PATCH", body)
.then((response) => {
@@ -891,10 +1018,30 @@ const FormCreate = (props) => {
});
}
+ async function handleComplete(complete = false) {
+ const body = {
+ isCompleted: complete
+ };
+
+ fetchBackend(`/events/${eventId}/${parseInt(eventYear)}`, "PATCH", body)
+ .then((response) => {
+ alert(response.message);
+ fetchEvents();
+ history.replace(`/admin/event/${eventId}/${eventYear}/edit`);
+ window.location.reload();
+ })
+ .catch((err) => {
+ console.log(err);
+ alert(err.message + " Please contact a dev");
+ });
+ }
+
const formProps = {
handlePublish,
+ handleComplete,
isSaved,
- isPublished
+ isPublished,
+ isCompleted
};
return (
diff --git a/src/pages/admin/DynamicForm/FormCreatePreview.js b/src/pages/admin/DynamicForm/FormCreatePreview.js
index 912ae460..f910e3fa 100644
--- a/src/pages/admin/DynamicForm/FormCreatePreview.js
+++ b/src/pages/admin/DynamicForm/FormCreatePreview.js
@@ -1,5 +1,7 @@
import React from "react";
-import { Container, Paper } from "@material-ui/core";
+import {
+ Container, Paper
+} from "@material-ui/core";
import ImagePlaceholder from "../../../assets/placeholder.jpg";
import QuestionPreview from "./components/QuestionPreview";
@@ -96,7 +98,9 @@ const formStyles = {
};
const FormCreatePreview = (props) => {
- const { imageUrl, type, eventName, description, questionsData } = props;
+ const {
+ imageUrl, type, eventName, description, questionsData
+ } = props;
const basicQuestions = {
"attendee": [
@@ -137,7 +141,7 @@ const FormCreatePreview = (props) => {
required: true,
},
{
- type: "SELECT",
+ type: "CHECKBOX",
label: "Preferred Pronouns",
choices: "He/Him/His,She/Her/Hers,They/Them/Their,Other/Prefer not to say",
required: true,
@@ -155,7 +159,7 @@ const FormCreatePreview = (props) => {
required: true,
},
],
- "partner": [
+ "partner": [
{
type: "TEXT",
label: "Email Address",
@@ -175,10 +179,10 @@ const FormCreatePreview = (props) => {
required: true
},
{
- type: "TEXT",
- label: "Pronouns",
- choices: "",
- required: true
+ type: "CHECKBOX",
+ label: "Preferred Pronouns",
+ choices: "He/Him/His,She/Her/Hers,They/Them/Their,Other/Prefer not to say",
+ required: true,
},
{
type: "TEXT",
@@ -193,9 +197,9 @@ const FormCreatePreview = (props) => {
required: true,
},
]
- }
+ };
- const allQuestions = basicQuestions[type].concat(questionsData)
+ const allQuestions = basicQuestions[type].concat(questionsData);
const displayQuestions = allQuestions.map((question, index) => {
return (
@@ -223,9 +227,16 @@ const FormCreatePreview = (props) => {
/>
{(eventName || description) && (
-
+ {isSaved ?
Event Link
: <>
}
- {isSaved ?
+ {isSaved ?
Partner Event Link
@@ -381,6 +453,22 @@ const FormCreateForm = (props) => {
+ {!eventId &&
+
+ Is this an application based event (ie. will you accept/reject applicants)?
+
+ }
+
Event Cover Photo
+
)}
@@ -527,7 +619,7 @@ const FormCreateForm = (props) => {
helperText={showError("location") && errors.location}
/>
-
+
{
-
+
{
helperText={showError("partnerDescription") && errors.partnerDescription}
/>
{"https://ubcbiztech.com/event/" + slug + "/" + start.getFullYear() + "/register"}
- {"https://ubcbiztech.com/event/" + slug + "/" + start.getFullYear() + "/register/partner"}
+ {"https://ubcbiztech.com/event/" + slug + "/" + start.getFullYear() + "/register/partner"}
Partner Form Custom Questions
- {/* custom questions for partner*/} - {partnerCustomQuestions} + {/* custom questions for partner */} + {partnerCustomQuestions}
-
+ Warning: {currEvent.ename || "this event"} only has {remaining} spot
+ {remaining > 1 ? "s" : ""} left!
+
+ );
+ } else if (remaining <= 0 && !user) {
+ setRegAlert(
+
+ Warning: {currEvent.ename || "this event"} is full!
+
+ );
+ } else {
+ setRegAlert(null);
+ }
+ if (
+ !(
+ user?.isMember ||
+ user?.admin ||
+ currEvent.pricing?.nonMembers === undefined ||
+ samePricing()
+ )
+ ) {
+ setisNonMemberModalOpen(true);
+ }
+ }
+ }, [currEvent]); // eslint-disable-line react-hooks/exhaustive-deps
+
const updateField = useCallback(
(index, value) => {
const responses = responseData;
@@ -310,8 +398,10 @@ const FormRegister = (props) => {
// todo; check if response already exists (shouldn't happen, but to be safe)
if (checked) {
- // add
- responses[index].push(value);
+ if (value) {
+ // add
+ responses[index].push(value);
+ }
} else {
// remove
const newArr = responses[index].filter((choice) => choice !== value);
@@ -320,7 +410,9 @@ const FormRegister = (props) => {
} else {
// no items in yet
const initialArr = [];
- initialArr.push(value);
+ if (value) {
+ initialArr.push(value);
+ }
responses[index] = initialArr;
}
setResponseData(responses);
@@ -339,12 +431,21 @@ const FormRegister = (props) => {
// .. once finished..
const rawLog = reader.result.split(",")[1]; // extract only the file data part
const dataSend = {
- dataReq: { data: rawLog, name: file.name, type: file.type },
- fname: "uploadFilesToGoogleDrive"
+ dataReq: {
+ data: rawLog,
+ name: file.name,
+ type: file.type,
+ folderId: currEvent.id
+
+ },
+ fname: "uploadFilesToGoogleDrive",
}; // preapre info to send to API
fetch(
- "https://script.google.com/macros/s/AKfycbyX8joJ5WeyqZxrUh-iS-Cay17N3ygO-YMuoNVaBN5o4jl6Cy0k9X0JcxRrwiWy1OEoiQ/exec", // your AppsScript URL
- { method: "POST", body: JSON.stringify(dataSend) }
+ "https://script.google.com/macros/s/AKfycbzLif9Uypau-R54Ob-g3bs9jqWujIzfXFvZEMKx7k5m3KfZZNlPUwj-dIdKh7dMaxTotA/exec", // your AppsScript URL
+ {
+ method: "POST",
+ body: JSON.stringify(dataSend)
+ }
) // send to Api
.then((res) => res.json())
.then((e) => {
@@ -352,15 +453,17 @@ const FormRegister = (props) => {
})
.catch((e) =>
alert(
- "An error occurred while trying to upload the file. Please try again."
+ e
+ // "An error occurred while trying to upload the file. Please try again."
)
);
};
},
- [updateField]
+ [updateField, currEvent.ename]
);
const loadQuestions = () => {
+ let workshopQuestionCount = 0;
const returnArr = [];
for (let i = 0; i < formData.questions.length; i++) {
const {
@@ -372,10 +475,16 @@ const FormRegister = (props) => {
charLimit
} = formData.questions[i];
const choicesArr = choices ? choices.split(",") : [];
- if (questionType === "CHECKBOX") {
+ if (questionType === "CHECKBOX" || questionType === "SKILLS") {
returnArr.push(
-
{eventName}{type === "partner" ? " Partner Confirmation Form" : ""}
-{description.split("
").join("\n")}
+
)}
{eventName}{type === "partner" ? " Partner Confirmation Form" : ""}
+{description.split("
").join("\n")}
{displayQuestions}
diff --git a/src/pages/admin/DynamicForm/FormRegister.js b/src/pages/admin/DynamicForm/FormRegister.js
index ea92b90b..94ad83fb 100644
--- a/src/pages/admin/DynamicForm/FormRegister.js
+++ b/src/pages/admin/DynamicForm/FormRegister.js
@@ -16,15 +16,34 @@ import {
Modal
} from "@material-ui/core";
import CardMembershipIcon from "@material-ui/icons/CardMembership";
-import { Alert } from "@material-ui/lab";
+import {
+ Redirect
+} from "react-router-dom/cjs/react-router-dom.min";
+import {
+ Alert
+} from "@material-ui/lab";
import CloudUpload from "@material-ui/icons/CloudUpload";
-import React, { useEffect, useState, useCallback, Fragment } from "react";
-import { connect } from "react-redux";
-import { useParams, useHistory } from "react-router-dom";
-import { Helmet } from "react-helmet";
-import { fetchBackend } from "utils";
-import { ArrowBack as ArrowBackIcon } from "@material-ui/icons";
-import { COLORS } from "../../../constants/_constants/theme";
+import React, {
+ useEffect, useState, useCallback, Fragment
+} from "react";
+import {
+ connect
+} from "react-redux";
+import {
+ useParams, useHistory
+} from "react-router-dom";
+import {
+ Helmet
+} from "react-helmet";
+import {
+ fetchBackend
+} from "utils";
+import {
+ ArrowBack as ArrowBackIcon
+} from "@material-ui/icons";
+import {
+ COLORS
+} from "../../../constants/_constants/theme";
import ImagePlaceholder from "../../../assets/placeholder.jpg";
import LoginAccess from "components/LoginAccess/LoginAccess";
import Loading from "pages/Loading";
@@ -34,6 +53,13 @@ import {
BASIC_QUESTIONS,
QUESTION_DOMAINS
} from "constants/index";
+import OtherCheckbox from "./components/OtherCheckbox";
+import {
+ APPLICATION_STATUS
+} from "constants/_constants/eventStatsStatusFields";
+import {
+ EMAIL_REGEX
+} from "constants/_constants/registration";
const styles = {
// Container for custom form image
@@ -61,6 +87,10 @@ const styles = {
},
submitSection: {
padding: "2rem"
+ },
+ disabled: {
+ pointerEvents: "none",
+ color: "grey",
}
};
@@ -145,7 +175,9 @@ const useStyles = makeStyles((theme) => ({
}));
const FormRegister = (props) => {
- const { user, event, userRegisteredEvents } = props;
+ const {
+ user, event, userRegisteredEvents
+ } = props;
const history = useHistory();
const [currEvent, setCurrEvent] = useState(event);
const [registeredEvents, setRegisteredEvents] = useState(
@@ -155,6 +187,8 @@ const FormRegister = (props) => {
const [questionDomain, setQuestionDomain] = useState("");
const [isNonMemberModalOpen, setisNonMemberModalOpen] = useState(false);
const [isSubmitting, setIsSubmitting] = useState(false);
+ const [workshopChoicesArr, setWorkshopChoicesArr] = useState([]);
+ // const [workshopCounts, setWorkShopCounts] = useState([]);
const parsedRegistrationQuestions = currEvent.registrationQuestions?.map(
({
@@ -169,11 +203,11 @@ const FormRegister = (props) => {
}) => ({
questionType: type,
question: label,
- choices: choices,
- required: required,
- questionId: questionId,
- questionImageUrl: questionImageUrl,
- charLimit: charLimit,
+ choices,
+ required,
+ questionId,
+ questionImageUrl,
+ charLimit,
questionDomain: domain
})
);
@@ -201,7 +235,9 @@ const FormRegister = (props) => {
const [refresh, setRefresh] = useState(false);
- const { id: eventId, year: eventYear } = useParams();
+ const {
+ id: eventId, year: eventYear
+ } = useParams();
const [responseData, setResponseData] = useState(
Array.from(Array(formData.questions.length))
@@ -210,6 +246,10 @@ const FormRegister = (props) => {
Array.from(Array(formData.questions.length))
); // index of errors correspond to responses array (right above)
+ // data from "Other" checkboxes
+ const [otherData] = useState({
+ });
+
useEffect(() => {
const fetchEvent = async () => {
if (!registeredEvents && user) {
@@ -237,10 +277,23 @@ const FormRegister = (props) => {
);
eventData.counts = regData;
setCurrEvent(eventData);
+ // Populate the dynamicCounts array with data
+ eventData.counts.dynamicCounts.forEach((dynamicCount) => {
+ dynamicCount.counts.forEach((workshop) => {
+ if (workshop.count >= workshop.cap) {
+ workshop.isDisabled = true;
+ } else {
+ workshop.isDisabled = false;
+ }
+ });
+
+ // Push the modified dynamicCount into the dynamicCounts array
+ setWorkshopChoicesArr(eventData.counts.dynamicCounts);
+ });
}
};
fetchEvent();
- }, []); // eslint-disable-line react-hooks/exhaustive-deps
+ }, [user, eventId, eventYear, registeredEvents, currEvent]);
useEffect(() => {
if (user) {
@@ -291,6 +344,41 @@ const FormRegister = (props) => {
}
}, [currEvent]); // eslint-disable-line react-hooks/exhaustive-deps
+ // disable workshops which are full from selection and mark them as such
+ useEffect(() => {
+ if (currEvent) {
+ const remaining =
+ currEvent.capac -
+ (currEvent.counts.registeredCount + currEvent.counts.checkedInCount);
+ if (remaining > 0 && remaining <= 20) {
+ setRegAlert(
+
-
+
+
{choicesArr.map((item) => {
+ if (item === "...") {
+ return updateCheckbox(i, e.target.checked, null)} otherData={otherData} index={i} />;
+ }
return (
{
);
} else if (questionType === "SELECT") {
returnArr.push(
-
{question} {question && required && "*"}
@@ -391,6 +500,9 @@ const FormRegister = (props) => {
-
+
+
{question} {question && required && "*"}
@@ -463,8 +581,14 @@ const FormRegister = (props) => { ); } else if (questionType === "TEXT") { returnArr.push( -
-
+
+
{question} {question && required && "*"}
@@ -531,8 +655,14 @@ const FormRegister = (props) => { ); } else if (questionType === "UPLOAD") { returnArr.push( -
-
);
@@ -1062,7 +1330,9 @@ const FormRegister = (props) => {
+
+
);
+ } else if (questionType === "WORKSHOP SELECTION") {
+ returnArr.push(
+ {question} {question && required && "*"}
@@ -555,7 +685,10 @@ const FormRegister = (props) => { href={responseData[i]} target="_blank" rel="noopener noreferrer" - style={{ width: "100%", wordWrap: "break-word" }} + style={{ + width: "100%", + wordWrap: "break-word" + }} > {responseData[i]} @@ -567,14 +700,19 @@ const FormRegister = (props) => { variant="contained" color="primary" component="label" - style={{ width: "150px" }} + style={{ + width: "150px" + }} > {responseData[i] ? "Reupload" : "Upload"} -
+
+
+ {!!responseError[i] && (
+ {responseError[i]}
+ )}
+
+
+ );
+ workshopQuestionCount += 1;
}
}
return returnArr;
@@ -605,7 +791,7 @@ const FormRegister = (props) => {
if (question.questionType === "CHECKBOX") {
// check if empty
if (question.required) {
- if (!responseData[i] || responseData[i].length <= 0) {
+ if (!otherData[i] && (!responseData[i] || responseData[i].length <= 0)) {
newErrors[i] = "A selection is required";
valid = false;
}
@@ -619,7 +805,11 @@ const FormRegister = (props) => {
valid = false;
}
}
- // other checks can go here...
+ // check if email is valid
+ if (!EMAIL_REGEX.test(responseData[0])) {
+ newErrors[0] = "This email address is invalid";
+ valid = false;
+ }
}
}
@@ -641,9 +831,10 @@ const FormRegister = (props) => {
const handlePaymentSubmit = () => {
setIsSubmitting(true);
if (isValidSubmission()) {
- const dynamicResponses = {};
+ const dynamicResponses = {
+ };
for (let i = BASIC_QUESTIONS.length; i < formData.questions.length; i++) {
- if (formData.questions[i].questionType === "CHECKBOX") {
+ if (formData.questions[i].questionType === "CHECKBOX" || formData.questions[i].questionType === "WORKSHOP SELECTION") {
dynamicResponses[formData.questions[i].questionId] = responseData[
i
]?.join(", ");
@@ -670,7 +861,8 @@ const FormRegister = (props) => {
diet: responseData[7],
heardFrom: responseData[8]
},
- dynamicResponses
+ dynamicResponses,
+ applicationStatus: currEvent.isApplicationBased ? APPLICATION_STATUS.reviewing.dbValue : ""
};
fetchBackend("/registrations", "POST", registrationBody, false)
.then((response) => {
@@ -679,8 +871,7 @@ const FormRegister = (props) => {
window.open(response.url, "_self");
} else {
const paymentBody = {
- paymentName: `${currEvent.ename} ${
- user?.isMember || samePricing() ? "" : "(Non-member)"
+ paymentName: `${currEvent.ename} ${user?.isMember || samePricing() ? "" : "(Non-member)"
}`,
paymentImages: [formData.image_url],
paymentPrice:
@@ -688,15 +879,13 @@ const FormRegister = (props) => {
? currEvent.pricing?.members
: currEvent.pricing.nonMembers) * 100,
paymentType: "Event",
- success_url: `${
- process.env.REACT_APP_STAGE === "local"
- ? "http://localhost:3000/"
- : CLIENT_URL
+ success_url: `${process.env.REACT_APP_STAGE === "local"
+ ? "http://localhost:3000/"
+ : CLIENT_URL
}event/${currEvent.id}/${currEvent.year}/register/success`,
- cancel_url: `${
- process.env.REACT_APP_STAGE === "local"
- ? "http://localhost:3000/"
- : CLIENT_URL
+ cancel_url: `${process.env.REACT_APP_STAGE === "local"
+ ? "http://localhost:3000/"
+ : CLIENT_URL
}event/${currEvent.id}/${currEvent.year}/register`,
email: responseData[0],
fname: responseData[1],
@@ -706,7 +895,11 @@ const FormRegister = (props) => {
fetchBackend("/payments", "POST", paymentBody, false)
.then(async (response) => {
setIsSubmitting(false);
- window.open(response, "_self");
+ if (currEvent.isApplicationBased) {
+ history.push(`/event/${currEvent.id}/${currEvent.year}/register/success/application`);
+ } else {
+ window.open(response, "_self");
+ }
})
.catch((err) => {
alert(
@@ -727,15 +920,24 @@ const FormRegister = (props) => {
console.error("Form errors");
}
};
+
const handleSubmit = () => {
setIsSubmitting(true);
if (isValidSubmission()) {
- const dynamicResponses = {};
+ const dynamicResponses = {
+ };
for (let i = BASIC_QUESTIONS.length; i < formData.questions.length; i++) {
if (formData.questions[i].questionType === "CHECKBOX") {
+ if (otherData[i]) {
+ dynamicResponses[formData.questions[i].questionId] = responseData[
+ i
+ ].push(otherData[i]);
+ }
dynamicResponses[formData.questions[i].questionId] = responseData[
i
]?.join(", ");
+ } else if (formData.questions[i].questionType === "WORKSHOP SELECTION") {
+ dynamicResponses[formData.questions[i].questionId] = responseData[i];
} else {
dynamicResponses[formData.questions[i].questionId] = responseData[i];
}
@@ -746,7 +948,7 @@ const FormRegister = (props) => {
studentId: user?.id,
eventID: currEvent.id,
year: currEvent.year,
- registrationStatus: "registered",
+ registrationStatus: currEvent.id === "ux-open" ? "waitlist" : "registered",
isPartner: false,
points: 0,
basicInformation: {
@@ -759,17 +961,18 @@ const FormRegister = (props) => {
diet: responseData[7],
heardFrom: responseData[8]
},
- dynamicResponses
+ dynamicResponses,
+ applicationStatus: currEvent.isApplicationBased ? APPLICATION_STATUS.reviewing.dbValue : ""
};
fetchBackend("/registrations", "POST", registrationBody, false)
.then(() => {
history.push(
- `/event/${currEvent.id}/${currEvent.year}/register/success/attendee`
+ `/event/${currEvent.id}/${currEvent.year}/register/success/${currEvent.isApplicationBased ? "application" : "attendee"}`
);
})
.catch((err) => {
alert(
- `An error has occured: ${err} Please contact an exec for support.`
+ `An error has occured: ${err} Please contact an exec for support. 4`
);
setIsSubmitting(false);
});
@@ -804,50 +1007,65 @@ const FormRegister = (props) => {
const changeRegStatus = (newStatus) => {
switch (newStatus) {
- case REGISTRATION_STATUS.REGISTERED:
- if (
- window.confirm(
- `Do you want to re-register for ${
- event.ename || "this event"
- }?\nYou will be sent an email confirming your registration.`
- )
- ) {
- updateUserRegistrationStatus(
- user?.email,
- user?.fname,
- REGISTRATION_STATUS.REGISTERED
- );
- }
- break;
- case REGISTRATION_STATUS.CANCELLED:
- if (
- window.confirm(
- `Are you sure you would cancel your spot at ${
- event.ename || "this event"
- }?\nYou will be sent an email regarding your cancellation.`
- )
- ) {
- updateUserRegistrationStatus(
- user?.email,
- user?.fname,
- REGISTRATION_STATUS.CANCELLED
- );
- }
- break;
- default:
- return {};
+ case REGISTRATION_STATUS.REGISTERED:
+ if (
+ window.confirm(
+ `Do you want to re-register for ${event.ename || "this event"
+ }?\nYou will be sent an email confirming your registration.`
+ )
+ ) {
+ updateUserRegistrationStatus(
+ user?.email,
+ user?.fname,
+ REGISTRATION_STATUS.REGISTERED
+ );
+ }
+ break;
+ case REGISTRATION_STATUS.CANCELLED:
+ if (
+ window.confirm(
+ `Are you sure you would cancel your spot at ${event.ename || "this event"
+ }?\nYou will be sent an email regarding your cancellation.`
+ )
+ ) {
+ updateUserRegistrationStatus(
+ user?.email,
+ user?.fname,
+ REGISTRATION_STATUS.CANCELLED
+ );
+ }
+ break;
+ default:
+ return {
+ };
}
};
const isEventFull = () => {
return (
currEvent.capac -
- (currEvent.counts?.registeredCount +
- currEvent.counts?.checkedInCount) <=
+ (currEvent.counts?.registeredCount +
+ currEvent.counts?.checkedInCount) <=
0
);
};
+ const isSpecialBypassEmail = (email) => {
+ const bypassEmails = [
+ process.env.REACT_APP_BYPASS_EMAIL_1,
+ process.env.REACT_APP_BYPASS_EMAIL_2,
+ process.env.REACT_APP_BYPASS_EMAIL_3,
+ process.env.REACT_APP_BYPASS_EMAIL_4,
+ process.env.REACT_APP_BYPASS_EMAIL_5,
+ process.env.REACT_APP_BYPASS_EMAIL_6,
+ process.env.REACT_APP_BYPASS_EMAIL_7,
+ process.env.REACT_APP_BYPASS_EMAIL_8,
+ process.env.REACT_APP_BYPASS_EMAIL_9,
+ process.env.REACT_APP_BYPASS_EMAIL_10
+ ].filter(Boolean);
+ return bypassEmails.includes(email?.toLowerCase());
+ };
+
const isDeadlinePassed = () => {
const deadline = new Date(event.deadline).getTime();
return deadline < new Date().getTime();
@@ -876,18 +1094,21 @@ const FormRegister = (props) => {
const renderRegMessage = (status) => {
switch (status) {
- case REGISTRATION_STATUS.CANCELLED:
- return `You have cancelled your registration for ${
- currEvent.ename || "this event"
- }.`;
- case REGISTRATION_STATUS.WAITLISTED:
- return `You are currently waitlisted for ${
- currEvent.ename || "this event"
- }.`;
- case REGISTRATION_STATUS.INCOMPLETE:
- return `You have not completed your payment yet!`;
- default:
- return `Already registered for ${currEvent.ename || "this event"}!`;
+ case REGISTRATION_STATUS.CANCELLED:
+ return `You have cancelled your registration for ${currEvent.ename || "this event"
+ }.`;
+ case REGISTRATION_STATUS.WAITLISTED:
+ return `You are currently waitlisted for ${currEvent.ename || "this event"
+ }.`;
+ case REGISTRATION_STATUS.INCOMPLETE:
+ if (currEvent?.isApplicationBased) {
+ return `You have submitted your application for ${currEvent.ename || "this event"
+ }. You can check your application status for updates below!`;
+ } else {
+ return "You have not completed your payment yet!";
+ }
+ default:
+ return `Already registered for ${currEvent.ename || "this event"}!`;
}
};
@@ -919,14 +1140,61 @@ const FormRegister = (props) => {
)}
{reg.registrationStatus === REGISTRATION_STATUS.INCOMPLETE && (
-
- )}
+ currEvent?.isApplicationBased ? (
+
+ ) : (
+
+ ))}
+ {question} + {question && required && "*"} +
+ {questionImageUrl && ( +
+ 
+
+ )}
+
-
+
Registration open now until{" "}
{formData.deadline.toLocaleString(navigator.language, {
year: "numeric",
@@ -1076,35 +1346,51 @@ const FormRegister = (props) => {
{
alt="Event"
/>
- {loadQuestions()}
- {!user?.admin &&
- ((user?.isMember && currEvent.pricing?.members > 0) ||
- (!user?.isMember && currEvent.pricing?.nonMembers)) ? (
-
- ) : (
-
+ )}
+
);
};
+ if (user && (currEvent?.pricing?.nonMembers === undefined && !user?.isMember && !user?.admin)) {
+ return
-
{formData.name}
-+
+
diff --git a/src/pages/admin/DynamicForm/FormRegisterPartner.js b/src/pages/admin/DynamicForm/FormRegisterPartner.js
index 9d9b58bd..668b607b 100644
--- a/src/pages/admin/DynamicForm/FormRegisterPartner.js
+++ b/src/pages/admin/DynamicForm/FormRegisterPartner.js
@@ -13,16 +13,34 @@ import {
TextField,
Typography,
} from "@material-ui/core";
-import CloudUpload from '@material-ui/icons/CloudUpload';
-import React, { useEffect, useState, useCallback, Fragment } from "react";
-import { connect } from 'react-redux';
-import { useParams, useHistory } from "react-router-dom";
-import { Helmet } from "react-helmet";
-import { fetchBackend } from "utils";
-import { ArrowBack as ArrowBackIcon } from "@material-ui/icons";
-import { COLORS } from "../../../constants/_constants/theme";
+import CloudUpload from "@material-ui/icons/CloudUpload";
+import React, {
+ useEffect, useState, useCallback, Fragment
+} from "react";
+import {
+ connect
+} from "react-redux";
+import {
+ useParams, useHistory
+} from "react-router-dom";
+import {
+ Helmet
+} from "react-helmet";
+import {
+ fetchBackend
+} from "utils";
+import {
+ ArrowBack as ArrowBackIcon
+} from "@material-ui/icons";
+import {
+ COLORS
+} from "../../../constants/_constants/theme";
import ImagePlaceholder from "../../../assets/placeholder.jpg";
import Loading from "pages/Loading";
+import OtherCheckbox from "./components/OtherCheckbox";
+import {
+ QRCodeTypes
+} from "constants/index";
const styles = {
// Container for custom form image
@@ -102,8 +120,8 @@ const useStyles = makeStyles((theme) => ({
backgroundColor: "#E38424",
color: "white",
maxWidth: 552,
- marginLeft: 'auto',
- marginRight: 'auto',
+ marginLeft: "auto",
+ marginRight: "auto",
},
registerButton: {
textTransform: "none",
@@ -121,10 +139,12 @@ const useStyles = makeStyles((theme) => ({
}));
const FormRegisterPartner = (props) => {
- const { event } = props;
+ const {
+ event
+ } = props;
const history = useHistory();
const [currEvent, setCurrEvent] = useState(event);
- const [isSubmitting, setIsSubmitting] = useState(false)
+ const [isSubmitting, setIsSubmitting] = useState(false);
const basicQuestions = [
{
questionType: "TEXT",
@@ -145,10 +165,10 @@ const FormRegisterPartner = (props) => {
required: true
},
{
- questionType: "TEXT",
- question: "Pronouns",
- choices: "",
- required: true
+ questionType: "SELECT",
+ question: "Preferred Pronouns",
+ choices: "He/Him/His,She/Her/Hers,They/Them/Their,Other/Prefer not to say",
+ required: true,
},
{
questionType: "TEXT",
@@ -162,17 +182,19 @@ const FormRegisterPartner = (props) => {
choices: "",
required: true,
},
- ]
+ ];
- const parsedRegistrationQuestions = currEvent.partnerRegistrationQuestions?.map(({type,label,choices,required,questionId,questionImageUrl,charLimit}) => ({
- questionType: type,
- question: label,
- choices: choices,
- required: required,
- questionId: questionId,
- questionImageUrl: questionImageUrl,
- charLimit: charLimit,
- }))
+ const parsedRegistrationQuestions = currEvent.partnerRegistrationQuestions?.map(({
+ type,label,choices,required,questionId,questionImageUrl,charLimit
+ }) => ({
+ questionType: type,
+ question: label,
+ choices,
+ required,
+ questionId,
+ questionImageUrl,
+ charLimit,
+ }));
const formData = {
image_url: currEvent.imageUrl || "",
@@ -185,20 +207,24 @@ const FormRegisterPartner = (props) => {
location: currEvent.elocation || "",
deadline: currEvent.deadline ? new Date(currEvent.deadline) : new Date(),
questions: basicQuestions.concat(parsedRegistrationQuestions || [])
- }
+ };
const classes = useStyles();
const [refresh, setRefresh] = useState(false);
- const { id: eventId, year: eventYear } = useParams();
-
+ const {
+ id: eventId, year: eventYear
+ } = useParams();
+
const [responseData, setResponseData] = useState(
Array.from(Array(formData.questions.length))
); // index of answers correspond to questions array index
const [responseError, setResponseError] = useState(
Array.from(Array(formData.questions.length))
); // index of errors correspond to responses array (right above)
+ const [otherData] = useState({
+ });
useEffect(() => {
const fetchEvent = async () => {
@@ -206,9 +232,9 @@ const FormRegisterPartner = (props) => {
const eventData = await fetchBackend(`/events/${eventId}/${eventYear}`, "GET", undefined, false);
setCurrEvent(eventData);
}
- }
- fetchEvent()
- }, []) // eslint-disable-line react-hooks/exhaustive-deps
+ };
+ fetchEvent();
+ }, []); // eslint-disable-line react-hooks/exhaustive-deps
const updateField = useCallback(
(index, value) => {
@@ -229,8 +255,10 @@ const FormRegisterPartner = (props) => {
// todo; check if response already exists (shouldn't happen, but to be safe)
if (checked) {
- // add
- responses[index].push(value);
+ if (value) {
+ // add
+ responses[index].push(value);
+ }
} else {
// remove
const newArr = responses[index].filter((choice) => choice !== value);
@@ -239,7 +267,9 @@ const FormRegisterPartner = (props) => {
} else {
// no items in yet
const initialArr = [];
- initialArr.push(value);
+ if (value) {
+ initialArr.push(value);
+ }
responses[index] = initialArr;
}
setResponseData(responses);
@@ -250,34 +280,52 @@ const FormRegisterPartner = (props) => {
const uploadFile = useCallback (
(i, e) => {
- if (e.target.files.length === 0) return
- const file = e.target.files[0] // the file
- const reader = new FileReader() // this for convert to Base64
- reader.readAsDataURL(e.target.files[0]) // start conversion...
+ if (e.target.files.length === 0) return;
+ const file = e.target.files[0]; // the file
+ const reader = new FileReader(); // this for convert to Base64
+ reader.readAsDataURL(e.target.files[0]); // start conversion...
reader.onload = function (e) { // .. once finished..
- const rawLog = reader.result.split(',')[1]; // extract only the file data part
- const dataSend = { dataReq: { data: rawLog, name: file.name, type: file.type }, fname: "uploadFilesToGoogleDrive" }; // preapre info to send to API
- fetch('https://script.google.com/macros/s/AKfycbyX8joJ5WeyqZxrUh-iS-Cay17N3ygO-YMuoNVaBN5o4jl6Cy0k9X0JcxRrwiWy1OEoiQ/exec', // your AppsScript URL
- { method: "POST", body: JSON.stringify(dataSend) }) // send to Api
+ const rawLog = reader.result.split(",")[1]; // extract only the file data part
+ const dataSend = {
+ dataReq: {
+ data: rawLog,
+ name: file.name,
+ type: file.type
+ },
+ fname: "uploadFilesToGoogleDrive"
+ }; // preapre info to send to API
+ fetch("https://script.google.com/macros/s/AKfycbyX8joJ5WeyqZxrUh-iS-Cay17N3ygO-YMuoNVaBN5o4jl6Cy0k9X0JcxRrwiWy1OEoiQ/exec", // your AppsScript URL
+ {
+ method: "POST",
+ body: JSON.stringify(dataSend)
+ }) // send to Api
.then(res => res.json()).then((e) => {
- updateField(i, e.url)
- }).catch(e => alert('An error occurred while trying to upload the file. Please try again.'))
- }
+ updateField(i, e.url);
+ }).catch(e => alert("An error occurred while trying to upload the file. Please try again."));
+ };
},
[updateField]
- )
+ );
const loadQuestions = () => {
const returnArr = [];
for (let i = 0; i < formData.questions.length; i++) {
- const { question, questionType, required, choices, questionImageUrl, charLimit } = formData.questions[
+ const {
+ question, questionType, required, choices, questionImageUrl, charLimit
+ } = formData.questions[
i
];
const choicesArr = choices ? choices.split(",") : [];
- if (questionType === "CHECKBOX") {
+ if (questionType === "CHECKBOX" || questionType === "SKILLS") {
returnArr.push(
- {formData.name}
+
{formData.description.split("
").join("\n")}
-
+
+
{choicesArr.map((item) => {
+ if (item === "...") {
+ return updateCheckbox(i, e.target.checked, null)} otherData={otherData} index={i}/>;
+ }
return (
{
);
} else if (questionType === "SELECT") {
returnArr.push(
-
{question} {question && required && "*"}
@@ -293,6 +341,9 @@ const FormRegisterPartner = (props) => {
-
-
- )
- }
+ );
+ };
return (
<>
@@ -632,9 +747,16 @@ const FormRegisterPartner = (props) => {
alt="Event"
/>
- +
+
- The registration deadline for {currEvent.ename || 'this event'} has already passed on {formData.deadline.toLocaleString(navigator.language, {
- year: 'numeric',
- month: '2-digit',
- day: '2-digit',
- hour: '2-digit',
- minute:'2-digit'
- })}.
+ The registration deadline for {currEvent.ename || "this event"} has already passed on {formData.deadline.toLocaleString(navigator.language, {
+ year: "numeric",
+ month: "2-digit",
+ day: "2-digit",
+ hour: "2-digit",
+ minute:"2-digit"
+ })}.
- )
+ );
}
return (
{question} {question && required && "*"}
@@ -345,8 +402,8 @@ const FormRegisterPartner = (props) => { labelId="q-type" variant="outlined" margin="dense" - defaultValue={responseData[i] || ''} - value={responseData[i] || ''} + defaultValue={responseData[i] || ""} + value={responseData[i] || ""} onChange={(e) => updateField(i, e.target.value)} > {choicesArr.map((item) => { @@ -365,8 +422,14 @@ const FormRegisterPartner = (props) => { ); } else if (questionType === "TEXT") { returnArr.push( -
- {
fullWidth
multiline
inputProps={{
- maxLength: charLimit
+ maxLength: charLimit
}}
margin="dense"
variant="outlined"
@@ -411,13 +474,19 @@ const FormRegisterPartner = (props) => {
);
} else if (questionType === "UPLOAD") {
- returnArr.push(
- +
+
)}
- {question === 'Email Address' ? (
+ {question === "Email Address" ? (
<>
{question} {question && required && "*"}
@@ -379,7 +442,7 @@ const FormRegisterPartner = (props) => { />
- {responseError[i]}
+ )}
+
+
+ );
}
}
- return returnArr
- }
+ return returnArr;
+ };
const validifyForm = () => {
// currently only checks "required" field of question object in questions array
@@ -473,10 +550,10 @@ const FormRegisterPartner = (props) => {
for (let i = 0; i < formData.questions.length; i++) {
// indices should correspond between formData.questions, responseData, and responseError arrays
const question = formData.questions[i];
- if (question.questionType === "CHECKBOX") {
+ if (question.questionType === "CHECKBOX" || question.questionType === "SKILLS") {
// check if empty
if (question.required) {
- if (!responseData[i] || responseData[i].length <= 0) {
+ if (!otherData[i] && (!responseData[i] || responseData[i].length <= 0)) {
newErrors[i] = "A selection is required";
valid = false;
}
@@ -505,15 +582,44 @@ const FormRegisterPartner = (props) => {
return res;
};
+ const createPartnerQR = (registrationBody) => {
+ const id = `${registrationBody.eventID};${registrationBody.year};${registrationBody.email}`;
+ const data = {
+ "partnerID": registrationBody.email,
+ };
+
+ return {
+ id,
+ eventID: registrationBody.eventID,
+ year: registrationBody.year,
+ type: QRCodeTypes.PARTNER,
+ data: data
+ };
+ };
+
const handleSubmit = () => {
- setIsSubmitting(true)
+ setIsSubmitting(true);
if (isValidSubmission()) {
- const dynamicResponses = {}
+ const dynamicResponses = {
+ };
for (let i = basicQuestions.length; i < formData.questions.length; i++) {
if (formData.questions[i].questionType === "CHECKBOX") {
- dynamicResponses[formData.questions[i].questionId] = responseData[i]?.join(', ')
+ if (otherData[i]) {
+ dynamicResponses[formData.questions[i].questionId] = responseData[
+ i
+ ].push(otherData[i]);
+ }
+ dynamicResponses[formData.questions[i].questionId] = responseData[
+ i
+ ]?.join(", ");
+ } else if (formData.questions[i].questionType === "SKILLS") {
+ if (otherData[i]) {
+ dynamicResponses[formData.questions[i].questionId] = responseData[
+ i
+ ].concat(otherData[i].split(",").map(d => d.trim()));
+ }
} else {
- dynamicResponses[formData.questions[i].questionId] = responseData[i]
+ dynamicResponses[formData.questions[i].questionId] = responseData[i];
}
}
const registrationBody = {
@@ -531,34 +637,41 @@ const FormRegisterPartner = (props) => {
role: responseData[5],
},
dynamicResponses,
- }
- fetchBackend('/registrations', 'POST', registrationBody, false)
+ };
+ fetchBackend("/registrations", "POST", registrationBody, false)
.then(() => {
- history.push(`/event/${currEvent.id}/${currEvent.year}/register/success/partner`)
+ history.push(`/event/${currEvent.id}/${currEvent.year}/register/success/partner`);
})
.catch((err) => {
alert(
`An error has occured: ${err} Please contact an exec for support.`
- )
- setIsSubmitting(false)
- })
+ );
+ setIsSubmitting(false);
+ });
+
+ const partnerQR = createPartnerQR(registrationBody);
+
+ fetchBackend("/qr", "POST", partnerQR, false)
+ .catch((err) => {
+ console.log("QR code could not be created for the partner: ", err);
+ });
} else {
- setIsSubmitting(false)
+ setIsSubmitting(false);
console.error("Form errors");
}
};
const isDeadlinePassed = () => {
- const deadline = new Date(event.deadline).getTime()
- return deadline < new Date().getTime()
- }
+ const deadline = new Date(event.deadline).getTime();
+ return deadline < new Date().getTime();
+ };
if (!currEvent) {
return (
- {question} - {question && required && "*"} -
- {questionImageUrl && ( + returnArr.push( +
+
![]()
{
/>
)}
-
-
- {responseData[i] ? (
-
- {responseData[i]}
-
- ) : (
- "No file uploaded yet!"
- )}
-
-
- {!!responseError[i] && (
- {responseError[i]}
+
+
+ {responseData[i] ? (
+
+ {responseData[i]}
+
+ ) : (
+ "No file uploaded yet!"
)}
-
-
- )
+
+
+ {!!responseError[i] && (
+ + {question} + {question && required && "*"} +
+ {questionImageUrl && (
-
+
+
+
Registration open now until {formData.deadline.toLocaleString(navigator.language, {
- year: 'numeric',
- month: '2-digit',
- day: '2-digit',
- hour: '2-digit',
- minute:'2-digit'
+ year: "numeric",
+ month: "2-digit",
+ day: "2-digit",
+ hour: "2-digit",
+ minute:"2-digit"
})}
-
-
+ {loadQuestions()}
-
-
{formData.name}
-{formData.description.split("
").join("\n")}
+
{renderFormQuestions()}
@@ -646,7 +768,7 @@ const FormRegisterPartner = (props) => {
const mapStateToProps = (state) => {
return {
userRegisteredEvents: state.userState.userRegisteredEvents.data,
- }
-}
+ };
+};
export default connect(mapStateToProps)(FormRegisterPartner);
diff --git a/src/pages/admin/DynamicForm/components/CustomQuestion.js b/src/pages/admin/DynamicForm/components/CustomQuestion.js
index f46ddefd..b129189b 100644
--- a/src/pages/admin/DynamicForm/components/CustomQuestion.js
+++ b/src/pages/admin/DynamicForm/components/CustomQuestion.js
@@ -1,8 +1,18 @@
-import React from "react";
-import { makeStyles } from "@material-ui/core/styles";
-import { Checkbox, MenuItem, Select, TextField, Tooltip } from "@material-ui/core";
-import { Delete, KeyboardArrowDown, KeyboardArrowUp } from "@material-ui/icons";
-import { useFormikContext } from "formik";
+import React, {
+ useEffect
+} from "react";
+import {
+ makeStyles
+} from "@material-ui/core/styles";
+import {
+ Checkbox, MenuItem, Select, TextField, Tooltip
+} from "@material-ui/core";
+import {
+ Delete, KeyboardArrowDown, KeyboardArrowUp
+} from "@material-ui/icons";
+import {
+ useFormikContext
+} from "formik";
// Styling Material UI Components
const useStyles = makeStyles((theme) => ({
@@ -41,12 +51,18 @@ const CustomQuestion = (props) => {
handleBlur,
errors,
touched,
- submitCount
+ submitCount,
+ setFieldValue,
+ values
} = useFormikContext();
- const { id, name, index, length } = props;
+ const {
+ id, name, index, length, formType
+ } = props;
- const { type, label, choices, questionImageUrl, charLimit, required } = props.data;
+ const {
+ type, label, choices, questionImageUrl, charLimit, required, participantCap
+ } = props.data;
const questionStyles = {
// -------- QUESTION COMPONENT STYLES ----------
card: {
@@ -88,11 +104,16 @@ const CustomQuestion = (props) => {
flexDirection: "column",
justifyContent: "center"
},
- requiredContainer: {
+ checkboxContainer: {
display: "flex",
justifyContent: "flex-end",
alignItems: "center",
color: "rgba(255,255,255,0.8)"
+ },
+ checkboxWrapper: {
+ display: "flex",
+ flexDirection: "row",
+ justifyContent: "flex-end"
}
};
@@ -108,6 +129,17 @@ const CustomQuestion = (props) => {
);
};
+ // handle new fields for changing custom questions per type
+ useEffect(() => {
+ values.partnerRegistrationQuestions.forEach((question, index) => {
+ const type = question.type;
+ switch (type) {
+ case "SKILLS":
+ setFieldValue(`partnerRegistrationQuestions[${index}].isSkillsQuestion`, true);
+ };
+ });
+ }, [values.partnerRegistrationQuestions]);
+
return (
{formData.name}
+{formData.description.split("
").join("\n")}
@@ -119,13 +151,17 @@ const CustomQuestion = (props) => {
variant="outlined"
margin="dense"
value={type}
- onChange={handleChange}
+ onChange={(e) => handleChange(e)}
onBlur={handleBlur}
>
+
+ { formType === "PARTNER" &&
+
+ }
diff --git a/src/pages/admin/DynamicForm/components/OtherCheckbox.js b/src/pages/admin/DynamicForm/components/OtherCheckbox.js
new file mode 100644
index 00000000..875334be
--- /dev/null
+++ b/src/pages/admin/DynamicForm/components/OtherCheckbox.js
@@ -0,0 +1,78 @@
+import React, {
+ useEffect,
+ useState
+} from "react";
+import Checkbox from "@material-ui/core/Checkbox";
+import FormControlLabel from "@material-ui/core/FormControlLabel";
+import TextField from "@material-ui/core/TextField";
+import {
+ makeStyles
+} from "@material-ui/core/styles";
+
+const OtherCheckbox = ({
+ onChange, otherData, index
+}) => {
+ const useStyles = makeStyles((theme) => ({
+ otherContainer: {
+ display: "flex",
+ alignItems: "center",
+ },
+ otherCheckbox: {
+ marginRight: 0
+ }
+ }));
+ const classes = useStyles();
+ const [checked, setChecked] = useState(false);
+ const [otherValue, setOtherValue] = useState("");
+
+ useEffect(() => {
+ if (checked && otherValue) {
+ otherData[index] = otherValue;
+ } else if (!checked && otherValue) {
+ delete otherData[index];
+ setOtherValue("");
+ }
+ }, [otherValue, checked]);
+
+ const handleCheckboxChange = (event) => {
+ setChecked(event.target.checked);
+ onChange(event);
+ };
+
+ const handleInputChange = (event) => {
+ setOtherValue(event.target.value);
+ };
+
+ return (
+ <>
+
@@ -209,37 +245,87 @@ const CustomQuestion = (props) => {
)}
- {(type === "SELECT" || type === "CHECKBOX") && (
-
+
{"Separate options by comma, no spaces (Option 1,Option 2)"}
{"To use the 'Other' option, add an ellipsis (Option 1,Option 2,...)"}
+
+
+
)}
+
+
Required?
-
+
+
+ To add multiple options, separate by comma, no spaces (Opion 1,Option 2)
+ + ); +}; + +export default OtherCheckbox; + diff --git a/src/pages/admin/DynamicForm/components/QuestionPreview.js b/src/pages/admin/DynamicForm/components/QuestionPreview.js index c4d3aeee..168a3389 100644 --- a/src/pages/admin/DynamicForm/components/QuestionPreview.js +++ b/src/pages/admin/DynamicForm/components/QuestionPreview.js @@ -1,5 +1,7 @@ import React from "react"; -import { makeStyles } from "@material-ui/core/styles"; +import { + makeStyles +} from "@material-ui/core/styles"; import { Checkbox, FormControlLabel, @@ -10,8 +12,9 @@ import { Typography, Button, } from "@material-ui/core"; -import CloudUpload from '@material-ui/icons/CloudUpload'; +import CloudUpload from "@material-ui/icons/CloudUpload"; import ImagePlaceholder from "../../../../assets/placeholder.jpg"; +import OtherCheckbox from "./OtherCheckbox"; const styles = { imageContainer: { @@ -28,7 +31,11 @@ const styles = { height: 300, objectFit: "cover", }, -} + disabled: { + pointerEvents: "none", + color: "grey", + } +}; // LIVE PREVIEW QUESTION component const QuestionPreview = (props) => { @@ -47,16 +54,32 @@ const QuestionPreview = (props) => { })); const classes = useStyles(); - const { type, label, choices, questionImageUrl, required } = props; + const { + type, label, choices, questionImageUrl, required + } = props; const choicesArr = choices ? choices.split(",") : []; - // types: CHECKBOX, SELECT, TEXT - if (type === "CHECKBOX") { + const workshopChoicesArr = choices + ? choices.split(",").map((choice) => ({ + value: choice, + label: choice, + isDisabled: false, // Set to true for items you want to be unselectable + })) + : []; + + // types: CHECKBOX, SELECT, TEXT, UPLOAD, WORKSHOP SELECTION, SKILLS + if (type === "CHECKBOX" || type === "SKILLS") { return ( label && ( -
-
+
+
{choicesArr.map((item) => {
+ if (item === "...") {
+ return {}}/>;
+ }
return (
{
} else if (type === "SELECT") {
return (
label && (
-
{label} {label && required && "*"}
@@ -71,6 +94,10 @@ const QuestionPreview = (props) => { )}
-
+
+
{label} {label && required && "*"}
@@ -120,8 +153,14 @@ const QuestionPreview = (props) => { } else if (type === "TEXT") { return ( label && ( -
-
+
+
{label} {label && required && "*"}
@@ -147,8 +186,14 @@ const QuestionPreview = (props) => { } else if (type === "UPLOAD") { return ( label && ( -
-
+
+
)
);
+ } else if (type === "WORKSHOP SELECTION") {
+ return (
+ label && (
+ {label} {label && required && "*"}
@@ -166,11 +211,56 @@ const QuestionPreview = (props) => {
+
+ )
+ );
} else {
// Could just default to text but just in case
return + {label} + {label && required && "*"} +
+ {questionImageUrl && ( +
+
+
+ )}
+
+ Invalid question type
;
diff --git a/src/pages/admin/Event/EventCreate/EventCreateForm.js b/src/pages/admin/Event/EventCreate/EventCreateForm.js
index 636e8c5f..4929147f 100644
--- a/src/pages/admin/Event/EventCreate/EventCreateForm.js
+++ b/src/pages/admin/Event/EventCreate/EventCreateForm.js
@@ -1,8 +1,14 @@
-import React, { useEffect } from "react";
-import { makeStyles } from "@material-ui/core/styles";
+import React, {
+ useEffect
+} from "react";
+import {
+ makeStyles
+} from "@material-ui/core/styles";
import DateFnsUtils from "@date-io/date-fns";
import slugify from "slugify";
-import { COLORS } from "../../../../constants/_constants/theme";
+import {
+ COLORS
+} from "../../../../constants/_constants/theme";
import {
Button,
@@ -16,7 +22,9 @@ import {
MuiPickersUtilsProvider,
KeyboardDateTimePicker,
} from "@material-ui/pickers";
-import { Info as InfoIcon } from "@material-ui/icons";
+import {
+ Info as InfoIcon
+} from "@material-ui/icons";
const useStyles = makeStyles(() => ({
underline: {
@@ -33,9 +41,12 @@ const useStyles = makeStyles(() => ({
backgroundColor: "transparent"
}
},
- disabled: {},
- focused: {},
- error: {},
+ disabled: {
+ },
+ focused: {
+ },
+ error: {
+ },
}));
export default function EventCreateForm(props) {
@@ -65,7 +76,13 @@ export default function EventCreateForm(props) {
} = props;
useEffect(() => {
- updatePreview({ ename, description, imageUrl, startDate, endDate });
+ updatePreview({
+ ename,
+ description,
+ imageUrl,
+ startDate,
+ endDate
+ });
}, [updatePreview, ename, description, imageUrl, startDate, endDate]);
const change = (name, e) => {
@@ -76,7 +93,9 @@ export default function EventCreateForm(props) {
const handleEventNameChange = (name, e) => {
e.persist();
- const newSlug = slugify(e.target.value, { lower: true });
+ const newSlug = slugify(e.target.value, {
+ lower: true
+ });
setFieldValue("slug", newSlug);
handleChange(e);
setFieldTouched(name, true, false);
@@ -103,32 +122,32 @@ export default function EventCreateForm(props) {
const value = e.target.value;
let location, longitude, latitude;
switch (value) {
- case "Nest":
- location = "UBC AMS Nest";
- longitude = "-123.249818";
- latitude = "49.266503";
- break;
- case "Hennings":
- location = "Hennings";
- longitude = "-123.252198";
- latitude = "49.266487";
- break;
- case "Sauder":
- location = "UBC Sauder School of Business";
- longitude = "-123.253800";
- latitude = "49.264861";
- break;
- case "Birmingham":
- location = "Birmingham, Henry Angus";
- longitude = "-123.253929";
- latitude = "49.265112";
- break;
- case "Orchard":
- location = "Orchard Commons";
- longitude = "-123.251181";
- latitude = "49.260396";
- break;
- default:
+ case "Nest":
+ location = "UBC AMS Nest";
+ longitude = "-123.249818";
+ latitude = "49.266503";
+ break;
+ case "Hennings":
+ location = "Hennings";
+ longitude = "-123.252198";
+ latitude = "49.266487";
+ break;
+ case "Sauder":
+ location = "UBC Sauder School of Business";
+ longitude = "-123.253800";
+ latitude = "49.264861";
+ break;
+ case "Birmingham":
+ location = "Birmingham, Henry Angus";
+ longitude = "-123.253929";
+ latitude = "49.265112";
+ break;
+ case "Orchard":
+ location = "Orchard Commons";
+ longitude = "-123.251181";
+ latitude = "49.260396";
+ break;
+ default:
}
e.persist();
setFieldValue("elocation", location);
@@ -139,7 +158,9 @@ export default function EventCreateForm(props) {
const createMenuItems = (listOfMenuItems) => {
return listOfMenuItems.map((menuItem) => (