diff --git a/_data/awards.yml b/_data/awards.yml index c7ce67f..6dec009 100644 --- a/_data/awards.yml +++ b/_data/awards.yml @@ -8,6 +8,20 @@ # awards: #the list of the awards that we won at that event # - Really Cool First Award # - Even Cooler Second Award +- year: 2025 + events: + - name: Canadian Pacific Regional + awards: + - Regional Finalists + - Excellence in Engineering Award + - name: San Diego Regional + awards: + - Regional Finalists + - Autonomous Award + - name: Fairbotics Pacific Showdown + awards: + - Winner of Event + - year: 2024 events: - name: Hueneme Port Regional diff --git a/_data/people.yml b/_data/people.yml index 7d4a875..06556f2 100644 --- a/_data/people.yml +++ b/_data/people.yml @@ -12,76 +12,77 @@ #sub-team leads - group: projectleads - name: Coming soon... + name: Vivian Lewis photo: default title: Mechanical Design Lead - blurb: Coming soon... + blurb: - group: projectleads - name: Coming soon... + name: Claire Robinson photo: default title: Mechanical Manufacturing Lead - blurb: Coming soon... + blurb: - group: projectleads - name: Coming soon... + name: Beatrice Au photo: default title: Mechanical Curriculum Lead - blurb: Coming soon... + blurb: - group: projectleads - name: Coming soon... + name: Eben Chan photo: default title: Mechanical Curriculum Lead - blurb: Coming soon... + blurb: - group: projectleads - name: Coming soon... + name: Bryce Brown photo: default title: Controls Electrical Lead - blurb: Coming soon... + blurb: - group: projectleads - name: Coming soon... + name: Lucas Han photo: default title: Controls Software Lead - blurb: Coming soon... + blurb: - group: projectleads - name: Coming soon... + name: Maggie Liang photo: default title: Controls Curriculum Lead - blurb: Coming soon... + blurb: - group: projectleads - name: Coming soon... + name: Samarth Kaashyap + photo: default + title: Controls Curriculum Lead + blurb: + +- group: projectleads + name: Vinh Olanrewaju photo: default title: Scouting Systems Lead - blurb: Coming soon... + blurb: - group: projectleads - name: Coming soon... + name: Abraham Jiang photo: default title: Strategic Design Lead - blurb: Coming soon... + blurb: -- group: projectleads - name: Coming soon... + group: projectleads + name: Vanyaa Khandelwal photo: default title: Strategy Curriculum Lead - blurb: Coming soon... + blurb: - group: projectleads - name: Coming soon... + name: Claire Lin photo: default - title: Business Lead - blurb: Coming soon... + title: Barketing Lead + blurb: -- group: projectleads - name: Coming soon... - photo: default - title: Business/Marketing Curriculum Lead - blurb: Coming soon... # Mentors - group: mentors @@ -161,42 +162,42 @@ name: Kenneth Wah photo: default title: Mentor - blurb: Coming soon... + blurb: # Leaders - group: leaders - name: Coming soon... + name: Colton Cumberland photo: default title: President - blurb: Coming soon... + blurb: - group: leaders - name: Coming soon... + name: Isabel Lai photo: default title: President - blurb: Coming soon... + blurb: - group: leaders - name: Coming soon... + name: Audrey Zheng photo: default title: Controls Coordinator - blurb: Coming soon... + blurb: - group: leaders - name: Coming soon... + name: Claire Lin photo: default - title: Business/Marketing Coordinator - blurb: Coming soon... + title: Barketing Coordinator + blurb: - group: leaders - name: Coming soon... + name: Emmi Dimmock photo: default title: Mechanical Coordinator - blurb: Coming soon... + blurb: - group: leaders - name: Coming soon... + name: Raynor Sanam photo: default title: Strategy Coordinator - blurb: Coming soon... + blurb: diff --git a/_data/robots.yml b/_data/robots.yml index 4fc0c54..1dcff3b 100644 --- a/_data/robots.yml +++ b/_data/robots.yml @@ -10,6 +10,16 @@ # weight: 312.8 lbs # speed: 31.28 mph # description: blah blah blah #a cool and nice mini-bio about the robot (i.e. the story of its ideation, any fun anecdotes about construction/design changes, and how well it did) +- year: 2025 + game: "REEFSCAPE" + name: Gillbert + code: 3128-robot-2025 + yt: _eTev_ZdTsM + stats: true + dimensions: 26.5” x 26.5” + weight: 115 lbs + description: Coming soon... + - year: 2024 game: "CRESCENDO" name: G-Minor @@ -100,7 +110,7 @@ name: The Claw code: robot-TheClawwww yt: 4_vVo1oC554 - description: Our robot this year was a versatile machine with a really, really large claw. It moved quickly and was able to move and stack the trash cans with ease. The Claw also had a state of the art autonomous, which dealt with trash cans with ease. + description: Our robot this year was a versatile machine with a really, really large claw. It moved quickly and was able to move and stack the trash cans with ease. The Claw also had an extremely good autonomous, which let it move trash cans smoothly. - year: 2014 game: AERIAL ASSIST diff --git "a/assets/page_photos/about/robots/Screenshot 2025-12-01 at 3.58.39\342\200\257PM.png" "b/assets/page_photos/about/robots/Screenshot 2025-12-01 at 3.58.39\342\200\257PM.png" new file mode 100644 index 0000000..f18fac9 Binary files /dev/null and "b/assets/page_photos/about/robots/Screenshot 2025-12-01 at 3.58.39\342\200\257PM.png" differ diff --git a/contact.md b/contact.md index c0006c6..df4d7fb 100644 --- a/contact.md +++ b/contact.md @@ -18,4 +18,4 @@ Canyon Crest Academy 5951 Village Center Loop Road San Diego, CA 92130 -hello + diff --git a/index.html b/index.html index a8298b3..0e3ff35 100644 --- a/index.html +++ b/index.html @@ -174,7 +174,7 @@

Robotics Summer Camp

-

Finding the workshop

+

Finding the Workshop

Our Workshop is located right under the Learning Commons. You can see where our workshop is on this map. There are two ways to get to our workshop:
1. From the school: Take the stairs between the B building and the Learning Commons towards the Admin Parking Lot. Our workshop is just past the Nest on the right side of the gate (the fenced-in area).
diff --git a/outreach/sdr-visitors.md b/outreach/sdr-visitors.md index aec3737..6e16039 100644 --- a/outreach/sdr-visitors.md +++ b/outreach/sdr-visitors.md @@ -17,7 +17,7 @@ Please contact us at [info@team3128.org](info@team3128.org) # Location of SDR ### Map of everything San Diego Regional (SDR): - + SDR will be held at the Lion Tree Arena on the campus of the University of California at San Diego (UCSD) - [9730 Hopkins Dr. La Jolla CA 92093](https://maps.app.goo.gl/bxYfCJs3iHreUewR8)