Skip to content

dev to master #174

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.

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

Merged
merged 49 commits into from
Nov 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
88bdfd6
Added if statement to check if url is set on attachment
Kenneth-W-Chen Dec 7, 2022
b89ba19
Changed it so we aren't duplicating tmpfiles
Kenneth-W-Chen Dec 8, 2022
a8f2cb4
Changed json decoding a constant to an array
Kenneth-W-Chen Dec 8, 2022
eea1525
Added support for bin key in send_messages
Kenneth-W-Chen Dec 8, 2022
126e125
Changed JSON decode in function to a global array. Function should ru…
Kenneth-W-Chen Dec 8, 2022
490b477
Added support for adding attachments with file binary or path for sen…
Kenneth-W-Chen Dec 8, 2022
1c5f97b
Changed static array to const
Kenneth-W-Chen Dec 8, 2022
735acac
Removed some commented-out code
Kenneth-W-Chen Dec 8, 2022
3d02e09
Fixed attachment to have the right type
Kenneth-W-Chen Dec 18, 2022
31f81a0
Added jpg mime support
Kenneth-W-Chen Dec 18, 2022
d1bf946
Removed unnecessary comments
Kenneth-W-Chen Dec 20, 2022
21f2e27
Merge pull request #152 from untrobotics/URW-170-AdminBot-Update-Send…
sebastian-king Mar 19, 2024
8951811
Changed nav script to use jquery/dom objects in array instead
Kenneth-W-Chen Apr 16, 2024
7c81cfa
Refactoring
Kenneth-W-Chen Apr 16, 2024
04a3e43
Nav initial active anchor is now set properly when page is already sc…
Kenneth-W-Chen Apr 16, 2024
36af6cd
Change querySelector to jQuery
Kenneth-W-Chen Jun 29, 2024
4f5207c
Remove curIndex
Kenneth-W-Chen Jun 29, 2024
0a245a4
Change queries to be more dynamic
Kenneth-W-Chen Jul 3, 2024
6909ab5
Change variable names
Kenneth-W-Chen Aug 9, 2024
d7d7617
Merge pull request #160 from untrobotics/master
sebastian-king Aug 21, 2024
e5648ed
Merge remote-tracking branch 'origin/develop' into URW-176-botathon-n…
Kenneth-W-Chen Aug 21, 2024
76eb2db
Merge pull request #157 from untrobotics/URW-176-botathon-nav-code-cl…
sebastian-king Aug 21, 2024
04f600e
Fix product page breadcrumbs
Kenneth-W-Chen Sep 22, 2024
ed7b62c
Componentize bios
Kenneth-W-Chen Sep 28, 2024
0d78249
Review fixes
Kenneth-W-Chen Oct 3, 2024
28562a1
Merge pull request #165 from untrobotics/URW-191-componentize-our-tea…
Kenneth-W-Chen Oct 5, 2024
e990cc6
Fix temp file handles being closed early
Kenneth-W-Chen Oct 12, 2024
7dad713
Replace $file var with reference to $tmp_files
Kenneth-W-Chen Oct 13, 2024
c509d85
Use tabs for indent
Kenneth-W-Chen Oct 15, 2024
63f702a
Merge pull request #166 from untrobotics/URW-205-discord-attachments-fix
Kenneth-W-Chen Nov 9, 2024
13d1f0b
FIX CASING!
sebastian-king Nov 16, 2024
59e3c63
Merge pull request #168 from untrobotics/sebastian-king-patch-1
sebastian-king Nov 16, 2024
4a89452
Merge pull request #164 from untrobotics/URW-197-product-breadcrumbs-fix
sebastian-king Nov 16, 2024
5cc9d5f
URW-0: add myself to the website
sebastian-king Nov 16, 2024
1285ed9
Merge branch 'develop' of https://github.com/untrobotics/website into…
sebastian-king Nov 16, 2024
ea50e69
URW-0: added myself to the website
tjcrozier Nov 16, 2024
6e056d5
Merge branch 'develop' of https://github.com/untrobotics/website into…
tjcrozier Nov 16, 2024
070a5aa
URW0: removed 2 from peyton thibodeaux
tjcrozier Nov 16, 2024
3f350f8
add willow to web team bio
WillowHouchin Nov 16, 2024
15e2eb6
Merge branch 'develop' into URW-206
WillowHouchin Nov 16, 2024
2e0e9ca
fixed truitt mitosis
WillowHouchin Nov 16, 2024
387d2c5
Merge pull request #171 from untrobotics/URW-206
sebastian-king Nov 16, 2024
52a2829
URW-0: fix import path
sebastian-king Nov 16, 2024
1c4aa97
Merge pull request #169 from untrobotics/URW-0-add-Truitt-to-website
sebastian-king Nov 16, 2024
e0e5bcf
resolve merge conflicts
sebastian-king Nov 16, 2024
0d2b69b
Merge pull request #172 from untrobotics/URW-0-add-myself-to-the-web-…
sebastian-king Nov 16, 2024
94d2e26
Added Logan to About
loganthebrewer Nov 16, 2024
5e8785e
Added Logan image
loganthebrewer Nov 16, 2024
5748fb9
Merge pull request #173 from untrobotics/URW-0-Add-Logan-To-Web-Team
sebastian-king Nov 16, 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
53 changes: 53 additions & 0 deletions about/card.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php
/**
* @param string $name First and last name of individual
* @param string $title Their position or title in the org
* @param string $description The description paragraph about the individual
* @param string $picture_uri The URI of the individual's headshot
* @param string|null $email The position's contact email. E.g., president@untrobotics.com
* @param string|null $linkedin_url
* @param string|null $github_url
* @param string|null $twitter_url
* @return void
*/
function get_member_card(string $name, string $title, string $description, string $picture_uri, ?string $email = null, ?string $linkedin_url = null, ?string $github_url = null, ?string $twitter_url = null){

$contact_links_html = '';
if($email !== null){
$contact_links_html .= '<li>' .
"<a href='mailto:{$email}' class='icon icon-sm text-primary fa-envelope'></a>" .
'</li>';
}
if($linkedin_url !== null){
$contact_links_html .= '<li>' .
"<a href='{$linkedin_url}' class='icon icon-sm text-primary fa-linkedin'></a>" .
'</li>';
}
if($github_url !== null){
$contact_links_html .= '<li>' .
"<a href='{$github_url}' class='icon icon-sm text-primary fa-github'></a>" .
'</li>';
}
if($twitter_url !== null){
$contact_links_html .= '<li>' .
"<a href='{$twitter_url}' class='icon icon-sm text-primary fa-twitter'></a>" .
'</li>';
}

echo '<div class="cell-lg-12 bio-area">' .
'<div class="range range-sm-middle">' .
'<div class="cell-md-3">' .
"<img src='{$picture_uri}' alt='' width='360' height='404' class='img-responsive' />" .
'</div>' .
'<div class="cell-md-6">' .
'<div class="inset-xl-right-70 inset-xl-left-70 inset-left-15 inset-right-15">' .
"<h6 class='h6-with-small'><p>{$name}</p><span class='small text-silver-chalice'>{$title}</span></h6>" .
"<p>{$description}</p>" .
'<ul class="list-inline-lg">' .
$contact_links_html .
'</ul>' .
'</div>' .
'</div>' .
'</div>' .
'</div>';
}
151 changes: 49 additions & 102 deletions about/our-alumni.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,51 @@
<?php
require('../template/top.php');
require_once('card.php');
head('Our Alumni', true);
$members = array();
$members[] = [
'name'=>'Nick Tindle',
'title'=>'1st President',
'description'=>"I am a Computer Engineering Student, The first president, and still an active member of the group",
'picture_uri'=>'/images/bio-pics/nick-tindle.jpg',
];
$members[] = [
'name'=>'Juan Ruiz',
'title'=>'2nd President',
'description'=>"I am a Computer Engineering Student, I.T. Support Technician, and Undergrad Research Assistant at The University of North Texas. I am an active member of The Alpha Tau Omega Fraternity, Society of Hispanic Professional Engineers, Engineers without Borders, IEEE, and National Society of Professional Engineers. I have also interned at NASA, U.S. Department of Energy, and iOLAP. My focus is Embedded Systems but I have a strong passion for robotics, automation, machine learning, and artificial intelligence.",
'picture_uri'=>'/images/bio-pics/juan-ruiz.jpg',
];
$members[] = [
'name'=>'Katie Lee',
'title'=>'Former Secretary',
'description'=>"I’m a transfer student from UH. I’m studying Computer Engineering because I want to be on the front of the newest technology development, and I’m the secretary for UNT Robotics.",
'picture_uri'=>'/images/bio-pics/katie-lee.jpg',
];
$members[] = [
'name'=>'Michelle Rosal Vargas',
'title'=>'Former Event Coordinator',
'description'=>"Mechanical Engineer | Event Coordinator at UNT Robotics",
'picture_uri'=>'/images/bio-pics/michelle-vargas.jpg',
];
$members[] = [
'name'=>'Andrew Jarrett',
'title'=>'Former Public Relations',
'description'=>"Mechanical Engineer | Public Relations at UNT Robotics",
'picture_uri'=>'/images/bio-pics/andrew-jarrett.jpg',
];
$members[] = [
'name'=>'Nicole Kohm',
'title'=>'Former Project Manager',
'description'=>"I am an adaptive problem-solver with a lifetime of scientific passion. I enjoy applying what I learn to make new ideas and possibilities come to fruition. I have a strong track record of careful attention to detail and thinking outside the box. I frequently invent new technologies and methods to quickly solve multidisciplinary problems.",
'picture_uri'=>'/images/bio-pics/nicole-kohm.jpg',
];
$members[] = [
'name'=>'Jesse Sullivan',
'title'=>'Former Aerospace Division Lead',
'description'=>"Jesse is a senior mechanical engineering student interested in all things that fly and go fast. He has 4 years of experience in amateur high-power rocketry and currently holds an L1 certification with the National Association of Rocketry. He founded the Aerospace Division with UNT Robotics in order to foster interest in the hobby and provide a learning experience for anyone to become a part of.",
'picture_uri'=>'/images/bio-pics/jesse-sullivan.jpg',
];
?>
<style>
.bio-area {
border-top: 2px solid #ececec;
margin-top: 10px;
padding-top: 10px;
}
</style>
<main class="page-content">
<!-- Classic Breadcrumbs-->
<section class="breadcrumb-classic">
Expand All @@ -33,101 +70,11 @@
<h6>These people are the ones responsible for building our organisation and getting us to where we are today.</h6>
</div>
</div>
<!-- 1st President -->
<div class="cell-lg-12 bio-area">
<div class="range range-sm-middle">
<div class="cell-md-3"><img src="/images/bio-pics/nick-tindle.jpg" alt="" width="360" height="404" class="img-responsive" />
</div>
<div class="cell-md-6">
<div class="inset-xl-right-70 inset-xl-left-70 inset-left-15 inset-right-15">
<h6 class="h6-with-small"><a href="#"> Nick Tindle</a><span class="small text-silver-chalice">1st President</span></h6>
<p>I am a Computer Engineering Student, The first president, and still an active member of the group</p>
</div>
</div>
</div>
</div>
<!-- 2nd President -->
<div class="cell-lg-12 bio-area">
<div class="range range-sm-middle">
<div class="cell-md-3"><img src="/images/bio-pics/juan-ruiz.jpg" alt="" width="360" height="404" class="img-responsive" />
</div>
<div class="cell-md-6">
<div class="inset-xl-right-70 inset-xl-left-70 inset-left-15 inset-right-15">
<h6 class="h6-with-small"><a href="#"> Juan Ruiz</a><span class="small text-silver-chalice">2nd President</span></h6>
<p>I am a Computer Engineering Student, I.T. Support Technician, and Undergrad Research Assistant at The University of North Texas. I am an active member of The Alpha Tau Omega Fraternity, Society of Hispanic Professional Engineers, Engineers without Borders, IEEE, and National Society of Professional Engineers. I have also interned at NASA, U.S. Department of Energy, and iOLAP. My focus is Embedded Systems but I have a strong passion for robotics, automation, machine learning, and artificial intelligence.</p>
</div>
</div>
</div>
</div>

<!-- Former Secretary -->
<div class="cell-lg-12 bio-area">
<div class="range range-sm-middle">
<div class="cell-md-3"><img src="/images/bio-pics/katie-lee.jpg" alt="" width="360" height="404" class="img-responsive" />
</div>
<div class="cell-md-6">
<div class="inset-xl-right-70 inset-xl-left-70 inset-left-15 inset-right-15">
<h6 class="h6-with-small"><a href="#"> Katie Lee</a><span class="small text-silver-chalice">Former Secretary</span></h6>
<p>I’m a transfer student from UH. I’m studying Computer Engineering because I want to be on the front of the newest technology development, and I’m the secretary for UNT Robotics.</p>
</div>
</div>
</div>
</div>
<!-- Former Event Coordinator -->
<div class="cell-lg-12 bio-area">
<div class="range range-sm-middle">
<div class="cell-md-3"><img src="/images/bio-pics/michelle-vargas.jpg" alt="" width="360" height="404" class="img-responsive" />
</div>
<div class="cell-md-6">
<div class="inset-xl-right-70 inset-xl-left-70 inset-left-15 inset-right-15">
<h6 class="h6-with-small"><a href="#"> Michelle Rosal Vargas</a><span class="small text-silver-chalice">Former Event Coordinator</span></h6>
<p>Mechanical Engineer | Event Coordinator at UNT Robotics</p>
</div>
</div>
</div>
</div>
<!-- Former Public Relations -->
<div class="cell-lg-12 bio-area">
<div class="range range-sm-middle">
<div class="cell-md-3"><img src="/images/bio-pics/andrew-jarrett.jpg" alt="" width="360" height="404" class="img-responsive" />
</div>
<div class="cell-md-6">
<div class="inset-xl-right-70 inset-xl-left-70 inset-left-15 inset-right-15">
<h6 class="h6-with-small"><a href="#"> Andy Jarrett</a><span class="small text-silver-chalice">Former Public Relations</span></h6>
<p>Mechanical Engineer | Public Relations at UNT Robotics</p>
</div>
</div>
</div>
</div>
<!-- Former Project Manager -->
<div class="cell-lg-12 bio-area">
<div class="range range-sm-middle">
<div class="cell-md-3"><img src="/images/bio-pics/nicole-kohm.jpg" alt="" width="360" height="404" class="img-responsive" />
</div>
<div class="cell-md-6">
<div class="inset-xl-right-70 inset-xl-left-70 inset-left-15 inset-right-15">
<h6 class="h6-with-small"><a href="#">Nicole Kohm</a><span class="small text-silver-chalice">Former Project Manager</span></h6>
<p>I am an adaptive problem-solver with a lifetime of scientific passion. I enjoy applying what I learn to make new ideas and possibilities come to fruition. I have a strong track record of careful attention to detail and thinking outside the box. I frequently invent new technologies and methods to quickly solve multidisciplinary problems.</p>
</div>
</div>
</div>
</div>
<!-- Former Aerospace Division Lead -->
<div class="cell-lg-12 bio-area">
<div class="range range-sm-middle">
<div class="cell-md-3"><img src="/images/bio-pics/jesse-sullivan.jpg" alt="" width="360" height="404" class="img-responsive" />
</div>
<div class="cell-md-6">
<div class="inset-xl-right-70 inset-xl-left-70 inset-left-15 inset-right-15">
<h6 class="h6-with-small"><a href="#"> Jesse Sullivan</a><span class="small text-silver-chalice">Former Aerospace Division Lead</span></h6>
<p>Jesse is a senior mechanical engineering student interested in all things that fly and go fast. He has 4 years of experience in amateur high-power rocketry and currently holds an L1 certification with the National Association of Rocketry. He founded the Aerospace Division with UNT Robotics in order to foster interest in the hobby and provide a learning experience for anyone to become a part of. </p>
<ul class="list-inline-lg">
</ul>
</div>
</div>
</div>
</div>

<?php
foreach ($members as $member) {
get_member_card($member['name'], $member['title'], $member['description'], $member['picture_uri'], $member['email']??null, $member['linkedin_url'] ?? null, $member['github_url'] ?? null, $member['twitter_url'] ?? null);
}
?>
</div>
</section>
</main>
Expand Down
Loading
Loading