Skip to content

Commit 7e4d0c5

Browse files
GabrielWeinbrennerGabrielWeinbrenner
authored
Merge pull request #481 from HackRU/env/dev
Deployment To Prod
2 parents f9a0a87 + b5b929d commit 7e4d0c5

12 files changed

Lines changed: 35215 additions & 15512 deletions

File tree

‎package-lock.json‎

Lines changed: 35048 additions & 15449 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
<head>
1717
<meta charset="utf-8">
1818
<meta property="og:url" content="https://www.hackru.org/" />
19-
<meta property="og:title" content="HackRU Fall 2021" />
19+
<meta property="og:title" content="HackRU Spring 2022" />
2020
<meta property="og:description" content="Get hyped for the best Hackathon that Rutgers has to offer!" />
2121
<meta property="og:image" content="./assets/fb-banner-upper.png" />
2222
<meta name="viewport" content="width=device-width, initial-scale=1.0">
23-
<meta name="description" content="Find out more about HackRU Fall 2021.">
23+
<meta name="description" content="Find out more about HackRU Spring 2022.">
2424
<link rel="icon" href="%PUBLIC_URL%/assets/icons/red_hackru.png">
2525
<link rel="shortcut icon" href="%PUBLIC_URL%/assets/icons/red)hackru.png">
2626
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">

‎src/Defaults.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import FAQs from "./components/Landing/Sections/Faqs";
88
import Footer from "./components/Landing/Sections/Footer";
99

1010
const defaults = {
11-
title: "HackRU Fall 2021",
12-
dateText: "October 16th - 17th",
13-
locationText: "Virtual",
11+
title: "HackRU Spring 2022",
12+
dateText: "April 2nd - 3rd",
13+
locationText: "Rutgers College Ave Student Center",
1414
universityText: "Rutgers University",
1515
slogan: "hack all knight",
1616
mobileWidthThresholdSensitive: 1500,
@@ -32,7 +32,7 @@ const defaults = {
3232
partnerLogos:
3333
"https://s3-us-west-2.amazonaws.com/hackru-internal/partners-logos/",
3434
teamInfo: "https://s3-us-west-2.amazonaws.com/hackru-internal/hackru-team/",
35-
freeze: true,
35+
freeze: false,
3636
teamru: true,
3737
teamru_user: false,
3838
volunteers: {

‎src/MLHBadge.jsx‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,13 @@ import React, { Component } from "react";
33
class MLHBadge extends Component {
44
render() {
55
return (
6-
<a
7-
id="mlh-trust-badge"
8-
style={{
9-
display: "block",
10-
maxWidth: "100px",
11-
minWidth: "60px",
12-
position: "absolute",
13-
right: "50px",
14-
top: "0",
15-
width: "10%",
16-
zIndex: "10",
17-
}}
18-
href="https://mlh.io/seasons/2021/events?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2021-season&utm_content=white"
19-
target="_blank"
20-
rel="noopener noreferrer"
21-
>
22-
<img
23-
src="https://s3.amazonaws.com/logged-assets/trust-badge/2022/mlh-trust-badge-2022-white.svg"
6+
<a id="mlh-trust-badge"
7+
style={{display:"block",maxWidth:"100px",minWidth:"60px",position:"fixed",right:"50px",top:0,width:"10%", zIndex:10000}}
8+
href="https://mlh.io/seasons/2022/events?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2022-season&utm_content=white">
9+
<img src="https://s3.amazonaws.com/logged-assets/trust-badge/2022/mlh-trust-badge-2022-white.svg"
2410
alt="Major League Hacking 2022 Hackathon Season"
25-
style={{ width: "100%" }}
26-
/>
27-
</a>
11+
style={{width:"100%"}} />
12+
</a>
2813
);
2914
}
3015
}

‎src/components/Dashboard/Dashboard.jsx‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,17 @@ class Dashboard extends Component {
160160
<ProfileMessage message={this.state.profileMSG} />
161161
{SHOW_FLAG ? (
162162
<Row>
163-
<Col className="dashboard-row" lg={12}>
163+
<Col className="dashboard-row"
164+
lg={12}>
164165
<Links />
165166
</Col>
166167
</Row>
167168
) : (
168169
<br />
169170
)}
170171
<Row>
171-
<Col className="dashboard-row" lg={12}>
172+
<Col className="dashboard-row"
173+
lg={12}>
172174
<div className="dashboard-card">
173175
<div className="dashboard-left-strip dashboard-strip-red"></div>
174176
<h1
@@ -208,7 +210,9 @@ class Dashboard extends Component {
208210
)}
209211
{SHOW_FLAG ? (
210212
<Row>
211-
<Section title="Schedule" color="red" isOpen={true}>
213+
<Section title="Schedule"
214+
color="red"
215+
isOpen={true}>
212216
<Schedule />
213217
</Section>
214218
</Row>
@@ -290,7 +294,8 @@ class Dashboard extends Component {
290294
</div>
291295
</div>
292296
</Col>} */}
293-
<Section title={"Application Status"} isOpen={true}>
297+
<Section title={"Application Status"}
298+
isOpen={true}>
294299
<div
295300
style={{
296301
marginTop: 0,

‎src/components/Dashboard/Forms/UserProfileForm/ProfileCards/About.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class About extends Component {
133133
value: "01/01/1920"
134134
},
135135
end: {
136-
value: "10/16/2003"
136+
value: "04/02/2004"
137137
}
138138
} }} />
139139
</Col>

‎src/components/Dashboard/Forms/UserProfileForm/ProfileCards/Documents.jsx‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { AvForm } from "availity-reactstrap-validation";
44
import { Icon } from "react-fa";
55
import ResumeUploader from "../ResumeUploader";
66
import WaiverUploader from "../WaiverUploader";
7+
import VaccineUploader from "../VaccineUploader";
78

89
// import { theme } from "../../../../Defaults";
910
import { ProfileType } from "../../../../Profile";
@@ -44,6 +45,11 @@ class UserProfileForm extends Component {
4445
waiver_message: message
4546
});
4647
}
48+
checkVacciner = (message) => {
49+
this.setState({
50+
vaccine_message: message
51+
});
52+
}
4753

4854

4955
render() {
@@ -90,6 +96,11 @@ class UserProfileForm extends Component {
9096
profile={this.props.profile} />
9197

9298
{message}
99+
<div>Vaccine Card Upload</div>
100+
<VaccineUploader edit={this.state.edit}
101+
profile={this.props.profile} />
102+
103+
93104
<div style={{ width: "100%" }}
94105
align="right">
95106
<Button color="success"
@@ -132,10 +143,15 @@ class UserProfileForm extends Component {
132143
<WaiverUploader edit={this.state.edit}
133144
profile={this.props.profile}
134145
checkWaiver={this.checkWaiver} />
135-
<div> Resume </div>
146+
<div>Resume</div>
136147
<ResumeUploader edit={this.state.edit}
137148
profile={this.props.profile} />
149+
<div>Vaccine Card Upload</div>
150+
<VaccineUploader edit={this.state.edit}
151+
profile={this.props.profile} />
138152
</div>
153+
154+
139155
);
140156
}
141157
}

‎src/components/Dashboard/Forms/UserProfileForm/VaccineUploader.jsx‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import React, { useEffect, useState } from "react";
2+
import { CustomInput, FormGroup } from "reactstrap";
3+
import { ProfileType } from "../../../Profile";
4+
import { theme } from "../../../../Defaults";
5+
import PropTypes from "prop-types";
6+
7+
8+
const VaccineUploader = (props) => {
9+
10+
const [vaccineLabelText, setVaccineLabelText] = useState("Loading...");
11+
12+
useEffect(() => {
13+
props.profile.DoesVaccineExist().then((success) => {
14+
setVaccineLabelText(
15+
success ? "Vaccine Card found" : props.edit ? "Choose a file to upload" : "Nothing yet"
16+
);
17+
});
18+
}, []);
19+
20+
const onVaccineUpload = async (event) => {
21+
setVaccineLabelText("Uploading Vaccine Card...");
22+
const res = await props.profile.UploadVaccine(event.target.files[0]);
23+
setVaccineLabelText(res.ok ? "Vaccine Card uploaded successfully." : "Failed to upload Vaccine Card");
24+
};
25+
const pStyle = {
26+
color: theme.disabled[0] + "70",
27+
padding: 5,
28+
height: 35,
29+
};
30+
31+
return (
32+
<div>
33+
34+
<FormGroup>
35+
{props.edit ? (
36+
<CustomInput
37+
accept=".jpg, .pdf, .png"
38+
id="vaccine"
39+
onChange={onVaccineUpload}
40+
type="file"
41+
label={vaccineLabelText}
42+
/>
43+
) : (
44+
<p style={pStyle}>{vaccineLabelText}</p>
45+
)}
46+
</FormGroup>
47+
</div>
48+
);
49+
};
50+
51+
VaccineUploader.propTypes = {
52+
edit: PropTypes.bool,
53+
profile: ProfileType,
54+
checkVaccine: PropTypes.func
55+
};
56+
57+
export default VaccineUploader;

‎src/components/Landing/Sections/About.jsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import Card from "../../Card";
55

66
function About() {
77
return (
8-
<Card backgroundColor={theme.secondary[1]} sideBar={theme.accent[0]}>
8+
<Card backgroundColor={theme.secondary[1]}
9+
sideBar={theme.accent[0]}>
910
<div
1011
style={{
1112
position: "absolute",
@@ -58,7 +59,8 @@ function About() {
5859
>
5960
<Icon name="question-circle" /> What?
6061
</h2>
61-
<p style={{ display: "inline-block" }} className="lead">
62+
<p style={{ display: "inline-block" }}
63+
className="lead">
6264
HackRU is a 24-hour hackathon at Rutgers University. We
6365
welcome hundreds of students to join us in building
6466
awesome tech projects. Industry experts and mentors help
@@ -100,7 +102,7 @@ function About() {
100102
<Icon name="calendar" /> When?
101103
</h2>
102104
<p className="lead">
103-
HackRU is from October 16th-17th, 2021.
105+
HackRU is from April 2nd-3rd, 2022.
104106
</p>
105107
</div>
106108
<div
@@ -134,7 +136,7 @@ function About() {
134136
<Icon name="location-arrow" /> Where?
135137
</h2>
136138
<p className="lead">
137-
Your own home! HackRU is virtual for Fall 2021!
139+
HackRU is at The Rutgers College Ave Student Center for Spring 2022!
138140
</p>
139141
{/* <iframe title="about-map"
140142
frameBorder={0}

‎src/components/Landing/Sections/Faqs.jsx‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const FAQTextOne = {
3131
three: {
3232
title: "What is the application process like?",
3333
text:
34-
"Because we are virtual this semester, all applications will be accepted!",
34+
"HackRU will be back in person this Spring! We will be accepting anywhere between 300-500 hackers based on when you register for the event. After you register, you'll get a notification 1-2 weeks before the hackathon whether we have accepted you or not to the hackathon. You then will have to let us know if you plan on coming or not and then you're all set!",
3535
},
3636
// four: {
3737
// title: "Are there travel reimbursements?",
@@ -131,17 +131,21 @@ class FAQs extends Component {
131131
>
132132
FAQs
133133
</h1>
134-
<Container fluid maxWidth={false}>
135-
<Grid container spacing={3}>
136-
<Grid item xs>
134+
<Container fluid
135+
maxWidth={false}>
136+
<Grid container
137+
spacing={3}>
138+
<Grid item
139+
xs>
137140
{Object.keys(FAQTextOne).map((key, index) => (
138141
<FaqsCollapse
139142
key={index + "1"}
140143
cat={FAQTextOne[key]}
141144
/>
142145
))}
143146
</Grid>
144-
<Grid item xs>
147+
<Grid item
148+
xs>
145149
{Object.keys(FAQTextTwo).map((key, index) => (
146150
<FaqsCollapse
147151
key={index + "2"}

0 commit comments

Comments
 (0)