diff --git a/website/about.html b/website/about.html index bc7620d..7c8b8c9 100644 --- a/website/about.html +++ b/website/about.html @@ -3,6 +3,7 @@ Open Source Club + @@ -22,7 +23,7 @@
Sign in Projects - + Events @@ -39,7 +40,7 @@ ☰ - + @@ -47,7 +48,7 @@

About OSC

- 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.

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!

@@ -57,12 +58,50 @@

About OSC

+
+

Meetings

+

+ We have a couple types of meetings. Check our Facebook for times and locations. +

    +
  1. 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.
    2. +
  2. 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.
    3. +
  3. 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!
    4. +
+

+
+

History

+

Getting Started

- 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. +
+

Growing Up

+
+ 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. +
+

Staying Strong

+
+ 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. +

+ To be continued...
-
@@ -81,30 +120,19 @@

History

- +

- - with - + + with + by OSC

- + - - - + + + - \ No newline at end of file diff --git a/website/assets/images/open-source-favicon-35x35.png b/website/assets/images/open-source-favicon-35x35.png new file mode 100644 index 0000000..6692a80 Binary files /dev/null and b/website/assets/images/open-source-favicon-35x35.png differ diff --git a/website/index.html b/website/index.html index 5bc145d..6a40f62 100644 --- a/website/index.html +++ b/website/index.html @@ -1,9 +1,12 @@ + Open Source Club - + + + @@ -22,7 +25,7 @@
Sign in Projects - + Events @@ -51,7 +54,8 @@
-

+

+
@@ -115,7 +119,7 @@

- Facebook group for meeting announcements and join our Discord to communicate with other members and ask questions. And of course, come to our meetings! Introduce yourself, work on projects, and have fun. +

+ You can find our more about us and our meetings in the about page.

@@ -213,7 +220,9 @@

+ + diff --git a/website/projects.html b/website/projects.html index 9d61031..61bcb42 100644 --- a/website/projects.html +++ b/website/projects.html @@ -1,8 +1,10 @@ + Open Source Club - + + @@ -22,7 +24,7 @@
Sign in Projects - + Events @@ -39,245 +41,238 @@ ☰ - + -
+
- -
- -

Culture II

-

Analysis by Jonathan Morales

- -
- -
-
-

-

-
- - -
-

- - hotnewhiphop.com -

- -

- - me, myself, i feat. quavo, offset, liftoff -

-
-
-

Club Website

The thing your on right now!

+ -
+ +

- The website is built from scratch, using basic HTML, CSS, and JavaScript, to be a one-stop-shop for information about the Open Source Club. It's provides information about what the club is, the projects we work on, and upcoming events. + The website is built from scratch, using basic HTML, CSS, and JavaScript, to be a one-stop-shop for information + about the Open Source Club. It's provides information about what the club is, the projects we work on, and + upcoming events.

- + -
+

github.com/ufosc/club-website

- -

+ + - -

- -

Club Website

-

The thing your on right now!

- -
- -
-
-

- The website is built from scratch, using basic HTML, CSS, and JavaScript, to be a one-stop-shop for information about the Open Source Club. It's provides information about what the club is, the projects we work on, and upcoming events. -

- - -
-

- - github.com/ufosc/club-website -

- -

- - JING1201, juansuh, lucasgrinspan, mirdaki, paologarcia002 -

-
-

Club Website

-

The thing your on right now!

+

Marston vs West

+

A platform fighter utilizing the Phaser JavaScript library

+ -
+ +

- The website is built from scratch, using basic HTML, CSS, and JavaScript, to be a one-stop-shop for information about the Open Source Club. It's provides information about what the club is, the projects we work on, and upcoming events. + A simple street fighter/smash bros esque video game project about the ongoing debate for best library. This project is made using JavaScript and the Phaser framework.

- + -
+

- github.com/ufosc/club-website + github.com/ufosc/marston-vs-west

- -

+ + + +

-

Club Website

-

The thing your on right now!

+

GatorQuestions

+

Open source teacher/professor interaction software

+ -
+ +

- The website is built from scratch, using basic HTML, CSS, and JavaScript, to be a one-stop-shop for information about the Open Source Club. It's provides information about what the club is, the projects we work on, and upcoming events. + Teacher/student interaction software designed to provide an open source alternative to existing solutions like Top Hat. It is being built with Ruby on Rails.

- + -
+

- github.com/ufosc/club-website + github.com/ufosc/GatorQuestions

- -

+ + + +

-

Club Website

-

The thing your on right now!

+

MuddySwamp

+

A simple UF themed Multi-User Dungeon

+ -
+ +

- The website is built from scratch, using basic HTML, CSS, and JavaScript, to be a one-stop-shop for information about the Open Source Club. It's provides information about what the club is, the projects we work on, and upcoming events. + Multi-user dungeons, or "MUDs" are text-based role-playing games, that naturally evolved from the text-based rpg and adventure games of the 1970s. This project aims to introduce a new generation—one that never experienced a world without broadband internet—to this classic game genre. While this code can be adapted for any setting, we intend to render our university in beautiful ASCII.

- + -
+

- github.com/ufosc/club-website + github.com/ufosc/MuddySwamp

- -

+ + + +

-

Club Website

-

The thing your on right now!

+

ALBot and ALBotA

+

Discord bots written in Python

+ -
+ +

- The website is built from scratch, using basic HTML, CSS, and JavaScript, to be a one-stop-shop for information about the Open Source Club. It's provides information about what the club is, the projects we work on, and upcoming events. + A python3 Discord bot used to run the Open Source Club's Discord server. The bot is using the Discord.py rewrite.

- + -
+

- github.com/ufosc/club-website + github.com/ufosc/albot-and-albota

- -

+ + + +

- -

Club Website

-

The thing your on right now!

- -
- + +

Club Backend

+

A RESTful API for club information (events, projects, sign-ins, etc)

+ + + + +
+

+ A RESTful API for club information (events, projects, sign-ins, etc) that is used for the club website, bots, and any future projects related to administration. Built using Rust, Rocket, PostgreSQL, and Diesel. +

+
+ + +
+

+ + github.com/ufosc/club-backend +

+ + + +
-
-

- The website is built from scratch, using basic HTML, CSS, and JavaScript, to be a one-stop-shop for information about the Open Source Club. It's provides information about what the club is, the projects we work on, and upcoming events. -

+ + +
+ +

Club Admin Portal

+

Web app for accessing and modifying club data

+ + + + +
+

+ Web app for accessing and modifying club data stored in the club backend. Built using Vue and TypeScript. +

+
+ + +
+

+ + github.com/ufosc/club-admin-portal +

+ + + +
- - -
-

- - github.com/ufosc/club-website -

- -

- - JING1201, juansuh, lucasgrinspan, mirdaki, paologarcia002 -

-
-
-
@@ -296,30 +291,19 @@

The thing your on right now!

- +

- - with - + + with + by OSC

- +
- - - + + + - \ No newline at end of file diff --git a/website/scripts/index.js b/website/scripts/index.js index 2da3e12..a7a467d 100644 --- a/website/scripts/index.js +++ b/website/scripts/index.js @@ -1,13 +1,3 @@ -// 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"; - } -} - //Functions for creating an interactive slideshow var slideIndex = 1; var timeOut; diff --git a/website/scripts/unified.js b/website/scripts/unified.js new file mode 100644 index 0000000..ff0857d --- /dev/null +++ b/website/scripts/unified.js @@ -0,0 +1,9 @@ +// 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"; + } +} diff --git a/website/styles/about.css b/website/styles/about.css index 727a93c..8562883 100644 --- a/website/styles/about.css +++ b/website/styles/about.css @@ -1,48 +1,16 @@ @import "unified.css"; -/* Bigger screen layout */ +/* Layout adapts to both desktop and mobile */ #wrapper { display: grid; - grid-template-columns: repeat(2, 1fr); - width: 97%; - overflow: auto; + grid-template-columns: repeat(auto-fit, minmax(320px, 1fr)); grid-gap: 20px; - margin: 20px auto 0; + justify-items: stretch; + margin: 20px; } -#about { - grid-column: 1; - grid-row: 1; -} - -#history { - grid-column: 2; - grid-row: 1; -} - -/* For mobile phones */ -@media only screen and (max-width: 600px) { - - #wrapper { - display: grid; - width: 95%; - max-width: 500px; - margin: 0 auto; - margin-top: 10px; - grid-template-rows: repeat(2, auto); - grid-template-columns: 1fr; - grid-auto-rows: min-content; - grid-gap: 10px; - } - - #about { - grid-column: 1; - grid-row: 1; - } - - #history { - grid-column: 1; - grid-row: 2; - } - +/* Make sure the list is within the box */ +ol { + padding-left: 10px; + padding-right: 10px; } \ No newline at end of file diff --git a/website/styles/unified.css b/website/styles/unified.css index 16f0bdc..74411eb 100644 --- a/website/styles/unified.css +++ b/website/styles/unified.css @@ -102,6 +102,13 @@ body { font-family: var(--title-font); } +/* Every subtitle on the site */ +.subtitle { + position: relative; + text-align: center; + font-family: var(--title-font); +} + /* All text on the site */ .text { position: relative; @@ -212,7 +219,16 @@ body { float: none; display: block; text-align: left; - padding-bottom: 18px; + } + + /* Adjusted padding on nav links when in mobile view to try and tighten things up */ + + .topnav.drop-down-menu .topnav-link { + padding: 8px 16px; + } + + .topnav.drop-down-menu .topnav-link:last-child { + padding-bottom: 15px; } /* Make the menu items be below the menu icon when clicked */ diff --git a/website/unfinished/eventspage/events.html b/website/unfinished/eventspage/events.html index 45bd6ab..f58afb6 100644 --- a/website/unfinished/eventspage/events.html +++ b/website/unfinished/eventspage/events.html @@ -4,9 +4,11 @@ Events <<<<<<< HEAD + ======= + >>>>>>> 9e305dd9f2591ed46794db5b07b720cf206cbccc diff --git a/website/unfinished/resources-page/resources.html b/website/unfinished/resources-page/resources.html index 1ef22ba..0bf718e 100644 --- a/website/unfinished/resources-page/resources.html +++ b/website/unfinished/resources-page/resources.html @@ -7,8 +7,7 @@ - - +