Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/ufosc/club-website into mydev
Browse files Browse the repository at this point in the history
  • Loading branch information
jperitz committed Oct 23, 2018
2 parents ee1ceb3 + 984d34c commit 126ab32
Show file tree
Hide file tree
Showing 10 changed files with 249 additions and 244 deletions.
76 changes: 52 additions & 24 deletions website/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<title>Open Source Club</title>
<meta charset="utf-8"/>
<link rel="shortcut icon" type="image/x-icon" href="assets/images/open-source-favicon-35x35.png">
<link rel="stylesheet" type="text/css" href="styles/about.css">
<!-- TODO: Give license credit to all fonts -->
</head>
Expand All @@ -22,7 +23,7 @@
<div class="topnav-placeholder"></div>
<a class="topnav-link" href="login.html">Sign in</a>
<a class="topnav-link" href="projects.html">Projects</a>
<a class="topnav-link" href="https://calendar.google.com/calendar/embed?src=toln76hk72u3v4vhu4hblu8s88%40group.calendar.google.com&ctz=America%2FNew_York">
<a class="topnav-link" href="https://www.facebook.com/groups/ufosc/events/?source=4&action_history=null&filter=calendar">
Events
<i class="fas fa-external-link-alt external-link" data-fa-transform="up-6"></i>
</a>
Expand All @@ -39,15 +40,15 @@
<a href="javascript:void(0);" class="topnav-link topnav-menu-icon" onclick="dropDownMenu()">
&#9776;
</a>

</div>
<!-- End of header bar -->

<div id="wrapper">
<div id="about" class="page-element">
<h1 class="title">About OSC</h1>
<p class="text">
OSC is the Open Source Club at the University of Florida. We are a community of makers, who want to solve problems and improve our world using open source projects.
OSC is the Open Source Club at the University of Florida. We are a community of makers, who want to solve problems and improve our world using open source projects.
<br> <br>
The OSC is first and foremost, about working on open source projects. Student choose what they want to work on, whether it be a totally new idea, or an existing project. Our meetings create a constructive atmosphere to help students collaborate in teams to grow their knowledge and skills!
<br> <br>
Expand All @@ -57,12 +58,50 @@ <h1 class="title">About OSC</h1>
</p>
</div>

<div id="meetings" class="page-element">
<h1 class="title">Meetings</h1>
<p class="text">
We have a couple types of meetings. Check our <a href="https://www.facebook.com/groups/ufosc/">Facebook</a> for times and locations.
<ol class="text">
<li>Casual Coding Sessions are laid back meetings. You can work on projects, homework, or just hang out! They happen twice weekly. It's a great time to find people with similar interest and create something cool.</li>
<li>General Body Meetings (GBMs) open up with a brief round of project updates. Following that, there is a tech talk on an open source technology. This is great for anyone to come in and learn. They happen every other week.</li>
<li>Code Jams are a once a month workshop and hack sessions. Spend the morning of Saturday learning about an open source technology then in the afternoon work on existing open source projects or start you own!</li>
</ol>
</p>
</div>

<div id="history" class="page-element">
<h1 class="title">History</h1>
<h2 class="subtitle">Getting Started</h2>
<div class="text">
We were founded in the Spring of 2016 as an official student organization at UF. The club is also a partnered Special Interest Group of the UF ACM chapter. In the summer of 2017 we helped start the Mozilla Open Source Student Network, a collection of university open source clubs across the country who help students contribute to open source.
After noticing a lack of general project focused clubs on campus, Matthew Booe (President) brought together Nick Cioli (Vice President) and Nick Barnes (Treasure) and their enthusiasm for open source to create the club at the start of Spring 2016. They found Professor Ira Hill to become their faculty adviser. It gathered enough sign-ups to become an official student government organization.

During the first year of operation, there were about five active members. The focus was primarily on teaching Git/Web Design and working on the club website and other basic projects.

In the middle of Fall 2016, the OSC became a Special Interest Group of the UF ACM chapter. The goal of this was to improve relations with the computer science community and find a source of funding.
</div>
<h2 class="subtitle">Growing Up</h2>
<div class="text">
There were two problems that became apparent over the previous year: 1. There wasn't a lot of time to work on projects 2. Administrative duties make it really hard to work on other things.

As a result, in the Spring of 2017 Casual Coding Sessions were introduced as two regular weekly meetings and more officer positions were added. This brought on Anthony Rossello (Secretary), Greg Fussell (External Relations Chair), Will Owens (Social Chair), and Vaibhav Yenamandra (Project Lead).

This helped grow the active members to be above ten people and work on the course planner.

The end of Spring elections resulted in news officers Joe Komskis (External Relations Chair) and Josh Hew (Secretary). A representative from Mozilla also reached out to learn more about the club.

Over the Summer of 2017 Matthew and Josh worked with Mozilla and eighteen other students to help put together the Mozilla Open Source Student Network.
</div>
<h2 class="subtitle">Staying Strong</h2>
<div class="text">
Through Fall of 2018 the Open Source Club has kept a simmilar format, while experimenting with a new type of meetings called Code Jams. The goal was to provide a longer workshop where students could come to learn about a topic before jumping into projects that deal with that.

Total club membership was around fifteen active members, with another ten or so coming around occasionally.

New projects included Marston vs West, Gator Questions, a revamped club website and backend, and Discord bots.
<br><br>
To be continued...
</div>
</div>
</div>

<!-- The footer -->
Expand All @@ -81,30 +120,19 @@ <h1 class="title">History</h1>
<a href="mailto:[email protected]" class="footer-link">
<i class="fas fa-envelope-square fa-2x"></i>
</a>

<!-- The text -->
<p class="footer-text">
<i class="fas fa-code"></i>
with
<i class="fas fa-heart"></i>
<i class="fas fa-code"></i>
with
<i class="fas fa-heart"></i>
by <strong>OSC</strong>
</p>

</div>
<!-- End of footer -->

<script>
// Function for setting the drop down menu css
function dropDownMenu() {
var x = document.getElementsByClassName("topnav");
if (x[0].className === "topnav") {
x[0].className += " drop-down-menu";
} else {
x[0].className = "topnav";
}
}
</script>


<script src="./scripts/unified.js"></script>

</body>
</html>

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 15 additions & 6 deletions website/index.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<!DOCTYPE html>
<html>

<head>
<title>Open Source Club</title>
<meta charset="utf-8"/>
<meta charset="utf-8" />
<link rel="shortcut icon" type="image/x-icon" href="assets/images/open-source-favicon-35x35.png">
<link rel="stylesheet" type="text/css" href="styles/index.css">

<!-- TODO: Give license credit to all fonts -->
</head>

Expand All @@ -22,7 +25,7 @@
<div class="topnav-placeholder"></div>
<a class="topnav-link" href="login.html">Sign in</a>
<a class="topnav-link" href="projects.html">Projects</a>
<a class="topnav-link" href="https://calendar.google.com/calendar/embed?src=toln76hk72u3v4vhu4hblu8s88%40group.calendar.google.com&ctz=America%2FNew_York">
<a class="topnav-link" href="https://www.facebook.com/groups/ufosc/events/?source=4&action_history=null&filter=calendar">
Events
<i class="fas fa-external-link-alt external-link" data-fa-transform="up-6"></i>
</a>
Expand Down Expand Up @@ -51,7 +54,8 @@
<div class="slideshow-container">
<div class="mySlides fade">
<img class="slide" style="object-fit: contain" src=".\assets\images\small-logo.png">
<br><br> <!--This is here so the box is the same height as the other slides w/text-->
<br><br>
<!--This is here so the box is the same height as the other slides w/text-->
</div>
<div class="mySlides fade">
<img class="slide" style="object-position: 50% 35%" src=".\assets\images\casual-coding.jpg">
Expand Down Expand Up @@ -115,7 +119,7 @@ <h1 class="title">

<!-- TODO: Finish the event integration -->
<!-- Upcoming events box -->
<!-- <div id="events-wrapper" class="page-element">
<!-- <div id="events-wrapper" class="page-element">
<h1 class="title" id="upcoming-events-title">
Upcoming Events
</h1>
Expand Down Expand Up @@ -178,9 +182,12 @@ <h1 class="title" id="get-involved-title">
Get Involved
</h1>
<p class="get-involved-text">
OSC is the Open Source Club at the University of Florida. We are a community of makers, who want to solve problems and improve our world using open source projects.
OSC is the Open Source Club at the University of Florida. We are a community of makers, who want to solve problems
and improve our world using open source projects.
<br> <br>
Sign up for our <a href="https://docs.google.com/forms/d/e/1FAIpQLSfeU1RSGQWOZfvQXLrUGnDAKvVAqO7gc3TZySmN1CFhCM9uog/viewform?c=0&w=1">email list</a> or our <a href="https://www.facebook.com/groups/ufosc/">Facebook group<a/> for meeting announcements and join our <a href="https://discord.gg/Gsxej6u">Discord</a> to communicate with other members and ask questions. And of course, come to our meetings! Introduce yourself, work on projects, and have fun.
Sign up for our <!-- <a href="https://docs.google.com/forms/d/e/1FAIpQLSfeU1RSGQWOZfvQXLrUGnDAKvVAqO7gc3TZySmN1CFhCM9uog/viewform?c=0&w=1">email list</a> or our --> <a href="https://www.facebook.com/groups/ufosc/">Facebook group<a/> for meeting announcements and join our <a href="https://discord.gg/Gsxej6u">Discord</a> to communicate with other members and ask questions. And of course, come to our meetings! Introduce yourself, work on projects, and have fun.
<br> <br>
You can find our more about us and our meetings in the <a href="about.html"> about page</a>.
</p>
</div>
</div>
Expand Down Expand Up @@ -213,7 +220,9 @@ <h1 class="title" id="get-involved-title">
</div>
<!-- End of footer -->

<script src="./scripts/unified.js"></script>
<script src="./scripts/index.js"></script>

</body>

</html>
Loading

0 comments on commit 126ab32

Please sign in to comment.