Merge pull request #489 from HackRU/env/dev

prod

Author: GabrielWeinbrenner

src/Defaults.js

@@ -33,7 +33,7 @@ const defaults = {
         "https://s3-us-west-2.amazonaws.com/hackru-internal/partners-logos/",
     teamInfo: "https://s3-us-west-2.amazonaws.com/hackru-internal/hackru-team/",
     freeze: false,
-    teamru: true,
+    teamru: false,
     teamru_user: false,
     volunteers: {
         display: true,

src/MLHBadge.jsx

@@ -1,8 +1,61 @@
 import React, { Component } from "react";
 
 class MLHBadge extends Component {
+    constructor(props) {
+        super(props);
+        this.handleScroll = this.handleScroll.bind(this);
+        this.handleResize = this.handleResize.bind(this);
+        this.state = {
+            isVisible: true,
+            badgeHeight: 0,
+        };
+    }
+
+    handleResize() {
+        let badge = document.getElementById("mlh-trust-badge");
+        if (badge == null) {
+            return;
+        }
+        this.setState({
+            badgeHeight: parseFloat(
+                window
+                    .getComputedStyle(badge)
+                    .getPropertyValue("height")
+                    .replace("px", "")
+            ),
+        });
+    }
+
+    handleScroll() {
+        let badgeHeight = this.state.badgeHeight;
+        let offset = window.pageYOffset;
+        if (offset < badgeHeight) {
+            //At top
+            this.setState({
+                isVisible: true,
+            });
+        } else if (offset > badgeHeight) {
+            this.setState({
+                isVisible: false,
+            });
+        }
+    }
+
+    componentDidMount() {
+        window.addEventListener("scroll", this.handleScroll);
+        window.addEventListener("resize", this.handleResize);
+        this.handleResize();
+    }
+
+    componentWillUnmount() {
+        window.removeEventListener("scroll", this.handleScroll);
+        window.removeEventListener("resize", this.handleResize);
+    }
+
     render() {
         return (
+            this.state.isVisible 
+            &&
             <a id="mlh-trust-badge"
                 style={{display:"block",maxWidth:"100px",minWidth:"60px",position:"fixed",right:"50px",top:0,width:"10%", zIndex:10000}}
                 href="https://mlh.io/seasons/2022/events?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2022-season&utm_content=white">

src/components/Dashboard/Forms/UserProfileForm/ProfileCards/Register.jsx

@@ -17,6 +17,7 @@ class Register extends Component {
             user: this.props.user,
             checkedState1: (this.props.user.registration_status !== "unregistered"),
             checkedState2: (this.props.user.registration_status !== "unregistered"),
+            checkedState3: (this.props.user.registration_status !== "unregistered"),
             message: null
         });
     }
@@ -119,6 +120,9 @@ class Register extends Component {
         if (this.state.checkedState2) {
             mlhnotices.push("mlh2");
         }
+        if (this.state.checkedState3) {
+            mlhnotices.push("mlh3");
+        }
         let model = { mlhnotices };
         let message = null;
         if (this.state.message) {
@@ -137,7 +141,7 @@ class Register extends Component {
                         className="custom-av-checkbox"
                         label={<h4>MLH Notices</h4>}
                         required
-                        validate={{ required: { value: true, errorMessage: "Please review these MLH guidelines" }, min: { value: 2, errorMessage: "You must select both of these checkboxes" } }}>
+                        validate={{ required: { value: true, errorMessage: "Please review these MLH guidelines" }, min: { value: 3, errorMessage: "You must select all of the checkboxes" } }}>
                         <AvCheckbox name="mlh1"
                             customInput
                             onChange={() => { this.setState({ checkedState1: !this.state.checkedState1 }); }}
@@ -151,14 +155,19 @@ class Register extends Component {
                             label={<p>I authorize you to share my application/registration information for event administration, ranking, MLH administration, pre- and post-event informational e-mails, and occasional messages about hackathons in-line with the{" "} 
                                 <a href="https://mlh.io/privacy" 
                                     rel="noopener noreferrer"
-                                    target="_blank">MLH Privacy Policy</a>. Further, I agree to the terms of both the{" "} 
+                                    target="_blank">MLH Privacy Policy</a>.</p>}
+                            value={"mlh2"} />
+                        <AvCheckbox name="mlh3" 
+                            customInput
+                            onChange={() => { this.setState({ checkedState2: !this.state.checkedState2 }); }}
+                            label={<p> Further, I agree to the terms of both the{" "}
                                 <a href="https://github.com/MLH/mlh-policies/blob/master/prize-terms-and-conditions/contest-terms.md" 
                                     rel="noopener noreferrer"
                                     target="_blank">MLH Contest Terms and Conditions</a> and the{" "} 
                                 <a href="https://mlh.io/privacy"
                                     rel="noopener noreferrer"
                                     target="_blank">MLH Privacy Policy</a>. NOTE: Proof of vaccination or a negative test result 1-2 days before the event must be shown for entry.</p>}
-                            value={"mlh2"} />
+                            value={"mlh3"} />
                     </AvCheckboxGroup>
                     <h4>Registration</h4>
                     <p>After filling out all required parts in About and Education, please make sure you have uploaded a filled and signed{" "}

src/components/Landing/Sections/Faqs.jsx

@@ -43,6 +43,10 @@ const FAQTextOne = {
             "Yes! We'll release more information about prizes as the event draws near.",
     },
     six: {
+        title: "Will there be a mask mandate?",
+        text: "Yes, HackRU will have a mask mandate throughout the duration of the event."
+    },
+    seven: {
         title: "I have more questions!",
         text: [
             <span key={1}>