Removed the server module

app/controllers/admin_controller.rb

@@ -22,7 +22,7 @@ def logout
   # else it renders the login again.
   # POST http://francismb.com/admin/authenticate
   def authenticate
-    user = User.find_by_username(params[:username]);
+    user = User.find_by_username(params[:username])
     if user && user.authenticate(params[:password])
       flash[:error] = nil
       session[:user_id] = user.id

app/controllers/application_controller.rb

@@ -5,7 +5,7 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   # Standard application layout
-  layout "application"
+  layout 'application'
 
   # A few helper methods to assist controllers and templates.
   include ApplicationHelper

app/controllers/messages_controller.rb

@@ -1,7 +1,7 @@
 class MessagesController < ApplicationController
 
   # Require authentication for the following functions
-  before_action :require_admin_authentication, :only => [
+  before_action :logged_in, :only => [
       :index,
       :delete, :destroy
   ]

app/controllers/milestones_controller.rb

@@ -1,7 +1,7 @@
 class MilestonesController < ApplicationController
 
   # Require authentication for the following functions
-  before_action :require_admin_authentication, :only => [
+  before_action :logged_in, :only => [
       :new, :create,
       :edit, :update,
       :delete, :destroy

app/controllers/projects_controller.rb

@@ -1,7 +1,7 @@
 class ProjectsController < ApplicationController
 
   # Require authentication for the following functions
-  before_action :require_admin_authentication, :only => [
+  before_action :logged_in, :only => [
       :new, :create,
       :edit, :update,
       :delete, :destroy

app/controllers/skills_controller.rb

@@ -1,7 +1,7 @@
 class SkillsController < ApplicationController
 
   # Require authentication for the following functions
-  before_action :require_admin_authentication, :only => [
+  before_action :logged_in, :only => [
       :new, :create,
       :edit, :update,
       :delete, :destroy

app/helpers/application_helper.rb

@@ -4,14 +4,6 @@ module ApplicationHelper
   def logged_in
     session[:user_id] != nil
   end
-
-  # Returns true if the logged in user is an admin else false
-  def admin_logged_in
-    if session[:user_id] == nil
-      return false
-    end
-    return User.find_by_id(session[:user_id]).admin
-  end
 
   # Returns the currently logged in user model.
   def get_user
@@ -25,13 +17,5 @@ def require_authentication
       redirect_to :controller => :admin, :action => :login
     end
   end
-
-  # A usefull before action to redirect the user to the login
-  # if the user has not logged in yet and is required to.
-  def require_admin_authentication
-    unless logged_in && get_user.admin
-      redirect_to :controller => :admin, :action => :login
-    end
-  end
 
 end

app/views/admin/login.html.erb

@@ -1,6 +1,3 @@
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "access" %>
-<% end %>
 <div class="login-form">
   <%= form_for :user, :url => {:action => :authenticate} do |f| %>
 

app/views/layouts/application.html.erb

@@ -54,12 +54,9 @@
             <a href="<%= url_for :controller => :milestones %>">Milestones</a>
           </li>
           <li>
-           <% if admin_logged_in %>
-              <a href="<%= url_for :controller => :messages %>">Messages</a>
-            <% end %>
             <% if logged_in %>
-              <a href="<%= url_for :controller => :server, :action => :index %>">Server</a>
-              <a href="<%= url_for :controller => :admin, :action => :logout %>">Logout</a>
+                <a href="<%= url_for :controller => :messages %>">Messages</a>
+                <a href="<%= url_for :controller => :admin, :action => :logout %>">Logout</a>
             <% else %>
                 <a href="<%= url_for :controller => :admin, :action => :login %>">Admin</a>
             <% end %>

app/views/milestones/index.html.erb

@@ -1,6 +1,6 @@
 <div class="container">
   <h1 class="center">Milestones</h1>
-  <% if admin_logged_in %>
+  <% if logged_in %>
       <a class="new-project button" href="<%= url_for :action => :new %>">
         New Milestone
       </a>

app/views/milestones/show.html.erb

@@ -1,6 +1,6 @@
 <article class="container">
   <h1><%= @milestone.name %></h1>
-  <% if admin_logged_in %>
+  <% if logged_in %>
       <a class="edit-project button" href="<%= url_for :action => :edit, :id => @milestone.id %>">
         Edit Project
       </a>

app/views/projects/index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 <div class="container">
   <h1 class="center">Projects</h1>
-  <% if admin_logged_in %>
+  <% if logged_in %>
       <a class="new-project button" href="<%= url_for :action => :new %>">
         New Project
       </a>

app/views/projects/show.html.erb

@@ -1,11 +1,11 @@
 <article class="container">
   <h1 class="title">
       <span><%= @project.name %></span>
-      <% if @project.github_link.length() > 0 %>
+      <% if @project.github_link.length > 0 %>
         <a class="github-link" target="_blank" href="<%= @project.github_link %>">Github Project Link</a>
       <% end %>
   </h1>
-  <% if admin_logged_in %>
+  <% if logged_in %>
       <a class="edit-project button" href="<%= url_for :action => :edit, :id => @project.id %>">
         Edit Project
       </a>

app/views/skills/index.html.erb

@@ -4,7 +4,7 @@
 <% end %>
 <div class="container">
   <h1 class="center">Skills</h1>
-  <% if admin_logged_in %>
+  <% if logged_in %>
       <a class="new-skill button" href="<%= url_for :action => :new %>">
         New Skill
       </a>

app/views/skills/show.html.erb

@@ -1,6 +1,6 @@
 <article class="container">
   <h1><%= @skill.name %></h1>
-  <% if admin_logged_in %>
+  <% if logged_in %>
       <a class="edit-skill button" href="<%= url_for :action => :edit, :id => @skill.id %>">
         Edit Skill
       </a>

db/migrate/20160422050913_add_admin_to_users.rb

@@ -1,5 +1,5 @@
 class AddAdminToUsers < ActiveRecord::Migration
   def change
-      add_column :users, :admin, :boolean
+    add_column :users, :admin, :boolean
   end
 end

db/migrate/20160519070130_remove_servers.rb

@@ -0,0 +1,9 @@
+class RemoveServers < ActiveRecord::Migration
+  def up
+    drop_table :servers
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

db/migrate/20160519070409_remove_admin_from_users.rb

@@ -0,0 +1,5 @@
+class RemoveAdminFromUsers < ActiveRecord::Migration
+  def change
+    remove_column :users, :admin, :boolean
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160422052639) do
+ActiveRecord::Schema.define(version: 20160519070409) do
 
   create_table "messages", force: :cascade do |t|
     t.string   "name"
@@ -44,10 +44,6 @@
     t.integer "project_id"
   end
 
-  create_table "servers", force: :cascade do |t|
-    t.string "content"
-  end
-
   create_table "skills", force: :cascade do |t|
     t.string  "name"
     t.text    "summary"
@@ -58,9 +54,8 @@
   end
 
   create_table "users", force: :cascade do |t|
-    t.string  "username"
-    t.string  "password_digest"
-    t.boolean "admin"
+    t.string "username"
+    t.string "password_digest"
   end
 
 end