Skip to content

Updating to main #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mahatav wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Updating to main #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6b0c6fe
Changed names for copetition director and slightly edited the titles.…
Mahatav Sep 26, 2024
4dc1586
updating dev
Mahatav Nov 16, 2024
27c2597
added the roketry sponsers
Mahatav Nov 16, 2024
134548b
removed sukmans name
Mahatav Nov 16, 2024
1f0d0db
Merge branch 'update-exec-images' into dev
Mahatav Nov 16, 2024
f96f80b
Merge branch 'update-sponsor-logos' into dev
Mahatav Nov 16, 2024
7accdd3
added the FPV divison and made the rotary division look nice
Mahatav Nov 16, 2024
3f474dc
Merge branch 'update-divisions-titles' into dev
Mahatav Dec 5, 2024
1705d5c
added t-motors logo
Mahatav Dec 5, 2024
0ca8a94
Merge branch 'update-sponsor-logos' into dev to integrate tmotors logo
Mahatav Dec 5, 2024
e7fffd7
added dev changes to updtae it adn removed the two exes roles that do…
Mahatav Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"html.preview.doubleClickToSwitchToEditor": false,
"html.preview.markEditorSelection": false
}
10 changes: 10 additions & 0 deletions app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
85 changes: 35 additions & 50 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ <h3>Title Sponsorships</h3>
<img src="logos/title.png" alt="AdVance Recruiting Header Logo">
</div>
<div class="sponsorship-logo">
<img src="logos/title2.png" alt="hospitality associates Header Logo">
<img src="logos/title2.png" alt=" ">
</div>
<div class="sponsorship-logo">
<img src="logos/title3.png" alt="hospitality associates Header Logo">
<img src="logos/title3.png" alt=" ">
</div>
</div>

Expand All @@ -111,23 +111,24 @@ <h3>Gold Sponsorships</h3>
<hr />
<div class="sponsorships-section">
<div class="sponsorship-logo">
<img src="logos/gold2.png" alt="hospitality associates Header Logo">
<img src="logos/gold2.png" alt=" ">
</div>
</div>

<h3>Silver Sponsorships</h3>
<hr />
<div class="sponsorships-section">
<div class="sponsorship-logo">

<img src="logos/contrail_rockets.png" alt=" ">
</div>
<div class="sponsorship-logo">
<img src="logos/silver2.png" alt=" ">
</div>
</div>
<h3>Partnerships</h3>
<hr />
<div class="sponsorships-section">
<div class="sponsorship-logo">

</div>
<p>Metal Supermarkets</p>
</div>
</section>
</article>
Expand Down Expand Up @@ -160,7 +161,7 @@ <h5>Divyesh Gurnani</h5>
<img src="images/ben.jpg" id = "ig">
<div>
<h6>VP Rocketry</h6>
<h5>Benjamin van Hattem</h5>
<h5>Benjamin Van Hattem</h5>
</div>
</div>
<div style="position: relative; display: inline-block;">
Expand All @@ -173,13 +174,6 @@ <h5>Sarthak Bodhale</h5>
</div>
<br>
<div style="text-align: center;">
<div style="position: relative; display: inline-block; margin-right: 20px;">
<img src="images/felix.png" id = "ig">
<div>
<h6>Director of Software</h6>
<h5>Felix Perron</h5>
</div>
</div>
<div style="position: relative; display: inline-block; margin-right: 20px;">
<img src="images/Owen.jpg" id = "ig">
<div>
Expand All @@ -190,38 +184,29 @@ <h5>Owen Plumb</h5>
<div style="position: relative; display: inline-block;">
<img src="images/sam.png" id = "ig">
<div>
<h6>VP Fixed Wing</h6>
<h6>VP Fixed Wing & Photographer</h6>
<h5>Sam Wang</h5>
</div>
</div>
</div>
<br>
<div style="text-align: center;">
<div style="position: relative; display: inline-block;">
<img src="images/manu.jpg" id = "ig">
<div>
<h6>Director of Corporate Relations</h6>
<h5>Mahatav (Manu) Arora</h5>
</div>
</div>
</div>
<br>
<div style="text-align: center;">
<div style="position: relative; display: inline-block; margin-right: 20px;">
<div style="position: relative; display: inline-block; margin-right: 20px;">
<img src="images/felix.png" id = "ig">
<div>
<h6>Director of Sponsorships</h6>
<img src="images/blank.png" id = "ig">
<h5>Sukman Sar</h5>
<h6>Software Director</h6>
<h5>Felix Perron</h5>
</div>
</div>
<div style="position: relative; display: inline-block; margin-right: 20px;">
<div style="position: relative; display: inline-block;">
<img src="images/manu.jpg" id = "ig">
<div>
<h6>Director of Social Media</h6>
<img src="images/blank.png" id = "ig">
<h5>Comming Soon</h5>
<h6>Corporate Relations Director</h6>
<h5>Mahatav Arora</h5>
</div>
</div>
</div>
<br>
<div style="text-align: center;">
<div style="position: relative; display: inline-block; margin-right: 20px;">
<img src="images/logan.png" id = "ig">
Expand All @@ -245,22 +230,21 @@ <h5>Julian Joaquin</h5>
<h2 class="major">Divisions</h2>
<span class="image main"><img src="images/comp.webp" alt="" /></span>
<div style="text-align: center;">
<h3>Competition Divisions</h3>
<h3>🚁 Competition & Rotary UAV Divisions</h3>
<p>
<b>Our Competition Division consists of two subdivisions.</b><br>
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. <br>
<br> Our plans for the upcoming year include developing new payloads, general upgrades and continually preparing to compete in future competitions! <br>
Message us for details! <br>
<br> Competition Director: Gurkirat Singh Dhamija <br>
<a href = "mailto:aerialroboticsrocketry@gmail.com">
aerialroboticsrocketry@gmail.com
</a>
Our <b>Rotary Division</b> is the longest-running part of our club. With previous projects such as the <b>S500</b>, <b>Jellyfish</b>, and <b>Oreo</b> 🛠️, there’s truly a spot for everyone to try something new and expand their skills.<br>
<br>General goals for the Rotary Division include <b>long-range testing</b> 📡, <b>surveying</b> 🌍, and collaborating with sponsors to accomplish diverse objectives. A key focus is ensuring that our systems can operate reliably in <b>all-weather conditions</b> ☁️🌧️.<br>
<br>Our <b>Competition Division</b> is divided into two dedicated teams, each striving to take on their next big challenge 💪. With exciting events on the horizon, our teams are continually upgrading and improving our fleet of vehicles 🚀 to stay ahead in the competitive scene.<br>
<br>Plans for the upcoming year include <b>developing new payloads</b>, implementing <b>general upgrades</b>, and preparing to shine in future competitions 🏁. Whether you’re passionate about engineering, teamwork, or the thrill of competition, these divisions offer endless opportunities.<br>
<br>📩 Message us to learn more and get involved!<br>
<br><b>Competition Director</b>: Divyesh Gurnani<br>
<a href="mailto:aerialroboticsrocketry@gmail.com">📧 aerialroboticsrocketry@gmail.com</a>
</p>
</div>
<hr>
<span class="image main"><img src="images/rocket.webp" alt="" /></span>
<div style="text-align: center;">
<h3>Rocketry</h3>
<h3>Competition & Rocketry Divisions</h3>
<p>
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.<br>
<br>The Rocketry Division is highly encouraged for first years and is always welcoming new members.<br>
Expand All @@ -282,7 +266,7 @@ <h3>Fixed-WinG UAVs</h3>
Our fixed wing members are amongst some of our most dedicated. With the 2023/2024 season starting soon, we are looking at dividing up into 3 fixed wing project groups. <br>
<br>"FunSide", the Projects Ongoing group, & Adjacent.<br>
<br>Please message us with any questions!<br>
<br>Director of fixed wing UAVs: Divyesh Gurnani<br>
<br>VP fixed wing: Sam Wang<br>
<a href = "mailto:aerialroboticsrocketry@gmail.com">
aerialroboticsrocketry@gmail.com
</a>
Expand All @@ -291,12 +275,13 @@ <h3>Fixed-WinG UAVs</h3>
<hr>
<span class="image main"><img src="images/rot.webp" alt="" /></span>
<div style="text-align: center;">
<h3>Rotary UAV Divisions</h3>
<h3>FPV Division</h3>
<p>
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.<br>
<br>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.<br>
<br> Current projects ongoing: Racing FPV helicopters on a 5" or 7" frame<br>
<br>Rotary UAV Director: Devon Hawley<br>
We are thrilled to introduce our brand-new **FPV (First Person View) Division** 🎮, dedicated to advancing FPV racing 🏎️ and freestyle flying ✨. This exciting new venture is perfect for both beginners and enthusiasts looking to develop their skills in a hands-on environment.<br>
Copy link
Member

@Blobtoe Blobtoe Dec 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use <b> tag for bolding

<br>Our division focuses on training new pilots using flight simulators 🎮 for approximately 3 hours per week. These simulators provide a stress-free way to learn the basics of drone flying without worrying about damaging equipment. We are also organizing thrilling FPV races 🏁 around campus and acquiring small drones ✈️ for practical training. Together, these efforts help pilots transition seamlessly from simulation to real-world flying, building confidence and expertise.<br>
<br>Whether you're excited about the adrenaline of racing 🏎️ or the creativity of freestyle flying ✨, this division offers something for everyone.<br>
<br>📩 Message us to learn more!<br>
<br>FPV lead: Felix Perron<br>
<a href = "mailto:aerialroboticsrocketry@gmail.com">
aerialroboticsrocketry@gmail.com
</a>
Expand Down
Binary file added logos/contrail_rockets.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added logos/metal_supermarket.png
View file
Open in desktop
Copy link
Member

@Blobtoe Blobtoe Dec 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Image is not shown on website

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added logos/silver2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.