Fixed voting count

1571aa7f · Christiana Tan · 6c386672 · 1571aa7f · 1571aa7f · 1571aa7f
Commit 1571aa7f authored Jul 14, 2016 by Christiana Tan
84 changed files
--- a/.gitignore
+++ b/.gitignore
 # See https://help.github.com/articles/ignoring-files for more about ignoring files.
 #
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'
 # Ignore bundler config.
 /.bundle
 # Ignore the default SQLite database.
 /db/*.sqlite3
 /db/*.sqlite3-journal
 # Ignore all logfiles and tempfiles.
 /log/*
 !/log/.keep
 /tmp
--- a/Gemfile
+++ b/Gemfile
 source 'http://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.5.1'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
 gem 'coffee-rails', '~> 4.1.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
 gem 'sdoc', '~> 0.4.0', group: :doc
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 # Use Unicorn as the app server
 # gem 'unicorn'
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 group :development, :test do
  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
  gem 'byebug'
  gem 'better_errors'
 end
 group :development do
  # Access an IRB console on exception pages or by using <%= console %> in views
  gem 'web-console', '~> 2.0'
 end
 gem "simple_form"
 gem 'devise'
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
--- a/Gemfile.lock
+++ b/Gemfile.lock
 GEM
  remote: http://rubygems.org/
  specs:
    actionmailer (4.2.5.1)
      actionpack (= 4.2.5.1)
      actionview (= 4.2.5.1)
      activejob (= 4.2.5.1)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 1.0, >= 1.0.5)
    actionpack (4.2.5.1)
      actionview (= 4.2.5.1)
      activesupport (= 4.2.5.1)
      rack (~> 1.6)
      rack-test (~> 0.6.2)
      rails-dom-testing (~> 1.0, >= 1.0.5)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
    actionview (4.2.5.1)
      activesupport (= 4.2.5.1)
      builder (~> 3.1)
      erubis (~> 2.7.0)
      rails-dom-testing (~> 1.0, >= 1.0.5)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
    activejob (4.2.5.1)
      activesupport (= 4.2.5.1)
      globalid (>= 0.3.0)
    activemodel (4.2.5.1)
      activesupport (= 4.2.5.1)
      builder (~> 3.1)
    activerecord (4.2.5.1)
      activemodel (= 4.2.5.1)
      activesupport (= 4.2.5.1)
      arel (~> 6.0)
    activesupport (4.2.5.1)
      i18n (~> 0.7)
      json (~> 1.7, >= 1.7.7)
      minitest (~> 5.1)
      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
    arel (6.0.3)
    bcrypt (3.1.11-x86-mingw32)
    better_errors (2.1.1)
      coderay (>= 1.0.0)
      erubis (>= 2.6.6)
      rack (>= 0.9.0)
    binding_of_caller (0.7.2)
      debug_inspector (>= 0.0.1)
    builder (3.2.2)
    byebug (9.0.5)
    coderay (1.1.1)
    coffee-rails (4.1.1)
      coffee-script (>= 2.2.0)
      railties (>= 4.0.0, < 5.1.x)
    coffee-script (2.4.1)
      coffee-script-source
      execjs
    coffee-script-source (1.10.0)
    concurrent-ruby (1.0.2)
    debug_inspector (0.0.2)
    devise (4.2.0)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0, < 5.1)
      responders
      warden (~> 1.2.3)
    erubis (2.7.0)
    execjs (2.7.0)
    globalid (0.3.6)
      activesupport (>= 4.1.0)
    i18n (0.7.0)
    jbuilder (2.5.0)
      activesupport (>= 3.0.0, < 5.1)
      multi_json (~> 1.2)
    jquery-rails (4.1.1)
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
    json (1.8.3)
    loofah (2.0.3)
      nokogiri (>= 1.5.9)
    mail (2.6.4)
      mime-types (>= 1.16, < 4)
    mime-types (3.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2016.0521)
    mini_portile2 (2.1.0)
    minitest (5.9.0)
    multi_json (1.12.1)
    nokogiri (1.6.8-x86-mingw32)
      mini_portile2 (~> 2.1.0)
      pkg-config (~> 1.1.7)
    orm_adapter (0.5.0)
    pkg-config (1.1.7)
    rack (1.6.4)
    rack-test (0.6.3)
      rack (>= 1.0)
    rails (4.2.5.1)
      actionmailer (= 4.2.5.1)
      actionpack (= 4.2.5.1)
      actionview (= 4.2.5.1)
      activejob (= 4.2.5.1)
      activemodel (= 4.2.5.1)
      activerecord (= 4.2.5.1)
      activesupport (= 4.2.5.1)
      bundler (>= 1.3.0, < 2.0)
      railties (= 4.2.5.1)
      sprockets-rails
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
    rails-dom-testing (1.0.7)
      activesupport (>= 4.2.0.beta, < 5.0)
      nokogiri (~> 1.6.0)
      rails-deprecated_sanitizer (>= 1.0.1)
    rails-html-sanitizer (1.0.3)
      loofah (~> 2.0)
    railties (4.2.5.1)
      actionpack (= 4.2.5.1)
      activesupport (= 4.2.5.1)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rake (11.2.2)
    rdoc (4.2.2)
      json (~> 1.4)
    responders (2.2.0)
      railties (>= 4.2.0, < 5.1)
    sass (3.4.22)
    sass-rails (5.0.5)
      railties (>= 4.0.0, < 6)
      sass (~> 3.1)
      sprockets (>= 2.8, < 4.0)
      sprockets-rails (>= 2.0, < 4.0)
      tilt (>= 1.1, < 3)
    sdoc (0.4.1)
      json (~> 1.7, >= 1.7.7)
      rdoc (~> 4.0)
    simple_form (3.2.1)
      actionpack (> 4, < 5.1)
      activemodel (> 4, < 5.1)
    sprockets (3.6.3)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
    sprockets-rails (3.1.1)
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
    sqlite3 (1.3.11-x86-mingw32)
    thor (0.19.1)
    thread_safe (0.3.5)
    tilt (2.0.5)
    turbolinks (5.0.0)
      turbolinks-source (~> 5)
    turbolinks-source (5.0.0)
    tzinfo (1.2.2)
      thread_safe (~> 0.1)
    tzinfo-data (1.2016.6)
      tzinfo (>= 1.0.0)
    uglifier (3.0.0)
      execjs (>= 0.3.0, < 3)
    warden (1.2.6)
      rack (>= 1.0)
    web-console (2.3.0)
      activemodel (>= 4.0)
      binding_of_caller (>= 0.7.2)
      railties (>= 4.0)
      sprockets-rails (>= 2.0, < 4.0)
 PLATFORMS
  x86-mingw32
 DEPENDENCIES
  better_errors
  byebug
  coffee-rails (~> 4.1.0)
  devise
  jbuilder (~> 2.0)
  jquery-rails
  rails (= 4.2.5.1)
  sass-rails (~> 5.0)
  sdoc (~> 0.4.0)
  simple_form
  sqlite3
  turbolinks
  tzinfo-data
  uglifier (>= 1.3.0)
  web-console (~> 2.0)
 BUNDLED WITH
   1.10.4
--- a/README.rdoc
+++ b/README.rdoc
 == README
 This README would normally document whatever steps are necessary to get the
 application up and running.
 Things you may want to cover:
 * Ruby version
 * System dependencies
 * Configuration
 * Database creation
 * Database initialization
 * How to run the test suite
 * Services (job queues, cache servers, search engines, etc.)
 * Deployment instructions
 * ...
 Please feel free to use a different markup language if you do not plan to run
 <tt>rake doc:app</tt>.
--- a/Rakefile
+++ b/Rakefile
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 require File.expand_path('../config/application', __FILE__)
 Rails.application.load_tasks
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
 // This is a manifest file that'll be compiled into application.js, which will include all the files
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
 // or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file.
 //
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
 //= require_tree .
--- a/app/assets/javascripts/candidates.coffee
+++ b/app/assets/javascripts/candidates.coffee
 # 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/
--- a/app/assets/javascripts/positions.coffee
+++ b/app/assets/javascripts/positions.coffee
 # 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/
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
 /*
 * This is a manifest file that'll be compiled into application.css, which will include all the files
 * listed below.
 *
 * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
 * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
 *
 * You're free to add application-wide styles to this file and they'll appear at the bottom of the
 * compiled file so the styles you add here take precedence over styles defined in any styles
 * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
 * file per style scope.
 *
 *= require_tree .
 *= require_self
 */
--- a/app/assets/stylesheets/bootstrap.css
+++ b/app/assets/stylesheets/bootstrap.css
--- a/app/assets/stylesheets/candidates.scss
+++ b/app/assets/stylesheets/candidates.scss
 // Place all the styles related to the candidates controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
--- a/app/assets/stylesheets/positions.scss
+++ b/app/assets/stylesheets/positions.scss
 // Place all the styles related to the positions controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
 class ApplicationController < ActionController::Base
  # Prevent CSRF attacks by raising an exception.
  # For APIs, you may want to use :null_session instead.
  protect_from_forgery with: :exception
 end
--- a/app/controllers/candidates_controller.rb
+++ b/app/controllers/candidates_controller.rb
 class CandidatesController < ApplicationController
-  before_action :authenticate_user!, except: [:index] #or except
+  before_action :authenticate_user!, only: [:vote] #or except
+  before_action :authenticate_admin!, except: [:index]
  def index
    @candidates = Candidate.all
  end
  def vote
  end
  def new
    @candidate = Candidate.new
  end
  def create
    @candidate = Candidate.new(candidate_params)
    if @candidate.save
      redirect_to candidate_path(@candidate), notice: "User was successfully created" 
    else
      render 'new'
    end
  end
  def destroy
    @candidate = Candidate.find(params[:id])
    @candidate.destroy()
    redirect_to candidate_path
  end
  def edit
     @candidate = Candidate.find(params[:id])
  end
  def update
  end
  def show
    @candidate = Candidate.find(params[:id])
  end
  private 
  def candidate_params
    params.require(:candidate).permit!
  end
 end
--- a/app/controllers/positions_controller.rb
+++ b/app/controllers/positions_controller.rb
 class PositionsController < ApplicationController
  before_action :authenticate_admin!, except: [:index]
  def index
    @positions = Position.all
  end
  def new
    @position = Position.new
  end
  def create
    @position = Position.new(position_params)
    if @position.save  
      redirect_to positions_path
    else
      render 'new'
    end
  end
  def destroy
    @position = Position.find(params[:id])
    @position.destroy()
    redirect_to positions_path
  end
  def edit
    @position = Position.find(params[:id])
  end
  def update
    @position = Position.find(params[:id])
    if @position.update(position_params)
      redirect_to positions_path
    else
      render 'edit'
    end
  end
  def show
    @position = Position.find(params[:id])
  end
 private
  def position_params
    params.require(:position).permit!
  end
 end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
 module ApplicationHelper
 end
--- a/app/helpers/candidates_helper.rb
+++ b/app/helpers/candidates_helper.rb
 module CandidatesHelper
 end
--- a/app/helpers/positions_helper.rb
+++ b/app/helpers/positions_helper.rb
 module PositionsHelper
 end
--- a/app/models/admin.rb
+++ b/app/models/admin.rb
 class Admin < ActiveRecord::Base
  # Include default devise modules. Others available are:
  # :confirmable, :lockable, :timeoutable and :omniauthable
  devise :database_authenticatable, :registerable,
         :recoverable, :rememberable, :trackable, :validatable
 end
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
 class Candidate < ActiveRecord::Base
  belongs_to :position
  has_many :votes
  validates :first_name, presence: true
  validates :last_name, presence: true
  validates :nickname, presence: true, uniqueness: true
  validates :slogan, presence: true, uniqueness: true
  validates :position, presence: true
 end
--- a/app/models/position.rb
+++ b/app/models/position.rb
 class Position < ActiveRecord::Base
 	has_many :candidates
 	validates :name, presence: true, uniqueness: true
 end
--- a/app/models/user.rb
+++ b/app/models/user.rb
 class User < ActiveRecord::Base
  # Include default devise modules. Others available are:
  # :confirmable, :lockable, :timeoutable and :omniauthable
  has_many :votes
  devise :database_authenticatable, :registerable,
         :recoverable, :rememberable, :trackable, :validatable
 end
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
 class Vote < ActiveRecord::Base
-  belongs_to :user_id
+  belongs_to :user
-  belongs_to :candidate_id
+  belongs_to :candidate
 end
--- a/app/views/candidates/edit.html.erb
+++ b/app/views/candidates/edit.html.erb
 <div class = "container">
 	<h1>Edit Candidate</h1>
 	<%= render 'form' %>
 </div>
\ No newline at end of file
--- a/app/views/candidates/index.html.erb
+++ b/app/views/candidates/index.html.erb
 <div class = "container">
 <%#- <%= current_admin.email %>
 <% @candidates.group_by(&:position).each do |p, can| %>
 	<h4> <%= p.name %> </h4>
 		<table class = "table">
 			 <thead>
 				 <th>First Name</th>
 				 <th>Last Name</th>
 				 <th>Nickname</th>
 				 <% if !admin_signed_in? %>
 				 <th>Votes</th>
 				 <% end %>
 				 	<% if admin_signed_in? %>
 				 <th>Slogan</th>
 				 <% end %>
 			 </thead>
 		 	<tbody>
 						<% can.each do |c| %>
 						<tr>
 							<td> <%= c.first_name %> </td>
 							<td> <%= c.last_name %> </td>
 							<td> <%= c.nickname %></td>
 							<% if !admin_signed_in? %>
-								<td> <%= %></td>
+								<td> <%= c.votes.count%></td>
 							 <% end %>
 							<% if admin_signed_in? %>
 							<td> <%= c.slogan %>
 							<td> <%= link_to 'Show', show_candidates_path(c), class: "btn btn-primary" %></td>
 							<td> <%= link_to 'Edit', edit_candidates_path(c), class: "btn btn-success" %></td>
 							<td> <a href="/candidates/delete?id=<%= c.id %>"><button class="btn btn-danger">Delete</button></a></td>
 							<% end %>
 						</tr>
 						<% end %>
 		 	</tbody>
 		</table>
 <% end %>
 <% if admin_signed_in? %>
 <%= link_to 'New Candidate', new_candidates_path, class: "btn btn-primary" %>
 <% end %>
 <% if user_signed_in? %>
 <%= link_to 'Vote', vote_candidates_path, class: "btn btn-primary" %>
 <% end %>
 </div>
\ No newline at end of file
--- a/app/views/candidates/new.html.erb
+++ b/app/views/candidates/new.html.erb
 <h1>New Candidate</h1>
 <!--<%= form_for(@candidate) do |u| %>
 	<% if @candidate.errors.any? %>
 	<ul>
 		<%= @candidate.errors.full_messages.each do |message| %>
 		<li> <%= message %>
 		</li>
 		<% end %>
 	</ul>
 	<% end %>
 	<p>
 		<%= u.label "First Name: " %>
 		<%= u.text_field :first_name %> 
 	</p>
 	<p>
 		<%= u.label "Last Name: " %>
 		<%= u.text_field :last_name %> 
 	</p>
 	<p>
 		<%= u.label "Nickname: " %>
 		<%= u.text_field :nickname %> 
 	</p>
 	<p>
 		<%= u.label "Slogan" %>
 		<%= u.text_area :slogan %> 
 		<% if @candidate.errors.messages[:slogan].any? %>
 		<% end %>
 	</p>
 	<button class = "btn btn-success"> Create Candidate<% u.submit %></button>
 	<br>
 	<br>
 <% end %>
 <%= link_to 'Cancel', candidates_path, class: "btn btn-danger" %> -->
 <%= render 'form' %>
\ No newline at end of file
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
 <!DOCTYPE html>
 <html>
 <head>
  <title>ElectionProject</title>
  <link href="bootstrap.css" rel="stylesheet">
  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
  <%= csrf_meta_tags %>
 </head>
 <body>
 <nav class="navbar navbar-default navbar-fixed-top">
  <div class = "container-fluid">
    <div class = "navbar-header">
          <a class="navbar-brand" href="/">Election App</a>
    </div>
    <ul class="nav navbar-nav">
-    <li><a href="positions">View Positions</a></li>
+    <li><%= link_to 'View Positions', positions_path %></a></li>
    </ul>
    <p class="navbar-text pull-right">
      <% if user_signed_in? && !admin_signed_in? %>
        Logged in as <strong><%= current_user.email %></strong>.
        <%= link_to 'Edit profile', edit_user_registration_path, :class => 'navbar-link' %> |
        <%= link_to "Logout", destroy_user_session_path, method: :delete, :class => 'navbar-link'  %>
      <% elsif admin_signed_in? %>
        	Logged in as <strong><%= current_admin.email %></strong>.
        <%= link_to 'Edit profile', edit_admin_registration_path, :class => 'navbar-link' %> |
        <%= link_to "Logout", destroy_admin_session_path, method: :delete, :class => 'navbar-link'  %>
      <% else %>
        <%= link_to "Sign up", new_user_registration_path, :class => 'navbar-link'  %> |
        <%= link_to "Login", new_user_session_path, :class => 'navbar-link'  %> |
      <% end %>
    </p>
  </div>
 </nav>
 <br>
 <br>
 <br>
 <br>
 <%= yield %>
 </body>
 </html>
--- a/app/views/positions/edit.html.erb
+++ b/app/views/positions/edit.html.erb
 <h1>Edit Position</h1>
 <%= form_for(@position, url: update_position_path(@position)) do |p| %>
 <p>
 	<%= p.label "Name" %>
 	<%= p.text_field :name %>
 </p>
 <p>
 	<%= p.label "Number of Winners" %>
 	<%= p.text_field :number_of_winners %>
 </p>
 <button class = "btn btn-success">Edit position <% p.submit %></button>
 <% end %>
 <%= link_to 'Cancel', positions_path, class: "btn btn-danger" %>
--- a/app/views/positions/index.html.erb
+++ b/app/views/positions/index.html.erb
 <h1> List of Positions</h1>
 <table class = "table">
 	 <thead>
 		 <th>Name</th>
 		 <th>Number of Winners</th>
 	 </thead>
 	<tbody>
 		<% @positions.each do |c| %>
 				<tr>
 					<td> <%= c.name %> </td>
 					<td> <%= link_to 'Show', show_position_path(c) %> </td>
 					<td> <%= link_to 'Edit', edit_position_path(c) %> </td>
 					<td> <%= link_to 'Delete', delete_position_path(c) %> </td>
 				</tr>
 		<% end %>
 	</tbody>
 </table>
 <%= link_to 'Add new position', new_positions_path, class: "btn btn-primary" %>
\ No newline at end of file
--- a/app/views/positions/new.html.erb
+++ b/app/views/positions/new.html.erb
 <h1>New Position</h1>
 <%= form_for(@position) do |p| %>
 <p>
 	<%= p.label "Name" %>
 	<%= p.text_field :name %>
 </p>
 <p>
 	<%= p.label "Number of Winners" %>
 	<%= p.text_field :number_of_winners %>
 </p>
 <button class = "btn btn-success">Create new position <% p.submit %></button>
 <% end %>
 <%= link_to 'Cancel', positions_path, class: "btn btn-danger" %>
--- a/app/views/positions/show.html.erb
+++ b/app/views/positions/show.html.erb
 <h1>Candidates for <%= @position.name %></h1>
 <table class = "table">
 	 <thead>
 		 <th>First Name</th>
 		 <th>Last Name</th>
 		 <th>Nickname</th>
 		 <th>Slogan</th>
 	 </thead>
 	<tbody>
 		<% @position.candidate.each do |c| %>
 				<tr>
 					<td> <%= c.first_name %> </td>
 					<td> <%= c.last_name %> </td>
 					<td> <%= c.nickname %></td>
 					<td> <%= c.slogan %></td>
 				</tr>
 		<% end %>
 	</tbody>
 </table>
 <%= link_to 'Back', positions_path %>
\ No newline at end of file
--- a/bin/bundle
+++ b/bin/bundle
 #!/usr/bin/env ruby.exe
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 load Gem.bin_path('bundler', 'bundle')
--- a/bin/rails
+++ b/bin/rails
 #!/usr/bin/env ruby.exe
 APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'
--- a/bin/rake
+++ b/bin/rake
 #!/usr/bin/env ruby.exe
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run
--- a/bin/setup
+++ b/bin/setup
 #!/usr/bin/env ruby.exe
 require 'pathname'
 # path to your application root.
 APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
 Dir.chdir APP_ROOT do
  # This script is a starting point to setup your application.
  # Add necessary setup steps to this file:
  puts "== Installing dependencies =="
  system "gem install bundler --conservative"
  system "bundle check || bundle install"
  # puts "\n== Copying sample files =="
  # unless File.exist?("config/database.yml")
  #   system "cp config/database.yml.sample config/database.yml"
  # end
  puts "\n== Preparing database =="
  system "bin/rake db:setup"
  puts "\n== Removing old logs and tempfiles =="
  system "rm -f log/*"
  system "rm -rf tmp/cache"
  puts "\n== Restarting application server =="
  system "touch tmp/restart.txt"
 end
--- a/config.ru
+++ b/config.ru
 # This file is used by Rack-based servers to start the application.
 require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application
--- a/config/application.rb
+++ b/config/application.rb
 require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 module ElectionProject
  class Application < Rails::Application
    # Settings in config/environments/* take precedence over those specified here.
    # Application configuration should go into files in config/initializers
    # -- all .rb files in that directory are automatically loaded.
    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
    # config.time_zone = 'Central Time (US & Canada)'
    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
    # config.i18n.default_locale = :de
    # Do not swallow errors in after_commit/after_rollback callbacks.
    config.active_record.raise_in_transactional_callbacks = true
  end
 end
--- a/config/boot.rb
+++ b/config/boot.rb
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 require 'bundler/setup' # Set up gems listed in the Gemfile.
--- a/config/database.yml
+++ b/config/database.yml
 # SQLite version 3.x
 #   gem install sqlite3
 #
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
 #
 default: &default
  adapter: sqlite3
  pool: 5
  timeout: 5000
 development:
  <<: *default
  database: db/development.sqlite3
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
  <<: *default
  database: db/test.sqlite3
 production:
  <<: *default
  database: db/production.sqlite3
--- a/config/environment.rb
+++ b/config/environment.rb
 # Load the Rails application.
 require File.expand_path('../application', __FILE__)
 # Initialize the Rails application.
 Rails.application.initialize!
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
 Rails.application.configure do
  # Settings specified here will take precedence over those in config/application.rb.
  # In the development environment your application's code is reloaded on
  # every request. This slows down response time but is perfect for development
  # since you don't have to restart the web server when you make code changes.
  config.cache_classes = false
  # Do not eager load code on boot.
  config.eager_load = false
  # Show full error reports and disable caching.
  config.consider_all_requests_local       = true
  config.action_controller.perform_caching = false
  # Don't care if the mailer can't send.
  config.action_mailer.raise_delivery_errors = false
  # Print deprecation notices to the Rails logger.
  config.active_support.deprecation = :log
  # Raise an error on page load if there are pending migrations.
  config.active_record.migration_error = :page_load
  # Debug mode disables concatenation and preprocessing of assets.
  # This option may cause significant delays in view rendering with a large
  # number of complex assets.
  config.assets.debug = true
  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
  # yet still be able to expire them through the digest params.
  config.assets.digest = true
  # Adds additional error checking when serving assets at runtime.
  # Checks for improperly declared sprockets dependencies.
  # Raises helpful error messages.
  config.assets.raise_runtime_errors = true
  # Raises error for missing translations
  # config.action_view.raise_on_missing_translations = true
 end
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
 Rails.application.configure do
  # Settings specified here will take precedence over those in config/application.rb.
  # Code is not reloaded between requests.
  config.cache_classes = true
  # Eager load code on boot. This eager loads most of Rails and
  # your application in memory, allowing both threaded web servers
  # and those relying on copy on write to perform better.
  # Rake tasks automatically ignore this option for performance.
  config.eager_load = true
  # Full error reports are disabled and caching is turned on.
  config.consider_all_requests_local       = false
  config.action_controller.perform_caching = true
  # Enable Rack::Cache to put a simple HTTP cache in front of your application
  # Add `rack-cache` to your Gemfile before enabling this.
  # For large-scale production use, consider using a caching reverse proxy like
  # NGINX, varnish or squid.
  # config.action_dispatch.rack_cache = true
  # Disable serving static files from the `/public` folder by default since
  # Apache or NGINX already handles this.
  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
  # Compress JavaScripts and CSS.
  config.assets.js_compressor = :uglifier
  # config.assets.css_compressor = :sass
  # Do not fallback to assets pipeline if a precompiled asset is missed.
  config.assets.compile = false
  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
  # yet still be able to expire them through the digest params.
  config.assets.digest = true
  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
  # Specifies the header that your server uses for sending files.
  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
  # config.force_ssl = true
  # Use the lowest log level to ensure availability of diagnostic information
  # when problems arise.
  config.log_level = :debug
  # Prepend all log lines with the following tags.
  # config.log_tags = [ :subdomain, :uuid ]
  # Use a different logger for distributed setups.
  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
  # Use a different cache store in production.
  # config.cache_store = :mem_cache_store
  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
  # config.action_controller.asset_host = 'http://assets.example.com'
  # Ignore bad email addresses and do not raise email delivery errors.
  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
  # config.action_mailer.raise_delivery_errors = false
  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
  # the I18n.default_locale when a translation cannot be found).
  config.i18n.fallbacks = true
  # Send deprecation notices to registered listeners.
  config.active_support.deprecation = :notify
  # Use default logging formatter so that PID and timestamp are not suppressed.
  config.log_formatter = ::Logger::Formatter.new
  # Do not dump schema after migrations.
  config.active_record.dump_schema_after_migration = false
 end
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
 Rails.application.configure do
  # Settings specified here will take precedence over those in config/application.rb.
  # The test environment is used exclusively to run your application's
  # test suite. You never need to work with it otherwise. Remember that
  # your test database is "scratch space" for the test suite and is wiped
  # and recreated between test runs. Don't rely on the data there!
  config.cache_classes = true
  # Do not eager load code on boot. This avoids loading your whole application
  # just for the purpose of running a single test. If you are using a tool that
  # preloads Rails for running tests, you may have to set it to true.
  config.eager_load = false
  # Configure static file server for tests with Cache-Control for performance.
  config.serve_static_files   = true
  config.static_cache_control = 'public, max-age=3600'
  # Show full error reports and disable caching.
  config.consider_all_requests_local       = true
  config.action_controller.perform_caching = false
  # Raise exceptions instead of rendering exception templates.
  config.action_dispatch.show_exceptions = false
  # Disable request forgery protection in test environment.
  config.action_controller.allow_forgery_protection = false
  # Tell Action Mailer not to deliver emails to the real world.
  # The :test delivery method accumulates sent emails in the
  # ActionMailer::Base.deliveries array.
  config.action_mailer.delivery_method = :test
  # Randomize the order test cases are executed.
  config.active_support.test_order = :random
  # Print deprecation notices to the stderr.
  config.active_support.deprecation = :stderr
  # Raises error for missing translations
  # config.action_view.raise_on_missing_translations = true
 end
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
 # Be sure to restart your server when you modify this file.
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
 # Be sure to restart your server when you modify this file.
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
 # Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
 # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
 # Rails.backtrace_cleaner.remove_silencers!
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
 # Be sure to restart your server when you modify this file.
 Rails.application.config.action_dispatch.cookies_serializer = :json
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
 # Be sure to restart your server when you modify this file.
 # Configure sensitive parameters which will be filtered from the log file.
 Rails.application.config.filter_parameters += [:password]
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
 # Be sure to restart your server when you modify this file.
 # Add new inflection rules using the following format. Inflections
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.acronym 'RESTful'
 # end
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
 # Be sure to restart your server when you modify this file.
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
 # Be sure to restart your server when you modify this file.
 Rails.application.config.session_store :cookie_store, key: '_election_project_session'
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
 # Be sure to restart your server when you modify this file.
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end
 # To enable root element in JSON for ActiveRecord objects.
 # ActiveSupport.on_load(:active_record) do
 #  self.include_root_in_json = true
 # end
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
 # Additional translations at https://github.com/plataformatec/devise/wiki/I18n
 en:
  devise:
    confirmations:
      confirmed: "Your email address has been successfully confirmed."
      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
    failure:
      already_authenticated: "You are already signed in."
      inactive: "Your account is not activated yet."
      invalid: "Invalid %{authentication_keys} or password."
      locked: "Your account is locked."
      last_attempt: "You have one more attempt before your account is locked."
      not_found_in_database: "Invalid %{authentication_keys} or password."
      timeout: "Your session expired. Please sign in again to continue."
      unauthenticated: "You need to sign in or sign up before continuing."
      unconfirmed: "You have to confirm your email address before continuing."
    mailer:
      confirmation_instructions:
        subject: "Confirmation instructions"
      reset_password_instructions:
        subject: "Reset password instructions"
      unlock_instructions:
        subject: "Unlock instructions"
      password_change:
        subject: "Password Changed"
    omniauth_callbacks:
      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
      success: "Successfully authenticated from %{kind} account."
    passwords:
      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
      updated: "Your password has been changed successfully. You are now signed in."
      updated_not_active: "Your password has been changed successfully."
    registrations:
      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
      signed_up: "Welcome! You have signed up successfully."
      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
      updated: "Your account has been updated successfully."
    sessions:
      signed_in: "Signed in successfully."
      signed_out: "Signed out successfully."
      already_signed_out: "Signed out successfully."
    unlocks:
      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
  errors:
    messages:
      already_confirmed: "was already confirmed, please try signing in"
      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
      expired: "has expired, please request a new one"
      not_found: "not found"
      not_locked: "was not locked"
      not_saved:
        one: "1 error prohibited this %{resource} from being saved:"
        other: "%{count} errors prohibited this %{resource} from being saved:"
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
 # Files in the config/locales directory are used for internationalization
 # and are automatically loaded by Rails. If you want to use locales other
 # than English, add the necessary files in this directory.
 #
 # To use the locales, use `I18n.t`:
 #
 #     I18n.t 'hello'
 #
 # In views, this is aliased to just `t`:
 #
 #     <%= t('hello') %>
 #
 # To use a different locale, set it with `I18n.locale`:
 #
 #     I18n.locale = :es
 #
 # This would use the information in config/locales/es.yml.
 #
 # To learn more, please read the Rails Internationalization guide
 # available at http://guides.rubyonrails.org/i18n.html.
 en:
  hello: "Hello world"
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
 en:
  simple_form:
    "yes": 'Yes'
    "no": 'No'
    required:
      text: 'required'
      mark: '*'
      # You can uncomment the line below if you need to overwrite the whole required html.
      # When using html, text and mark won't be used.
      # html: '<abbr title="required">*</abbr>'
    error_notification:
      default_message: "Please review the problems below:"
    # Examples
    # labels:
    #   defaults:
    #     password: 'Password'
    #   user:
    #     new:
    #       email: 'E-mail to sign in.'
    #     edit:
    #       email: 'E-mail.'
    # hints:
    #   defaults:
    #     username: 'User name to sign in.'
    #     password: 'No special characters, please.'
    # include_blanks:
    #   defaults:
    #     age: 'Rather not say'
    # prompts:
    #   defaults:
    #     age: 'Select your age'
--- a/config/routes.rb
+++ b/config/routes.rb
 Rails.application.routes.draw do
  devise_for :users
  devise_for :admins
  root 'candidates#index'
  get '/candidates', to: 'candidates#index', as: :candidates
  get '/candidates/new', to: 'candidates#new', as: :new_candidates
  get '/candidates/vote', to: 'candidates#vote', as: :vote_candidates
  get 'candidates/edit/:id', to: 'candidates#edit', as: :edit_candidates
  get '/candidates/show/:id', to: 'candidates#show', as: :show_candidates
  patch 'candidates/update/:id', to: 'candidates#update', as: :update_candidates
  get '/candidates/delete', to: 'candidates#destroy', as: :delete_candidates
  post '/candidates', to: 'candidates#create', as: :candidate
  get 'positions', to:'positions#index', as: :positions
  get 'positions/new', to:'positions#new', as: :new_positions
  patch 'positions/update/:id', to: 'positions#update', as: :update_position
  post 'positions', to: 'positions#create', as: :create_position
  get 'positions/edit/:id', to: 'positions#edit', as: :edit_position
  get 'positions/show/:id', to: 'positions#show', as: :show_position
  get '/positions/delete/:id', to: 'positions#destroy', as: :delete_position
 end
--- a/config/secrets.yml
+++ b/config/secrets.yml
 # Be sure to restart your server when you modify this file.
 # Your secret key is used for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 # You can use `rake secret` to generate a secure secret key.
 # Make sure the secrets in this file are kept private
 # if you're sharing your code publicly.
 development:
  secret_key_base: 2391c495c8b65769e0909f23d260215d2895931c06d9a5f4b8254827a60aefc3c2cd338e5e72d2cd526b33cb61200491b7442a979014383b26b3fa76d6805792
 test:
  secret_key_base: d139b290f4ea3c4db8304d257faf3569e4a2ba06e8bfdae2a4f16a5306707199e24bc555bf6fbb353daf0579bd890627f7706b8f1fdf64c28c1aa79f720c7996
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
--- a/db/migrate/20160708033423_create_positions.rb
+++ b/db/migrate/20160708033423_create_positions.rb
 class CreatePositions < ActiveRecord::Migration
  def change
    create_table :positions do |t|
      t.string :name
      t.integer :number_of_winners
      t.timestamps null: false
    end
  end
 end
--- a/db/migrate/20160708033606_create_candidates.rb
+++ b/db/migrate/20160708033606_create_candidates.rb
 class CreateCandidates < ActiveRecord::Migration
  def change
    create_table :candidates do |t|
      t.string :first_name
      t.string :last_name
      t.string :nickname
      t.text :slogan
      t.references :position, index: true, foreign_key: true
      t.timestamps null: false
    end
  end
 end
--- a/db/migrate/20160711034137_devise_create_admins.rb
+++ b/db/migrate/20160711034137_devise_create_admins.rb
 class DeviseCreateAdmins < ActiveRecord::Migration
  def change
    create_table :admins do |t|
      ## Database authenticatable
      t.string :email,              null: false, default: ""
      t.string :encrypted_password, null: false, default: ""
      ## Recoverable
      t.string   :reset_password_token
      t.datetime :reset_password_sent_at
      ## Rememberable
      t.datetime :remember_created_at
      ## Trackable
      t.integer  :sign_in_count, default: 0, null: false
      t.datetime :current_sign_in_at
      t.datetime :last_sign_in_at
      t.string   :current_sign_in_ip
      t.string   :last_sign_in_ip
      ## Confirmable
      # t.string   :confirmation_token
      # t.datetime :confirmed_at
      # t.datetime :confirmation_sent_at
      # t.string   :unconfirmed_email # Only if using reconfirmable
      ## Lockable
      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
      # t.string   :unlock_token # Only if unlock strategy is :email or :both
      # t.datetime :locked_at
      t.timestamps null: false
    end
    add_index :admins, :email,                unique: true
    add_index :admins, :reset_password_token, unique: true
    # add_index :admins, :confirmation_token,   unique: true
    # add_index :admins, :unlock_token,         unique: true
  end
 end
--- a/db/migrate/20160712083205_devise_create_users.rb
+++ b/db/migrate/20160712083205_devise_create_users.rb
 class DeviseCreateUsers < ActiveRecord::Migration
  def change
    create_table :users do |t|
      ## Database authenticatable
      t.string :email,              null: false, default: ""
      t.string :encrypted_password, null: false, default: ""
      ## Recoverable
      t.string   :reset_password_token
      t.datetime :reset_password_sent_at
      ## Rememberable
      t.datetime :remember_created_at
      ## Trackable
      t.integer  :sign_in_count, default: 0, null: false
      t.datetime :current_sign_in_at
      t.datetime :last_sign_in_at
      t.string   :current_sign_in_ip
      t.string   :last_sign_in_ip
      ## Confirmable
      # t.string   :confirmation_token
      # t.datetime :confirmed_at
      # t.datetime :confirmation_sent_at
      # t.string   :unconfirmed_email # Only if using reconfirmable
      ## Lockable
      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
      # t.string   :unlock_token # Only if unlock strategy is :email or :both
      # t.datetime :locked_at
      t.string :first_name
      t.string :last_name
      t.string :gender
      t.date :birthday
      t.timestamps null: false
    end
    add_index :users, :email,                unique: true
    add_index :users, :reset_password_token, unique: true
    # add_index :users, :confirmation_token,   unique: true
    # add_index :users, :unlock_token,         unique: true
  end
 end
--- a/db/migrate/20160712083445_create_votes.rb
+++ b/db/migrate/20160712083445_create_votes.rb
 class CreateVotes < ActiveRecord::Migration
  def change
    create_table :votes do |t|
-      t.references :user_id, index: true, foreign_key: true
+      t.references :user, index: true, foreign_key: true
-      t.references :candidate_id, index: true, foreign_key: true
+      t.references :candidate, index: true, foreign_key: true
      t.text :comments
      t.timestamps null: false
    end
  end
 end
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -73,14 +73,14 @@ ActiveRecord::Schema.define(version: 20160712083445) do
  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
  create_table "votes", force: :cascade do |t|
-    t.integer  "user_id_id"
+    t.integer  "user_id"
-    t.integer  "candidate_id_id"
+    t.integer  "candidate_id"
    t.text     "comments"
-    t.datetime "created_at",      null: false
+    t.datetime "created_at",   null: false
-    t.datetime "updated_at",      null: false
+    t.datetime "updated_at",   null: false
  end
-  add_index "votes", ["candidate_id_id"], name: "index_votes_on_candidate_id_id"
+  add_index "votes", ["candidate_id"], name: "index_votes_on_candidate_id"
-  add_index "votes", ["user_id_id"], name: "index_votes_on_user_id_id"
+  add_index "votes", ["user_id"], name: "index_votes_on_user_id"
 end
--- a/db/seeds.rb
+++ b/db/seeds.rb
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #
 # Examples:
 #
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
--- a/lib/templates/erb/scaffold/_form.html.erb
+++ b/lib/templates/erb/scaffold/_form.html.erb
 <%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
  <%%= f.error_notification %>
  <div class="form-inputs">
  <%- attributes.each do |attribute| -%>
    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
  <%- end -%>
  </div>
  <div class="form-actions">
    <%%= f.button :submit %>
  </div>
 <%% end %>
--- a/public/404.html
+++ b/public/404.html
 <!DOCTYPE html>
 <html>
 <head>
  <title>The page you were looking for doesn't exist (404)</title>
  <meta name="viewport" content="width=device-width,initial-scale=1">
  <style>
  body {
    background-color: #EFEFEF;
    color: #2E2F30;
    text-align: center;
    font-family: arial, sans-serif;
    margin: 0;
  }
  div.dialog {
    width: 95%;
    max-width: 33em;
    margin: 4em auto 0;
  }
  div.dialog > div {
    border: 1px solid #CCC;
    border-right-color: #999;
    border-left-color: #999;
    border-bottom-color: #BBB;
    border-top: #B00100 solid 4px;
    border-top-left-radius: 9px;
    border-top-right-radius: 9px;
    background-color: white;
    padding: 7px 12% 0;
    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
  }
  h1 {
    font-size: 100%;
    color: #730E15;
    line-height: 1.5em;
  }
  div.dialog > p {
    margin: 0 0 1em;
    padding: 1em;
    background-color: #F7F7F7;
    border: 1px solid #CCC;
    border-right-color: #999;
    border-left-color: #999;
    border-bottom-color: #999;
    border-bottom-left-radius: 4px;
    border-bottom-right-radius: 4px;
    border-top-color: #DADADA;
    color: #666;
    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
  }
  </style>
 </head>
 <body>
  <!-- This file lives in public/404.html -->
  <div class="dialog">
    <div>
      <h1>The page you were looking for doesn't exist.</h1>
      <p>You may have mistyped the address or the page may have moved.</p>
    </div>
    <p>If you are the application owner check the logs for more information.</p>
  </div>
 </body>
 </html>
--- a/public/422.html
+++ b/public/422.html
 <!DOCTYPE html>
 <html>
 <head>
  <title>The change you wanted was rejected (422)</title>
  <meta name="viewport" content="width=device-width,initial-scale=1">
  <style>
  body {
    background-color: #EFEFEF;
    color: #2E2F30;
    text-align: center;
    font-family: arial, sans-serif;
    margin: 0;
  }
  div.dialog {
    width: 95%;
    max-width: 33em;
    margin: 4em auto 0;
  }
  div.dialog > div {
    border: 1px solid #CCC;
    border-right-color: #999;
    border-left-color: #999;
    border-bottom-color: #BBB;
    border-top: #B00100 solid 4px;
    border-top-left-radius: 9px;
    border-top-right-radius: 9px;
    background-color: white;
    padding: 7px 12% 0;
    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
  }
  h1 {
    font-size: 100%;
    color: #730E15;
    line-height: 1.5em;
  }
  div.dialog > p {
    margin: 0 0 1em;
    padding: 1em;
    background-color: #F7F7F7;
    border: 1px solid #CCC;
    border-right-color: #999;
    border-left-color: #999;
    border-bottom-color: #999;
    border-bottom-left-radius: 4px;
    border-bottom-right-radius: 4px;
    border-top-color: #DADADA;
    color: #666;
    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
  }
  </style>
 </head>
 <body>
  <!-- This file lives in public/422.html -->
  <div class="dialog">
    <div>
      <h1>The change you wanted was rejected.</h1>
      <p>Maybe you tried to change something you didn't have access to.</p>
    </div>
    <p>If you are the application owner check the logs for more information.</p>
  </div>
 </body>
 </html>
--- a/public/500.html
+++ b/public/500.html
 <!DOCTYPE html>
 <html>
 <head>
  <title>We're sorry, but something went wrong (500)</title>
  <meta name="viewport" content="width=device-width,initial-scale=1">
  <style>
  body {
    background-color: #EFEFEF;
    color: #2E2F30;
    text-align: center;
    font-family: arial, sans-serif;
    margin: 0;
  }
  div.dialog {
    width: 95%;
    max-width: 33em;
    margin: 4em auto 0;
  }
  div.dialog > div {
    border: 1px solid #CCC;
    border-right-color: #999;
    border-left-color: #999;
    border-bottom-color: #BBB;
    border-top: #B00100 solid 4px;
    border-top-left-radius: 9px;
    border-top-right-radius: 9px;
    background-color: white;
    padding: 7px 12% 0;
    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
  }
  h1 {
    font-size: 100%;
    color: #730E15;
    line-height: 1.5em;
  }
  div.dialog > p {
    margin: 0 0 1em;
    padding: 1em;
    background-color: #F7F7F7;
    border: 1px solid #CCC;
    border-right-color: #999;
    border-left-color: #999;
    border-bottom-color: #999;
    border-bottom-left-radius: 4px;
    border-bottom-right-radius: 4px;
    border-top-color: #DADADA;
    color: #666;
    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
  }
  </style>
 </head>
 <body>
  <!-- This file lives in public/500.html -->
  <div class="dialog">
    <div>
      <h1>We're sorry, but something went wrong.</h1>
    </div>
    <p>If you are the application owner check the logs for more information.</p>
  </div>
 </body>
 </html>
--- a/public/robots.txt
+++ b/public/robots.txt
 # See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
 #
 # To ban all spiders from the entire site uncomment the next two lines:
 # User-agent: *
 # Disallow: /
--- a/test/controllers/candidates_controller_test.rb
+++ b/test/controllers/candidates_controller_test.rb
 require 'test_helper'
 class CandidatesControllerTest < ActionController::TestCase
  test "should get index" do
    get :index
    assert_response :success
  end
  test "should get new" do
    get :new
    assert_response :success
  end
  test "should get create" do
    get :create
    assert_response :success
  end
  test "should get edit" do
    get :edit
    assert_response :success
  end
  test "should get updateshow" do
    get :updateshow
    assert_response :success
  end
 end
--- a/test/controllers/positions_controller_test.rb
+++ b/test/controllers/positions_controller_test.rb
 require 'test_helper'
 class PositionsControllerTest < ActionController::TestCase
  test "should get index" do
    get :index
    assert_response :success
  end
  test "should get new" do
    get :new
    assert_response :success
  end
  test "should get create" do
    get :create
    assert_response :success
  end
  test "should get edit" do
    get :edit
    assert_response :success
  end
  test "should get update" do
    get :update
    assert_response :success
  end
  test "should get show" do
    get :show
    assert_response :success
  end
 end
--- a/test/fixtures/admins.yml
+++ b/test/fixtures/admins.yml
 # 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
--- a/test/fixtures/candidates.yml
+++ b/test/fixtures/candidates.yml
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 one:
  first_name: MyString
  last_name: MyString
  nickname: MyString
  slogan: MyText
  position_id: 
 two:
  first_name: MyString
  last_name: MyString
  nickname: MyString
  slogan: MyText
  position_id: 
--- a/test/fixtures/positions.yml
+++ b/test/fixtures/positions.yml
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 one:
  name: MyString
  number_of_winners: 1
 two:
  name: MyString
  number_of_winners: 1
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
 # 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
--- a/test/fixtures/votes.yml
+++ b/test/fixtures/votes.yml
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 one:
  user_id_id: 
  candidate_id_id: 
  comments: MyText
 two:
  user_id_id: 
  candidate_id_id: 
  comments: MyText
--- a/test/models/admin_test.rb
+++ b/test/models/admin_test.rb
 require 'test_helper'
 class AdminTest < ActiveSupport::TestCase
  # test "the truth" do
  #   assert true
  # end
 end
--- a/test/models/candidate_test.rb
+++ b/test/models/candidate_test.rb
 require 'test_helper'
 class CandidateTest < ActiveSupport::TestCase
  # test "the truth" do
  #   assert true
  # end
 end
--- a/test/models/position_test.rb
+++ b/test/models/position_test.rb
 require 'test_helper'
 class PositionTest < ActiveSupport::TestCase
  # test "the truth" do
  #   assert true
  # end
 end
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
 require 'test_helper'
 class UserTest < ActiveSupport::TestCase
  # test "the truth" do
  #   assert true
  # end
 end
--- a/test/models/vote_test.rb
+++ b/test/models/vote_test.rb
 require 'test_helper'
 class VoteTest < ActiveSupport::TestCase
  # test "the truth" do
  #   assert true
  # end
 end
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
 ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 class ActiveSupport::TestCase
  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
  fixtures :all
  # Add more helper methods to be used by all tests here...
 end