Skip to content

Commit 689088a

Browse files
coopcodecoopcode
committed
finish sign in - still cant sign out
1 parent db6e9e6 commit 689088a

File tree

6 files changed

+76
-76
lines changed

6 files changed

+76
-76
lines changed

‎app/controllers/sessions_controller.rb‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
class SessionsController < ApplicationController
22

3-
def new
4-
end
3+
def new
4+
end
55

6-
def create
7-
user = User.find_by_email(params[:session][:email])
8-
if user && user.authenticate(params[:session][:password])
9-
sign_in user
10-
redirect_to user
11-
else
12-
flash.now[:error] = "Invalid email/password combination"
13-
render 'new'
14-
end
15-
end
6+
def create
7+
user = User.find_by_email(params[:session][:email])
8+
if user && user.authenticate(params[:session][:password])
9+
sign_in user
10+
redirect_to user
11+
else
12+
flash.now[:error] = 'Invalid email/password combination'
13+
render 'new'
14+
end
15+
end
1616

17-
def destroy
18-
sign_out
19-
redirect_to root_path
20-
end
17+
def destroy
18+
sign_out
19+
redirect_to root_path
20+
end
2121
end

‎app/controllers/users_controller.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ def new
1111
def create
1212
@user = User.new(params[:user])
1313
if @user.save
14+
sign_in @user
1415
flash[:success] = "Welcome to the Sample App!"
1516
redirect_to @user
1617
else

‎app/helpers/sessions_helper.rb‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
module SessionsHelper
22

3-
def sign_in(user)
4-
cookies.permanent[:remember_token] = user.remember_token
5-
self.current_user = user
6-
end
3+
def sign_in(user)
4+
cookies.permanent[:remember_token] = user.remember_token
5+
self.current_user = user
6+
end
77

8-
def signed_in?
9-
!current_user.nil?
10-
end
8+
def signed_in?
9+
!current_user.nil?
10+
end
1111

12-
def current_user=(user)
13-
@current_user = user
14-
end
12+
def current_user=(user)
13+
@current_user = user
14+
end
1515

16-
def current_user
17-
@current_user ||= User.find_by_remember_token(cookies[:remember_token])
18-
end
16+
def current_user
17+
@current_user ||= User.find_by_remember_token(cookies[:remember_token])
18+
end
1919

20-
def sign_out
21-
self.current_user = nil
22-
cookies.delete(:remember_token)
23-
end
20+
def sign_out
21+
current_user = nil
22+
cookies.delete(:remember_token)
23+
end
2424
end

‎app/models/user.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ class User < ActiveRecord::Base
22
attr_accessible :name, :email, :password, :password_confirmation
33
has_secure_password
44

5-
before_save { |user| user.email = user.email.downcase }
5+
before_save { |user| user.email = email.downcase }
66
before_save :create_remember_token
77

88
validates :name, presence: true, length: { maximum: 50 }

‎app/views/layouts/_header.html.erb‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1+
<header>
12
<header class="navbar navbar-fixed-top">
2-
<div class="navbar-inner">
3-
<div class="container">
4-
<%= link_to "sample app", root_path, id: "logo" %>
5-
<nav>
6-
<ul class="nav pull-right">
7-
<li><%= link_to "Home", root_path %></li>
8-
<li><%= link_to "Help", help_path %></li>
9-
<% if signed_in? %>
10-
<li><%= link_to "Users", '#' %></li>
11-
<li id="fat-menu" class="dropdown">
12-
<a href='#' class="dropdown-toggle" data-toggle="dropdown">
13-
Account <b class="caret"></b>
14-
</a>
15-
<ul class="dropdown-menu">
16-
<li><%= link_to "Profile", user_path(current_user) %></li>
17-
<li><%= link_to "Settings", '#' %></li>
18-
<li class="divider"></li>
19-
<li>
20-
<%= link_to "Sign out", signout_path, method: "delete" %>
21-
</li>
22-
</ul>
23-
</li>
24-
<% else %>
25-
<li><%= link_to "Sign in", signin_path %></li>
26-
<% end %>
27-
</ul>
28-
</nav>
29-
</div>
30-
</div>
3+
<div class="navbar-inner">
4+
<div class="container">
5+
<%= link_to "sample app", root_path, id: "logo" %>
6+
<nav>
7+
<ul class="nav pull-right">
8+
<li><%= link_to "Home", root_path %></li>
9+
<li><%= link_to "Help", help_path %></li>
10+
<% if signed_in? %>
11+
<li><%= link_to "Users", users_path %></li>
12+
<li id="fat-menu" class="dropdown">
13+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
14+
Account <b class="caret"></b>
15+
</a>
16+
<ul class="dropdown-menu">
17+
<li><%= link_to "Profile", current_user %></li>
18+
<li><%= link_to "Settings", edit_user_path(current_user) %></li>
19+
<li class="divider"></li>
20+
<li>
21+
<%= link_to "Sign out", signout_path, method: "delete" %>
22+
</li>
23+
</ul>
24+
</li>
25+
<% else %>
26+
<li><%= link_to "Sign in", signin_path %></li>
27+
<% end %>
28+
</ul>
29+
</nav>
30+
</div>
31+
</div>
3132
</header>

‎app/views/sessions/new.html.erb‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
<% provide(:title, 'Sign in') %>
1+
<% provide(:title, "Sign in") %>
22
<h1>Sign in</h1>
33

44
<div class="row">
5-
<div class="span6 offset3">
6-
<%= form_for(:session, url: sessions_path) do |f| %>
5+
<div class="span6 offset3">
6+
<%= form_for(:session, url: sessions_path) do |f| %>
77

8-
<%= f.label :email %>
9-
<%= f.text_field :email %>
8+
<%= f.label :email %>
9+
<%= f.text_field :email %>
1010

11-
<%= f.label :password %>
12-
<%= f.password_field :password %>
11+
<%= f.label :password %>
12+
<%= f.password_field :password %>
1313

14-
<%= f.submit "Sign in", class: "btn btn-large btn-primary" %>
14+
<%= f.submit "Sign in", class: "btn btn-large btn-primary" %>
15+
<% end %>
1516

16-
17-
<% end %>
18-
19-
<p>New User? <%= link_to "Sign up now!", signup_path %>
20-
</div>
17+
<p>New user? <%= link_to "Sign up now!", signup_path %></p>
18+
</div>
2119
</div>

0 commit comments

Comments
 (0)