MCSS-72: Add Code of Conduct Page

Co-authored-by: Hana Dowe <hana-dowe@users.noreply.github.com>
utmmcss · Dec 27, 2023 · fd3132d · fd3132d
1 parent ca0e319
commit fd3132d
Show file tree

Hide file tree

Showing 13 changed files with 762 additions and 118 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -53,6 +53,7 @@
     "hdri",
     "hookform",
     "ICUBE",
+    "inclusivity",
     "Maanjiwe",
     "MCSS",
     "MMPA",
@@ -64,4 +65,4 @@
     "Wireframe"
   ],
   "cSpell.language": "en"
-}
+}
diff --git a/components/Dashboard/ModalTips/index.tsx b/components/Dashboard/ModalTips/index.tsx
@@ -12,6 +12,7 @@ import DialogContent from '@mui/material/DialogContent'
 import DialogTitle from '@mui/material/DialogTitle'
 import Grow from '@mui/material/Grow'
 import IconButton from '@mui/material/IconButton'
+import Link from '@mui/material/Link'
 import Typography from '@mui/material/Typography'
 
 import { UserStatus } from '@/types/User'
@@ -135,7 +136,11 @@ const ModalTips = (props: Props) => {
                 ticket related assistance will be ignored.
               </Typography>
               <Typography>
-                We are always open to feedback and suggestions at DeerHacks. If you have any
+                Alternatively, you can email us at{' '}
+                <Link href="mailto:hello@deerhacks.ca" underline="always" sx={{ opacity: 0.75 }}>
+                  hello@deerhacks.ca
+                </Link>
+                . We are always open to feedback and suggestions at DeerHacks. If you have any
                 concerns, ideas, or found a bug in our dashboard please let us know!
               </Typography>
             </AccordionDetails>

diff --git a/components/Dashboard/RegistrationForms/RegistrationStepper/index.tsx b/components/Dashboard/RegistrationForms/RegistrationStepper/index.tsx
@@ -98,16 +98,23 @@ const RegistrationStepper = (props: Props) => {
       >
         Save as Draft
       </LoadingButton>
-      <Stepper activeStep={activeStep} orientation="vertical" connector={<StyledStepConnector />}>
+      <Stepper
+        activeStep={activeStep}
+        orientation="vertical"
+        connector={<StyledStepConnector />}
+        sx={{ width: '100%', p: '0.5rem' }}
+      >
         {formKeys.map((section, i) => (
           <Step key={section} disabled={getStepDisabled(i, activeStep, formSections)}>
             <StepButton
               icon={getStepIcon(i, activeStep, formSections)}
               onClick={() => handleAccordionChange(i)}
               sx={{
-                transition: '0.5s all ease',
-                '&:hover': {
+                transition: '0.3s all ease',
+                borderRadius: '0.5rem',
+                '&:hover, &:focus-visible': {
                   textDecoration: 'underline',
+                  backgroundColor: 'rgba(255,255,255,0.05)',
                 },
               }}
             >
@@ -119,7 +126,7 @@ const RegistrationStepper = (props: Props) => {
                 {formSections[section].heading}
               </Typography>
             </StepButton>
-            <StepContent>
+            <StepContent sx={{ transition: '0.3s all ease', pt: i === activeStep ? '1rem' : 0 }}>
               {formSections[section].subHeadings.map((subHeading) => (
                 <Typography key={`${section} - ${subHeading}`}>{subHeading}</Typography>
               ))}

diff --git a/components/Dashboard/RegistrationForms/Review/index.tsx b/components/Dashboard/RegistrationForms/Review/index.tsx
@@ -210,11 +210,11 @@ const CheckBoxReview = (props: CheckBoxReviewProps) => {
 const getMeals = (app: Application) => {
   const meals = []
 
-  if (app.day1_dinner) meals.push('Day 1 Dinner')
-  if (app.day2_breakfast) meals.push('Day 2 Breakfast')
-  if (app.day2_lunch) meals.push('Day 2 Lunch')
-  if (app.day2_dinner) meals.push('Day 2 Dinner')
-  if (app.day3_breakfast) meals.push('Day 3 Breakfast')
+  if (app.day1_dinner) meals.push('Friday Dinner (Feb 16)')
+  if (app.day2_breakfast) meals.push('Saturday Breakfast (Feb 17)')
+  if (app.day2_lunch) meals.push('Saturday Lunch (Feb 17)')
+  if (app.day2_dinner) meals.push('Saturday Dinner (Feb 17)')
+  if (app.day3_breakfast) meals.push('Sunday Breakfast (Feb 18)')
 
   return meals.length ? formatList(meals) : 'None'
 }

diff --git a/components/Dashboard/TileMentorForm/index.tsx b/components/Dashboard/TileMentorForm/index.tsx
@@ -38,7 +38,7 @@ const TileMentorForm = (props: Props) => {
           <Typography variant="body2" color={disabled ? 'text.disabled' : 'text.primary'}>
             {disabled
               ? 'Signup is unavailable while user is unverified'
-              : 'Interested in mentoring hackers? Apply to be a mentor before {TBD DATE}'}
+              : 'Interested in mentoring hackers? Apply to be a mentor before January 30, 2024'}
           </Typography>
         </CardContent>
       </CardActionArea>

diff --git a/components/Dashboard/TileTips/index.tsx b/components/Dashboard/TileTips/index.tsx
@@ -32,7 +32,7 @@ const TileTips = (props: Props) => {
               gutterBottom
             >
               <HelpIcon fontSize="inherit" />
-              Tips
+              Help
             </Typography>
             <Typography color="common.black" variant="body2">
               DeerHacks Dashboard 101

diff --git a/components/Dashboard/TileVolunteerForm/index.tsx b/components/Dashboard/TileVolunteerForm/index.tsx
@@ -38,7 +38,7 @@ const TileVolunteerForm = (props: Props) => {
           <Typography variant="body2" color={disabled ? 'text.disabled' : 'text.primary'}>
             {disabled
               ? 'Signup is unavailable while user is unverified'
-              : 'Want to volunteer for DeerHacks? Apply to be a volunteer before {TBD DATE}'}
+              : 'Want to volunteer for DeerHacks? Apply to be a volunteer before January 30, 2024'}
           </Typography>
         </CardContent>
       </CardActionArea>

diff --git a/components/Shared/Footer/index.tsx b/components/Shared/Footer/index.tsx
@@ -54,9 +54,9 @@ const Footer = () => {
               </Link>
             </Tooltip>
             {toggles.dashboard && (
-              <Tooltip title="Terms & Conditions" placement="top">
-                <Link href="/terms" component={NextLink}>
-                  Terms & Conditions
+              <Tooltip title="Code of Conduct" placement="top">
+                <Link href="/code" component={NextLink}>
+                  Code of Conduct
                 </Link>
               </Tooltip>
             )}
@@ -65,11 +65,6 @@ const Footer = () => {
                 Privacy Policy
               </Link>
             </Tooltip>
-            <Tooltip title="Code of Conduct" placement="top">
-              <Link rel="noopener" href="https://mlh.io/code-of-conduct">
-                Code of Conduct
-              </Link>
-            </Tooltip>
           </Box>
           <Box component="div">
             ✨ by&nbsp;