From 6b0c6fe6cb52334991bfa800df1b82e7e3c1bd6f Mon Sep 17 00:00:00 2001 From: Mahatav Arora <96105216+Mahatav@users.noreply.github.com> Date: Thu, 26 Sep 2024 08:13:40 -0700 Subject: [PATCH 1/7] Changed names for copetition director and slightly edited the titles. I also added the write up provided by sarthak but still waiting on a propper write up for FPV and fixed wing. --- .vscode/settings.json | 4 +++ app.py | 10 +++++++ index.html | 61 ++++++++++++++++--------------------------- 3 files changed, 36 insertions(+), 39 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 app.py diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..005e531 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "html.preview.doubleClickToSwitchToEditor": false, + "html.preview.markEditorSelection": false +} \ No newline at end of file diff --git a/app.py b/app.py new file mode 100644 index 0000000..7388fd7 --- /dev/null +++ b/app.py @@ -0,0 +1,10 @@ +from flask import Flask, send_from_directory + +app = Flask(__name__, static_folder='.', static_url_path='') + +@app.route('/') +def home(): + return send_from_directory('.', 'index.html') + +if __name__ == '__main__': + app.run(debug=True) diff --git a/index.html b/index.html index 4288823..5d23ac2 100644 --- a/index.html +++ b/index.html @@ -175,7 +175,7 @@
-
-
-
-
@@ -260,14 +244,16 @@
- Our Competition Division consists of two subdivisions.
+ Our rotary division is our longest ongoing division. With previous projects such as the, S500, Jellyfish and Oreo - there is really a spot for everyone to try something new.
+
General goals for the Rotary Division include long range testing, surveying, as well as working with our sponsors for an array of different goals. This includes be able to operate in all weather conditions.
+
Our Competition Division consists of two subdivisions.
Each is a team of dedicated members, vying for their next challenge. With upcoming events, our teams are regularly working on upgrades to our vehicle fleet.
Our plans for the upcoming year include developing new payloads, general upgrades and continually preparing to compete in future competitions!
- Message us for details!
-
Competition Director: Gurkirat Singh Dhamija
-
+
Message us for details!
+
Competition Director: Divyesh Gurnani
+
aerialroboticsrocketry@gmail.com
Rocketry has quickly become a new and engaging division within the UBCO Aerospace Club. We are currently working on a propulsion system for sounding rockets, with the purpose of atmospheric science research.
The Rocketry Division is highly encouraged for first years and is always welcoming new members.
@@ -297,7 +283,7 @@
- Our rotary division is our longest ongoing division. With previous projects such as the, S500, Jellyfish and Oreo - there is really a spot for everyone to try something new. TnnM@>KIy5wtmX_w|=m
-
General goals for the Rotary Division include long range testing, surveying, as well as working with our sponsors for an array of different goals. This includes be able to operate in all weather conditions.
-
Current projects ongoing: Racing FPV helicopters on a 5" or 7" frame
-
Rotary UAV Director: Devon Hawley
+
aerialroboticsrocketry@gmail.com
From 4dc15867ce79329d695f00bd55e483761d61f312 Mon Sep 17 00:00:00 2001
From: Mahatav Arora <96105216+Mahatav@users.noreply.github.com>
Date: Sat, 16 Nov 2024 14:17:26 -0800
Subject: [PATCH 2/7] updating dev
---
logos/contrail_rockets.png | Bin 0 -> 45450 bytes
logos/metal_supermarket.png | Bin 0 -> 45972 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 logos/contrail_rockets.png
create mode 100644 logos/metal_supermarket.png
diff --git a/logos/contrail_rockets.png b/logos/contrail_rockets.png
new file mode 100644
index 0000000000000000000000000000000000000000..83237a38a197e3d889b6f1aa53f4381d62466d17
GIT binary patch
literal 45450
zcmV*vKtR8VP)4lhBC-5Qk;xG2f>dZ_G8v6V3k?mmaMXt&
z6;CIFkZVh_
FrF!+<(2{__4)T4M0MkUi;1;RBrmTrL;6nMnx$sowm7
z8