Merge branch 'master' of https://github.com/zhaoyan1117/PeakDemand

Conflicts:
	app/models/user.rb

app/assets/javascripts/admin.js.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://jashkenas.github.com/coffee-script/

app/assets/stylesheets/admin.css.scss

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

app/controllers/admin_controller.rb

@@ -0,0 +1,16 @@
+class AdminController < ApplicationController
+
+  before_filter :authenticate_user!
+  before_filter :get_current_user
+
+  def index
+  	@users
+
+  end
+
+  def enable_user
+  end
+
+  def disable_user
+  end
+end

app/helpers/admin_helper.rb

@@ -0,0 +1,2 @@
+module AdminHelper
+end

app/models/user.rb

@@ -17,6 +17,10 @@ def is_provider?
     is_provider
   end
 
+  def is_admin?
+    is_administrator
+  end
+
   def validate_must_have_identity
     if !is_provider && !is_consumer
       errors[:identity] << "must have an identity!"

app/views/admin/index.html.erb

@@ -0,0 +1,2 @@
+<%= render 'shared/user_header' %>
+<%= render 'shared/error' %>

app/views/shared/_user_header.html.erb

@@ -6,6 +6,13 @@
 	</div>
 
 	<div class="user_profile">
+
+		<% if @user && @user.is_admin? %>
+			<%= link_to admin_index_url do %>
+				<div clas="admin_dashboard">Admin Dashboard</div>
+			<% end %>
+		<% end %>
+		
 		<% if user_signed_in? %>
 				<%= link_to destroy_user_session_path, :method => :delete do %>
 					<div class="logout">Log Out</div>
@@ -16,7 +23,6 @@
 				<% end %>
 
 		<% else %>
-
 				<div class="dropdown">
 					<div class="login" data-toggle="dropdown">Sign In</div>
 					<div class='dropdown-menu' >

config/routes.rb

@@ -1,12 +1,19 @@
 PeakDemand::Application.routes.draw do
 
+  # root
   root :to => 'resource#index'
-
+
+  # user & mailing
   devise_for :users
   post '/mail/send' => 'UserMailer#send_email'
 
+  # admin & announcement
+  get 'admin/index' => 'Admin#index'
+  post 'admin/enable_user' => 'Admin#enable_user'
+  post 'admin/disable_user' => 'Admin#disable_user'
   resources :announcement, :except => [:index, :new, :edit]
 
+  # resource & demand
   resources :resource do
     resources :demand, :except => :index
   end

spec/controllers/admin_controller_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe AdminController do
+
+  describe "GET 'index'" do
+    it "returns http success" do
+      get 'index'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'enable_user'" do
+    it "returns http success" do
+      get 'enable_user'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'disable_user'" do
+    it "returns http success" do
+      get 'disable_user'
+      response.should be_success
+    end
+  end
+
+end

spec/helpers/admin_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the AdminHelper. For example:
+#
+# describe AdminHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+describe AdminHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end