Merge branch 'master' of http://github.com/LukeShu/leaguer

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/games/index.html.erb
	db/migrate/20140304043618_create_servers.rb
	db/migrate/20140304043622_create_matches.rb
	db/migrate/20140304043631_create_games.rb

7 files changed, 37 insertions, 21 deletions

diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 56d9f90..4d28738 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -13,11 +13,15 @@
 
   <div class="field">
     <%= f.label :name %><br>
-    <%= f.text_area :name %>
+    <%= f.text_field :name %>
   </div>
   <div class="field">
-    <%= f.label :pw_hash %><br>
-    <%= f.text_area :pw_hash %>
+    <%= f.label :email %><br>
+    <%= f.text_field :email %>
+  </div>
+  <div class="field">
+    <%= f.label :user_name %><br>
+    <%= f.text_field :user_name %>
   </div>
   <div class="actions">
     <%= f.submit %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
deleted file mode 100644
index 99bd4cc..0000000
--- a/app/views/users/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Editing user</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @user %> |
-<%= link_to 'Back', users_path %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 8b9056b..d7b46da 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,10 +1,13 @@
 <h1>Listing users</h1>
 
-<table>
+<table class="table table-hover">
   <thead>
     <tr>
+      <th>Username</th>
       <th>Name</th>
-      <th>Pw hash</th>
+      <th>Email</th>
+      <th>User name</th>
+      <th></th>
       <th></th>
       <th></th>
       <th></th>
@@ -14,8 +17,10 @@
   <tbody>
     <% @users.each do |user| %>
       <tr>
+        <td><%= link_to("#{user.user_name}", user, nil) %></td>
         <td><%= user.name %></td>
-        <td><%= user.pw_hash %></td>
+        <td> ******* </td>
+        <td><%= user.user_name %></td>
         <td><%= link_to 'Show', user %></td>
         <td><%= link_to 'Edit', edit_user_path(user) %></td>
         <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
diff --git a/app/views/users/index.json.jbuilder b/app/views/users/index.json.jbuilder
index 182437e..42d8b72 100644
--- a/app/views/users/index.json.jbuilder
+++ b/app/views/users/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@users) do |user|
-  json.extract! user, :id, :name, :pw_hash
+  json.extract! user, :id, :name, :email, :user_name
   json.url user_url(user, format: :json)
 end
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 2a745cc..f0ce746 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -16,11 +16,11 @@
   </p>
    <p>
     <%= f.label :password %><br>
-    <%= f.text_field :password %>
+    <%= f.password_field :password %>
   </p>
   <p>
     <%= f.label :password_confirm %><br>
-    <%= f.text_field :password_confirmation %>
+    <%= f.password_field :password_confirmation %>
   </p>
   <p>
     <%= f.submit %>
@@ -45,16 +45,16 @@
   </p>
    <p>
     <label for="user_password">Password</label><br>
-    <input id="user_password" name="user[password]" type="text" />
+    <input id="user_password" name="user[password]" type="password" />
   </p>
   <p>
     <label for="user_password_confirm">Password confirm</label><br>
-    <input id="user_password_confirmation" name="user[password_confirmation]" type="text" />
+    <input id="user_password_confirmation" name="user[password_confirmation]" type="password" />
   </p>
   <p>
     <input name="commit" type="submit" value="Save User" />
   </p>
 </form>
 
-<%= link_to 'Already Have an Account? Log in', "signin", :class => "btn btn-warning btn-lg" %>
+<%= link_to 'Already Have an Account? Log in', new_session_path, :class => "btn btn-warning btn-lg" %>
 
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 43c12fe..d8cc82b 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,3 +1,17 @@
-app/views/users/show.html.erb
+<p>
+  <strong>Name:</strong>
+  <%= @user.name %>
+</p>
 
-<%= @user.name %>, <%= @user.email %>
+<p>
+  <strong>Email:</strong>
+  <%= @user.email %>
+</p>
+
+<p>
+  <strong>User name:</strong>
+  <%= @user.user_name %>
+</p>
+
+<%= link_to 'Edit', edit_user_path(@user) %> |
+<%= link_to 'Back', users_path %>
diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder
deleted file mode 100644
index 1262e80..0000000
--- a/app/views/users/show.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.extract! @user, :id, :name, :pw_hash, :created_at, :updated_at