Removed unuse file

app/controllers/users_controller.rb

@@ -9,6 +9,7 @@ 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
 
 
@@ -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/views/users/edit.html.erb

@@ -3,24 +3,7 @@
 
 
 <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 %>
-
+    <%= render  "form" %>
   <div class="gravatar_edit">
   <div class="gravatar_edit">
     <%= gravatar_for @user %>
     <%= gravatar_for @user %>
     <a href="http://gravatar.com/emails">change</a>
     <a href="http://gravatar.com/emails">change</a>

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>