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

Updated Trium to new Trium (2024-5) #88

Merged
merged 2 commits into from
May 2, 2024
Merged

Updated Trium to new Trium (2024-5) #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e289f7f
added awards & accomplishments
benjaminxiaa Apr 26, 2024
93953aa
updated trium
benjaminxiaa May 2, 2024
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
25 changes: 19 additions & 6 deletions static/new/css/about.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
font-weight: bold;
}

#body h2 {
color: var(--color-primary);
margin-bottom: 1.5vh;
font-size: 4vw;
}

#content {
width: 100%;
}
Expand All @@ -34,12 +28,31 @@
text-align: center;
}

#missionstatement-title {
color: var(--color-primary);
margin-bottom: 1.5vh;
margin-top: 1.5vh;
font-size: 4vw;
}

#missionstatement {
font-weight: 100;
font-size: 3vw;
/* margin-bottom: 10vw; */
}

#awards-title {
color: var(--color-primary);
margin-bottom: 1.5vh;
margin-top: 10vh;
font-size: 4vw;
}

#awards {
font-weight: 100;
font-size: 2vw;
}

#calendar {
background-color: var(--color-background);
width: 80%;
Expand Down
Binary file added static/new/img/faces/25atharvg.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 21 additions & 1 deletion views/new/pages/about.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,28 @@
<div id="body">
<div id="about">
<h1>About</h1>
<h2>Mission Statement</h2>
<h2 id="missionstatement-title">Mission Statement</h2>
<p id="missionstatement">We aim to grant club members the opportunity to explore STEAM through hands-on experience with robots and their components. We develop the organizational and teamwork skills required to successfully design and build for the FIRST® competition. We perform with joy, professionalism, and excellence, sharing our knowledge and experience with the larger community.</p>
<h2 id="awards-title">Awards & Accomplishments</h2>
<p id="awards">
<b>2024 Monterey Bay Regional:</b> Judges' Award <br />
<b>2024 Sacramento Regional:</b> Regional Finalists & Gracious Professionalism Award <br />
<b>2023 Sacramento Regional:</b> FIRST® Impact Award <br />
<b>2023 Central Valley Regional:</b> Judges' Award <br />
<b>2022 Silicon Valley Regional:</b> Excellence in Engineering Award <br />
<b>2019 Sacramento Regional:</b> Regional Finalists <br />
<b>2019 Central Valley Regional:</b> Regional Finalists Wildcard <br />
<b>2018 Roebling Division:</b> Championship Subdivision Winner <br />
<b>2018 Sacramento Regional:</b> Regional Finalists Wildcard <br />
<b>2014 Central Valley Regional:</b> Entrepreneurship Award sponsored by Kleiner Perkins Caufield & Byers <br />
<b>2012 Sacramento Regional:</b> Woodie Flowers Finalist Award (Eric Nelson) <br />
<b>2008 UC Dvais Sacramento Regional:</b> Regional Finalists <br />
<b>2007 Davis Sacramento Regional:</b> Xerox Creativity Award <br />
<b>2005 Silicon Valley Regional:</b> Judges' Award <br />
<b>2005 Sacramento Regional:</b> Regional Winner <br />
<b>2003 Silicon Valley Regional:</b> DaimlerChrysler Team Spirit Award <br />
<b>2003 Sacramento Regional:</b> Rookie All Star Award Friday <br />
</p>
</div>
</div>
<%- include(__base + 'views/new/partials/footer.ejs') %>
Expand Down
6 changes: 3 additions & 3 deletions views/new/pages/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
<h1 id="team-background-text">We are an FRC Team located at The Harker School.</h1>
<div id="team-statistics-wrapper">
<div class="team-statistic">
<h3 class="team-stat-value" id="in-view-0">55</h2>
<h3 class="team-stat-value" id="in-view-0">52</h2>
<h4 class="team-stat-label">Members</h3>
</div>
<div class="team-statistic">
<h3 class="team-stat-value" id="in-view-2">45</h2>
<h3 class="team-stat-value" id="in-view-2">58</h2>
<h4 class="team-stat-label">Competitions</h3>
</div>
<div class="team-statistic">
<h3 class="team-stat-value" id="in-view-1">18</h2>
<h3 class="team-stat-value" id="in-view-1">21</h2>
<h4 class="team-stat-label">Years</h3>
</div>
</div>
Expand Down
23 changes: 15 additions & 8 deletions views/new/pages/member.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,30 @@
<h1>Leadership</h1>
<h2>Presidents</h2>
<p>Presidents oversee our broader vision and ensure the smooth function and success of our team.</p>
<div id="triumvirate">
<div class="leader">
<h4 class="individual-title">Technical President</h4>
<img class="leader-image" src="new/img/faces/25chilingh.jpg" />
<h5>Chiling Han</h5>
</div>
<div id="opsgang">
<div class="leader">
<h4 class="individual-title">Executive President</h4>
<img class="leader-image" src="new/img/faces/24aeliyag.jpg" />
<h5>Aeliya Grover</h5>
<img class="leader-image" src="new/img/faces/25deeyav.jpg" />
<h5>Deeya Verma</h5>
</div>
<div class="leader">
<h4 class="individual-title">Operations President</h4>
<img class="leader-image" src="new/img/faces/25tiffanyg.jpg" />
<h5>Tiffany Gu</h5>
</div>
</div>
<div id="opsgang">
<div class="leader">
<h4 class="individual-title">Technical President</h4>
<img class="leader-image" src="new/img/faces/25atharvg.jpg" />
<h5>Atharv Goel</h5>
</div>
<div class="leader">
<h4 class="individual-title">Technical Vice-President</h4>
<img class="leader-image" src="new/img/faces/26brennar.jpg" />
<h5>Brenna Ren</h5>
</div>
</div>
<h2>Directors</h2>
<p>Directors operate directly under presidents and manage specific subteam functions.</p>
<h3>Technical Directors</h3>
Expand Down
65 changes: 65 additions & 0 deletions views/new/pages/pastleadership.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,71 @@
<div id="header">
<h1>Past Leadership</h1>
</div>
<div class="year-div">
<h2>2023-2024</h2>
<div class="year-div-inner">
<div class="year-div-item">
<span>Executive President</span>
<span>Aeliya Grover</span>
</div>
<div class="year-div-item">
<span>Technical President</span>
<span>Chiling Han</span>
</div>
<div class="year-div-item">
<span>Operations President</span>
<span>Tiffany Gu</span>
</div>
<div class="year-div-item">
<span>Design Co-Director</span>
<span>Sania Gupta</span>
</div>
<div class="year-div-item">
<span>Design Co-Director</span>
<span>Ronald Cartee</span>
</div>
<div class="year-div-item">
<span>Design Co-Director</span>
<span>Brindha Chandran</span>
</div>
<div class="year-div-item">
<span>Electrical Director</span>
<span>Brenden Hayes</span>
</div>
<div class="year-div-item">
<span>Mech/Machining Co-Director</span>
<span>Akul Goyal</span>
</div>
<div class="year-div-item">
<span>Mech/Machining Co-Director</span>
<span>Atharv Goyal</span>
</div>
<div class="year-div-item">
<span>Software Co-Director</span>
<span>Brenna Ren</span>
</div>
<div class="year-div-item">
<span>Software Co-Director</span>
<span>Benjamin Xia</span>
</div>
<div class="year-div-item">
<span>Application Development Director</span>
<span>Kabir Ramzan</span>
</div>
<div class="year-div-item">
<span>Game Strategy Director</span>
<span>Deeya Verma</span>
</div>
<div class="year-div-item">
<span>Outreach Director</span>
<span>Ceren Erdogan</span>
</div>
<div class="year-div-item">
<span>Media/PR Director</span>
<span>Sophia Liu</span>
</div>
</div>
</div>
<div class="year-div">
<h2>2022-2023</h2>
<div class="year-div-inner">
Expand Down
Loading