Skip to content

Commit 31cc195

Browse files
KryptKodeKryptKode
committed
Merge branch 'develop'
Fixed minor bugs
2 parents caadba9 + 6a604fd commit 31cc195

6 files changed

Lines changed: 93 additions & 12 deletions

File tree

‎package.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
"name": "css-modules",
33
"version": "0.1.0",
44
"private": true,
5+
"homepage": "http://kryptkode.github.io/NASA-Facts",
56
"dependencies": {
67
"classnames": "^2.2.6",
78
"custom-react-scripts": "0.2.2",
9+
"gh-pages": "^2.0.1",
810
"prop-types": "^15.7.2",
911
"react": "^16.8.6",
1012
"react-dom": "^16.8.6"
@@ -13,6 +15,8 @@
1315
"start": "react-scripts start",
1416
"build": "react-scripts build",
1517
"test": "react-scripts test --env=jsdom",
16-
"eject": "react-scripts eject"
18+
"eject": "react-scripts eject",
19+
"predeploy": "yarn run build",
20+
"deploy": "gh-pages -d build"
1721
}
1822
}

‎public/favicon.ico‎

-20.1 KB
Binary file not shown.

‎public/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
work correctly both with client-side routing and a non-root public URL.
2222
Learn how to configure a non-root public URL by running `npm run build`.
2323
-->
24-
<title>React App</title>
24+
<title>NASA Facts</title>
2525
</head>
2626
<body>
2727
<noscript>
2828
You need to enable JavaScript to run this app.
2929
</noscript>
3030
<audio autoplay loop>
31-
<source src="/NASA.mp3" type="audio/mpeg"></source>
31+
<source src="%PUBLIC_URL%/NASA.mp3" type="audio/mpeg"></source>
3232
</audio>
3333
<div id="root"></div>
3434
<!--

‎src/Rocket/Rocket.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default class Rocket extends React.Component {
66
return (
77
<div>
88
<img
9-
src='/shuttle.png'
9+
src='shuttle.png'
1010
alt='shuttle'
1111
className={styles.img} />
1212
</div>

‎src/Rocket/Smoke.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export default class Smoke extends React.Component {
55
render() {
66
return (
77
<div className={styles.smoke}>
8-
<video className={styles.video} autoPlay loop src='/smoke.mov' />
8+
<video className={styles.video} autoPlay loop src='smoke.mov' />
99
</div>
1010
);
1111
}

‎yarn.lock‎

Lines changed: 84 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ async@^1.5.2:
345345
version "1.5.2"
346346
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
347347

348-
async@^2.1.2, async@^2.1.4, async@^2.4.1:
348+
async@^2.1.2, async@^2.1.4, async@^2.4.1, async@^2.6.1:
349349
version "2.6.2"
350350
resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
351351
dependencies:
@@ -1694,6 +1694,10 @@ class-utils@^0.3.5:
16941694
isobject "^3.0.0"
16951695
static-extend "^0.1.1"
16961696

1697+
classnames@^2.2.6:
1698+
version "2.2.6"
1699+
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
1700+
16971701
clean-css@4.2.x:
16981702
version "4.2.1"
16991703
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
@@ -1824,7 +1828,7 @@ commander@2.17.x:
18241828
version "2.17.1"
18251829
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
18261830

1827-
commander@^2.11.0, commander@^2.9.0, commander@~2.20.0:
1831+
commander@^2.11.0, commander@^2.18.0, commander@^2.9.0, commander@~2.20.0:
18281832
version "2.20.0"
18291833
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
18301834

@@ -2537,6 +2541,10 @@ elliptic@^6.0.0:
25372541
minimalistic-assert "^1.0.0"
25382542
minimalistic-crypto-utils "^1.0.0"
25392543

2544+
email-addresses@^3.0.1:
2545+
version "3.0.3"
2546+
resolved "https://registry.yarnpkg.com/email-addresses/-/email-addresses-3.0.3.tgz#fc3c6952f68da24239914e982c8a7783bc2ed96d"
2547+
25402548
emoji-regex@^6.1.0:
25412549
version "6.5.1"
25422550
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2"
@@ -3126,6 +3134,25 @@ filename-regex@^2.0.0:
31263134
version "2.0.1"
31273135
resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
31283136

3137+
filename-reserved-regex@^1.0.0:
3138+
version "1.0.0"
3139+
resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4"
3140+
3141+
filenamify-url@^1.0.0:
3142+
version "1.0.0"
3143+
resolved "https://registry.yarnpkg.com/filenamify-url/-/filenamify-url-1.0.0.tgz#b32bd81319ef5863b73078bed50f46a4f7975f50"
3144+
dependencies:
3145+
filenamify "^1.0.0"
3146+
humanize-url "^1.0.0"
3147+
3148+
filenamify@^1.0.0:
3149+
version "1.2.1"
3150+
resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-1.2.1.tgz#a9f2ffd11c503bed300015029272378f1f1365a5"
3151+
dependencies:
3152+
filename-reserved-regex "^1.0.0"
3153+
strip-outer "^1.0.0"
3154+
trim-repeated "^1.0.0"
3155+
31293156
fileset@^2.0.2:
31303157
version "2.0.3"
31313158
resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
@@ -3292,6 +3319,14 @@ fs-extra@^0.30.0:
32923319
path-is-absolute "^1.0.0"
32933320
rimraf "^2.2.8"
32943321

3322+
fs-extra@^7.0.0:
3323+
version "7.0.1"
3324+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
3325+
dependencies:
3326+
graceful-fs "^4.1.2"
3327+
jsonfile "^4.0.0"
3328+
universalify "^0.1.0"
3329+
32953330
fs-minipass@^1.2.5:
32963331
version "1.2.5"
32973332
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -3382,6 +3417,19 @@ getpass@^0.1.1:
33823417
dependencies:
33833418
assert-plus "^1.0.0"
33843419

3420+
gh-pages@^2.0.1:
3421+
version "2.0.1"
3422+
resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-2.0.1.tgz#aefe47a43b8d9d2aa3130576b33fe95641e29a2f"
3423+
dependencies:
3424+
async "^2.6.1"
3425+
commander "^2.18.0"
3426+
email-addresses "^3.0.1"
3427+
filenamify-url "^1.0.0"
3428+
fs-extra "^7.0.0"
3429+
globby "^6.1.0"
3430+
graceful-fs "^4.1.11"
3431+
rimraf "^2.6.2"
3432+
33853433
glob-base@^0.3.0:
33863434
version "0.3.0"
33873435
resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -3797,6 +3845,13 @@ https-browserify@^1.0.0:
37973845
version "1.0.0"
37983846
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
37993847

3848+
humanize-url@^1.0.0:
3849+
version "1.0.1"
3850+
resolved "https://registry.yarnpkg.com/humanize-url/-/humanize-url-1.0.1.tgz#f4ab99e0d288174ca4e1e50407c55fbae464efff"
3851+
dependencies:
3852+
normalize-url "^1.0.0"
3853+
strip-url-auth "^1.0.0"
3854+
38003855
iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.4:
38013856
version "0.4.24"
38023857
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -4650,6 +4705,12 @@ jsonfile@^3.0.0:
46504705
optionalDependencies:
46514706
graceful-fs "^4.1.6"
46524707

4708+
jsonfile@^4.0.0:
4709+
version "4.0.0"
4710+
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
4711+
optionalDependencies:
4712+
graceful-fs "^4.1.6"
4713+
46534714
jsonify@~0.0.0:
46544715
version "0.0.0"
46554716
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -5349,7 +5410,7 @@ normalize-range@^0.1.2:
53495410
version "0.1.2"
53505411
resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
53515412

5352-
normalize-url@^1.4.0:
5413+
normalize-url@^1.0.0, normalize-url@^1.4.0:
53535414
version "1.9.1"
53545415
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
53555416
dependencies:
@@ -6123,7 +6184,7 @@ promise@^7.1.1:
61236184
dependencies:
61246185
asap "~2.0.3"
61256186

6126-
prop-types@^15.6.2:
6187+
prop-types@^15.6.2, prop-types@^15.7.2:
61276188
version "15.7.2"
61286189
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
61296190
dependencies:
@@ -6279,7 +6340,7 @@ react-dev-utils@^3.1.0:
62796340
strip-ansi "3.0.1"
62806341
text-table "0.2.0"
62816342

6282-
react-dom@16.8.6:
6343+
react-dom@^16.8.6:
62836344
version "16.8.6"
62846345
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
62856346
dependencies:
@@ -6303,7 +6364,7 @@ react-is@^16.8.1:
63036364
version "16.8.6"
63046365
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
63056366

6306-
react@16.8.6:
6367+
react@^16.8.6:
63076368
version "16.8.6"
63086369
resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
63096370
dependencies:
@@ -6618,7 +6679,7 @@ right-align@^0.1.1:
66186679
dependencies:
66196680
align-text "^0.1.1"
66206681

6621-
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1, rimraf@~2.6.2:
6682+
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
66226683
version "2.6.3"
66236684
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
66246685
dependencies:
@@ -7210,6 +7271,16 @@ strip-json-comments@~2.0.1:
72107271
version "2.0.1"
72117272
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
72127273

7274+
strip-outer@^1.0.0:
7275+
version "1.0.1"
7276+
resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
7277+
dependencies:
7278+
escape-string-regexp "^1.0.2"
7279+
7280+
strip-url-auth@^1.0.0:
7281+
version "1.0.1"
7282+
resolved "https://registry.yarnpkg.com/strip-url-auth/-/strip-url-auth-1.0.1.tgz#22b0fa3a41385b33be3f331551bbb837fa0cd7ae"
7283+
72137284
style-loader@0.18.2:
72147285
version "0.18.2"
72157286
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.2.tgz#cc31459afbcd6d80b7220ee54b291a9fd66ff5eb"
@@ -7482,6 +7553,12 @@ trim-newlines@^1.0.0:
74827553
version "1.0.0"
74837554
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
74847555

7556+
trim-repeated@^1.0.0:
7557+
version "1.0.0"
7558+
resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
7559+
dependencies:
7560+
escape-string-regexp "^1.0.2"
7561+
74857562
trim-right@^1.0.1:
74867563
version "1.0.1"
74877564
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"

0 commit comments

Comments
 (0)