merge commit part 2

tj-uav · Oct 19, 2024 · adc5f51 · adc5f51
1 parent 0e5e3ab
commit adc5f51
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 167 deletions.
diff --git a/asset-manifest.json b/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.25e6dccc.css",
-    "main.js": "/static/js/main.589b4be2.js",
+    "main.js": "/static/js/main.3e5bf5d5.js",
     "static/media/sophia.png": "/static/media/sophia.69cf9a95e6d02da8fab6.png",
     "static/media/winston.png": "/static/media/winston.6eb33dd33ceacdf29731.png",
     "static/media/khoi.png": "/static/media/khoi.d0d5f7920430c4f2cf13.png",
@@ -36,16 +36,16 @@
     "static/media/apc.jpg": "/static/media/apc.448cba1a52a4accaa04a.jpg",
     "static/media/rohan.jpg": "/static/media/rohan.53486590ac6c66aa9003.jpg",
     "static/media/default.jpg": "/static/media/default.c45ebad408aa4230c5dc.jpg",
-    "static/media/logo.svg": "/static/media/logo.8e71c6ed504e6c6683b9c8c71ec3fe86.svg",
-    "static/media/electronicsIcon.svg": "/static/media/electronicsIcon.ed7f3c6ad1ffe810bfb1.svg",
-    "static/media/plane.svg": "/static/media/plane.f602063647a0d12e9b09.svg",
-    "static/media/programmingIcon.svg": "/static/media/programmingIcon.5e94b131a98ff5a96447.svg",
+    "static/media/logo.svg": "/static/media/logo.3ea2acd04b6a6604b6d348c706a6fc30.svg",
+    "static/media/electronicsIcon.svg": "/static/media/electronicsIcon.02d561464bb4a858213b.svg",
+    "static/media/plane.svg": "/static/media/plane.40b0c99336db56563f2d.svg",
+    "static/media/programmingIcon.svg": "/static/media/programmingIcon.191bf2f04b0f929685d8.svg",
     "index.html": "/index.html",
     "main.25e6dccc.css.map": "/static/css/main.25e6dccc.css.map",
-    "main.589b4be2.js.map": "/static/js/main.589b4be2.js.map"
+    "main.3e5bf5d5.js.map": "/static/js/main.3e5bf5d5.js.map"
   },
   "entrypoints": [
     "static/css/main.25e6dccc.css",
-    "static/js/main.589b4be2.js"
+    "static/js/main.3e5bf5d5.js"
   ]
 }
diff --git a/index.html b/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/icon.png"/><meta name="google-site-verification" content="s1lKcvhqVIHIDujbdwzNDZOUd6OD-JkcunPUDwxp42s"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Website of The Thomas Jefferson High School for Science and Technology Unmanned Aerial Vehicles Team"/><meta name="keywords" content="TJ,TJHSST,UAV,TJUAV,Unmanned Aerial Vehicle,AUVSI SUAS"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>TJUAV</title><script defer="defer" src="/static/js/main.589b4be2.js"></script><link href="/static/css/main.25e6dccc.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript">!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/icon.png"/><meta name="google-site-verification" content="s1lKcvhqVIHIDujbdwzNDZOUd6OD-JkcunPUDwxp42s"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Website of The Thomas Jefferson High School for Science and Technology Unmanned Aerial Vehicles Team"/><meta name="keywords" content="TJ,TJHSST,UAV,TJUAV,Unmanned Aerial Vehicle,AUVSI SUAS"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>TJUAV</title><script defer="defer" src="/static/js/main.3e5bf5d5.js"></script><link href="/static/css/main.25e6dccc.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript">!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script></body></html>
diff --git a/static/css/main.25e6dccc.css.map b/static/css/main.25e6dccc.css.map
diff --git a/static/js/main.9a000805.js → static/js/main.3e5bf5d5.js b/static/js/main.9a000805.js → static/js/main.3e5bf5d5.js
diff --git a/static/js/main.589b4be2.js.LICENSE.txt → static/js/main.3e5bf5d5.js.LICENSE.txt b/static/js/main.589b4be2.js.LICENSE.txt → static/js/main.3e5bf5d5.js.LICENSE.txt
diff --git a/static/js/main.3e5bf5d5.js.map b/static/js/main.3e5bf5d5.js.map
diff --git a/static/js/main.589b4be2.js b/static/js/main.589b4be2.js
diff --git a/static/js/main.589b4be2.js.map b/static/js/main.589b4be2.js.map
diff --git a/static/js/main.9a000805.js.LICENSE.txt b/static/js/main.9a000805.js.LICENSE.txt
diff --git a/static/js/main.9a000805.js.map b/static/js/main.9a000805.js.map
diff --git a/.../electronicsIcon.ed7f3c6ad1ffe810bfb1.svg → .../electronicsIcon.02d561464bb4a858213b.svg b/.../electronicsIcon.ed7f3c6ad1ffe810bfb1.svg → .../electronicsIcon.02d561464bb4a858213b.svg
diff --git a/...logo.8e71c6ed504e6c6683b9c8c71ec3fe86.svg → ...logo.3ea2acd04b6a6604b6d348c706a6fc30.svg b/...logo.8e71c6ed504e6c6683b9c8c71ec3fe86.svg → ...logo.3ea2acd04b6a6604b6d348c706a6fc30.svg
diff --git a/static/media/plane.f602063647a0d12e9b09.svg → static/media/plane.40b0c99336db56563f2d.svg b/static/media/plane.f602063647a0d12e9b09.svg → static/media/plane.40b0c99336db56563f2d.svg
diff --git a/.../programmingIcon.5e94b131a98ff5a96447.svg → .../programmingIcon.191bf2f04b0f929685d8.svg b/.../programmingIcon.5e94b131a98ff5a96447.svg → .../programmingIcon.191bf2f04b0f929685d8.svg
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/icon.png"/><meta name="google-site-verification" content="s1lKcvhqVIHIDujbdwzNDZOUd6OD-JkcunPUDwxp42s"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Website of The Thomas Jefferson High School for Science and Technology Unmanned Aerial Vehicles Team"/><meta name="keywords" content="TJ,TJHSST,UAV,TJUAV,Unmanned Aerial Vehicle,AUVSI SUAS"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>TJUAV</title><script defer="defer" src="/static/js/main.589b4be2.js"></script><link href="/static/css/main.25e6dccc.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript">!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/icon.png"/><meta name="google-site-verification" content="s1lKcvhqVIHIDujbdwzNDZOUd6OD-JkcunPUDwxp42s"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Website of The Thomas Jefferson High School for Science and Technology Unmanned Aerial Vehicles Team"/><meta name="keywords" content="TJ,TJHSST,UAV,TJUAV,Unmanned Aerial Vehicle,AUVSI SUAS"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>TJUAV</title><script defer="defer" src="/static/js/main.3e5bf5d5.js"></script><link href="/static/css/main.25e6dccc.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript">!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script></body></html>