Hook up user stuff

app/assets/javascripts/exec_promotions.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/stylesheets/exec_promotions.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the exec_promotions controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/exec_promotions_controller.rb

@@ -0,0 +1,37 @@
+# Custom exec admin controller
+
+class ExecPromotionsController < ApplicationController
+    before_action :authenticate_user!
+    before_action :authorized_president, only: [:index]
+
+    def new
+        @exec_promotion = ExecPromotion.new
+    end
+
+    def create
+        @exec_promotion = ExecPromotion.new
+        @exec_promotion['reason'] = exec_promotion_params['reason']
+        @exec_promotion['user_id'] = current_user.id
+        @exec_promotion.save
+
+        redirect_to edit_user_registration_path, notice: "Successfully sent request"
+    end
+
+    def index
+        @exec_promotions = ExecPromotion.all
+    end
+
+    private
+
+    def authorized_president
+        if current_user.is_president?
+            return true
+        end
+
+        redirect_back fallback_location: root_path, notice: "Restricted action"
+    end
+
+    def exec_promotion_params
+        params.require(:exec_promotion).permit(:reason)
+    end
+end

app/helpers/exec_promotions_helper.rb

@@ -0,0 +1,12 @@
+module ExecPromotionsHelper
+
+    def pending_requests(user)
+        pending = ExecPromotion.where(user_id: user.id, resolved: false)
+
+        if pending.empty?
+            return false
+        end
+
+        return true
+    end
+end

app/models/exec_promotion.rb

@@ -0,0 +1,2 @@
+class ExecPromotion < ApplicationRecord
+end

app/models/user.rb

@@ -1,6 +1,6 @@
 class User < ApplicationRecord
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+    devise :database_authenticatable, :registerable,
+    :recoverable, :rememberable, :trackable, :validatable
 end

app/views/devise/registrations/edit.html.erb

@@ -36,8 +36,23 @@
   </div>
 <% end %>
 
-<h3>Cancel my account</h3>
+<h2>Other options</h2>
+<p id="notice"><%= notice %></p>
 
-<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
+<div>
+  <% if current_user.is_president %>
+    <%= link_to "Approve exec requests", exec_promotions_path %>
+  <% end %>
+</div>
+
+<div>
+  <% if !current_user.is_exec && !pending_requests(current_user) %>
+    <%= render partial: "exec_promotions/request_promotion" %>
+  <% end %>
+</div>
+
+<div>
+  <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>
+</div>
 
 <%= link_to "Back", :back %>

app/views/events/_header.html.erb

@@ -3,6 +3,12 @@
   <ul>
     <li class="current"><a href="index.html">Home</a></li>
     <li><a href="events.html">Events</a></li>
-    <li><a href="#" class="button special">Sign Up</a></li>
+    <% if user_signed_in? %>
+        <li><%= link_to 'Account', edit_user_registration_path %></li>
+        <li><%= link_to 'Sign out', destroy_user_session_path, :method => :delete %></li>
+     <% else %>
+        <li><%= link_to 'Sign up', new_user_registration_path %></li>
+        <li><%= link_to 'Sign in', new_user_session_path %></li>
+     <% end %>
   </ul>
 </nav>

app/views/exec_promotions/_request_promotion.html.erb

@@ -0,0 +1 @@
+<%= link_to "Request exec privileges", new_exec_promotion_path %>

app/views/exec_promotions/index.html.erb

@@ -0,0 +1,20 @@
+<h1>All exec promotion requests</h1>
+
+<table>
+<thead>
+    <tr>
+        <th>User ID</th>
+        <th>Reason</th>
+        <th>Resolved</th>
+    </tr>
+</thead>
+<tbody>
+    <% @exec_promotions.each do |promotion| %>
+        <tr>
+            <td><%= promotion.user_id %></td>
+            <td><%= promotion.reason %></td>
+            <td><%= promotion.resolved %></td>
+        </tr>
+    <% end %>
+</tbody>
+</table>

app/views/exec_promotions/new.html.erb

@@ -0,0 +1,9 @@
+<%= form_for(@exec_promotion) do |f| %>
+  <p>
+    <%= f.label :reason %><br />
+    <%= f.text_area :reason %>
+  </p>
+  <p>
+    <%= f.submit "Submit Request"%>
+  </p>
+<% end %>

config/routes.rb

@@ -3,5 +3,7 @@
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   root to: 'events#index'
   get '/index', to: 'events#index'
-  get "/events", to: 'events#events'
+  get '/events', to: 'events#events'
+
+  resources :exec_promotions
 end

db/migrate/20170313051920_create_exec_promotions.rb

@@ -0,0 +1,8 @@
+class CreateExecPromotions < ActiveRecord::Migration[5.0]
+  def change
+    create_table :exec_promotions do |t|
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20170313052632_add_columns_to_exec_promotions.rb

@@ -0,0 +1,5 @@
+class AddColumnsToExecPromotions < ActiveRecord::Migration[5.0]
+  def change
+    add_column :exec_promotions, :user_id, :string
+  end
+end

db/migrate/20170313053820_add_reason_to_exec.rb

@@ -0,0 +1,5 @@
+class AddReasonToExec < ActiveRecord::Migration[5.0]
+  def change
+    add_column :exec_promotions, :reason, :text
+  end
+end

db/migrate/20170315222839_add_resolved_to_exec_promotion.rb

@@ -0,0 +1,5 @@
+class AddResolvedToExecPromotion < ActiveRecord::Migration[5.0]
+    def change
+        add_column :exec_promotions, :resolved, :boolean, default: false
+    end
+end

db/schema.rb

@@ -10,7 +10,15 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170308001010) do
+ActiveRecord::Schema.define(version: 20170315222839) do
+
+  create_table "exec_promotions", force: :cascade do |t|
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
+    t.string   "user_id"
+    t.text     "reason"
+    t.boolean  "resolved",   default: false
+  end
 
   create_table "love_letters", force: :cascade do |t|
     t.string   "title"

test/controllers/exec_promotions_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ExecPromotionsControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/fixtures/exec_promotions.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value

test/models/exec_promotion_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ExecPromotionTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end