Skip to content

Commit 57d6c39

Browse files
authored
Merge pull request DeepBlueRoboticsMentors#8 from DeepBlueRobotics/master
Picture Updates, Mentor Updates, and Sponsor Updates
2 parents 98f2905 + e470222 commit 57d6c39

17 files changed

Lines changed: 182 additions & 99 deletions

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,17 @@ Once you are happy with how your changes to the site and `admin/config.yml` appe
6363

6464
To request inclusion of your changes in the production website, [create a "pull request"](https://github.com/DeepBlueRobotics/DeepBlueRobotics.github.io/pull/new/master) and then let a reviewer know that you have done so.
6565

66-
## Merging Changes into the Production Website
66+
## Reviewing and Merging Changes into the Production Website
6767

6868
If you've been asked to merge changes into the production website:
6969

70-
1. Go to https://github.com/DeepBlueRoboticsMentors/DeepBlueRoboticsMentors.github.io/pulls. There should be one open pull request. (If there is more than one, work with the people who are requesting that their changes be merged to figure out which one to merge.) Click on the pull request.
71-
2. Confirm that the request is to merge the `master` branch of the `DeepBlueRobotics/DeepBlueRobotics.github.io` repository into the `master` branch of the `DeepBlueRoboticsMentors/DeepBlueRoboticsMentors.github.io` repository. If the request lists different repositories or branches, you will not be able to review it by looking at the staging site, so you should ask the requester to make the changes to the staging site first.
72-
3. Verify that the staging site, https://deepbluerobotics.github.io, contains the desired corrections and is no worse than the production site, http://www.carlmontrobotics.org/, ideally on both a computer and a phone.
73-
4. If everything looks good, return to the page containing the pull request, click `Merge Pull Request` and then `Confirm Merge` to merge the pull request.
74-
5. It should only take a few seconds for your changes to show up at http://www.carlmontrobotics.org/. If you aren't sure whether the site has been regenerated yet, you can check https://github.com/DeepBlueRoboticsMentors/DeepBlueRoboticsMentors.github.io/deployments to see how recently the last deployment occurred.
70+
1. Right click on https://github.com/DeepBlueRoboticsMentors/DeepBlueRoboticsMentors.github.io/pulls and select "Open in new window" to see a *list* of requests for changes to be merged into the production website (i.e. "pull requests"). There should be only one open pull request in the list. (If there is more than one, work with the people who are requesting that their changes be merged to figure out which one to merge.)
71+
2. Click on the one pull request that is listed.
72+
3. Confirm that the request is to merge "commits into `DeepBlueRoboticsMentors:master from DeepBlueRobotics:master`". If the request is to merge commits from *someplace else*, you will not be able to review it by looking at the staging site, and you should ask the requester to make the changes to the staging site first.
73+
4. View the staging site, https://deepbluerobotics.github.io (right click and open in a new window), and verify that it contains the desired corrections and is no worse than the production site, http://www.carlmontrobotics.org/, ideally on both a computer and a phone.
74+
5. If you have any comments, you can add them at the bottom of the pull request. Be sure to click Preview above the comment box and review your comment before submitting it.
75+
6. When you are ready to merge the changes, return to the page containing the pull request, click `Merge Pull Request` and then `Confirm Merge` to merge the pull request.
76+
7. It should only take a few seconds for your changes to show up at http://www.carlmontrobotics.org/. If you aren't sure whether the site has been regenerated yet, you can check https://github.com/DeepBlueRoboticsMentors/DeepBlueRoboticsMentors.github.io/deployments to see how recently the last deployment occurred.
7577

7678
## Undoing Changes to the Production Website
7779

about.md

Lines changed: 79 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,33 @@
11
---
2-
layout: default
3-
title: About Us
4-
subtitle: Information about Deep Blue Robotics
5-
short_name: About
6-
permalink: /about
72
who_we_are:
83
title: Who We Are
9-
image: images/Team2017.jpg
10-
content: |
11-
FIRST Robotics Competition (FRC) Team 199, Deep Blue Robotics, is a third-year team established in August of 2015 by students at Carlmont High School to make STEM and business education accessible for Carlmont students through the avenue of FIRST. Deep
4+
image: /images/DSCF2291.JPG
5+
content: >
6+
FIRST Robotics Competition (FRC) Team 199, Deep Blue Robotics, is a
7+
third-year team established in August of 2015 by students at Carlmont High
8+
School to make STEM and business education accessible for Carlmont students
9+
through the avenue of FIRST. Deep
10+
1211
Blue Robotics participates in FRC, the FIRST-organized robotics competition. Each year, we are handed a challenge from FIRST and have six weeks to build a robot to overcome that challenge. To learn more about FIRST and FRC, visit the FIRST website at
12+
1313
[firstinspires.org](http://firstinspires.org){:target="_blank"}.
14-
14+
15+
1516
Team 199 consists of Carlmont students, invaluable mentors, and supportive parents. Carlmont also has a Robotics Engineering class.
17+
layout: default
18+
permalink: /about
19+
title: About Us
20+
subtitle: Information about Deep Blue Robotics
21+
short_name: About
1622
mission:
1723
title: Mission
18-
content: |
19-
The mission of Deep Blue Robotics is to provide students with the opportunity to explore STEM fields and develop engineering, project management, and community relations skills in an engaging and challenging environment. We are dedicated to thriving as
20-
a team, and further extending our hands to greet more members of our community with the gracious professionalism and technological opportunities that FIRST has to offer.
21-
history:
22-
title: History
23-
image: images/teamhuddle.jpg
24-
content: |
25-
Deep Blue Robotics has grown enormously as an enterprise and as a community since our foundation in 2015. Based at Carlmont High School after breaking off from FRC Team 100 at Woodside High School, we have worked hard to grow from a garage team without
26-
adequate shop space and tooling, staff resources, or funding, to a well-equipped team integrated into our school and local community. On the team, any Carlmont student that wishes to join and dedicate time has the opportunity to learn first-hand about
27-
essential technical and business skills, giving them priceless career experience and intellectually inspiring them through the potential of innovation and entrepreneurship.
28-
29-
Our progress has been dramatic, and our organization is expanding still. Starting in the 2016 school year, the team now has an official course at Carlmont High School, entitled Engineering Robotics, which is opening a huge opportunity for technical
30-
and entrepreneurial training and non-rushed development of our team's priorities, optimized structure, and efforts to engage with the community. Such a quick expansion would not have been possible without the advice and dedication of our mentors, the
31-
financial support of our sponsors, the invaluable help of our past and present core teachers, and our school administration's kind accommodation of us.
32-
33-
our_mentors:
34-
title: Our Mentors
35-
image: images/MrT.png
36-
content: We can't thank you enough!
24+
content: >
25+
The mission of Deep Blue Robotics is to provide students with the
26+
opportunity to explore STEM fields and develop engineering, project
27+
management, and community relations skills in an engaging and challenging
28+
environment. We are dedicated to thriving as
3729
30+
a team, and further extending our hands to greet more members of our community with the gracious professionalism and technological opportunities that FIRST has to offer.
3831
mentors:
3932
- name: Al Davies
4033
role: Mentor
@@ -76,6 +69,64 @@ mentors:
7669
role: Mentor
7770
- name: Stoyan Gaydarov
7871
role: Mentor
72+
history:
73+
title: History
74+
image: /images/random-image-of-team.jpg
75+
content: >
76+
Deep Blue Robotics has grown enormously as an enterprise and as a community
77+
since our foundation in 2015. Based at Carlmont High School after breaking
78+
off from FRC Team 100 at Woodside High School, we have worked hard to grow
79+
from a garage team without
80+
81+
adequate shop space and tooling, staff resources, or funding, to a well-equipped team integrated into our school and local community. On the team, any Carlmont student that wishes to join and dedicate time has the opportunity to learn first-hand about
82+
83+
essential technical and business skills, giving them priceless career experience and intellectually inspiring them through the potential of innovation and entrepreneurship.
84+
85+
86+
Our progress has been dramatic, and our organization is expanding still. Starting in the 2016 school year, the team now has an official course at Carlmont High School, entitled Engineering Robotics, which is opening a huge opportunity for technical
87+
88+
and entrepreneurial training and non-rushed development of our team's priorities, optimized structure, and efforts to engage with the community. Such a quick expansion would not have been possible without the advice and dedication of our mentors, the
89+
90+
financial support of our sponsors, the invaluable help of our past and present core teachers, and our school administration's kind accommodation of us.
91+
our_mentors:
92+
title: Our Mentors
93+
image: images/MrT.png
94+
content: We can't thank you enough!
95+
mentors:
96+
- name: Alex Abbas
97+
role: Mentor
98+
- name: Bonnie Wolf
99+
role: Lead Business Mentor
100+
- name: Chris Moropoulo
101+
role: Mentor
102+
- name: Dean Brettle
103+
role: Coach, Lead Sensing & Actuation Mentor
104+
- name: Jim Wilfong
105+
role: Mentor
106+
- name: Jennifer Low
107+
role: Mentor
108+
- name: Karin Saltzherr
109+
role: Mentor
110+
- name: Matt Moropoulos
111+
role: Mentor
112+
- name: Mike Bushue
113+
role: Lead Fabrication Mentor
114+
- name: Michyle LaPedis
115+
role: Mentor
116+
- role: Mentor
117+
name: Michyle LaPedis
118+
- name: Mike Gottesman
119+
role: Mentor
120+
- name: Nicole Bachelor
121+
role: Mentor
122+
- name: Ms Carefoot Carefoot
123+
role: Staff Chaperone
124+
- name: Steve Siefert
125+
role: Lead Design Mentor
126+
- name: Susan Neth
127+
role: Lead Programming Mentor
128+
- name: Wynne Chan
129+
role: Mentor
79130
---
80131
<div class="parallax-window" data-parallax="scroll" data-image-src="{{page.who_we_are.image}}" data-position="center center" data-speed="0.7"></div>
81132

images/ap-logo.png

10.4 KB
Loading
16.2 KB
Loading

images/intuitive.jpg

5.6 KB
Loading

images/kla-foundation.jpg

6.03 KB
Loading
111 KB
Loading

images/microsoft.png

900 Bytes
Loading

images/random-image-of-team.jpg

500 KB
Loading

images/solid-professor.png

3.49 KB
Loading

0 commit comments

Comments
 (0)