Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Busywork (#1) #5

Merged
merged 11 commits into from
Nov 11, 2021
Merged

Busywork (#1) #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5de14d2
Improved implementation of FAQ boxes, revised wording
J404 Nov 10, 2021
c53655b
updated link text and temporarily disabled devpost link
J404 Nov 10, 2021
352313b
For now, disabled devpost link until we have the devpost public
J404 Nov 10, 2021
e8788f6
Empty alt tag for accessibility
J404 Nov 10, 2021
98d85ae
Replaced reference from 2019 website to 2020 website
J404 Nov 10, 2021
94448a9
added tentative clarification for schedule
J404 Nov 10, 2021
6a4f3ff
Slightly reduced size of title logo
J404 Nov 10, 2021
253bd27
Nvm title big boi, countdown also bigger
J404 Nov 10, 2021
4ac1396
Increased logo size on mobile screens
J404 Nov 10, 2021
db3a4a1
Increased countdown font size on mobile
J404 Nov 10, 2021
082b746
Merge pull request #1 from J404/Busywork
J404 Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ body,html {

#countdown div{
font-family: var(--vaporfont);
font-size: 35px;
font-size: 50px;
padding: 5px;
}

Expand Down Expand Up @@ -200,6 +200,7 @@ body,html {
width: 100%;
height: auto;
}

.titleContainer {
width: 100%;
position: relative;
Expand All @@ -214,6 +215,15 @@ body,html {
right: 0px;
}

@media(max-width: 600px) {
#CWRUTitle {
position: relative;
width: 130%;
left: -15%;
height: auto;
}
}

@media(max-width: 600px) {
#subTitle {
margin-top: 5px;
Expand Down Expand Up @@ -773,6 +783,11 @@ a:hover, a:active{
text-decoration: underline;
}

a.disabled-link {
pointer-events: none;
cursor: not-allowed;
}


#tracksGrid{
width: 100%;
Expand Down Expand Up @@ -986,7 +1001,7 @@ a:hover, a:active{
}

#countdown div{
font-size: 12px;
font-size: 25px;
}
.header {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion src/components/DevpostButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class DevpostButton extends Component{
render(){
return (
<div id = "DevpostButton" >
<a href="https://hackcwru-2020.devpost.com/"> <img id="devpostLogo" src = {DevpostLogo} onClick="openDevpost()"></img> </a>
<a href="/"> <img id="devpostLogo" src = {DevpostLogo} onClick="openDevpost()" alt=""></img> </a>
</div>
)
}
Expand Down
45 changes: 35 additions & 10 deletions src/components/FAQ.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,59 @@ class FAQ extends Component{
<div id ="FAQBoxesGrid">
<div className="row">
<div class="FAQItem">
<FAQBox question={"Where will HackCWRU 2020 take place?"} answer={"Hackers will be working in CWRU's Sears think[box]. Attendees can check in at the Veale Center lobby, 2138 Adelbert Rd, Cleveland, OH 44106."}/>
<FAQBox question={"Where will HackCWRU 2022 take place?"}
answer={`Hackers will be working in CWRU's Sears think[box].
Attendees can check in at the Veale Center lobby,
2138 Adelbert Rd, Cleveland, OH 44106.`}/>
</div>
<div class="FAQItem">
<FAQBox question={"Who can attend?"} answer={"Anyone currently enrolled in a high school, undergraduate, or graduate program can attend."}/>
<FAQBox question={"Who can attend?"}
answer={`Anyone currently enrolled in a high school,
undergraduate, or graduate program can attend.`}/>
</div>
<div class="FAQItem">
<FAQBox question={"What if I don't have a lot of experience?"} answer={"First and foremost, hackathons are a learning experience. It wouldn't be fun if you knew exactly what to do. If you need help getting started or just can't find the source of a new feature we have a team of mentors at your disposal."}/>
<FAQBox question={"What if I don't have a lot of experience?"}
answer={`First and foremost, hackathons are a learning experience.
It wouldn't be fun if you knew exactly what to do!
If you need help, we have a team of mentors to get you started.`}/>
</div>
<div class="FAQItem">
<FAQBox question={"What if I don't have an idea or team?"} answer={"No problem. There are plenty of other hackers with your same dilemma that you can join forces with. Thirty six hours is plenty of time for a couple hours of brainstorming. Also, we will have team building and idea brainstorming workshops. You are not required to be part of a team."}/>
<FAQBox question={"What if I don't have an idea or team?"}
answer={`No problem. There are plenty of other hackers with your same dilemma you can
join forces with. Also, we will have team building and idea brainstorming workshops.
You are not required to be part of a team.`}/>
</div>
<div class="FAQItem">
<FAQBox question={"Will travel be reimbursed?"} answer={"We guarantee up to $50 in travel reimbursement per person. Just make sure to save your travel receipt!"}/>
<FAQBox question={"Will travel be reimbursed?"}
answer={`We guarantee up to $50 in travel reimbursement per person.
Just make sure to save your travel receipt!`}/>
</div>
<div class="FAQItem">
<FAQBox question={"How much does it cost?"} answer={"Nothing. Food, drinks, power, building materials, and machine time are all provided for free."}/>
<FAQBox question={"How much does it cost?"}
answer={`Nothing. Food, drinks, power, building materials,
and machine time are all provided for free.`}/>
</div>
<div class="FAQItem">
<FAQBox question={"What should I bring?"} answer={"Besides your computer, bring anything that you'd like to hack with or that would make your sleepover more comfortable. We suggest a sleeping bag, a toothbrush, and a change of clothes. **Also, please bring a valid state ID or driver's license.**"}/>
<FAQBox question={"What should I bring?"}
answer={`Besides your computer, bring anything that
you'd like to hack with or that would make your sleepover more comfortable.
We suggest a sleeping bag, a toothbrush, and a change of clothes.
**Also, please bring a valid state ID or driver's license.**`}/>
</div>
<div class="FAQItem">
<FAQBox question={"Do I have to sleep over?"} answer={"No. You may come and go from the hackathon as you want."}/>
<FAQBox question={"Do I have to sleep over?"}
answer={`No. You may come and go from the hackathon as you want.`}/>
</div>
<div class="FAQItem">
<FAQBox question={"What if I don't have equipment to make my hack?"} answer={"We have that covered! We'll have laptops, 3D printers and a lot of MLH-provided hardare (including fancy VR stuff like the Oculus Rift!) provided for you to rent out for free."}/>
<FAQBox question={"What if I don't have equipment to make my hack?"}
answer={`We have that covered! We'll have laptops,
3D printers and a lot of MLH-provided hardare
(including fancy VR stuff like the Oculus Rift!)
provided for you to rent out for free.`}/>
</div>
<div class="FAQItem">
<FAQBox question={"Is there free parking?"} answer={"Yes! We will have a reserved parking lot you can use for free."}/>
<FAQBox question={"Is there free parking?"}
answer={`Yes! We will have a reserved parking lot you can use for free.`}/>
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions src/components/HeaderSection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class HeaderSection extends Component {
<div className = "header">
<div className = "titleContainer">
<div className = "mainTitleContainer">
<img id = "CWRUTitle" src = {hackCWRUTitle} alt = "The HackCWRU7 Title"/>
<img id = "CWRUTitle" src = {hackCWRUTitle} alt = "The HackCWRU Title"/>
</div>
<div className = "subTitleAndLogoContainer">
<div className = "subTitleContainer">
Expand Down Expand Up @@ -88,7 +88,7 @@ class HeaderSection extends Component {


<div className = "oldWebsiteButtonGroup">
<a href="http://hack.cwru.edu/"><button id="oldWebsiteBtn">2019 website</button></a>
<a href="http://hack.cwru.edu/"><button id="oldWebsiteBtn">2020 website</button></a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Schedule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Schedule extends Component{
<div id = "ScheduleSection" >
<div className = "skewTitleBox">
<div>
SCHEDULE
SCHEDULE (tentative)
</div>
</div>
<div id ="ScheduleGridContainer">
Expand Down
5 changes: 4 additions & 1 deletion src/components/TracksSection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ class TracksSection extends Component{
</div>
</div>
<div id = "prizesMessage" className="bigClearText">
Check out the HackCWRU2020 <a href="https://hackcwru-2020.devpost.com/">Devpost</a> to see our prizes and judges.
Coming soon:
<br/>
Check out the HackCWRU2022 <a className="disabled-link"
href="https://hackcwru-2020.devpost.com/">Devpost</a> to see our prizes and judges.
</div>
</div>
)
Expand Down