fix style code

app/controllers/users_controller.rb

@@ -3,8 +3,8 @@ class UsersController < ApplicationController
 
 
   before_action :logged_in_user, only: [:index, :edit, :update, :destroy]
   before_action :logged_in_user, only: [:index, :edit, :update, :destroy]
   before_action :correct_user, only: [:edit, :update]
   before_action :correct_user, only: [:edit, :update]
-  before_action :admin_user,
-  only: :destroy
+  before_action :admin_user, only: :destroy
+
   def show
   def show
     @user = User.find(params[:id])
     @user = User.find(params[:id])
   end
   end
@@ -44,32 +44,32 @@ class UsersController < ApplicationController
   end
   end
 
 
   private
   private
-  def user_params
-    params.require(:user).permit(:name, :email, :password, :password_confirmation)
-  end
 
 
+    def user_params
+      params.require(:user).permit(:name, :email, :password, :password_confirmation)
+    end
 
 
-  def logged_in_user
-    unless logged_in?
-      store_location
-      flash[:danger] = "Please log in."
-      redirect_to login_url
+    def logged_in_user
+      unless logged_in?
+        store_location
+        flash[:danger] = "Please log in."
+        redirect_to login_url
+      end
     end
     end
-  end
 
 
-  def correct_user
-    @user = User.find(params[:id])
-    redirect_to(root_url) unless current_user?(@user)
-  end
+    def correct_user
+      @user = User.find(params[:id])
+      redirect_to(root_url) unless current_user?(@user)
+    end
 
 
-  def destroy
-    User.find(params[:id]).destroy
-    flash[:success] = "User deleted"
-    redirect_to users_url
-  end
+    def destroy
+      User.find(params[:id]).destroy
+      flash[:success] = "User deleted"
+      redirect_to users_url
+    end
 
 
-  # Confirms an admin user.
-  def admin_user
-    redirect_to(root_url) unless current_user.admin?
-  end
+    # Confirms an admin user.
+    def admin_user
+      redirect_to(root_url) unless current_user.admin?
+    end
 end
 end

app/views/users/_form.html.erb

+<%= form_with(model: @user, local: true) do |f| %>
+  <%= render 'shared/error_messages', object: @user %>
+
+  <%= 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 %>
+  <%= f.password_field :password_confirmation, class: 'form-control' %>
+  
+  <%= f.submit yield(:button_text), class: "btn btn-primary" %>
+<% end %>
\ No newline at end of file

app/views/users/edit.html.erb

@@ -2,23 +2,7 @@
 <h1>Update your profile</h1>
 <h1>Update your profile</h1>
 <div class="row">
 <div class="row">
   <div class="col-md-6 offset-md-3">
   <div class="col-md-6 offset-md-3">
-    <%= form_with(model: @user, local: true) do |f| %>
-      <%= render 'shared/error_messages' %>
-
-      <%= 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="https://gravatar.com/emails" target="_blank">change</a>
       <a href="https://gravatar.com/emails" target="_blank">change</a>

app/views/users/new.html.erb

@@ -2,22 +2,6 @@
 <h1>Sign up</h1>
 <h1>Sign up</h1>
 <div class="row">
 <div class="row">
   <div class="col-md-6 offset-md-3">
   <div class="col-md-6 offset-md-3">
-    <%= form_with(model: @user, local: true) do |f| %>
-      <%= render 'shared/error_messages' %>
-      <%= 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>