From 8534442dc3ef674a044bb1b2be24afc41f6401d1 Mon Sep 17 00:00:00 2001 From: Khushhhi <108921822+Khushhhi@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:14:39 -0600 Subject: [PATCH 1/6] removed inactive socials --- _includes/footer.html | 71 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 6bfbdd2..2a4c31d 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,46 +1,43 @@ + \ No newline at end of file From 7ac2d75bd493b88351668fc4e7cfc8887884d660 Mon Sep 17 00:00:00 2001 From: Khushhhi <108921822+Khushhhi@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:15:33 -0600 Subject: [PATCH 2/6] removed blog from navbar --- _includes/header.html | 71 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 9ca014d..527dd9c 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,43 +1,42 @@ \ No newline at end of file From 86abda97bf6bf3edd3aeeb38970bf14d5c89c9b9 Mon Sep 17 00:00:00 2001 From: Khushhhi <108921822+Khushhhi@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:17:13 -0600 Subject: [PATCH 3/6] changed navbar color --- assets/css/Updatedstyle.css | 450 ++++++++++++++++++++++-------------- 1 file changed, 271 insertions(+), 179 deletions(-) diff --git a/assets/css/Updatedstyle.css b/assets/css/Updatedstyle.css index 2cc7c4d..dfa5eca 100644 --- a/assets/css/Updatedstyle.css +++ b/assets/css/Updatedstyle.css @@ -1,37 +1,39 @@ /** Global bars **/ + :root { - --bs-primary-rgb: 236, 195, 11; - --bs-secondary-rgb: 117, 176, 156; - --bs-success-rgb: 25, 135, 84; - --bs-info-rgb: 13, 202, 240; - --bs-warning-rgb: 255, 193, 7; - --bs-danger-rgb: 220, 53, 69; - --bs-light-rgb: 248, 249, 250; - --bs-dark-rgb: 33, 37, 41; + --bs-primary-rgb: 236, 195, 11; + --bs-secondary-rgb: 117, 176, 156; + --bs-success-rgb: 25, 135, 84; + --bs-info-rgb: 13, 202, 240; + --bs-warning-rgb: 255, 193, 7; + --bs-danger-rgb: 220, 53, 69; + --bs-light-rgb: 248, 249, 250; + --bs-dark-rgb: 51, 53, 51; } + /** Utilities **/ + .d-grid { - display: grid; - gap: 1rem; + display: grid; + gap: 1rem; } .grid-col-3 { - grid-template-columns: repeat(3, minmax(0, 1fr)); + grid-template-columns: repeat(3, minmax(0, 1fr)); } .grid-col-2 { - grid-template-columns: repeat(2, minmax(0, 1fr)); + grid-template-columns: repeat(2, minmax(0, 1fr)); } @media (max-width: 768px) { - .grid-col-3 { - grid-template-columns: repeat(1, minmax(0, 1fr)); - } - - .grid-col-2 { - grid-template-columns: repeat(1, minmax(0, 1fr)); - } + .grid-col-3 { + grid-template-columns: repeat(1, minmax(0, 1fr)); + } + .grid-col-2 { + grid-template-columns: repeat(1, minmax(0, 1fr)); + } } @@ -53,9 +55,11 @@ background-image: url("../images/separators/home2.svg"); } + /** Global CSS * /* This is the style set for the entire body */ + body { font-family: 'Dosis', sans-serif; font-size: 25px; @@ -63,252 +67,340 @@ body { background: #373737; } + /* This is the second join button found on the footer */ + .footerJoinButton { - width: 160px; -} -.buttonEmail{ - display: inline-block; - border-radius: 100px; - background-color: #373737; - border: none; - color: #ffc107; - text-align: center; - font-size: 28px; - padding: 20px; - width: 250px; - transition: all 0.5s; - cursor: pointer; - margin: 5px; + width: 160px; } +.buttonEmail { + display: inline-block; + border-radius: 100px; + background-color: #373737; + border: none; + color: #ffc107; + text-align: center; + font-size: 28px; + padding: 20px; + width: 250px; + transition: all 0.5s; + cursor: pointer; + margin: 5px; +} + + /* The following 4 classes will allow for the animation to occur when hovering over */ + .buttonEmail span { - cursor: pointer; - display: inline-block; - position: relative; - transition: 0.5s; + cursor: pointer; + display: inline-block; + position: relative; + transition: 0.5s; } .buttonEmail span:after { - content: '\00bb'; - position: absolute; - opacity: 0; - top: 0; - right: -20px; - transition: 0.5s; + content: '\00bb'; + position: absolute; + opacity: 0; + top: 0; + right: -20px; + transition: 0.5s; } .buttonEmail:hover span { - padding-right: 25px; + padding-right: 25px; } .buttonEmail:hover span:after { - opacity: 1; - right: 0; + opacity: 1; + right: 0; } + /* Used in the contact page to format the area where the user enters in information */ + .contactForm { - height: 100vh; - margin-left: 20%; - margin-right: 10%; + height: 100vh; + margin-left: 20%; + margin-right: 10%; } + /* Background image used for the contact page */ + .contactBack { - background: url('../images/contact.jpg'); - background-position: center; - background-repeat: no-repeat; - background-size: cover; - max-height: 50vh; + background: url('../images/contact.jpg'); + background-position: center; + background-repeat: no-repeat; + background-size: cover; + max-height: 50vh; } + /* Background image used for the join us contact page */ + .joinContact { - background: url('../images/contact.jpg'); - background-position: center; - background-repeat: no-repeat; - background-size: cover; - height: 200vh; - opacity: .8; + background: url('../images/contact.jpg'); + background-position: center; + background-repeat: no-repeat; + background-size: cover; + height: 200vh; + opacity: .8; } .btnEntrance { - animation-duration: 0.5s; - animation-fill-mode: both; - animation-name: btnEntrance; + animation-duration: 0.5s; + animation-fill-mode: both; + animation-name: btnEntrance; } + /* fadeInUp */ + @keyframes btnEntrance { - from { - opacity: 0; - transform: translate3d(0, 100%, 0) rotate(0deg); - } - to { - opacity: 1; - transform: translate3d(0, 0, 0) rotate(360deg); - } + from { + opacity: 0; + transform: translate3d(0, 100%, 0) rotate(0deg); + } + to { + opacity: 1; + transform: translate3d(0, 0, 0) rotate(360deg); + } } .btnExit { - animation-duration: 0.25s; - animation-fill-mode: both; - animation-name: btnExit; + animation-duration: 0.25s; + animation-fill-mode: both; + animation-name: btnExit; } + /* fadeOutDown */ + @keyframes btnExit { - from { - opacity: 1; - } - to { - opacity: 0; - transform: translate3d(0, 100%, 0); - } + from { + opacity: 1; + } + to { + opacity: 0; + transform: translate3d(0, 100%, 0); + } } + /* The following 3 classes are used to animate the buttons for the footer. */ + .s-m a { - display: inline-flex; - width: 60px; - height: 60px; - background: #ffc107; - color: #373737; - margin: 0 6px; - border-radius: 50%; - justify-content: center; - align-items: center; - font-size: 40px; - text-decoration: none; + display: inline-flex; + width: 60px; + height: 60px; + background: #ffc107; + color: #373737; + margin: 0 6px; + border-radius: 50%; + justify-content: center; + align-items: center; + font-size: 40px; + text-decoration: none; } .regular-s-m a:hover { - background: #373737; - color: #ffc107; - transition: 0.4s; + background: #373737; + color: #ffc107; + transition: 0.4s; } -.regular-s-m a:hover > i { - transform: scale(1.3) rotate(380deg); - transition: .2s; +.regular-s-m a:hover>i { + transform: scale(1.3) rotate(380deg); + transition: .2s; } + /* The following 2 classes are used to animate the facebook button for the footer */ + #animatedFacebook:hover { - background: #373737; - color: #3366ff; - transition: 0.4s; + background: #373737; + color: #3366ff; + transition: 0.4s; } -#animatedFacebook:hover > i { - transform: scale(1.3) rotate(380deg); - transition: .2s; +#animatedFacebook:hover>i { + transform: scale(1.3) rotate(380deg); + transition: .2s; } + /* The following 2 classes are used to animate the facebook button for the footer */ + #animatedYoutube:hover { - background: #373737; - color: #cc0000; - transition: 0.4s; + background: #373737; + color: #cc0000; + transition: 0.4s; } -#animatedYoutube:hover > i { - transform: scale(1.3) rotate(380deg); - transition: .2s; +#animatedYoutube:hover>i { + transform: scale(1.3) rotate(380deg); + transition: .2s; } -.contact{ - background: #ffc107; - color: black; - border: 2px solid black; - text-align: center; - align-self: center; - padding: 20px; +.contact { + background: #ffc107; + color: black; + border: 2px solid black; + text-align: center; + align-self: center; + padding: 20px; } + /* Sets the font size for certain headers on the home page*/ + .homeTitle { - font-size: 80px; + font-size: 80px; } + /* This sets the style for the rotating text part */ + .rotatingText { - color: white; - font-size: 50px; + color: white; + font-size: 50px; } + /* This class is needed for the contact pages due to the overflow when changing to smaller screen sizes */ + .contactFont { - text-align: center; - padding-top: 20px; - font-size: 60px + text-align: center; + padding-top: 20px; + font-size: 60px } + /* Vertical Sliding was taken from https://codepen.io/amritleone/pen/qERPmW */ -.slidingVertical{ - display: inline; - text-indent: 8px; + +.slidingVertical { + display: inline; + text-indent: 8px; } -.slidingVertical span{ - animation: topToBottom 12.5s linear infinite 0s; - -ms-animation: topToBottom 12.5s linear infinite 0s; - -webkit-animation: topToBottom 12.5s linear infinite 0s; - opacity: 0; - overflow: hidden; - position: absolute; +.slidingVertical span { + animation: topToBottom 12.5s linear infinite 0s; + -ms-animation: topToBottom 12.5s linear infinite 0s; + -webkit-animation: topToBottom 12.5s linear infinite 0s; + opacity: 0; + overflow: hidden; + position: absolute; } -.slidingVertical span:nth-child(2){ - animation-delay: 2.5s; - -ms-animation-delay: 2.5s; - -webkit-animation-delay: 2.5s; +.slidingVertical span:nth-child(2) { + animation-delay: 2.5s; + -ms-animation-delay: 2.5s; + -webkit-animation-delay: 2.5s; } -.slidingVertical span:nth-child(3){ - animation-delay: 5s; - -ms-animation-delay: 5s; - -webkit-animation-delay: 5s; + +.slidingVertical span:nth-child(3) { + animation-delay: 5s; + -ms-animation-delay: 5s; + -webkit-animation-delay: 5s; } -.slidingVertical span:nth-child(4){ - animation-delay: 7.5s; - -ms-animation-delay: 7.5s; - -webkit-animation-delay: 7.5s; + +.slidingVertical span:nth-child(4) { + animation-delay: 7.5s; + -ms-animation-delay: 7.5s; + -webkit-animation-delay: 7.5s; } -.slidingVertical span:nth-child(5){ - animation-delay: 10s; - -ms-animation-delay: 10s; - -webkit-animation-delay: 10s; + +.slidingVertical span:nth-child(5) { + animation-delay: 10s; + -ms-animation-delay: 10s; + -webkit-animation-delay: 10s; } + /*topToBottom Animation*/ -@-moz-keyframes topToBottom{ - 0% { opacity: 0; } - 5% { opacity: 0; -moz-transform: translateY(-50px); } - 10% { opacity: 1; -moz-transform: translateY(0px); } - 25% { opacity: 1; -moz-transform: translateY(0px); } - 30% { opacity: 0; -moz-transform: translateY(50px); } - 80% { opacity: 0; } - 100% { opacity: 0; } -} - -@-webkit-keyframes topToBottom{ - 0% { opacity: 0; } - 5% { opacity: 0; -webkit-transform: translateY(-50px); } - 10% { opacity: 1; -webkit-transform: translateY(0px); } - 25% { opacity: 1; -webkit-transform: translateY(0px); } - 30% { opacity: 0; -webkit-transform: translateY(50px); } - 80% { opacity: 0; } - 100% { opacity: 0; } -} - -@-ms-keyframes topToBottom{ - 0% { opacity: 0; } - 5% { opacity: 0; -ms-transform: translateY(-50px); } - 10% { opacity: 1; -ms-transform: translateY(0px); } - 25% { opacity: 1; -ms-transform: translateY(0px); } - 30% { opacity: 0; -ms-transform: translateY(50px); } - 80% { opacity: 0; } - 100% { opacity: 0; } -} + +@-moz-keyframes topToBottom { + 0% { + opacity: 0; + } + 5% { + opacity: 0; + -moz-transform: translateY(-50px); + } + 10% { + opacity: 1; + -moz-transform: translateY(0px); + } + 25% { + opacity: 1; + -moz-transform: translateY(0px); + } + 30% { + opacity: 0; + -moz-transform: translateY(50px); + } + 80% { + opacity: 0; + } + 100% { + opacity: 0; + } +} + +@-webkit-keyframes topToBottom { + 0% { + opacity: 0; + } + 5% { + opacity: 0; + -webkit-transform: translateY(-50px); + } + 10% { + opacity: 1; + -webkit-transform: translateY(0px); + } + 25% { + opacity: 1; + -webkit-transform: translateY(0px); + } + 30% { + opacity: 0; + -webkit-transform: translateY(50px); + } + 80% { + opacity: 0; + } + 100% { + opacity: 0; + } +} + +@-ms-keyframes topToBottom { + 0% { + opacity: 0; + } + 5% { + opacity: 0; + -ms-transform: translateY(-50px); + } + 10% { + opacity: 1; + -ms-transform: translateY(0px); + } + 25% { + opacity: 1; + -ms-transform: translateY(0px); + } + 30% { + opacity: 0; + -ms-transform: translateY(50px); + } + 80% { + opacity: 0; + } + 100% { + opacity: 0; + } +} \ No newline at end of file From ce6d689a00033e036375c6d7734ba9a793e73ae4 Mon Sep 17 00:00:00 2001 From: Khushhhi <108921822+Khushhhi@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:20:45 -0600 Subject: [PATCH 4/6] added new members --- collections/_members/{shahzaib.md => george-kajaleme.md} | 2 +- collections/_members/{zony-yu.md => aidan-olsen.md} | 4 ++-- collections/_members/alina-iunusova.md | 6 ------ collections/_members/carl-berresheim.md | 2 +- collections/_members/dhruv-pranlal.md | 6 ------ collections/_members/doga-canturk.md | 6 ------ .../_members/{hung-duong-phuong.md => james-guest.md} | 2 +- collections/_members/kavish-shah.md | 6 ------ collections/_members/mackenzie-coleman.md | 6 ------ collections/_members/ritvik-gera.md | 6 ------ collections/_members/shahzaib-ahmed.md | 7 ------- collections/_members/{liyu-zhao.md => uzair-tariq.md} | 4 ++-- 12 files changed, 7 insertions(+), 50 deletions(-) rename collections/_members/{shahzaib.md => george-kajaleme.md} (74%) rename collections/_members/{zony-yu.md => aidan-olsen.md} (73%) delete mode 100644 collections/_members/alina-iunusova.md delete mode 100644 collections/_members/dhruv-pranlal.md delete mode 100644 collections/_members/doga-canturk.md rename collections/_members/{hung-duong-phuong.md => james-guest.md} (69%) delete mode 100644 collections/_members/kavish-shah.md delete mode 100644 collections/_members/mackenzie-coleman.md delete mode 100644 collections/_members/ritvik-gera.md delete mode 100644 collections/_members/shahzaib-ahmed.md rename collections/_members/{liyu-zhao.md => uzair-tariq.md} (74%) diff --git a/collections/_members/shahzaib.md b/collections/_members/ george-kajaleme.md similarity index 74% rename from collections/_members/shahzaib.md rename to collections/_members/ george-kajaleme.md index 066edbf..960fbda 100644 --- a/collections/_members/shahzaib.md +++ b/collections/_members/ george-kajaleme.md @@ -1,5 +1,5 @@ --- -name: "Shahzaib Ahmed" +name: "George Kajaleme" team: "Safety" position: "Lead" image_name: "placeholder.jpg" diff --git a/collections/_members/zony-yu.md b/collections/_members/aidan-olsen.md similarity index 73% rename from collections/_members/zony-yu.md rename to collections/_members/aidan-olsen.md index 80aece1..340ece9 100644 --- a/collections/_members/zony-yu.md +++ b/collections/_members/aidan-olsen.md @@ -1,6 +1,6 @@ --- -name: "Zony Yu" +name: "Aidan Olsen" team: "Imaging" position: "Lead" image_name: "placeholder.jpg" ---- \ No newline at end of file +--- diff --git a/collections/_members/alina-iunusova.md b/collections/_members/alina-iunusova.md deleted file mode 100644 index 89ab782..0000000 --- a/collections/_members/alina-iunusova.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: "Alina Iunusova" -team: "Admin" -position: "VP Admin" -image_name: "placeholder.jpg" ---- \ No newline at end of file diff --git a/collections/_members/carl-berresheim.md b/collections/_members/carl-berresheim.md index 6a8713a..c2db2c7 100644 --- a/collections/_members/carl-berresheim.md +++ b/collections/_members/carl-berresheim.md @@ -1,6 +1,6 @@ --- name: "Carl Berresheim" team: "Admin" -position: "VP Technical" +position: "President" image_name: "placeholder.jpg" --- \ No newline at end of file diff --git a/collections/_members/dhruv-pranlal.md b/collections/_members/dhruv-pranlal.md deleted file mode 100644 index 4c4027d..0000000 --- a/collections/_members/dhruv-pranlal.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: "Dhruv Manish Pranlal" -team: "Admin" -position: "VP Admin" -image_name: "placeholder.jpg" ---- \ No newline at end of file diff --git a/collections/_members/doga-canturk.md b/collections/_members/doga-canturk.md deleted file mode 100644 index 1187506..0000000 --- a/collections/_members/doga-canturk.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: "Doga Canturk" -team: "Electronics" -position: "Co-Lead" -image_name: "placeholder.jpg" ---- diff --git a/collections/_members/hung-duong-phuong.md b/collections/_members/james-guest.md similarity index 69% rename from collections/_members/hung-duong-phuong.md rename to collections/_members/james-guest.md index 867c3c6..340afd7 100644 --- a/collections/_members/hung-duong-phuong.md +++ b/collections/_members/james-guest.md @@ -1,5 +1,5 @@ --- -name: "Hung (Tom) Duong Phuong" +name: "James Guest" team: "Airframe" position: "Lead" image_name: "placeholder.jpg" diff --git a/collections/_members/kavish-shah.md b/collections/_members/kavish-shah.md deleted file mode 100644 index 4fe0b0e..0000000 --- a/collections/_members/kavish-shah.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: "Kavish Shah" -team: "Pilots" -position: "Lead" -image_name: "placeholder.jpg" ---- diff --git a/collections/_members/mackenzie-coleman.md b/collections/_members/mackenzie-coleman.md deleted file mode 100644 index b10167c..0000000 --- a/collections/_members/mackenzie-coleman.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: "Mackenzie Coleman" -team: "Imaging" -position: "Lead" -image_name: "placeholder.jpg" ---- \ No newline at end of file diff --git a/collections/_members/ritvik-gera.md b/collections/_members/ritvik-gera.md deleted file mode 100644 index fad45ba..0000000 --- a/collections/_members/ritvik-gera.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: "Ritvik Gera" -team: "Admin" -position: "VP Finance" -image_name: "placeholder.jpg" ---- diff --git a/collections/_members/shahzaib-ahmed.md b/collections/_members/shahzaib-ahmed.md deleted file mode 100644 index 28226b8..0000000 --- a/collections/_members/shahzaib-ahmed.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -name: "Shahzaib Ahmed" -team: "Admin" -position: "President" -image_name: "placeholder.jpg" -order: -1 # Use flexbox order to reorder ---- diff --git a/collections/_members/liyu-zhao.md b/collections/_members/uzair-tariq.md similarity index 74% rename from collections/_members/liyu-zhao.md rename to collections/_members/uzair-tariq.md index 05079a4..e8f9d77 100644 --- a/collections/_members/liyu-zhao.md +++ b/collections/_members/uzair-tariq.md @@ -1,6 +1,6 @@ --- -name: "Liyu Zhao" +name: "Uzair Tariq" team: "Autopilot" position: "Lead" image_name: "placeholder.jpg" ---- \ No newline at end of file +--- From 24e9bfa86cc8cbd757461ddd3881a49bd8bfede0 Mon Sep 17 00:00:00 2001 From: Khushhhi <108921822+Khushhhi@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:21:23 -0600 Subject: [PATCH 5/6] past members updated --- collections/_past_members/alina-iunusova.md | 6 ++++++ collections/_past_members/dhruv-pranlal.md | 6 ++++++ collections/_past_members/doga-canturk.md | 6 ++++++ collections/_past_members/hung-duong-phuong.md | 6 ++++++ collections/_past_members/kavish-shah.md | 6 ++++++ collections/_past_members/liyu-zhao.md | 6 ++++++ collections/_past_members/mackenzie-coleman.md | 6 ++++++ collections/_past_members/ritvik-gera.md | 6 ++++++ collections/_past_members/shahzaib-ahmed.md | 7 +++++++ collections/_past_members/shahzaib.md | 6 ++++++ collections/_past_members/zony-yu.md | 6 ++++++ 11 files changed, 67 insertions(+) create mode 100644 collections/_past_members/alina-iunusova.md create mode 100644 collections/_past_members/dhruv-pranlal.md create mode 100644 collections/_past_members/doga-canturk.md create mode 100644 collections/_past_members/hung-duong-phuong.md create mode 100644 collections/_past_members/kavish-shah.md create mode 100644 collections/_past_members/liyu-zhao.md create mode 100644 collections/_past_members/mackenzie-coleman.md create mode 100644 collections/_past_members/ritvik-gera.md create mode 100644 collections/_past_members/shahzaib-ahmed.md create mode 100644 collections/_past_members/shahzaib.md create mode 100644 collections/_past_members/zony-yu.md diff --git a/collections/_past_members/alina-iunusova.md b/collections/_past_members/alina-iunusova.md new file mode 100644 index 0000000..89ab782 --- /dev/null +++ b/collections/_past_members/alina-iunusova.md @@ -0,0 +1,6 @@ +--- +name: "Alina Iunusova" +team: "Admin" +position: "VP Admin" +image_name: "placeholder.jpg" +--- \ No newline at end of file diff --git a/collections/_past_members/dhruv-pranlal.md b/collections/_past_members/dhruv-pranlal.md new file mode 100644 index 0000000..4c4027d --- /dev/null +++ b/collections/_past_members/dhruv-pranlal.md @@ -0,0 +1,6 @@ +--- +name: "Dhruv Manish Pranlal" +team: "Admin" +position: "VP Admin" +image_name: "placeholder.jpg" +--- \ No newline at end of file diff --git a/collections/_past_members/doga-canturk.md b/collections/_past_members/doga-canturk.md new file mode 100644 index 0000000..1187506 --- /dev/null +++ b/collections/_past_members/doga-canturk.md @@ -0,0 +1,6 @@ +--- +name: "Doga Canturk" +team: "Electronics" +position: "Co-Lead" +image_name: "placeholder.jpg" +--- diff --git a/collections/_past_members/hung-duong-phuong.md b/collections/_past_members/hung-duong-phuong.md new file mode 100644 index 0000000..867c3c6 --- /dev/null +++ b/collections/_past_members/hung-duong-phuong.md @@ -0,0 +1,6 @@ +--- +name: "Hung (Tom) Duong Phuong" +team: "Airframe" +position: "Lead" +image_name: "placeholder.jpg" +--- diff --git a/collections/_past_members/kavish-shah.md b/collections/_past_members/kavish-shah.md new file mode 100644 index 0000000..4fe0b0e --- /dev/null +++ b/collections/_past_members/kavish-shah.md @@ -0,0 +1,6 @@ +--- +name: "Kavish Shah" +team: "Pilots" +position: "Lead" +image_name: "placeholder.jpg" +--- diff --git a/collections/_past_members/liyu-zhao.md b/collections/_past_members/liyu-zhao.md new file mode 100644 index 0000000..05079a4 --- /dev/null +++ b/collections/_past_members/liyu-zhao.md @@ -0,0 +1,6 @@ +--- +name: "Liyu Zhao" +team: "Autopilot" +position: "Lead" +image_name: "placeholder.jpg" +--- \ No newline at end of file diff --git a/collections/_past_members/mackenzie-coleman.md b/collections/_past_members/mackenzie-coleman.md new file mode 100644 index 0000000..b10167c --- /dev/null +++ b/collections/_past_members/mackenzie-coleman.md @@ -0,0 +1,6 @@ +--- +name: "Mackenzie Coleman" +team: "Imaging" +position: "Lead" +image_name: "placeholder.jpg" +--- \ No newline at end of file diff --git a/collections/_past_members/ritvik-gera.md b/collections/_past_members/ritvik-gera.md new file mode 100644 index 0000000..fad45ba --- /dev/null +++ b/collections/_past_members/ritvik-gera.md @@ -0,0 +1,6 @@ +--- +name: "Ritvik Gera" +team: "Admin" +position: "VP Finance" +image_name: "placeholder.jpg" +--- diff --git a/collections/_past_members/shahzaib-ahmed.md b/collections/_past_members/shahzaib-ahmed.md new file mode 100644 index 0000000..28226b8 --- /dev/null +++ b/collections/_past_members/shahzaib-ahmed.md @@ -0,0 +1,7 @@ +--- +name: "Shahzaib Ahmed" +team: "Admin" +position: "President" +image_name: "placeholder.jpg" +order: -1 # Use flexbox order to reorder +--- diff --git a/collections/_past_members/shahzaib.md b/collections/_past_members/shahzaib.md new file mode 100644 index 0000000..066edbf --- /dev/null +++ b/collections/_past_members/shahzaib.md @@ -0,0 +1,6 @@ +--- +name: "Shahzaib Ahmed" +team: "Safety" +position: "Lead" +image_name: "placeholder.jpg" +--- diff --git a/collections/_past_members/zony-yu.md b/collections/_past_members/zony-yu.md new file mode 100644 index 0000000..80aece1 --- /dev/null +++ b/collections/_past_members/zony-yu.md @@ -0,0 +1,6 @@ +--- +name: "Zony Yu" +team: "Imaging" +position: "Lead" +image_name: "placeholder.jpg" +--- \ No newline at end of file From 6218cdf2577a49568806567296d3b2db004c6801 Mon Sep 17 00:00:00 2001 From: Khushhhi <108921822+Khushhhi@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:26:35 -0600 Subject: [PATCH 6/6] removed what's new --- _site/index.html | 372 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 372 insertions(+) create mode 100644 _site/index.html diff --git a/_site/index.html b/_site/index.html new file mode 100644 index 0000000..b7f9fb2 --- /dev/null +++ b/_site/index.html @@ -0,0 +1,372 @@ + + + + + Home - UAARG + + + + + + + + + + + + + + + + + + + + + + +
+
+
+

University of Alberta Aerial Robotics Group

+
+

Innovate.

+

Collaborate.

+

Take Flight.

+
+
+
+
+ + + +
+

What We Do

+
+ +
+
+
+
Automated UAV
+
+ +
+
Software and Systems
+
+
+
+
+
Airframe
+ +
Research and Development
+
+
+
+
+
International
+
+ +
+
Competitions
+
+
+
+ +
+ +
+ +
+
+

Our Competitions

+
+

Throughout the year, UAARG designs and develops autonomous aircraft for student competitions, where we perform a full flight demonstration of our aircraft. We attend the following competitions each year:

+
+
+ +

USC:  Unmanned Systems Canada

+ + +

AUVSI:  Association of Unmanned Vehicle Systems International

+ +

UAARG also has a blog where we document our competitions and work:

+ Check out our Blog +
+
+ +
+
+
+
+ +
+ +
+
+

Come Join the Fun!

+
+
+
+

Your + + Club. + Ideas. + Voice. + Thoughts. + Designs. + +

+
+

+ At UAARG, your ideas drive our innovation. After all what is a club without people? +

+

+ Expect your ideas to come to life as you put in meaningful work that has many applications in today's industry. From software, hardware, R & D and business, there are many places at UAARG where you can fit in! +

+

+ Currently, we are working on a hybrid plane design which combines the functionality of a quadcopter and a fixed wing plane. +

+

+ This allows for vertical takeoff and landing along with long flight times. +

+
+
+
+ +
+
+
+ Join Now! +
+ +
+ +
+
+

Our Generous Sponsors

+
+

A special thank you goes out to all of our wonderful sponsors for making this club a reality! +

+

Platinum Sponsors

+
+ +
+
+
Faculty of Engineering
+ +
+
+
+ +
+

Gold Sponsors

+
+ +
+
+
Spirit of George Fund Endowment Fund
+ +
+
+
+ +
+

Bronze Sponsors

+
+ +
+
+
Simnet
+ +
+
+
+ + +
+
+
Xing Fu Tang
+ +
+
+
+ +
+

Previous Sponsors

+
+ +
+
+
University of Alberta Student's Union
+ +
+
+
+ + +
+
+
Shell
+ +
+
+
+ + +
+
+
Paparazzi UAV
+ +
+
+
+ +
+ +

Check out the link below if you're interested in sponsoring us!

+ Sponsor Us! +
+
+ +
+ + + + + + + \ No newline at end of file