rename username to email
This commit is contained in:
parent
7412853a3e
commit
cd40ef66c6
9 changed files with 18 additions and 13 deletions
|
@ -3,7 +3,7 @@ class SessionsController < ApplicationController
|
|||
end
|
||||
|
||||
def create
|
||||
@user = User.find_by(username: params[:username])
|
||||
@user = User.find_by(email: params[:email])
|
||||
if @user && @user.authenticate(params[:password])
|
||||
session[:user_id] = @user.id
|
||||
end
|
||||
|
|
|
@ -4,7 +4,7 @@ class UsersController < ApplicationController
|
|||
end
|
||||
|
||||
def create
|
||||
@user = User.create(params.require(:user).permit(:username, :password))
|
||||
@user = User.create(params.require(:user).permit(:email, :password))
|
||||
session[:user_id] = @user.id
|
||||
redirect_to '/welcome'
|
||||
end
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<h1>Login</h1>
|
||||
<%= form_tag '/login' do %>
|
||||
<%= label_tag :username%>
|
||||
<%= text_field_tag :username %>
|
||||
<%= label_tag :email%>
|
||||
<%= text_field_tag :email %>
|
||||
<%= label_tag :password%>
|
||||
<%= password_field_tag :password%>
|
||||
<%= submit_tag "Login"%>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<h1>Welcome</h1>
|
||||
<% if logged_in? %>
|
||||
<h1>You are Logged In, <%= current_user.username %></h1>
|
||||
<h1>You are Logged In, <%= current_user.email %></h1>
|
||||
<%= button_to "Logout", '/logout', method: :get%>
|
||||
<%else%>
|
||||
<%= button_to "Login", '/login', method: :get%>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<h1>Sign Up</h1>
|
||||
<%= form_for @user do |f|%>
|
||||
<%= f.label :username%><br>
|
||||
<%= f.text_field :username%><br>
|
||||
<%= f.label :email%><br>
|
||||
<%= f.text_field :email%><br>
|
||||
<%= f.label :password%><br>
|
||||
<%= f.password_field :password%><br>
|
||||
<%= f.submit %>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue