Skip to content

Commit 2c50053

Browse files
AndyLi23AndyLi23
committedDec 26, 2020
Auto stash before merge of "master" and "origin/master"
1 parent 66b127c commit 2c50053

15 files changed

+1110
-1296
lines changed
 

‎.github/PULL_REQUEST_TEMPLATE.md

-8
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ Fixes # (issue)
1111
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
1212
- [ ] This change requires a documentation update
1313

14-
**Test Configuration**:
15-
16-
- Operating System (with version #):
17-
- Firmware version:
18-
- Hardware:
19-
- Toolchain:
20-
- SDK:
21-
2214
# Checklist:
2315

2416
- [ ] My code follows the style guidelines of this project

‎.vscode/settings.json

+4-25
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,5 @@
11
{
2-
"liveServer.settings.port": 5500,
3-
"cSpell.words": [
4-
"arrowpath",
5-
"balsamiq",
6-
"cynder",
7-
"cynder host",
8-
"cynderhost",
9-
"daystamp",
10-
"hackathon",
11-
"host",
12-
"mainpath",
13-
"merch",
14-
"minecraft",
15-
"orm",
16-
"proftitle",
17-
"sched",
18-
"scribbl",
19-
"share",
20-
"signup",
21-
"stickermule",
22-
"taskade",
23-
"typef",
24-
"typef orm share"
25-
]
26-
}
2+
"cSpell.words": [
3+
"devpost"
4+
]
5+
}

‎about/index.html ‎about.html

File renamed without changes.

‎devpost.html

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8" />
3+
<title>ThetaHacks Virtual - Devpost</title>
4+
<meta http-equiv="refresh" content="0; URL=https://ThetaHacks.devpost.com" />
5+
<link rel="canonical" href="https://ThetaHacks.devpost.com" />

‎discord.html

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8" />
3+
<title>ThetaHacks Virtual - Discord</title>
4+
<meta http-equiv="refresh" content="0; URL=https://discord.gg/KYpMAAGNUe" />
5+
<link rel="canonical" href="https://discord.gg/KYpMAAGNUe" />

‎img/profiles/adarsh.png

-230 KB
Binary file not shown.

‎img/profiles/chenghao.png

622 KB
Loading

‎img/profiles/kai.png

330 KB
Loading

‎img/profiles/rigel.png

-372 KB
Binary file not shown.

‎index.html

+918-1,252
Large diffs are not rendered by default.

‎info/index.html ‎info.html

File renamed without changes.

‎js/main.js

+64-8
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,71 @@ $(function () {
213213
});
214214
});
215215

216-
function shift() {
217-
if (document.getElementById("day").innerHTML == "Saturday") {
218-
document.getElementById("day").innerHTML = " Sunday ";
219-
document.getElementById("sched1").style.display = "none";
220-
document.getElementById("sched2").style.display = "block";
221-
} else {
216+
var shiftDay = "Saturday";
217+
// function shift() {
218+
// if (shiftDay == "Saturday") {
219+
// document.getElementById("day").innerHTML = "Sunday";
220+
// document.getElementById("sched1").style.display = "none";
221+
// document.getElementById("sched2").style.display = "block";
222+
// }
223+
// else if (shiftDay == '')
224+
// else {
225+
// document.getElementById("day").innerHTML = "Saturday";
226+
// document.getElementById("sched2").style.display = "none";
227+
// document.getElementById("sched1").style.display = "block";
228+
// }
229+
// }
230+
function shiftBackward() {
231+
if (shiftDay == "Saturday") {
232+
shiftDay = "Friday";
233+
document.getElementById("day").innerHTML = "Friday";
234+
document.getElementById("schedSat").style.display = "none";
235+
document.getElementById("schedFri").style.display = "block";
236+
}
237+
else if (shiftDay == "Friday") {
238+
shiftDay = "Monday";
239+
document.getElementById("day").innerHTML = "Monday";
240+
document.getElementById("schedFri").style.display = "none";
241+
document.getElementById("schedMon").style.display = "block";
242+
}
243+
else if (shiftDay == "Monday") {
244+
shiftDay = "Sunday";
245+
document.getElementById("day").innerHTML = "Sunday";
246+
document.getElementById("schedMon").style.display = "none";
247+
document.getElementById("schedSun").style.display = "block";
248+
}
249+
else if (shiftDay == "Sunday") {
250+
shiftDay = "Saturday";
251+
document.getElementById("day").innerHTML = "Saturday";
252+
document.getElementById("schedSun").style.display = "none";
253+
document.getElementById("schedSat").style.display = "block";
254+
}
255+
}
256+
257+
function shiftForward() {
258+
if (shiftDay == "Saturday") {
259+
shiftDay = "Sunday";
260+
document.getElementById("day").innerHTML = "Sunday";
261+
document.getElementById("schedSat").style.display = "none";
262+
document.getElementById("schedSun").style.display = "block";
263+
}
264+
else if (shiftDay == "Sunday") {
265+
shiftDay = "Monday";
266+
document.getElementById("day").innerHTML = "Monday";
267+
document.getElementById("schedSun").style.display = "none";
268+
document.getElementById("schedMon").style.display = "block";
269+
}
270+
else if (shiftDay == "Monday") {
271+
shiftDay = "Friday";
272+
document.getElementById("day").innerHTML = "Friday";
273+
document.getElementById("schedMon").style.display = "none";
274+
document.getElementById("schedFri").style.display = "block";
275+
}
276+
else if (shiftDay == "Friday") {
277+
shiftDay = "Saturday";
222278
document.getElementById("day").innerHTML = "Saturday";
223-
document.getElementById("sched2").style.display = "none";
224-
document.getElementById("sched1").style.display = "block";
279+
document.getElementById("schedFri").style.display = "none";
280+
document.getElementById("schedSat").style.display = "block";
225281
}
226282
}
227283

‎mentor.html

+38-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,38 @@
1-
<html> <head> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> <title>Mentor Registration - ThetaHacks</title> <style type="text/css"> html{ margin: 0; height: 100%; overflow: hidden; } iframe{ position: absolute; left:0; right:0; bottom:0; top:0; border:0; } </style> </head> <body> <iframe id="typeform-full" width="100%" height="100%" frameborder="0" allow="camera; microphone; autoplay; encrypted-media;" src="https://form.typeform.com/to/XTexU8Se?typeform-medium=embed-snippet"></iframe> <script type="text/javascript" src="https://embed.typeform.com/embed.js"></script> </body> </html>
1+
<html>
2+
<head>
3+
<meta
4+
name="viewport"
5+
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
6+
/>
7+
<title>Mentor Registration - ThetaHacks</title>
8+
<style type="text/css">
9+
html {
10+
margin: 0;
11+
height: 100%;
12+
overflow: hidden;
13+
}
14+
iframe {
15+
position: absolute;
16+
left: 0;
17+
right: 0;
18+
bottom: 0;
19+
top: 0;
20+
border: 0;
21+
}
22+
</style>
23+
</head>
24+
<body>
25+
<iframe
26+
id="typeform-full"
27+
width="100%"
28+
height="100%"
29+
frameborder="0"
30+
allow="camera; microphone; autoplay; encrypted-media;"
31+
src="https://form.typeform.com/to/XTexU8Se?typeform-medium=embed-snippet"
32+
></iframe>
33+
<script
34+
type="text/javascript"
35+
src="https://embed.typeform.com/embed.js"
36+
></script>
37+
</body>
38+
</html>

‎signup.html

+38-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,38 @@
1-
<html> <head> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> <title>Attendee Registration - ThetaHacks</title> <style type="text/css"> html{ margin: 0; height: 100%; overflow: hidden; } iframe{ position: absolute; left:0; right:0; bottom:0; top:0; border:0; } </style> </head> <body> <iframe id="typeform-full" width="100%" height="100%" frameborder="0" allow="camera; microphone; autoplay; encrypted-media;" src="https://form.typeform.com/to/PhePnrTa"></iframe> <script type="text/javascript" src="https://embed.typeform.com/embed.js"></script> </body> </html>
1+
<html>
2+
<head>
3+
<meta
4+
name="viewport"
5+
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
6+
/>
7+
<title>Attendee Registration - ThetaHacks</title>
8+
<style type="text/css">
9+
html {
10+
margin: 0;
11+
height: 100%;
12+
overflow: hidden;
13+
}
14+
iframe {
15+
position: absolute;
16+
left: 0;
17+
right: 0;
18+
bottom: 0;
19+
top: 0;
20+
border: 0;
21+
}
22+
</style>
23+
</head>
24+
<body>
25+
<iframe
26+
id="typeform-full"
27+
width="100%"
28+
height="100%"
29+
frameborder="0"
30+
allow="camera; microphone; autoplay; encrypted-media;"
31+
src="https://form.typeform.com/to/PhePnrTa"
32+
></iframe>
33+
<script
34+
type="text/javascript"
35+
src="https://embed.typeform.com/embed.js"
36+
></script>
37+
</body>
38+
</html>

‎volunteer.html

+38-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,38 @@
1-
<html> <head> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> <title>Speaker/Workshop Signup</title> <style type="text/css"> html{ margin: 0; height: 100%; overflow: hidden; } iframe{ position: absolute; left:0; right:0; bottom:0; top:0; border:0; } </style> </head> <body> <iframe id="typeform-full" width="100%" height="100%" frameborder="0" allow="camera; microphone; autoplay; encrypted-media;" src="https://form.typeform.com/to/ikjv2lze?typeform-medium=embed-snippet"></iframe> <script type="text/javascript" src="https://embed.typeform.com/embed.js"></script> </body> </html>
1+
<html>
2+
<head>
3+
<meta
4+
name="viewport"
5+
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
6+
/>
7+
<title>Speaker/Workshop Signup</title>
8+
<style type="text/css">
9+
html {
10+
margin: 0;
11+
height: 100%;
12+
overflow: hidden;
13+
}
14+
iframe {
15+
position: absolute;
16+
left: 0;
17+
right: 0;
18+
bottom: 0;
19+
top: 0;
20+
border: 0;
21+
}
22+
</style>
23+
</head>
24+
<body>
25+
<iframe
26+
id="typeform-full"
27+
width="100%"
28+
height="100%"
29+
frameborder="0"
30+
allow="camera; microphone; autoplay; encrypted-media;"
31+
src="https://form.typeform.com/to/ikjv2lze?typeform-medium=embed-snippet"
32+
></iframe>
33+
<script
34+
type="text/javascript"
35+
src="https://embed.typeform.com/embed.js"
36+
></script>
37+
</body>
38+
</html>

0 commit comments

Comments
 (0)
Please sign in to comment.