Skip to content

Commit 6d258eb

Browse files
kehess99kehess99
authored
Merge pull request #180 from UTD-CRSS/develop
Develop
2 parents 3778641 + f0e4a4e commit 6d258eb

30 files changed

+284
-217
lines changed

‎.travis.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
sudo: false
22
dist: trusty
3-
language:
4-
- node_js
5-
- java
3+
language:
4+
- node_js
5+
- java
66
node_js:
77
- 12
8-
jdk:
8+
jdk:
99
- openjdk8
1010
- oraclejdk8
1111
rvm:
1212
- 1.9.3
1313
before_install:
14-
- npm install -g npm@latest
15-
- rvm install 1.9.3
16-
- gem update --system 1.8.24
17-
- travis_internal_ruby() { echo "1.9.3"; }
18-
- echo $(travis_internal_ruby)
14+
- npm install -g npm@latest
15+
- rvm install 1.9.3
16+
- gem update --system 1.8.24
17+
- travis_internal_ruby() { echo "1.9.3"; }
18+
- echo $(travis_internal_ruby)
1919
script:
20-
- npm run lint
21-
- npm test
20+
- npm run lint
21+
- npm test
2222
deploy:
23-
- provider: script
24-
skip_cleanup: true
25-
script: scripts/deploy.sh production
26-
on:
27-
branch: master
28-
- provider: script
29-
skip_cleanup: true
30-
script: scripts/deploy.sh staging
31-
on:
32-
branch: develop
23+
- provider: script
24+
skip_cleanup: true
25+
script: scripts/deploy.sh production
26+
on:
27+
branch: master
28+
- provider: script
29+
skip_cleanup: true
30+
script: scripts/deploy.sh staging
31+
on:
32+
branch: develop
3333
env:
3434
global:
3535
- secure: r3e4vkVNz6rnVRqCAT6nu6kCE435bSB1nkRjFQpOSZM3LX1qe/6mnVRJBT8PvgEeNMQWiuQ1RBGy/zvBo7njw1mKXUOYeH7yitFwgDV3Ito/DVSQbEqDPcks+R0lC+10XsSJnt4gXuTnZlOgKesYuqVRbwMBP/l2fIBeedkk//MC5siZ43uZSmJjq+OmyUNB2flOT6IqO3psKPFjR9Rqn+/nCqLbSk/YQ/EVcql2Sf8t0v2emcYk25rJTEljYdEyqpNbMgpzU5wRR1YeRpGcw3rDSdBs393Ys+5IQhtCwqiX0Dda0s1eQmrCI55jFAgAZjj7X6GRoQJ03R3vHE/tmnFaSL7UBL8duCQOGSlDPokp5mrRwSVEO7sFN7n6jJZFiDW5booL7CDaoVbU66fGqzvWVcLdJp+gJImLYqCt4YtZoLXlmXxziuEKA8Qw+shhWtndStNVoB5RjfiSqvB8IJZZ0IqfHP3MHz4rZrZ96BnOGv1Pjeh5kMKPO7a1qSM8t/i/L2A4YgyLswu3L6AEXy4rjzfE3X5PZFPpHhku84GrG6UWKiqFFmSOsEzopRvjdj4Hep9nTj3bIxZOGHnSATvLrnM6t+i8NrYGSuvEi3btgRCPpdeq4177HJOmO293T39PhRPZvNAzJmqfDkVcaIQDYQ+7XQnR5HW4onp2ZkA=
@@ -38,4 +38,4 @@ env:
3838
- secure: BxzEKVUOOSRPJK3zY8wEmXumd2sBWj5WQZoLsXWb/4aFUmFHWjB/sxRTdgySUgZLwRxQt9nya4vH4wimwWbbOtof17C++xZvaMXZ94Xdks6kZ4ULLzMyFgWHsrwfqGW+PrL4IcQCtJSHAvj9w3vY40jucsNfqjkkXDDZuItNt0c8lVZy8V4jm/PQNDY87LOqyC7bVuuUNlNt2J18y87DBB6BhO7cgjYQWIzx5QWa/RDQNL3TuXM4bWh3fR6n/MQ+cKXOno61PYfNsL7zSVE4aJfPN6/V8i3trIadBgFXV4eNn5x/uU8kV50ngo/8VGXGotnSjzjHAJyU5z/0FeoLcNBAEZ+SOYJ0exEHWNubPk5jq2paw9wQXUYjbXMMhr5wks8ei+Vztq++EZ9AYzKROHR3pB4kbJfPzKxsx1z3a93/zwUL5+KwdDa5Iddvp/BwmbzC78p2MpUCF5noY7yHdWHeaC5Lzod5ONSB0/jnVyLQ3479Q5g2BdU1eHFWVpiy/cNdg5OnGCmLUkZzo7m0mKPdwFV0VJY25q6ZjvuXwv6RuNbMB8NUpxWxH06ec+rGRT0+h84FvqpAlAuA2ZGcTEtGbFhWqoH6FF6V2iZI/FgIXEedQtoxls2k+CD4hEmIqVdrULLmwdlkpjNJruYpORvtNfzDy5pztKDdZjrjqhU=
3939
notifications:
4040
slack:
41-
secure: jbTPrBk3fg1k529RvW99/K69NqhG0r1d3+L+kCycPgj+YHheyyU3RUoK4ZnLkWAxIHK8FNgy5yq9n/rAKN+v20kXANV/Td5ZYZUrNoIyYE5L6aipjzxgYxvaBC8DglA+0DN7woUitYdSkDkoljVMzZVKsrYN5hR7ycJu5bmTMz4xJSnVZi4UY6oLLpaFjHXXDSVm8bOqJaeQhhr7sf4m/LYdF6D23FK4O4Y/qBycNfMopDMY34RUeiDnPzU0TX2tnpXpo+q0UWPqyuQ66w4R4SS7EaNgqaEHG7xdG/tXylB/9+ZCoGz6tcSxCJMshuN54K/c4KqWAJXkkbfGpq6ZuQ2f7dwqgNEKDt2yPSxjZyt4JZP7fl+oGZ6ecawrbT9ylpbq++dSBmvhBHIbZzFVXAjOibkHV2vVpY4jT1rxL7HMkpbrtWlyLHMOEo4aA7g0gi4Lt2oSOXBlJtwwePF+irmg6mlAHZfbHSsucSVrv2jWwENcBfz49ugdG133ypzq1sznyoJZyxKFL8M0vCa9mgyp2g/vO/+IlMijlLqj+dv9rab+mqHF3N+n/YY/h16K0VcC9qSY+Y/M/35V5siQsVBqKeC98j0sAqAUSWdt6LDRdDOJZCLWUYad5SURd6gkGV4WfG0cDNfRky4/O+TltUXCXlgjbU7z+tPq5go90oQ=
41+
secure: jbTPrBk3fg1k529RvW99/K69NqhG0r1d3+L+kCycPgj+YHheyyU3RUoK4ZnLkWAxIHK8FNgy5yq9n/rAKN+v20kXANV/Td5ZYZUrNoIyYE5L6aipjzxgYxvaBC8DglA+0DN7woUitYdSkDkoljVMzZVKsrYN5hR7ycJu5bmTMz4xJSnVZi4UY6oLLpaFjHXXDSVm8bOqJaeQhhr7sf4m/LYdF6D23FK4O4Y/qBycNfMopDMY34RUeiDnPzU0TX2tnpXpo+q0UWPqyuQ66w4R4SS7EaNgqaEHG7xdG/tXylB/9+ZCoGz6tcSxCJMshuN54K/c4KqWAJXkkbfGpq6ZuQ2f7dwqgNEKDt2yPSxjZyt4JZP7fl+oGZ6ecawrbT9ylpbq++dSBmvhBHIbZzFVXAjOibkHV2vVpY4jT1rxL7HMkpbrtWlyLHMOEo4aA7g0gi4Lt2oSOXBlJtwwePF+irmg6mlAHZfbHSsucSVrv2jWwENcBfz49ugdG133ypzq1sznyoJZyxKFL8M0vCa9mgyp2g/vO/+IlMijlLqj+dv9rab+mqHF3N+n/YY/h16K0VcC9qSY+Y/M/35V5siQsVBqKeC98j0sAqAUSWdt6LDRdDOJZCLWUYad5SURd6gkGV4WfG0cDNfRky4/O+TltUXCXlgjbU7z+tPq5go90oQ=

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ invalid or insecure, it is just self-signed.
3131

3232
### Branches and Versioning
3333

34-
The `master` is considered "hot" and is continuously deployed to a staging
35-
server. Every tagged version is automatically deployed to production.
34+
The `master` is considered "hot" and is continously deployed to production.
35+
**NOTE:** The master branch previously was deployed to a staging server, and tagged versions were deployed. However, in the React upgrade, this added step seems to have been broken. Ideally, this should be reimplemented such that only tagged commits are deployed to the live website.
3636

3737
Day-to-day development is done on the `develop` branch. The `develop` branch is continuously deployed to a development server for evaluation.
3838

‎src/components/LessonList/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export function LessonList() {
55
return (
66
<div className="app-container">
77
<nav className="navbar navbar-inverse bg-black">
8-
<a className="lessonlinks" href="/lessons#k-2">
8+
<a className="lessonlinks " href="/lessons#k-2">
99
Cadets (k-2)
1010
</a>
1111
<a className="lessonlinks" href="/lessons#3-5">
@@ -20,7 +20,7 @@ export function LessonList() {
2020
</nav>
2121
<span className="addpadding"></span>
2222

23-
<h3 className="center">
23+
<h3 className="center feedbacktext">
2424
We would love more ideas and input on engaging lessons for everyone to
2525
learn
2626
</h3>
@@ -36,7 +36,7 @@ export function LessonList() {
3636
<span className="addpadding"></span>
3737
<span className="addpadding"></span>
3838

39-
<h3 id="k-2" className="gradeanchor round out">
39+
<h3 id="k-2" className="gradeanchor round out responsive">
4040
Cadets K-2
4141
</h3>
4242
<button className="btn-info btn-lg flex-grow-1 addpadding bolder">

‎src/components/LessonList/index.scss

+24-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,36 @@
1717
.lessonlinks {
1818
background-color:rgba(118, 77, 212, 0.801);
1919
padding: 20px;
20-
width: 20%;
20+
width: 22vw;
2121
text-align: center;
2222
font-weight: bolder;
2323
border-color: white;
2424
border-width: 15px;
2525
border-radius: 5px;
26-
font-size: 20px;
26+
font-size: inherit;
2727
}
28+
@media screen and (max-width: 800px) {
29+
//MOBILE STYLINGS
30+
.lessonlinks {
31+
flex-grow: 1;
32+
margin: 2vw;
33+
width: auto;
34+
height:auto;
35+
}
36+
37+
.gradeanchor {
38+
font-size: 15vw;
39+
width: 100%;
40+
height:auto;
41+
}
42+
.feedbacktext {
43+
font-size: 8vw;
44+
padding: 1vw;
45+
}
46+
47+
48+
}
49+
2850

2951
.bolder {
3052
font-weight: bolder;

‎src/containers/Apollo11Explorer/index.js

+48-34
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import _ from "lodash";
33
import { DayDisplay } from "../../components";
44
import { AppFooter, AppHeader } from "../App";
55
import config from "../../../config";
6-
import apollo11logo from "../../../static/apollo11logo.jpg";
6+
import apollo11logo from "../../../static/FastFactsimgs/apollo11logo.jpg";
7+
import Crew from "../../../static/FastFactsimgs/apollo11crew.jpg";
78
import { StoryList } from "../../components";
89
import Spinner from "react-spinner";
910

@@ -121,50 +122,63 @@ export class Apollo11Explorer extends Component {
121122
<br></br>
122123
<br></br>
123124
</h3>
124-
<p>
125+
<h4>
126+
<b>Information: </b>
127+
</h4>
128+
1. Astronauts: Neil Armstrong, Buzz Aldrin, and Michael Collins{" "}
129+
<br></br>
130+
2. This was the first manned mission to successfully reach the moon.{" "}
131+
<br></br>
132+
3. The American flag that was planted on the moon by the astronauts
133+
was made by Sears. <br></br>
134+
4. Apollo 11 was launched at the same time of the Soviet's Sputnik.{" "}
135+
<br></br>
136+
5. President John F. Kennedy was more interested in the Space Race
137+
than he was of what the astronauts would find in space. <br></br>
138+
6. When Armstrong, Aldrin, and Collins returned back to Earth, they
139+
were placed in quarantine because scientists were inconclusive about
140+
space germs entering Earth. <br></br> <br></br>
141+
<h4>
142+
<b>Significance: </b>
143+
</h4>
144+
1. Apollo 11 was the first mission to successfully place men on the
145+
moon. <br></br>
146+
2. Neil Armstrong marked the occasion with his famous quote: "That's
147+
one small step for man, one giant leap for mankind." <br></br>{" "}
148+
<br></br>
149+
<div>
125150
<h4>
126-
<b>Information: </b>
151+
<b> Crew: </b>
127152
</h4>
128-
1. Astronauts: Neil Armstrong, Buzz Aldrin, and Michael Collins{" "}
129-
<br></br>
130-
2. This was the first manned mission to successfully reach the
131-
moon. <br></br>
132-
3. The American flag that was planted on the moon by the
133-
astronauts was made by Sears. <br></br>
134-
4. Apollo 11 was launched at the same time of the Soviet's
135-
Sputnik. <br></br>
136-
5. President John F. Kennedy was more interested in the Space Race
137-
than he was of what the astronauts would find in space. <br></br>
138-
6. When Armstrong, Aldrin, and Collins returned back to Earth,
139-
they were placed in quarantine because scientists were
140-
inconclusive about space germs entering Earth. <br></br> <br></br>
141-
<h4>
142-
<b>Significance: </b>
143-
</h4>
144-
1. Apollo 11 was the first mission to successfully place men on
145-
the moon. <br></br>
146-
2. Neil Armstrong marked the occasion with his famous quote:
147-
"That's one small step for man, one giant leap for mankind."{" "}
148-
<br></br> <br></br>
149-
</p>
153+
Pictured Left to Right <br></br>
154+
1. Neil Armstrong (Mission Commander)<br></br>
155+
2. Michael Collins (Command Module Pilot) <br></br>
156+
3. Edwin (Buzz) Aldrin (Lunar Module Pilot) <br></br>
157+
</div>
150158
</div>
151159

152160
<div className="col-sm-6">
153161
<img
154162
src={apollo11logo}
155-
className="apollo11logo"
156-
width="90%"
157-
height="90%"
163+
className="center addpadding"
164+
width="70%"
165+
height="auto"
158166
/>
159-
</div>
160-
<div className="container">
161-
<DayDisplay
162-
day={this.props.location.pathname.split("/")[3]}
163-
url={url}
167+
<img
168+
src={Crew}
169+
className="center addpadding"
170+
width="80%"
171+
height="auto"
164172
/>
165-
{this.checkDay()}
166173
</div>
167174
</div>
175+
<div className="container">
176+
<DayDisplay
177+
day={this.props.location.pathname.split("/")[3]}
178+
url={url}
179+
/>
180+
{this.checkDay()}
181+
</div>
168182
<AppFooter />
169183
</div>
170184
);

‎src/containers/Apollo13Explorer/index.js

+42-31
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { Component } from "react";
2-
import Apollo13logo from "../../../static/Apollo13Logo.jpg";
2+
import Apollo13logo from "../../../static/FastFactsimgs/Apollo13Logo.jpg";
3+
import Crew from "../../../static/FastFactsimgs/apollo13crew.jpg";
34
import { AppFooter, AppHeader } from "../App";
45
// import { Apollo13StoryTimeline } from "../../components";
56

@@ -16,47 +17,57 @@ export class Apollo13Explorer extends Component {
1617
</h4>
1718

1819
<div className="row fastfacts">
19-
<div className="col-sm-6">
20+
<div className="col-sm-6 fastfactstext">
2021
<h3>
2122
{" "}
2223
<br></br>
2324
<b> Fast Facts</b>
2425
<br></br>
2526
<br></br>
2627
</h3>
27-
<p>
28-
<h4>
29-
<b>Information:</b>
30-
</h4>
31-
1. Astronauts: Jim Lovell, Fred Haise, and Jack Swigert <br></br>
32-
2. The rocket that carried the astronauts is called the Saturn V.
33-
This rocket was the heaviest flown rocket by NASA. <br></br>
34-
3. The command module on the Odyssey was completely damaged, so
35-
they used the Aquarius lunar module to come back to Earth. (This
36-
is what they were supposed to use when they landed on the moon).{" "}
37-
<br></br>
38-
4. This became a very dangerous situation because Aquarius did not
39-
have a heat shield. <br></br> <br></br>
40-
<h4>
41-
<b> Significance: </b>
42-
</h4>
43-
1. This was the most carefully watched mission. <br></br>
44-
2. The mission was supposed to be the 3rd landing attempt on the
45-
moon. <br></br>
46-
3. The primary goal of this mission was to study Earth's origin.
47-
The plan was to land near the Fra Mauro crater. <br></br>
48-
4. The Fra Mauro crater had material from when the moon was first
49-
created. <br></br>
50-
5. This mission brought about a very famous quote: "Houston, we
51-
have a problem." <br></br>
52-
<br></br>
53-
</p>
28+
<h4>
29+
<b>Information:</b>
30+
</h4>
31+
1. Astronauts: Jim Lovell, Fred Haise, and Jack Swigert <br></br>
32+
2. The rocket that carried the astronauts is called the Saturn V.
33+
This rocket was the heaviest flown rocket by NASA. <br></br>
34+
3. The command module on the Odyssey was completely damaged, so they
35+
used the Aquarius lunar module to come back to Earth. (This is what
36+
they were supposed to use when they landed on the moon). <br></br>
37+
4. This became a very dangerous situation because Aquarius did not
38+
have a heat shield. <br></br> <br></br>
39+
<h4>
40+
<b> Significance: </b>
41+
</h4>
42+
1. This was the most carefully watched mission. <br></br>
43+
2. The mission was supposed to be the 3rd landing attempt on the
44+
moon. <br></br>
45+
3. The primary goal of this mission was to study Earth's origin. The
46+
plan was to land near the Fra Mauro crater. <br></br>
47+
4. The Fra Mauro crater had material from when the moon was first
48+
created. <br></br>
49+
5. This mission brought about a very famous quote: "Houston, we have
50+
a problem." <br></br>
51+
<br></br>
52+
<h4>
53+
<b> Crew: </b>
54+
</h4>
55+
Pictured Left to Right <br></br>
56+
1. Fred W. Haise (Lunar Module Pilot)<br></br>
57+
2. James A. Lovell (Commander) <br></br>
58+
3. John L. Swigert (Command Module Pilot) <br></br>
5459
</div>
5560
<div className="col-sm-6">
5661
<img
5762
src={Apollo13logo}
58-
className="Apollo13Logo"
59-
width="auto"
63+
className="center addpadding"
64+
width="70%"
65+
height="auto"
66+
/>
67+
<img
68+
src={Crew}
69+
className="center addpadding"
70+
width="80%"
6071
height="auto"
6172
/>
6273
</div>

0 commit comments

Comments
 (0)