Skip to content

Commit

Permalink
Merge pull request #78 from waterloo-rocketry/award-update
Browse files Browse the repository at this point in the history
Add LC 24 trophy
  • Loading branch information
Redstone-ray authored Sep 4, 2024
2 parents 667f62f + f07ffec commit dbf3fd8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
Binary file added src/img/awards/advanced_2024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/routes/Awards.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import CoverPhoto from '../components/CoverPhoto/CoverPhoto';
import awardsCoverImage from '../img/awards/awards_cover.jpg';
import MOORE21Image from '../img/awards/DrGilMoore21.png';
import CANRGXImage from '../img/awards/CANRGXOutreach19.png';
import ADVANCED2024 from '../img/awards/advanced_2024.png';
import SRAD23Image from '../img/awards/30k_SRAD23.png';
import KOTS23Image from '../img/awards/10k_KOTS23.png';
import SRAD19Image from '../img/awards/30k_SRAD19.png';
Expand All @@ -19,6 +20,21 @@ const Awards = () => {
<CoverPhoto image={awardsCoverImage} style={{ backgroundPosition: '50% 52.5%' }} />
<Container fluid>
<Row className="my-4 mx-2 gx-5 justify-content-right">
<AwardYear Year={2024} />
<AwardItem
RocketName="Borealis"
AwardName="FIRST PLACE - ADVANCED CATEGORY"
ImageAddress={ADVANCED2024}
ImageStyle={{ width: '300px', marginLeft: '2%' }}
ImageName="First place - advanced category"
>
The Category First Place Awards recognize the teams with the highest overall
scores in each of the three competition categories, with this category representing
advanced flights, including Student Research and Designed two-stage, hybird and liquid
engine rockets. Our team received this award for finishing first in our category
at the 2024 LC, with the flight of Borealis - the first-ever Canadian
liquid bi-propellant rocket.
</AwardItem>
<AwardYear Year={2023} />
<AwardItem
RocketName="LotS"
Expand Down
10 changes: 1 addition & 9 deletions src/routes/Join.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,7 @@ const Join = () => {
</a>
{' '}
to get started. We&apos;ll send you an invite to our
Slack workspace, the team&apos;s main form of communication. If you haven&apos;t
already, you can also join our
{' '}
<a target="_blank" rel="noopener noreferrer" href="https://www.facebook.com/groups/uwrocketry/">
Facebook group
</a>
{' '}
for important updates and
announcements regarding the team.
Slack workspace, the team&apos;s main form of communication.
</Content>
</Row>

Expand Down

0 comments on commit dbf3fd8

Please sign in to comment.