7 files changed, 37 insertions, 37 deletions

diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index ad89f47..4d28738 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -23,14 +23,6 @@
     <%= f.label :user_name %><br>
     <%= f.text_field :user_name %>
   </div>
-  <div class="field">
-    <%= f.label :password_digest %><br>
-    <%= f.text_field :password_digest %>
-  </div>
-  <div class="field">
-    <%= f.label :remember_token %><br>
-    <%= f.text_field :remember_token %>
-  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
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 c0d52a0..d7b46da 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,13 +1,13 @@
 <h1>Listing users</h1>
 
-<table>
+<table class="table table-hover">
   <thead>
     <tr>
+      <th>Username</th>
       <th>Name</th>
       <th>Email</th>
       <th>User name</th>
-      <th>Password digest</th>
-      <th>Remember token</th>
+      <th></th>
       <th></th>
       <th></th>
       <th></th>
@@ -17,11 +17,10 @@
   <tbody>
     <% @users.each do |user| %>
       <tr>
+        <td><%= link_to("#{user.user_name}", user, nil) %></td>
         <td><%= user.name %></td>
-        <td><%= user.email %></td>
+        <td> ******* </td>
         <td><%= user.user_name %></td>
-        <td><%= user.password_digest %></td>
-        <td><%= user.remember_token %></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 cf21a4a..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, :email, :user_name, :password_digest, :remember_token
+  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 efc0404..704aa10 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,5 +1,32 @@
-<h1>New user</h1>
+<h1> Sign Up </h1>
 
-<%= render 'form' %>
+<%= form_for @user do |f| %>
+  <%= render "common/error_messages", :target => @user %>
+  <p>
+    <%= f.label :name %><br>
+    <%= f.text_field :name %>
+  </p>
+  <p>
+    <%= f.label :email %><br>
+    <%= f.text_field :email %>
+  </p>
+  <p>
+    <%= f.label :user_name %><br>
+    <%= f.text_field :user_name %>
+  </p>
+  <p>
+    <%= f.label :password %><br>
+    <%= f.password_field :password %>
+  </p>
+  <p>
+    <%= f.label :password_confirm %><br>
+    <%= f.password_field :password_confirmation %>
+  </p>
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+
+
+<%= link_to 'Already Have an Account? Log in', new_session_path, :class => "btn btn-warning btn-lg" %>
 
-<%= link_to 'Back', users_path %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index a0fa94c..d8cc82b 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
 <p>
   <strong>Name:</strong>
   <%= @user.name %>
@@ -15,15 +13,5 @@
   <%= @user.user_name %>
 </p>
 
-<p>
-  <strong>Password digest:</strong>
-  <%= @user.password_digest %>
-</p>
-
-<p>
-  <strong>Remember token:</strong>
-  <%= @user.remember_token %>
-</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
index 11b0784..4919af3 100644
--- a/app/views/users/show.json.jbuilder
+++ b/app/views/users/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @user, :id, :name, :email, :user_name, :password_digest, :remember_token, :created_at, :updated_at
+json.extract! @user, :id, :name, :email, :user_name, :created_at, :updated_at