Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4,450 changes: 185 additions & 4,265 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"humanize-duration": "^3.28.0",
"md-to-pdf": "^5.1.0",
"mdToPdf": "^1.0.4",
"nodemon": "^1.14.9",
"nodemon": "^3.0.3",
"path-to-regexp": "^6.2.1",
"shelljs": "^0.8.4",
"socket.io": "^4.7.1",
Expand Down
10 changes: 7 additions & 3 deletions public/css/one-page-wonder.css
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@ h5 {
/* TODO: Probably add navbar components */
.navbar-custom .navbar-brand {
text-transform: uppercase;
font-size: 1rem;
font-size: 1.05rem;
letter-spacing: 0.1rem;
font-weight: 700;
}

.navbar-custom .navbar-nav .nav-item .nav-link {
text-transform: uppercase;
font-size: 0.8rem;
font-size: 0.85rem;
font-weight: 700;
letter-spacing: 0.1rem;
}
Expand Down Expand Up @@ -557,7 +557,7 @@ header.masthead .bg-plus-1 {
}

.about-us-row {
gap: 1.5rem, 0rem;
--bs-gutter-x: 3rem;
}

.card {
Expand Down Expand Up @@ -599,3 +599,7 @@ header.masthead .bg-plus-1 {
.col {
width: fit-content;
}

p{
font-size:1.1em
}
Binary file added public/img/organizers/drew.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/organizers/roy.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/organizers/skyelar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions views/pages/about.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,59 @@
</div>
</div>
</div>
<div class="col-12 col-md-6 col-xl-4">
<div class="card" style="height: 100%;">
<img
class="card-img-top"
src="img/organizers/roy.jpg"
alt="Card image cap"
/>
<div class="card-body">
<h5>Roy Wang</h5>
<h6>Sophmore Representative</h6>
<p class="blurb">
Roy is a sophomore at IMSA who has memorized more than 100 digits of pi. In addition to math, he enjoys basketball, clarinet, and table tennis.
He can often be spotted studying in his room, procrastinating in the main building, or hanging out with friends.
</p>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-xl-4">
<div class="card" style="height: 100%;">
<img
class="card-img-top"
src="img/organizers/drew.jpg"
alt="Card image cap"
/>
<div class="card-body">
<h5>Drew Wang</h5>
<h6>Sophmore Representative</h6>
<p class="blurb">
Drew is a sophomore at IMSA. He loves exploring concepts in mathematics and physics.
In his free time, he plays mobile games and pumps metal. He loves to devour eggs and catch his friends lacking.
On a Friday night you can catch him running while blasting "Eye of the Tiger".
</p>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-xl-4">
<div class="card" style="height: 100%;">
<img
class="card-img-top"
src="img/organizers/Skyelar.jpg"
alt="Card image cap"
/>
<div class="card-body">
<h5>Skyelar Reuter</h5>
<h6>Sophmore Representative</h6>
<p class="blurb">
Skyelar is a sophomore at IMSA. Outside of math, she enjoys chess, dance, debate, and golf!
Skyelar has a deep love for penguins and hopes to adopt one someday.
🐧 Her favorite math topic is complex numbers.
</p>
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions views/pages/home.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
class="btn btn-imsa btn-xl rounded-pill mt-5"
style="color: white !important"
>In-Person</a
>&nbsp;&nbsp;&nbsp;
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a
href="https://docs.google.com/forms/d/e/1FAIpQLSdu_fbvQNxdRObawCtMUXBI1IaQyCu6FnmTVaYeP65ptVxMTQ/viewform"
target="_blank"
Expand Down Expand Up @@ -91,7 +91,7 @@
<div class="col-lg">
<div class="p-5">
<h2 class="display-4">About</h2>
<div class="container about-us-div">
<div class="container about-us-div overflow-hidden">
<div class="row about-us-row">
<div class="col-12 col-sm-6 about-us-column">
<h3 class="hover_blue hover-underline-animation">
Expand Down
2 changes: 1 addition & 1 deletion views/partials/navbar.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
>
<div class="container">
<a class="navbar-brand d-flex align-items-center" href="/">
<img src="img/jhmc-logo.svg" height="30" class="d-inline-block align-top me-2" alt="">
<img src="img/jhmc-logo.svg" height="30" class="d-inline-block align-top me-3" alt="">
Junior High Math Contest
</a>
<button
Expand Down