Merge pull request #27 from corquaid/dev

Dev
corquaid · Mar 5, 2024 · 86eda85 · 86eda85
2 parents 59bfc57 + 73c5a3a
commit 86eda85
Show file tree

Hide file tree

Showing 2 changed files with 98 additions and 2 deletions.
diff --git a/JSON/iss-docked-spacecraft.json b/JSON/iss-docked-spacecraft.json
@@ -1,5 +1,5 @@
 {
-  "number": 5,
+  "number": 6,
   "spacecraft": [
     {
       "id": 1,
@@ -120,6 +120,34 @@
       "mission_patch": null,
       "url": "https://en.wikipedia.org/wiki/Progress_MS-26",
       "image": "https://i.ibb.co/rwd7VjK/Tb7c2ah5-Vx4-Jn-ZZJpmdyw-E-1200-80-jpg.webp"
+    },
+    {
+      "id": 6,
+      "name": "Crew-8 Dragon",
+      "country": "United States",
+      "flag_code": "us",
+      "operator": "SpaceX",
+      "manufacturer": "SpaceX",
+      "spacecraft_name": "Endeavour",
+      "launched": 1709520840,
+      "launch_site": "KSC, LC-39A",
+      "iss": true,
+      "docked": 1709620080,
+      "docking_port": "Harmony forward",
+      "launch_mass": 12519,
+      "payload_mass": null,
+      "launch_vehicle": "Falcon 9",
+      "launch_vehicle_name": "B1083.1",
+      "mission_type": "Crew",
+      "crew": [
+        "Matthew Dominick",
+        "Michael Barratt",
+        "Jeanette Epps",
+        "Alexander Grebenkin"
+      ],
+      "mission_patch": "https://upload.wikimedia.org/wikipedia/commons/a/a0/SpaceX_Crew-8_logo.png",
+      "url": "https://en.wikipedia.org/wiki/SpaceX_Crew-8",
+      "image": "https://upload.wikimedia.org/wikipedia/commons/f/fd/Jsc2023e070781.jpg"
     }
   ]
 }
diff --git a/JSON/people-in-space.json b/JSON/people-in-space.json
@@ -1,5 +1,5 @@
 {
-  "number": 10,
+  "number": 14,
   "iss_expedition": 70,
   "expedition_patch": "https://upload.wikimedia.org/wikipedia/commons/6/65/ISS_Expedition_70_Patch.png",
   "expedition_url": "https://en.wikipedia.org/wiki/Expedition_70",
@@ -176,6 +176,74 @@
       "instagram": "",
       "twitter": "",
       "facebook": ""
+    },
+    {
+      "id": 11,
+      "name": "Matthew Dominick",
+      "country": "United States",
+      "flag_code": "us",
+      "agency": "NASA",
+      "position": "Flight Engineer",
+      "spacecraft": "Crew-8 Dragon",
+      "launched": 1709520840,
+      "iss": true,
+      "days_in_space": 0,
+      "url": "https://en.wikipedia.org/wiki/Matthew_Dominick",
+      "image": "https://upload.wikimedia.org/wikipedia/commons/f/fc/Matthew_Dominick%2C_NASA_portrait%2C_2017_%28cropped%29_2.jpg",
+      "instagram": "https://www.instagram.com/matthew.dominick/",
+      "twitter": "https://twitter.com/dominickmatthew",
+      "facebook": "https://www.facebook.com/astro.matthew.dominick"
+    },
+    {
+      "id": 12,
+      "name": "Michael Barratt",
+      "country": "United States",
+      "flag_code": "us",
+      "agency": "NASA",
+      "position": "Flight Engineer",
+      "spacecraft": "Crew-8 Dragon",
+      "launched": 1709520840,
+      "iss": true,
+      "days_in_space": 211,
+      "url": "https://en.wikipedia.org/wiki/Michael_Barratt_(astronaut)",
+      "image": "https://upload.wikimedia.org/wikipedia/commons/3/37/Michael_R._Barratt_2010_%28cropped%29_2.jpg",
+      "instagram": "",
+      "twitter": "",
+      "facebook": ""
+    },
+    {
+      "id": 13,
+      "name": "Jeanette Epps",
+      "country": "United States",
+      "flag_code": "us",
+      "agency": "NASA",
+      "position": "Flight Engineer",
+      "spacecraft": "Crew-8 Dragon",
+      "launched": 1709520840,
+      "iss": true,
+      "days_in_space": 0,
+      "url": "https://en.wikipedia.org/wiki/Jeanette_Epps",
+      "image": "https://upload.wikimedia.org/wikipedia/commons/b/bd/Jeanette_J._Epps_%28cropped%29.jpg",
+      "instagram": "https://www.instagram.com/jeanette.epps/",
+      "twitter": "https://twitter.com/astro_jeanette",
+      "facebook": "https://www.facebook.com/people/Jeanette-Epps/pfbid02qGv6poB5B37XjuzkrTaH9a8UjsPF9MrxRYnJVPe2hFYodgqq5VEoCuEG9CznMJjEl/"
+    },
+    {
+      "id": 14,
+      "name": "Alexander Grebenkin",
+      "country": "Russia",
+      "flag_code": "ru",
+      "agency": "Roscosmos",
+      "position": "Flight Engineer",
+      "spacecraft": "Crew-8 Dragon",
+      "launched": 1709520840,
+      "iss": true,
+      "days_in_space": 0,
+      "url": "https://en.wikipedia.org/wiki/Alexander_Grebenkin",
+      "image": "https://upload.wikimedia.org/wikipedia/commons/e/e6/Aleksandr_Grebenkin_%28cropped%29.jpg",
+      "instagram": "",
+      "twitter": "",
+      "facebook": ""
     }
   ]
 }