Removed unuse file

app/controllers/users_controller.rb

@@ -9,12 +9,13 @@ class UsersController < ApplicationController
 
 
   def show
   def show
     @user = User.find(params[:id])
     @user = User.find(params[:id])
+    redirect_to root_url and return unless @user.activated
     @microposts = @user.microposts.paginate(page: params[:page]) 
     @microposts = @user.microposts.paginate(page: params[:page]) 
   end
   end
 
 
   def new
   def new
     @user = User.new 
     @user = User.new 
- end
+  end
 
 
   def create
   def create
     @user = User.new(user_params)  
     @user = User.new(user_params)  
@@ -71,17 +72,6 @@ class UsersController < ApplicationController
     params.require(:user).permit(:name, :email, :password, :password_confirmation)
     params.require(:user).permit(:name, :email, :password, :password_confirmation)
   end
   end
 
 
-  # Before filters
-
-  # Confirms a logged-in user.
-  def logged_in_user
-    unless logged_in?
-      store_location
-      flash[:danger] = "Please log in."
-      redirect_to login_url
-    end
-  end
-
   # Confirms the correct user.
   # Confirms the correct user.
   def correct_user
   def correct_user
     @user = User.find(params[:id])
     @user = User.find(params[:id])

app/helpers/microposts_helper.rb

-module MicropostsHelper
-end

app/models/micropost.rb

@@ -12,9 +12,9 @@ class Micropost < ApplicationRecord
   private
   private
 
 
     # Validates the size of an uploaded picture.
     # Validates the size of an uploaded picture.
-    def picture_size
-      if picture.size > 5.megabytes
-        errors.add(:picture, "should be less than 5MB")
-      end
+  def picture_size
+    if picture.size > 5.megabytes
+      errors.add(:picture, "should be less than 5MB")
     end
     end
+  end
 end
 end

app/models/user.rb

@@ -24,7 +24,7 @@ class User < ApplicationRecord
   has_secure_password
   has_secure_password
 
 
   class << self
   class << self
-     # Returns the hash digest of the given string. 
+    # Returns the hash digest of the given string. 
     def digest(string)
     def digest(string)
       cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost
       cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost
       BCrypt::Password.create(string, cost: cost)
       BCrypt::Password.create(string, cost: cost)

app/views/microposts/_micropost.html.erb

@@ -8,7 +8,7 @@
   <span class="timestamp">
   <span class="timestamp">
     Posted <%= time_ago_in_words(micropost.created_at) %> ago.
     Posted <%= time_ago_in_words(micropost.created_at) %> ago.
     <% if current_user?(micropost.user) %>
     <% if current_user?(micropost.user) %>
-    <%= link_to "delete", micropost, method: :delete, data: { confirm: "You sure?" } %>
+      <%= link_to "delete", micropost, method: :delete, data: { confirm: "You sure?" } %>
     <% end %>
     <% end %>
   </span>
   </span>
 </li>
 </li>

app/views/users/edit.html.erb

@@ -3,27 +3,10 @@
 
 
 <div class="row">
 <div class="row">
   <div class="col-md-6 col-md-offset-3">
   <div class="col-md-6 col-md-offset-3">
-    <%= form_for(@user) do |f| %>
-      <%= render "shared/error_messages", object: f.object %>
-
-      <%= f.label :name %>
-      <%= f.text_field :name, class: "form-control" %>
-
-      <%= f.label :email %>
-      <%= f.email_field :email, class: "form-control" %>
-
-      <%= f.label :password %>
-      <%= f.password_field :password, class: "form-control" %>
-
-      <%= f.label :password_confirmation, "Confirmation" %>
-      <%= f.password_field :password_confirmation, class: "form-control" %>
-
-      <%= f.submit "Save changes", class: "btn btn-primary" %>
-    <% end %>
-
-    <div class="gravatar_edit">
-      <%= gravatar_for @user %>
-      <a href="http://gravatar.com/emails">change</a>
+    <%= render  "form" %>
+  <div class="gravatar_edit">
+    <%= gravatar_for @user %>
+    <a href="http://gravatar.com/emails">change</a>
     </div>
     </div>
   </div>
   </div>
 </div>
 </div>

app/views/users/new.html.erb

@@ -3,17 +3,6 @@
 
 
 <div class="row">
 <div class="row">
   <div class="col-md-6 col-md-offset-3">
   <div class="col-md-6 col-md-offset-3">
-    <%= form_for(@user) do |f| %>
-      <%= render "shared/error_messages", object: f.object %>
-      <%= f.label :name %>
-      <%= f.text_field :name, class: "form-control" %>
-      <%= f.label :email %>
-      <%= f.email_field :email, class: "form-control" %>
-      <%= f.label :password %>
-      <%= f.password_field :password, class: "form-control" %>
-      <%= f.label :password_confirmation, "Confirmation" %>
-      <%= f.password_field :password_confirmation, class: "form-control" %>
-      <%= f.submit "Create my account", class: "btn btn-primary" %>
-    <% end %>
+    <%= render "form" %>
   </div>
   </div>
 </div>
 </div>