From 960d9ceb5e0cb47e2dddae0f1613516519f905c8 Mon Sep 17 00:00:00 2001
From: Bo Tembunkiart <stembunk@andrew.cmu.edu>
Date: Tue, 16 Apr 2019 23:32:31 -0400
Subject: [PATCH 1/5] Revert "Revert "Dashboards (#293)""

This reverts commit 16b1f71668a1529d5efc9cb5116ea2fd6393c724.
---
 Gemfile                                       |  2 +
 Gemfile.lock                                  |  6 +-
 app/assets/javascripts/application.js         |  8 +-
 app/assets/javascripts/datatables.js          | 65 +++++++++++++
 app/assets/stylesheets/application.css.scss   | 18 ++--
 app/assets/stylesheets/datatables.scss        | 15 +++
 app/views/home/_quick_links.html.erb          | 97 ++++++++++++-------
 app/views/layouts/application.html.erb        |  8 +-
 app/views/shifts/_shifts_sidebar.html.erb     |  4 +-
 app/views/store/items/_cart_widget.html.erb   |  6 ++
 app/views/store_cart/_store_cart.html.erb     | 39 ++++++++
 app/views/tasks/_tasks_sidebar.html.erb       |  2 +-
 lib/templates/erb/scaffold/index.html.erb     | 17 ++++
 .../rails/jbuilder/index.json.jbuilder        | 10 ++
 14 files changed, 241 insertions(+), 56 deletions(-)
 create mode 100644 app/assets/javascripts/datatables.js
 create mode 100644 app/assets/stylesheets/datatables.scss
 create mode 100644 app/views/store/items/_cart_widget.html.erb
 create mode 100644 app/views/store_cart/_store_cart.html.erb
 create mode 100644 lib/templates/erb/scaffold/index.html.erb
 create mode 100644 lib/templates/rails/jbuilder/index.json.jbuilder

diff --git a/Gemfile b/Gemfile
index 2603e80a..69f3e0c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,12 +7,14 @@ gem 'sass-rails'
 gem 'uglifier'
 gem 'coffee-rails'
 gem 'jquery-rails'
+gem 'jquery-datatables'
 gem 'jbuilder'
 gem 'bootstrap-sass'
 gem 'simple_form'
 gem 'therubyracer', :platform=>:ruby
 gem 'omniauth'
 gem 'omniauth-shibboleth'
+gem 'materialize-sass'
 
 # User and role management
 gem 'cancancan'
diff --git a/Gemfile.lock b/Gemfile.lock
index 003dcddf..14d6cd87 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -159,6 +159,7 @@ GEM
     jbuilder (2.4.1)
       activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
+    jquery-datatables (1.10.19.1)
     jquery-rails (4.1.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -171,6 +172,8 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    materialize-sass (1.0.0)
+      autoprefixer-rails (>= 6.0.3)
     mime-types (2.99.1)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
@@ -358,6 +361,7 @@ DEPENDENCIES
   factory_girl_rails
   highline
   jbuilder
+  jquery-datatables
   jquery-rails
   mysql2 (~> 0.4.10)
   newrelic_rpm
@@ -396,4 +400,4 @@ RUBY VERSION
    ruby 2.3.0p0
 
 BUNDLED WITH
-   1.14.5
+   1.17.3
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index ebfd1166..ce49cec9 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,6 +14,7 @@
 //= require jquery_ujs
 //= require bootstrap
 //= require turbolinks
+//= require datatables
 //= require_tree .
 
 $(document).on("ready page:change", function(){
@@ -57,4 +58,9 @@ function _toggleText(el, opt1, opt2){
   var $el = $(el);
   if($el.html().trim() == opt1.trim()) $el.html(opt2);
   else if($el.html().trim() == opt2.trim()) $el.html(opt1);
-}
\ No newline at end of file
+}
+
+$(document).ready(function () {
+  $('#tasks').DataTable();
+});
+
diff --git a/app/assets/javascripts/datatables.js b/app/assets/javascripts/datatables.js
new file mode 100644
index 00000000..d5cfb74b
--- /dev/null
+++ b/app/assets/javascripts/datatables.js
@@ -0,0 +1,65 @@
+//= require datatables/jquery.dataTables
+
+// optional change '//' --> '//=' to enable
+
+// require datatables/extensions/AutoFill/dataTables.autoFill
+// require datatables/extensions/Buttons/dataTables.buttons
+// require datatables/extensions/Buttons/buttons.html5
+// require datatables/extensions/Buttons/buttons.print
+// require datatables/extensions/Buttons/buttons.colVis
+// require datatables/extensions/Buttons/buttons.flash
+// require datatables/extensions/ColReorder/dataTables.colReorder
+// require datatables/extensions/FixedColumns/dataTables.fixedColumns
+// require datatables/extensions/FixedHeader/dataTables.fixedHeader
+// require datatables/extensions/KeyTable/dataTables.keyTable
+// require datatables/extensions/Responsive/dataTables.responsive
+// require datatables/extensions/RowGroup/dataTables.rowGroup
+// require datatables/extensions/RowReorder/dataTables.rowReorder
+// require datatables/extensions/Scroller/dataTables.scroller
+// require datatables/extensions/Select/dataTables.select
+
+//= require datatables/dataTables.bootstrap4
+// require datatables/extensions/AutoFill/autoFill.bootstrap4
+// require datatables/extensions/Buttons/buttons.bootstrap4
+// require datatables/extensions/Responsive/responsive.bootstrap4
+
+
+//Global setting and initializer
+
+$.extend( $.fn.dataTable.defaults, {
+  responsive: true,
+  pagingType: 'full',
+  //dom:
+  //  "<'row'<'col-sm-4 text-left'f><'right-action col-sm-8 text-right'<'buttons'B> <'select-info'> >>" +
+  //  "<'row'<'dttb col-12 px-0'tr>>" +
+  //  "<'row'<'col-sm-12 table-footer'lip>>"
+});
+
+
+$(document).on('preInit.dt', function(e, settings) {
+  var api, table_id, url;
+  api = new $.fn.dataTable.Api(settings);
+  table_id = "#" + api.table().node().id;
+  url = $(table_id).data('source');
+  if (url) {
+    return api.ajax.url(url);
+  }
+});
+
+
+// init on turbolinks load
+$(document).on('turbolinks:load', function() {
+  if (!$.fn.DataTable.isDataTable("table[id^=dttb-]")) {
+    $("table[id^=dttb-]").DataTable();
+  }
+});
+
+// turbolinks cache fix
+$(document).on('turbolinks:before-cache', function() {
+  var dataTable = $($.fn.dataTable.tables(true)).DataTable();
+  if (dataTable !== null) {
+    dataTable.clear();
+    dataTable.destroy();
+    return dataTable = null;
+  }
+});
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index cbc93a82..c0e06bb9 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -10,41 +10,43 @@
  *
  *= require_self
  *= require_tree .
+ *= require datatables
 */
 
-@import "bootstrap";
+@import 'bootstrap';
+@import 'datatables';
 
 body {
   padding-bottom: 30px;
 }
 
-.alert-inline{
+.alert-inline {
   margin: 4px;
   padding: 10px;
 }
 
-.full-width{
+.full-width {
   width: 100%;
 }
 
-.cart-item{
+.cart-item {
   padding: 8px 4px 8px 4px;
   border-top: 1px solid lightgrey;
   width: 100%;
   margin: 0;
 }
 
-.cart-item div{
+.cart-item div {
   padding: 0;
 }
 
-.cart-warning{
+.cart-warning {
   background-color: #fcf3dd;
 }
 
-.cart-button{
+.cart-button {
   width: 33%;
   white-space: normal;
   height: 55px;
   border-color: #1d4b97;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/datatables.scss b/app/assets/stylesheets/datatables.scss
new file mode 100644
index 00000000..5d298609
--- /dev/null
+++ b/app/assets/stylesheets/datatables.scss
@@ -0,0 +1,15 @@
+@import 'datatables/dataTables.bootstrap4';
+
+// optional remove '//=' to enable
+
+//@import 'datatables/extensions/AutoFill/autoFill.bootstrap4';
+//@import 'datatables/extensions/Buttons/buttons.bootstrap4';
+//@import 'datatables/extensions/ColReorder/colReorder.bootstrap4';
+//@import 'datatables/extensions/FixedColumns/fixedColumns.bootstrap4';
+//@import 'datatables/extensions/FixedHeader/fixedHeader.bootstrap4';
+//@import 'datatables/extensions/KeyTable/keyTable.bootstrap4';
+//@import 'datatables/extensions/Responsive/responsive.bootstrap4';
+//@import 'datatables/extensions/RowGroup/rowGroup.bootstrap4';
+//@import 'datatables/extensions/RowReorder/rowReorder.bootstrap4';
+//@import 'datatables/extensions/Scroller/scroller.bootstrap4';
+//@import 'datatables/extensions/Select/select.bootstrap4';
diff --git a/app/views/home/_quick_links.html.erb b/app/views/home/_quick_links.html.erb
index 9141aa52..18ea1173 100644
--- a/app/views/home/_quick_links.html.erb
+++ b/app/views/home/_quick_links.html.erb
@@ -2,7 +2,7 @@
   <h1>Welcome to Binder!</h1>
 </div>
 
-<div class="col-xs-10 col-sm-6">
+<div>
   <% if !user_signed_in? then %>
     <% if Rails.env.staging? or Rails.env.production? %>
       <p><%= link_to "Login to Begin", main_app.user_omniauth_authorize_path(:shibboleth), :class => "btn btn-success" %></p>
@@ -11,45 +11,70 @@
       <p>Please login to continue.</p>
     <% end %>
   <% elsif user_signed_in? and !current_user.participant.has_signed_waiver? then %>
-    <p><%= link_to "Sign Waiver", new_waiver_path, :class => "btn btn-success" %></p>
-    <br>
+    <%= link_to "Sign Waiver", new_waiver_path, :class => "btn btn-success" %>
   <% end %>
 
-  <% if can?(:read, Charge) %>
-    <p><%= link_to "Charges", charges_path, :class => "btn btn-primary" %></p>
-  <% end %>
-  <% if can?(:downtime, OrganizationTimelineEntry) %>
-    <p><%= link_to "Downtime", downtime_index_path, :class => "btn btn-primary" %></p>
-  <% end %>
-  <% if can?(:read, Faq) %>
-    <p><%= link_to "FAQs", faqs_path, :class => "btn btn-primary" %></p>
-  <% end %>
-  <% if can?(:read, Shift) %>
-    <p><%= link_to "Shifts", shifts_path, :class => "btn btn-primary" %></p>
+  <% if can?(:read, Faq) && %>
+    <%= link_to "FAQs", faqs_path, :class => "btn btn-primary" %>
   <% end %>
 
-  <% if can?(:read, Task) %>
-    <p><%= link_to "Tasks", tasks_path, :class => "btn btn-primary" %></p>
-  <% end %>
-  <% if can?(:structural, OrganizationTimelineEntry) %>
-    <p><%= link_to "Structural Queue", structural_path, :class => "btn btn-primary" %></p>
-  <% end %>
-  <% if can?(:electrical, OrganizationTimelineEntry) %>
-    <p><%= link_to "Electrical Queue", electrical_path, :class => "btn btn-primary" %></p>
-  <% end %>
+</div> <br>
+
+  <div class="row">
+
+  <% if user_signed_in? %>
+    <% if current_user.participant.is_scc? %>
+
+     <%# Change to true to enable queues %>
+      <div class = "col col-sm-3">
+        <% if true %>
+          <%= render 'organization_timeline_entries/queue_sidebar' %>    
+        <% end %>
+      </div>
+
+      <%# Change to true to enable downtime %>
+      <div class = "col col-sm-3">
+        <% if true %>
+          <%= render 'organization_timeline_entries/downtime_sidebar' %>
+        <% end %>
+      </div>
+
+      <div class= "col col-sm-3">
+        <%= render 'store_cart/store_cart' %>
+      </div>
 
-  <br>
-
-  <% if user_signed_in? then %>
-    <%= form_tag(search_path, class: 'form-inline', role: 'search') do %>
-      <div class="form-group">
-        <div class="input-group">
-          <%= text_field_tag('query', '', :size => 10, :class => 'form-control col-md-6') %>
-          <span class="input-group-btn">
-            <%= submit_tag('Search', :class => 'btn btn-default') %>
-          </span>
-        </div>
+      <div class = "col col-sm-3">
+        <%= render 'tool_cart/tool_cart' %>
       </div>
+
+  </div>
+
+
+   <div class="row">
+
+      <div class= "col col-sm-6">
+        <% if !@tasks_sidebar.blank? %>
+            <% cache ['tasks_sidebar', @tasks_sidebar] do %>
+              <%= render 'tasks/tasks_sidebar' %>
+            <% end %>
+        <% end %>
+      </div>
+
+      <div class= "col col-sm-6">
+        <% if !@current_shifts_sidebar.blank? or !@upcoming_shifts_sidebar.blank? %>
+          <% cache ['shift_sidebar', 'current', @current_shifts_sidebar, 'upcoming', @upcoming_shifts_sidebar] do%>
+            <%= render 'shifts/shifts_sidebar' %>
+          <% end %>
+        <% end %>
+      </div>
+
+  </div>
+
+      <%# Change to true to enable event sidebar %>
+      <% if true %>
+        <%= render 'events/events_sidebar' %>
+      <% end %>
+
+
     <% end %>
-  <% end %>
-</div>
+  <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 560bb364..17d26aba 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -15,16 +15,10 @@
     <%= render 'layouts/navigation' %>
     <div class="container" role="main">
       <div class="row">
-        <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9" id='main-content-div'>
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12" id='main-content-div'>
           <%= render 'layouts/messages' %>
           <%= yield %>
         </div>
-        <div class="col-xs-12 col-md-3 col-lg-3">
-          <% if user_signed_in? %>
-            <br class="hidden-lg">
-            <%= render 'layouts/sidebar' %>
-          <% end %>
-        </div>
       </div>
     </div>
   </body>
diff --git a/app/views/shifts/_shifts_sidebar.html.erb b/app/views/shifts/_shifts_sidebar.html.erb
index 4fe4fc09..f0895b68 100644
--- a/app/views/shifts/_shifts_sidebar.html.erb
+++ b/app/views/shifts/_shifts_sidebar.html.erb
@@ -4,11 +4,11 @@
       <div class='col-xs-9'>Shifts</div>
       <div class='col-xs-3'>
         <a href="#sidebar-shifts-widget" onclick='_toggleText(this, "Show", "Hide")'
-           class="btn btn-info btn-xs"  data-toggle="collapse">Show</a>
+           class="btn btn-info btn-xs"  data-toggle="collapse">Hide</a>
       </div>
     </div>
   </div>
-  <div id='sidebar-shifts-widget' class="collapse panel-body">
+  <div id='sidebar-shifts-widget' class="collapse in panel-body">
     <table class="table table-condensed" style="margin-bottom: 5px;">
       <thead>
         <th>Current</th>
diff --git a/app/views/store/items/_cart_widget.html.erb b/app/views/store/items/_cart_widget.html.erb
new file mode 100644
index 00000000..eb0c7684
--- /dev/null
+++ b/app/views/store/items/_cart_widget.html.erb
@@ -0,0 +1,6 @@
+<tr>
+  <td><%= cart_widget.store_item.name  %></td>
+  <td><%= number_to_currency (cart_widget.quantity_purchased * cart_widget.price_at_purchase) %></td>
+  <td><%= link_to t('.remove_from_cart', :default => t("helpers.links.remove_from_cart")),
+	        remove_from_cart_store_item_path(cart_widget), :class => 'btn btn-danger btn-xs', method: :post  %></td>
+</tr>
\ No newline at end of file
diff --git a/app/views/store_cart/_store_cart.html.erb b/app/views/store_cart/_store_cart.html.erb
new file mode 100644
index 00000000..c3e0585d
--- /dev/null
+++ b/app/views/store_cart/_store_cart.html.erb
@@ -0,0 +1,39 @@
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <div class='row'>
+      <div class='col-xs-9'>Store Cart</div>
+      <div class='col-xs-3'>
+        <a href="#sc_actions" onclick='_toggleText(this, "Show", "Hide")'
+           class="btn btn-info btn-xs"  data-toggle="collapse">Hide</a>
+      </div>
+    </div>
+  </div>
+
+  <div id='sc_actions' class="collapse in panel-body">
+
+  <% if show_cart? %>
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Total</th>
+          <th>Actions</th>
+        </tr>
+      </thead>
+
+      <tbody>
+
+        <%= render partial: 'store/items/cart_widget', collection: StorePurchase.items_in_cart %>
+
+      </tbody>
+    </table>
+    
+  <% end %>
+
+    <% if can?(:create, StoreItem) and @organization.blank? %>
+    <%= link_to t('.new_item', :default => t("helpers.links.new_item")),
+    new_store_item_path,
+    :class => 'btn btn-primary', :style => "width: 100%" %>
+    <% end %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/tasks/_tasks_sidebar.html.erb b/app/views/tasks/_tasks_sidebar.html.erb
index a6bd8d28..c221b6bc 100644
--- a/app/views/tasks/_tasks_sidebar.html.erb
+++ b/app/views/tasks/_tasks_sidebar.html.erb
@@ -9,7 +9,7 @@
   </div>
   </div>
   <div id='sidebar-tasks-widget' class="collapse in panel-body">
-    <table class="table table-condensed" style="margin-bottom: 0;">
+    <table id = "tasks" class="table table-condensed" style="margin-bottom: 0; width:100%;">
       <thead>
         <th>Title</th>
         <th style="text-align: right;">Due By</th>
diff --git a/lib/templates/erb/scaffold/index.html.erb b/lib/templates/erb/scaffold/index.html.erb
new file mode 100644
index 00000000..fc6a8d85
--- /dev/null
+++ b/lib/templates/erb/scaffold/index.html.erb
@@ -0,0 +1,17 @@
+<h1><%= plural_table_name.titleize %></h1>
+
+<table class="responsive nowrap table table-hover" id="dttb-<%= plural_table_name %>" data-sort="true" data-source="<%%= url_for(format: :json)%>">
+  <thead>
+    <tr>
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+      <th data-data="<%= attribute.name %>"><%= attribute.human_name %></th>
+<% end -%>
+      <th data-data="url" data-orderable="false" data-class-name="all" data-searchable="false" class="skip-export" width="100px"></th>
+    </tr>
+  </thead>
+
+</table>
+
+<br>
+
+<%%= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_route_name %>_path %>
\ No newline at end of file
diff --git a/lib/templates/rails/jbuilder/index.json.jbuilder b/lib/templates/rails/jbuilder/index.json.jbuilder
new file mode 100644
index 00000000..cd1baae4
--- /dev/null
+++ b/lib/templates/rails/jbuilder/index.json.jbuilder
@@ -0,0 +1,10 @@
+json.set! :data do
+  json.array! @<%= plural_table_name %> do |<%= singular_table_name %>|
+    json.partial! '<%= plural_table_name %>/<%= singular_table_name %>', <%= singular_table_name %>: <%= singular_table_name %>
+    json.url  "
+              #{link_to 'Show', <%= singular_table_name %> }
+              #{link_to 'Edit', edit_<%= singular_route_name %>_path(<%= singular_table_name %>)}
+              #{link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' }}
+              "
+  end
+end
\ No newline at end of file

From b6634871b855ebf58cfd5883a05d3396690a3cef Mon Sep 17 00:00:00 2001
From: Bo Tembunkiart <stembunk@andrew.cmu.edu>
Date: Tue, 16 Apr 2019 23:45:17 -0400
Subject: [PATCH 2/5] removes materialize gem

---
 Gemfile      | 1 -
 Gemfile.lock | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 69f3e0c7..1e13303e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,6 @@ gem 'simple_form'
 gem 'therubyracer', :platform=>:ruby
 gem 'omniauth'
 gem 'omniauth-shibboleth'
-gem 'materialize-sass'
 
 # User and role management
 gem 'cancancan'
diff --git a/Gemfile.lock b/Gemfile.lock
index 14d6cd87..6bc8bc0e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,8 +172,6 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    materialize-sass (1.0.0)
-      autoprefixer-rails (>= 6.0.3)
     mime-types (2.99.1)
     mini_portile2 (2.0.0)
     minitest (5.8.4)

From d1fc67c4b1ee09e6dacb93f8fe3b3f0e602d6d24 Mon Sep 17 00:00:00 2001
From: Ameeshi Goel <ameeshig@andrew.cmu.edu>
Date: Sun, 21 Apr 2019 17:41:23 -0400
Subject: [PATCH 3/5] Changing nav bar

---
 app/views/layouts/_navigation.html.erb | 43 ++++++++++++++------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index f078490a..0889fb35 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -16,27 +16,17 @@
         <ul class="nav navbar-nav navbar-left">
           <!-- Normal Navbar LI's -->
           <li><%= link_to "Organizations", organizations_path(:type => "building") %></li>
-          <li><%= link_to "Tools", tools_path %></li>
-          <li><%= link_to "Store", store_items_path %></li>
-
-          <% if current_user.participant.is_booth_chair? %>
-              <% if can?(:structural, OrganizationTimelineEntry) %>
-                <li><%= link_to "Structural", structural_path %></li>
-              <% end %>
-              <% if can?(:electrical, OrganizationTimelineEntry) %>
-                <li><%= link_to "Electrical", electrical_path %></li>
-              <% end %>
+          <% if can?(:read, Faq) %>
+            <li><%= link_to "FAQs", faqs_path %></li>
           <% end %>
 
           <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Other Links<b class="caret"></b></a>
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Links<b class="caret"></b></a>
             <ul class="dropdown-menu">
               <% if can?(:read, Charge) %>
                 <li><%= link_to "Charges", charges_path %></li>
               <% end %>
-              <% if can?(:read, Faq) %>
-                <li><%= link_to "FAQs", faqs_path %></li>
-              <% end %>
+ 
               <% if can?(:read, Participant) %>
                 <li><%= link_to "Participants", participants_path %></li>
               <% end %>
@@ -46,6 +36,14 @@
               <% if can?(:read, Task) %>
                 <li><%= link_to "Tasks", tasks_path %></li>
               <% end %>
+              <li><%= link_to "Tools", tools_path %></li>
+              <li><%= link_to "Store", store_items_path %></li>
+              <% if can?(:downtime, OrganizationTimelineEntry) %>
+                <li><%= link_to "Downtime", downtime_index_path %></li>
+              <% end %>
+              <% if can?(:read, Event) %>
+                <li><%= link_to "Event Log", events_path %></li>
+              <% end %>
               <% if !current_user.participant.is_booth_chair? %>
                 <% if can?(:structural, OrganizationTimelineEntry) %>
                   <li><%= link_to "Structural Queue", structural_path %></li>
@@ -57,16 +55,21 @@
             </ul>
           </li>
 
+          <% if current_user.is_admin? %> 
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Admin Links<b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <% if can?(:create, :reports) %>
+                  <li><%= link_to "Reports", reports_path %></li>
+                <% end %>
+              </ul>
+            </li>
+          <% end %> 
+
           <% if current_user.participant.is_scc? %>
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">SCC Links<b class="caret"></b></a>
               <ul class="dropdown-menu">
-                <% if can?(:downtime, OrganizationTimelineEntry) %>
-                  <li><%= link_to "Downtime", downtime_index_path %></li>
-                <% end %>
-                <% if can?(:read, Event) %>
-                  <li><%= link_to "Event Log", events_path %></li>
-                <% end %>
                 <% if can?(:create, :reports) %>
                   <li><%= link_to "Reports", reports_path %></li>
                 <% end %>

From 72df81088c8497a4600b01f9cfb9bab31b6658b2 Mon Sep 17 00:00:00 2001
From: Ameeshi Goel <ameeshig@andrew.cmu.edu>
Date: Fri, 26 Apr 2019 13:38:59 -0400
Subject: [PATCH 4/5] Navbar stuff done

---
 app/views/layouts/_navigation.html.erb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index 0889fb35..4ecc2349 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -55,24 +55,24 @@
             </ul>
           </li>
 
-          <% if current_user.is_admin? %> 
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Admin Links<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <% if can?(:create, :reports) %>
-                  <li><%= link_to "Reports", reports_path %></li>
-                <% end %>
-              </ul>
-            </li>
-          <% end %> 
 
           <% if current_user.participant.is_scc? %>
             <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">SCC Links<b class="caret"></b></a>
+              <% if is_admin? %>
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Admin Links<b class="caret"></b></a>
+              <% else %>  
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">SCC Links<b class="caret"></b></a>
+              <% end %>
               <ul class="dropdown-menu">
                 <% if can?(:create, :reports) %>
                   <li><%= link_to "Reports", reports_path %></li>
                 <% end %>
+                <% if is_admin? %>
+                  <li><%# link_to "Create Carnival", show_uploader_path %></li>
+                <% end %>
+                <% if is_admin? %>
+                  <li><%= link_to "Edit Carnival" %></li>
+                <% end %>
               </ul>
             </li>
           <% end %>

From a606160296d30d5440007728924228c68c872bb3 Mon Sep 17 00:00:00 2001
From: Ameeshi Goel <ameeshig@andrew.cmu.edu>
Date: Fri, 3 May 2019 13:10:24 -0400
Subject: [PATCH 5/5] Made search bar wider

---
 app/views/layouts/_navigation.html.erb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index 4ecc2349..ca5f5b56 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -60,9 +60,7 @@
             <li class="dropdown">
               <% if is_admin? %>
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Admin Links<b class="caret"></b></a>
-              <% else %>  
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">SCC Links<b class="caret"></b></a>
-              <% end %>
+              <% end %>  
               <ul class="dropdown-menu">
                 <% if can?(:create, :reports) %>
                   <li><%= link_to "Reports", reports_path %></li>
@@ -80,7 +78,7 @@
         </ul>
         <!-- Searchbar -->
         <form class="navbar-form navbar-left" role="search" accept-charset="UTF-8" action="/search" method="get" >
-          <input type="text" class="form-control" placeholder="Search..." id="query" name="query" style="width: 100px;">
+          <input type="text" class="form-control" placeholder="Search..." id="query" name="query" style="width: 200%;">
         </form>
       <% end %>