Merge pull request #22 from corquaid/dev

feat: docking of Axiom-3 Dragon spacecraft
corquaid · Jan 20, 2024 · 795ebe4 · 795ebe4
2 parents a958b11 + 52e52df
commit 795ebe4
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 2 deletions.
diff --git a/JSON/iss-docked-spacecraft.json b/JSON/iss-docked-spacecraft.json
@@ -1,5 +1,5 @@
 {
-  "number": 4,
+  "number": 5,
   "spacecraft": [
     {
       "id": 1,
@@ -8,6 +8,7 @@
       "flag_code": "ru",
       "operator": "Roscosmos",
       "manufacturer": "KSC Energia",
+      "spacecraft_name": null,
       "launched": 1692745680,
       "launch_site": "Site 31, Baikonur",
       "iss": true,
@@ -29,6 +30,7 @@
       "flag_code": "us",
       "operator": "SpaceX",
       "manufacturer": "SpaceX",
+      "spacecraft_name": "Endurance",
       "launched": 1693027620,
       "launch_site": "KSC, LC-39A",
       "iss": true,
@@ -55,6 +57,7 @@
       "flag_code": "ru",
       "operator": "Roscosmos",
       "manufacturer": "Energia",
+      "spacecraft_name": null,
       "launched": 1694785440,
       "launch_site": "Site 31/6, Baikonur",
       "iss": true,
@@ -76,6 +79,7 @@
       "flag_code": "ru",
       "operator": "Roscosmos",
       "manufacturer": "KSC Energia",
+      "spacecraft_name": null,
       "launched": 1701419100,
       "launch_site": "Site 31, Baikonur",
       "iss": true,
@@ -89,6 +93,33 @@
       "mission_patch": null,
       "url": "https://en.wikipedia.org/wiki/Progress_MS-25",
       "image": "https://i.ibb.co/PG8J4G0/Progress-86-Cargo-Craft-Approaches-Space-Station-1536x1024.jpg"
+    },
+    {
+      "id": 5,
+      "name": "Axiom-3 Dragon",
+      "country": "United States",
+      "flag_code": "us",
+      "operator": "SpaceX",
+      "manufacturer": "SpaceX",
+      "spacecraft_name": "Freedom",
+      "launched": 1705610940,
+      "launch_site": "KSC, LC-39A",
+      "iss": true,
+      "docked": 1705743720,
+      "docking_port": "Harmony forward",
+      "launch_mass": 12519,
+      "payload_mass": null,
+      "launch_vehicle": "Falcon 9",
+      "mission_type": "Crew",
+      "crew": [
+        "Michael López-Alegría",
+        "Walter Villadei",
+        "Alper Gezeravcı",
+        "Marcus Wandt"
+      ],
+      "mission_patch": "https://upload.wikimedia.org/wikipedia/en/7/78/Axiom_3_mission_patch.png",
+      "url": "https://en.wikipedia.org/wiki/Axiom_Mission_3",
+      "image": "https://i.ibb.co/yBXrZwT/ax3-liftoff2.webp"
     }
   ]
 }
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": "Michael López-Alegría",
+      "country": "United States",
+      "flag_code": "us",
+      "agency": "Axiom Space",
+      "position": "Spacecraft commander",
+      "spacecraft": "Axiom-3 Dragon",
+      "launched": 1705610940,
+      "iss": true,
+      "days_in_space": 275,
+      "url": "https://en.wikipedia.org/wiki/Michael_L%C3%B3pez-Alegr%C3%ADa",
+      "image": "https://i.ibb.co/X3JRkF0/Ax-3-Commander-Michael-Lo-pez-Alegri-a.jpg",
+      "instagram": "https://www.instagram.com/commandermla/?hl=en",
+      "twitter": "https://twitter.com/CommanderMLA",
+      "facebook": "https://www.facebook.com/commandermla/"
+    },
+    {
+      "id": 12,
+      "name": "Walter Villadei",
+      "country": "Italy",
+      "flag_code": "it",
+      "agency": "Italian Air Force",
+      "position": "Pilot",
+      "spacecraft": "Axiom-3 Dragon",
+      "launched": 1705610940,
+      "iss": true,
+      "days_in_space": 0,
+      "url": "https://en.wikipedia.org/wiki/Walter_Villadei",
+      "image": "https://i.ibb.co/mCwNm1t/Ax-3-Pilot-Walter-Villadei.jpg",
+      "instagram": "",
+      "twitter": "https://twitter.com/WalterVilladei",
+      "facebook": ""
+    },
+    {
+      "id": 13,
+      "name": "Alper Gezeravcı",
+      "country": "Turkey",
+      "flag_code": "tr",
+      "agency": "TSA",
+      "position": "Mission Specialist 1",
+      "spacecraft": "Axiom-3 Dragon",
+      "launched": 1705610940,
+      "iss": true,
+      "days_in_space": 0,
+      "url": "https://en.wikipedia.org/wiki/Alper_Gezeravc%C4%B1",
+      "image": "https://i.ibb.co/7tc79cz/Ax-3-Mission-Specialist-Alper-Gezeravc.jpg",
+      "instagram": "https://www.instagram.com/astroalper/",
+      "twitter": "https://twitter.com/TURKastro",
+      "facebook": ""
+    },
+    {
+      "id": 14,
+      "name": "Marcus Wandt",
+      "country": "Sweden",
+      "flag_code": "se",
+      "agency": "SNSA/ESA",
+      "position": "Mission Specialist 2",
+      "spacecraft": "Axiom-3 Dragon",
+      "launched": 1705610940,
+      "iss": true,
+      "days_in_space": 0,
+      "url": "https://en.wikipedia.org/wiki/Marcus_Wandt",
+      "image": "https://i.ibb.co/DRy2XZV/Ax-3-Mission-Specialist-Marcus-Wandt.jpg",
+      "instagram": "https://www.instagram.com/esaastro_marcus/",
+      "twitter": "https://twitter.com/astro_marcus",
+      "facebook": ""
     }
   ]
 }