From ccaa53a1c286f7fd9ba8f5eb0a14353ea3a636b4 Mon Sep 17 00:00:00 2001
From: Julia Elman <julia.elman@gmail.com>
Date: Tue, 17 Feb 2015 10:51:49 -0500
Subject: [PATCH 01/21] Adding project requirements page, fixes #341.

---
 app/views/home/project_requirements.html.erb | 38 ++++++++++++++++++++
 app/views/layouts/_navigation.html.erb       |  7 +++-
 config/routes.rb                             |  2 ++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 app/views/home/project_requirements.html.erb

diff --git a/app/views/home/project_requirements.html.erb b/app/views/home/project_requirements.html.erb
new file mode 100644
index 00000000..b23a1a8c
--- /dev/null
+++ b/app/views/home/project_requirements.html.erb
@@ -0,0 +1,38 @@
+<div id="project_requirements">
+  <div class="row">
+    <h2>Project Requirements</h2>
+    <p>Wanting to partner with CodeMontage and become one of our <%= link_to "featured projects", projects_path %>? Here are some guidelines we look for and simple suggestions on what we consider best practices for all of our projects.</p>
+  </div>
+  <div class="row" id="open_source">
+    <h3>Open Source</h3>
+    <p>At CodeMontage, we strive for the projects we work on to have as much transparency to the public as possible. This leads us to make open source projects a requirement for any of our featured projects.</p>
+    <p><strong>What is considered an open source project?</strong>  Open source software is software that can be freely viewed, used, changed, and shared (in modified or unmodified form) by anyone.</p>
+  </div>
+  <div class="row" id="leadership">
+    <h3>Leadership</h3>
+    <p>The most successful open source projects have stemmed from a healthy community surrounding it. Some of these projects may have a specific foundation (e.g. jQuery, Django) that supplies the leadership to help maintain the code base. We do not require that a project have a foundation or larger organization surround the project, but merely a consistent group (or individual) who helps keep the project fresh and serves as the main point of contact.</p>
+  </div>
+  <div class="row" id="issue_tracker">
+    <h3>Issue Tracker</h3>
+    <p>Being able to organize and track issues surrounding the development of a project is a great way to help onboard new developers. GitHub issues, Trac and other systems are acceptable forms of issue management. We require this so that our members are better able to understand how to contribute to the code base.</p>
+  </div>
+  <div class="row" id="up_to_date">
+    <h3>Up-To-Date Code Base</h3>
+    <p>Consistent management of the code base helps a project stay fresh and well organized. If a project has not been committed to in six months or over, CodeMontage considers it a stale project and is not considered something our members can easily contribute to. However, there may be exceptions to this and project owners are welcome to connect with us at <%= mail_to "projects@codemontage.com", "projects@codemontage.com", :subject => "Connecting with CodeMontage", :target => '_blank' %> to discuss further.</p>
+  </div>
+  <div class="row" id="licensing">
+    <h3>Licensing</h3>
+    <p>Choosing a license for your open source project is a crucial part to becoming a solid code base. It helps direct users how they are legally able to use and distribute the code in the project. We request that all projects have a license in order for us to recommend it to our members. Here is a helpful link that explains some of the more popular licensing options: <%= link_to "http://choosealicense.com/", "http://choosealicense.com/" %>.</p>
+    <p>
+      <em>DISCLAIMER: We are not lawyers. Please consult legal counsel regarding questions about these licensing options.</em>
+    </p>
+  </div>
+  <div class="row" id="social_impact">
+    <h3>Social Impact</h3>
+    <p>CodeMontage’s mission is to “improve yourself while improving the world.” Within this context, we require that our featured projects have a direct social impact on the world and help further the advancement of various aspects of the human race, the planet and social good throughout the world. It is our goal to focus on featured projects who provide this level of impact either directly or indirectly to the global community.</p>
+  </div>
+  <div class="row">
+    <h5>Questions?</h5>
+    <p>Feel free to reach out to us at <%= mail_to "projects@codemontage.com", "projects@codemontage.com", :subject => "CodeMontage Project Requirement Questions", :target => '_blank' %>. We look forward to hearing from you!</p>
+  </div>
+</div>
diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index 1f66e681..033b7ea6 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -12,7 +12,12 @@
     </ul>
     <section class="top-bar-section">
       <ul class="left">
-        <li><%= link_to "Projects", projects_path %></li>
+        <li class="has-dropdown">
+          <%= link_to "Projects", projects_path %>
+          <ul class="dropdown">
+            <li><%= link_to "Project Requirements", project_requirements_path %></li>
+          </ul>
+        </li>
         <li><%= link_to "Jobs", jobs_path %></li>
         <li class="has-dropdown"><%= link_to "Events", events_path %>
           <ul class="dropdown">
diff --git a/config/routes.rb b/config/routes.rb
index 920d2422..9b99d3dc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -36,6 +36,8 @@
   get '/our_services', controller: 'home', action: 'services'
   get '/resources', controller: 'home', action: 'resources'
   get '/training', controller: 'home', action: 'training'
+  get '/project_requirements', controller: 'home',
+                               action: 'project_requirements'
 
   # Blog
   get '/blog' => redirect('http://blog.codemontage.com')

From 927a3a78ef7c0cb602001b2224a65571e1548cfa Mon Sep 17 00:00:00 2001
From: alexshook <alexandra.shook@gmail.com>
Date: Sat, 21 Feb 2015 00:36:05 -0500
Subject: [PATCH 02/21] adding support for differentiating between upcoming and
 past events in the Event model

---
 app/models/event.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/models/event.rb b/app/models/event.rb
index 915bfde2..ecdff0fa 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -27,6 +27,7 @@ class Event < ActiveRecord::Base
   friendly_id :name, use: :slugged
 
   scope :upcoming_events, -> { where("end_date >= ?", Time.now) }
+  scope :past_events, -> { where("start_date < ?", Time.now) }
   scope :public_events, -> { where(is_public: true) }
 
   def self.featured
@@ -114,6 +115,14 @@ def fetch_engagement_stats
     stats
   end
 
+  def upcoming?
+    true if self.start_date > Time.now
+  end
+
+  def past?
+    true if self.start_date < Time.now
+  end
+
   private
 
   def delete_logo

From b4d0992eca3dd35f9d6fafcd8704d14aacbca870 Mon Sep 17 00:00:00 2001
From: alexshook <alexandra.shook@gmail.com>
Date: Sat, 21 Feb 2015 00:37:33 -0500
Subject: [PATCH 03/21] Change language in events show template button and text
 from 'RSVP' and 'Join Us' for past events

---
 app/views/events/show.html.erb | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index 57320608..3f36b263 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -9,18 +9,24 @@
 
       <div id="event_rsvp_top" class="row">
         <div class="large-10 columns large-centered text-center">
-          <%= %>
-          <% if @event.eventbrite_url.present? %>
-            <%= link_to "RSVP for the " + @event.name, @event.eventbrite_url, :class => "large index radius button" %>
+          <%=  %>
+          <% if @event.upcoming? %>
+            <% if @event.eventbrite_url.present? %>
+              <%= link_to "RSVP for the " + @event.name, @event.eventbrite_url, :class => "large index radius button" %>
+            <% else %>
+              <%= link_to "Join the " + @event.name, dashboard_path, :class => "large index radius button" %>
+            <% end %>
           <% else %>
-            <%= link_to "Join the " + @event.name, dashboard_path, :class => "large index radius button" %>
+            <%= link_to "Too late! View More Events", events_path, :class => "large index radius button" %>
           <% end %>
         </div>
       </div>
 
-      <div>
-        <p class="text-center"><strong>Join us <%= @event.start_date.strftime("%B %d, %Y") %> for the </strong></p>
-      </div>
+      <% if @event.upcoming? %>
+        <div>
+          <p class="text-center"><strong>Join us <%= @event.start_date.strftime("%B %d, %Y") %> for the </strong></p>
+        </div>
+      <% end %>
 
       <div class="large-10 columns large-centered text-center">
         <h1><%= @event.name %></h1>
@@ -66,11 +72,15 @@
     <div id="event_rsvp_bottom" class="row">
       <div class="large-6 columns large-centered text-center">
         <%= %>
-        <% if @event.eventbrite_url.present? %>
-          <%= link_to "RSVP for the " + @event.name, @event.eventbrite_url, :class => "large index radius button" %>
-        <% else %>
-          <%= link_to "Join the " + @event.name, dashboard_path, :class => "large index radius button" %>
-        <% end %>
+          <% if @event.upcoming? %>
+            <% if @event.eventbrite_url.present? %>
+              <%= link_to "RSVP for the " + @event.name, @event.eventbrite_url, :class => "large index radius button" %>
+            <% else %>
+              <%= link_to "Join the " + @event.name, dashboard_path, :class => "large index radius button" %>
+            <% end %>
+          <% else %>
+            <%= link_to "Too late! View More Events", events_path, :class => "large index radius button" %>
+          <% end %>
       </div>
     </div>
 

From 065e4b8a9aa7e8bdebe50d70825d31681c7091c6 Mon Sep 17 00:00:00 2001
From: alexshook <alexandra.shook@gmail.com>
Date: Sat, 21 Feb 2015 00:38:41 -0500
Subject: [PATCH 04/21] Change listing in events index template to include a
 'Past Events' heading

---
 app/controllers/events_controller.rb |  3 ++-
 app/views/events/index.html.erb      | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 27fff25c..a1f72b28 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -12,7 +12,8 @@ def create
   end
 
   def index
-    @events = Event.public_events.order("start_date desc")
+    @upcoming_events = Event.upcoming_events.public_events.order("start_date desc")
+    @past_events = Event.past_events.public_events.order("start_date desc")
   end
 
   def show
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 44561113..65ab9df9 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -2,16 +2,27 @@
   <div>
     <h4>Events</h4>
 
-    <% if @events.present? %>
+    <% if @upcoming_events.present? %>
       <p>Join us online or in-person at these upcoming events to build open source and change the world:</p>
 
       <div class="events">
-        <% @events.each do |event| %>
+        <% @upcoming_events.each do |event| %>
           <div class="large-10 centered">
             <h5><%= link_to event.name + " - " + event.start_date.strftime("%B %d, %Y"), event_path(event) %></h5>
           </div>
 
         <% end %>
+
+        <% if @past_events.present? %>
+          <h4 style="padding-top: 25px;">Past Events</h4>
+
+          <% @past_events.each do |event| %>
+          <div class="large-10 centered">
+            <h5><%= link_to event.name + " - " + event.start_date.strftime("%B %d, %Y"), event_path(event) %></h5>
+          </div>
+
+          <% end %>
+        <% end %>
       </div>
     <% else %>
       <p>Oops! We can't seem to find any events. <%= link_to "Jump into a project", projects_path %>, or <%= link_to "reach out to an organization", organizations_path %> directly.</p>
@@ -23,3 +34,4 @@
     <%= render "check_in_prompt" %>
   <% end %>
 </div>
+

From 5fe06348cae23c64fbd7e4bd351f2fad307008ae Mon Sep 17 00:00:00 2001
From: alexshook <alexandra.shook@gmail.com>
Date: Sat, 21 Feb 2015 00:51:10 -0500
Subject: [PATCH 05/21] show event start date for past events

---
 app/views/events/show.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index 3f36b263..bb5844f3 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -26,6 +26,8 @@
         <div>
           <p class="text-center"><strong>Join us <%= @event.start_date.strftime("%B %d, %Y") %> for the </strong></p>
         </div>
+      <% else %>
+          <p class="text-center"><strong><%= @event.start_date.strftime("%B %d, %Y") %></strong></p>
       <% end %>
 
       <div class="large-10 columns large-centered text-center">

From c15737c28085a2348d2194a6c9415fd0b1503d47 Mon Sep 17 00:00:00 2001
From: alexshook <alexandra.shook@gmail.com>
Date: Tue, 24 Feb 2015 22:36:40 -0500
Subject: [PATCH 06/21] update event methods for consistency

---
 app/models/event.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index ecdff0fa..c7e907d8 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -27,7 +27,7 @@ class Event < ActiveRecord::Base
   friendly_id :name, use: :slugged
 
   scope :upcoming_events, -> { where("end_date >= ?", Time.now) }
-  scope :past_events, -> { where("start_date < ?", Time.now) }
+  scope :past_events, -> { where("end_date < ?", Time.now) }
   scope :public_events, -> { where(is_public: true) }
 
   def self.featured
@@ -116,11 +116,11 @@ def fetch_engagement_stats
   end
 
   def upcoming?
-    true if self.start_date > Time.now
+    true if end_date >= Time.now
   end
 
   def past?
-    true if self.start_date < Time.now
+    true if end_date < Time.now
   end
 
   private

From 88dfb5e485dfe74c97ae812aaaef2ab8df667538 Mon Sep 17 00:00:00 2001
From: alexshook <alexandra.shook@gmail.com>
Date: Tue, 24 Feb 2015 22:39:51 -0500
Subject: [PATCH 07/21] move Past Events heading styling to stylesheets folder

---
 app/assets/stylesheets/events.css.scss | 4 ++++
 app/views/events/index.html.erb        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/events.css.scss b/app/assets/stylesheets/events.css.scss
index 7be64c15..acfffea3 100644
--- a/app/assets/stylesheets/events.css.scss
+++ b/app/assets/stylesheets/events.css.scss
@@ -7,3 +7,7 @@
 .check-in {
   margin-top:25px;
 }
+
+.top-25 {
+  padding-top: 25px;
+}
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 65ab9df9..2db8eccb 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -14,7 +14,7 @@
         <% end %>
 
         <% if @past_events.present? %>
-          <h4 style="padding-top: 25px;">Past Events</h4>
+          <h4 class="top-25">Past Events</h4>
 
           <% @past_events.each do |event| %>
           <div class="large-10 centered">

From 88063e71bf7e9a05c1b1e2e2f419812ccd525299 Mon Sep 17 00:00:00 2001
From: Courteney Ervin <courteney.ervin@gmail.com>
Date: Fri, 27 Feb 2015 16:11:50 -0500
Subject: [PATCH 08/21] Create beta_signups for users

---
 app/models/beta_signup.rb                        |  5 +++++
 app/models/user.rb                               |  1 +
 db/migrate/20150227190642_create_beta_signups.rb | 10 ++++++++++
 db/schema.rb                                     | 10 +++++++++-
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 app/models/beta_signup.rb
 create mode 100644 db/migrate/20150227190642_create_beta_signups.rb

diff --git a/app/models/beta_signup.rb b/app/models/beta_signup.rb
new file mode 100644
index 00000000..554dcd48
--- /dev/null
+++ b/app/models/beta_signup.rb
@@ -0,0 +1,5 @@
+class BetaSignup < ActiveRecord::Base
+  belongs_to :user
+
+  validates :user_id, uniqueness: true
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 1a31b28e..4e32cc00 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -19,6 +19,7 @@ class User < ActiveRecord::Base
 
   has_many :services
   has_one :profile, class_name: 'UserProfile'
+  has_one :beta_signup
   delegate :gravatar_email, :headline, :is_coder, :name, :represents_org, :represents_team, :cause_list, :technology_list, :email_news, :email_training, to: :profile
 
   validates_presence_of :password, on: :create # will only run on account creation
diff --git a/db/migrate/20150227190642_create_beta_signups.rb b/db/migrate/20150227190642_create_beta_signups.rb
new file mode 100644
index 00000000..c09d6817
--- /dev/null
+++ b/db/migrate/20150227190642_create_beta_signups.rb
@@ -0,0 +1,10 @@
+class CreateBetaSignups < ActiveRecord::Migration
+  def change
+    create_table :beta_signups do |t|
+      t.references :user
+      t.timestamps
+    end
+
+    add_index :beta_signups, :user_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9f990daa..5dad3cdc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150213195324) do
+ActiveRecord::Schema.define(:version => 20150227190642) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "namespace"
@@ -27,6 +27,14 @@
   add_index "active_admin_comments", ["namespace"], :name => "index_active_admin_comments_on_namespace"
   add_index "active_admin_comments", ["resource_type", "resource_id"], :name => "index_active_admin_comments_on_resource_type_and_resource_id"
 
+  create_table "beta_signups", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "beta_signups", ["user_id"], :name => "index_beta_signups_on_user_id"
+
   create_table "event_registrations", :force => true do |t|
     t.integer  "event_id",   :null => false
     t.integer  "user_id",    :null => false

From c88ae187a3dee6a3b02bf957eb6030a925b05873 Mon Sep 17 00:00:00 2001
From: rachelmad <rachelvmadrigal@gmail.com>
Date: Sat, 28 Feb 2015 13:58:02 -0600
Subject: [PATCH 09/21] Added all projects button to navigation

Added all projects button to navigation
---
 app/views/layouts/_navigation.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index 033b7ea6..55e4068f 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -15,6 +15,7 @@
         <li class="has-dropdown">
           <%= link_to "Projects", projects_path %>
           <ul class="dropdown">
+			<li><%= link_to "All Projects", projects_path %>
             <li><%= link_to "Project Requirements", project_requirements_path %></li>
           </ul>
         </li>

From d7d4eaec1cf20ff67b9172b1295432dfe1994a86 Mon Sep 17 00:00:00 2001
From: Courteney Ervin <courteney.ervin@gmail.com>
Date: Tue, 10 Mar 2015 00:04:50 -0400
Subject: [PATCH 10/21] Link to issue template & include requisite emojis in
 the README

Link to issue template & include requisite emojis in the README
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 59b3d570..e858e46c 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,7 @@ Join our mission to create superhero coders! You can get involved by taking any
 1. [Register for CodeMontage](http://codemontage.com/auth/github).
 2. [Follow us on Twitter](http://twitter.com/CodeMontage).
 3. Be the change you wish to see by [creating a branch](http://guides.github.com/overviews/flow) submitting a [pull request](https://github.com/CodeMontageHQ/codemontage/pulls/new) to improve the platform. *Please include a screenshot of any user interface changes with all pull requests.*
-4. Suggest an improvement by opening an [issue](https://github.com/CodeMontageHQ/codemontage/issues/new).
-(We recommend including [emojis](http://www.emoji-cheat-sheet.com) for maximum effectiveness.)
+4. Suggest an improvement by opening an [issue](https://github.com/CodeMontageHQ/codemontage/issues/new). Please follow [our issue template](https://github.com/CodeMontageHQ/codemontage/issues/347) and use multiple [emojis](http://www.emoji-cheat-sheet.com) for maximum effectiveness. :+1::100::wink:
 5. Reach out to us at hello@codemontage.com.
 
 

From b80c7e0d09847b1323285b716932012f934201e0 Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Wed, 25 Mar 2015 10:13:47 -0500
Subject: [PATCH 11/21] Added a helper method to return tech and causes tag
 names.

---
 app/helpers/project_controller_helper.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/helpers/project_controller_helper.rb b/app/helpers/project_controller_helper.rb
index da8e49df..016a51e6 100644
--- a/app/helpers/project_controller_helper.rb
+++ b/app/helpers/project_controller_helper.rb
@@ -11,4 +11,24 @@ def project_tags_link_list(project, type)
       link_to tag.name, projects_path(tags: tag.name)
     end.join(', ').html_safe
   end
+  
+  def project_tech_and_cause_tags_lists
+    technologies = []
+    causes = []
+    
+    self.each do |project|
+      project.technologies.each do |tech|
+        unless technologies.include? tech.name
+          technologies << tech.name
+        end
+      end
+      project.causes.each do |cause|
+        unless causes.include? cause.name
+          causes << cause.name
+        end
+      end
+    end
+      
+    return technologies, causes
+  end
 end

From 973aa463d97647f4c5b1daa3e58f7b5191e9c8ea Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Wed, 25 Mar 2015 10:29:10 -0500
Subject: [PATCH 12/21] Changes to helper and added variables for lists to the
 controller.  Working as intended.

---
 app/controllers/projects_controller.rb   | 1 +
 app/helpers/project_controller_helper.rb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 062edb06..1d11d1fb 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -8,6 +8,7 @@ def index
       else
         Project.featured
       end.with_technologies_and_causes.with_organization
+    @tech_list, @cause_list = projects_tech_and_cause__tags_lists(@featured_projects)
   end
 
   def show
diff --git a/app/helpers/project_controller_helper.rb b/app/helpers/project_controller_helper.rb
index 016a51e6..dd02d8e0 100644
--- a/app/helpers/project_controller_helper.rb
+++ b/app/helpers/project_controller_helper.rb
@@ -12,11 +12,11 @@ def project_tags_link_list(project, type)
     end.join(', ').html_safe
   end
   
-  def project_tech_and_cause_tags_lists
+  def projects_tech_and_cause_tags_lists(projects_array)
     technologies = []
     causes = []
     
-    self.each do |project|
+    projects_array.each do |project|
       project.technologies.each do |tech|
         unless technologies.include? tech.name
           technologies << tech.name

From a445db4392616dd2aaa3096526a8071617825c09 Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Wed, 25 Mar 2015 10:35:34 -0500
Subject: [PATCH 13/21] Small typo fix.

---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1d11d1fb..745c6092 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -8,7 +8,7 @@ def index
       else
         Project.featured
       end.with_technologies_and_causes.with_organization
-    @tech_list, @cause_list = projects_tech_and_cause__tags_lists(@featured_projects)
+    @tech_list, @cause_list = projects_tech_and_cause_tags_lists(@featured_projects)
   end
 
   def show

From 0ff66fd5f7cfb2388d23fc2059441450038019d3 Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Wed, 25 Mar 2015 10:52:08 -0500
Subject: [PATCH 14/21] Added helper to created form

---
 app/views/projects/_tags_list.html.erb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 app/views/projects/_tags_list.html.erb

diff --git a/app/views/projects/_tags_list.html.erb b/app/views/projects/_tags_list.html.erb
new file mode 100644
index 00000000..46f816aa
--- /dev/null
+++ b/app/views/projects/_tags_list.html.erb
@@ -0,0 +1,6 @@
+<form>
+  <input type="radio", name="tags", value="all" checked>All</input>
+  <% tag_list.each do |tech| %>
+  <input type="radio", name="tags", value="<%= tech %>"><%= tech %></input>
+  <% end %>
+</form>
\ No newline at end of file

From 94a1cc40f1df26e93666cd5d333de29380751d03 Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Wed, 25 Mar 2015 14:46:22 -0500
Subject: [PATCH 15/21] Working state for helper and controller for returning a
 sorted tag list

---
 app/controllers/projects_controller.rb   | 2 +-
 app/helpers/project_controller_helper.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 745c6092..62894885 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -8,7 +8,7 @@ def index
       else
         Project.featured
       end.with_technologies_and_causes.with_organization
-    @tech_list, @cause_list = projects_tech_and_cause_tags_lists(@featured_projects)
+    @tech_list, @cause_list = view_context.projects_tech_and_cause_tags_lists(@featured_projects)
   end
 
   def show
diff --git a/app/helpers/project_controller_helper.rb b/app/helpers/project_controller_helper.rb
index dd02d8e0..cc302fa8 100644
--- a/app/helpers/project_controller_helper.rb
+++ b/app/helpers/project_controller_helper.rb
@@ -29,6 +29,6 @@ def projects_tech_and_cause_tags_lists(projects_array)
       end
     end
       
-    return technologies, causes
+    return technologies.sort, causes.sort
   end
 end

From 078a9fe6d59b373ba850c672b2553d13fdf9ac6e Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Wed, 25 Mar 2015 14:46:57 -0500
Subject: [PATCH 16/21] Added javascript for adding links to radio buttons.

---
 app/assets/javascripts/projects.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 app/assets/javascripts/projects.js

diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js
new file mode 100644
index 00000000..ae4f1667
--- /dev/null
+++ b/app/assets/javascripts/projects.js
@@ -0,0 +1,18 @@
+window.onload = function() {
+  var tags = [];
+  var href = window.location.origin + window.location.pathname
+  console.log(href)
+  
+  tags = document.getElementsByClassName("tag_radio");
+  
+  for (i = 0; i < tags.length; i++) {
+    tags[i].addEventListener("click", function() {
+      if (this.value === "all") {
+        window.location.href = href;
+      } else {
+        window.location.href = href +"?tags=" + this.value;
+      };
+    });
+  };
+  
+};
\ No newline at end of file

From 8ea15dbd65f1a12b36483d4207f029dd874d9ac3 Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Wed, 25 Mar 2015 14:48:52 -0500
Subject: [PATCH 17/21] Added extra divs to partial to clean up HTML and added
 partial rendering to index.html.erb

---
 app/views/projects/_tags_list.html.erb | 10 +++++-----
 app/views/projects/index.html.erb      |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/views/projects/_tags_list.html.erb b/app/views/projects/_tags_list.html.erb
index 46f816aa..262df8fe 100644
--- a/app/views/projects/_tags_list.html.erb
+++ b/app/views/projects/_tags_list.html.erb
@@ -1,6 +1,6 @@
-<form>
-  <input type="radio", name="tags", value="all" checked>All</input>
-  <% tag_list.each do |tech| %>
-  <input type="radio", name="tags", value="<%= tech %>"><%= tech %></input>
-  <% end %>
+<form class="tag_list <%= color %>">
+  <div><input type="radio" name="tags" class="tag_radio" value="all">All</input></div>
+  <%- tag_list.each do |tech| %>
+    <div><input type="radio" name="tags" class="tag_radio" value="<%= tech %>"><%= "#{tech}" %></input></div>
+  <%- end -%>
 </form>
\ No newline at end of file
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index 7f7d12f5..4b788a56 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -5,7 +5,10 @@
     <% if @featured_projects.present? %>
       <p>These open source, community-driven projects are making the world better and could really use your help. Check them out and contribute however you'd like. Or, view <%= link_to "organizations", organizations_path %>.
         Excited to contribute, but can't dig in right now? <%= link_to "Code Later", code_later_url %>!</p>
-
+        
+      <%= render partial: 'tags_list', locals: { tag_list: @tech_list, color: "purple" } %>
+      <%= render partial: 'tags_list', locals: { tag_list: @cause_list, color: "teal" } %>
+        
       <% @featured_projects.each do |project| %>
         <%= render partial: 'project', locals: { project: project } %>
       <% end %>

From d308cf2ca2a1e812401ad2c01b374013eda2d625 Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Wed, 25 Mar 2015 14:49:17 -0500
Subject: [PATCH 18/21] Added basic styling for tag list bars.

---
 app/assets/stylesheets/projects.css.scss | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 06253ca6..fe335998 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -27,3 +27,21 @@ h5 span.favorite {
 .project_links {
   margin-bottom: 6%;
 }
+
+.tag_list {
+  border-radius: 5px;
+  color: #fff;
+  padding: 10px;
+  margin-bottom: 0;
+  overflow-x: scroll;
+  overflow-y: hidden;
+  white-space: nowrap;
+  
+  div {
+    display: inline-block;
+    padding-right: 10px;
+  }
+}
+
+.purple { background-color: $cmPurple; }
+.teal   { background-color: $cmTeal; }
\ No newline at end of file

From bb9c73593df925cf8caa333cee582be4ab3de49a Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Mon, 6 Apr 2015 08:56:41 -0500
Subject: [PATCH 19/21] Cleaning up files for hound.

---
 app/assets/javascripts/projects.js       | 27 ++++++++++++------------
 app/assets/stylesheets/projects.css.scss |  4 ++--
 app/views/projects/_tags_list.html.erb   |  6 +++---
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js
index ae4f1667..6c5581bf 100644
--- a/app/assets/javascripts/projects.js
+++ b/app/assets/javascripts/projects.js
@@ -1,18 +1,19 @@
+function tagLoop() {
+  if (this.value === "all") {
+    window.location.href = href;
+  } else {
+    window.location.href = href +"?tags=" + this.value;
+  }
+};
+
 window.onload = function() {
   var tags = [];
-  var href = window.location.origin + window.location.pathname
-  console.log(href)
+  var href = window.location.origin + window.location.pathname;
   
   tags = document.getElementsByClassName("tag_radio");
   
-  for (i = 0; i < tags.length; i++) {
-    tags[i].addEventListener("click", function() {
-      if (this.value === "all") {
-        window.location.href = href;
-      } else {
-        window.location.href = href +"?tags=" + this.value;
-      };
-    });
-  };
-  
-};
\ No newline at end of file
+  for (var i = 0; i < tags.length; i++) {
+    tags[i].addEventListener("click", tagLoop)
+  })
+};
+  
\ No newline at end of file
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index fe335998..d8b19ba8 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -30,7 +30,7 @@ h5 span.favorite {
 
 .tag_list {
   border-radius: 5px;
-  color: #fff;
+  color: white;
   padding: 10px;
   margin-bottom: 0;
   overflow-x: scroll;
@@ -44,4 +44,4 @@ h5 span.favorite {
 }
 
 .purple { background-color: $cmPurple; }
-.teal   { background-color: $cmTeal; }
\ No newline at end of file
+.teal { background-color: $cmTeal; }
diff --git a/app/views/projects/_tags_list.html.erb b/app/views/projects/_tags_list.html.erb
index 262df8fe..40d376c1 100644
--- a/app/views/projects/_tags_list.html.erb
+++ b/app/views/projects/_tags_list.html.erb
@@ -1,6 +1,6 @@
 <form class="tag_list <%= color %>">
   <div><input type="radio" name="tags" class="tag_radio" value="all">All</input></div>
-  <%- tag_list.each do |tech| %>
-    <div><input type="radio" name="tags" class="tag_radio" value="<%= tech %>"><%= "#{tech}" %></input></div>
-  <%- end -%>
+  <% tag_list.each do |tech| %>
+    <div><input type="radio" name="tags" class="tag_radio" value="<%= tech %>"><%= "#{tech}" -%></input></div>
+  <% end %>
 </form>
\ No newline at end of file

From 5691ecede33bdcff22115983b1b909e2b26200b7 Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Mon, 6 Apr 2015 09:00:01 -0500
Subject: [PATCH 20/21] fixes scope of projects.js function.

---
 app/assets/javascripts/projects.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js
index 6c5581bf..73c4eea0 100644
--- a/app/assets/javascripts/projects.js
+++ b/app/assets/javascripts/projects.js
@@ -1,15 +1,15 @@
-function tagLoop() {
-  if (this.value === "all") {
-    window.location.href = href;
-  } else {
-    window.location.href = href +"?tags=" + this.value;
-  }
-};
-
 window.onload = function() {
   var tags = [];
   var href = window.location.origin + window.location.pathname;
   
+  function tagLoop() {
+    if (this.value === "all") {
+      window.location.href = href;
+    } else {
+      window.location.href = href +"?tags=" + this.value;
+    }
+  };
+  
   tags = document.getElementsByClassName("tag_radio");
   
   for (var i = 0; i < tags.length; i++) {

From 048295a0a506da20703d9a8c657a1401853172d9 Mon Sep 17 00:00:00 2001
From: Andrew Strovers <ADStrovers@gmail.com>
Date: Thu, 9 Apr 2015 09:15:29 -0500
Subject: [PATCH 21/21] Removes erroneous clasing paranthesis from javascript
 file.

---
 app/assets/javascripts/projects.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js
index 73c4eea0..8c46d7ad 100644
--- a/app/assets/javascripts/projects.js
+++ b/app/assets/javascripts/projects.js
@@ -14,6 +14,6 @@ window.onload = function() {
   
   for (var i = 0; i < tags.length; i++) {
     tags[i].addEventListener("click", tagLoop)
-  })
+  }
 };
   
\ No newline at end of file