summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-03-03 12:22:57 -0500
committerDavisLWebb <davislwebb@ymail.com>2014-03-03 12:22:57 -0500
commitd6cd8be7b4b5453e93faf11858c3e888f23a8ed9 (patch)
tree031b3216d2be62e36d143e822a387998f7b038e6 /app
parent399543c7ad0577afa2c840b1e39e368acfcb0076 (diff)
I HAVE THE WEBSITE RENDER THE USER'S USER NAME
Diffstat (limited to 'app')
-rw-r--r--app/helpers/sessions_helper.rb8
-rw-r--r--app/views/layouts/application.html.erb7
2 files changed, 13 insertions, 2 deletions
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index 29a5c90..20010c8 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -14,10 +14,14 @@ module SessionsHelper
#method creating for self.current_user
def current_user=(user)
- remember_token = User.hash(cookies[:remember_token])
- @current_user ||= User.find_by(remember_token: remember_token)
+ @current_user = user
end
+ def current_user
+ remember_token = User.hash(cookies[:remember_token])
+ @current_user ||= User.find_by(remember_token: remember_token)
+ end
+
# checks if someone is currently signed in
def signed_in?
!current_user.nil?
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 8a81c0a..469f024 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -18,9 +18,16 @@
<%= submit_tag("Go", {:class => "btn btn-warning"}) %>
<% end %>
</div>
+ <li>
+ <%= link_to "Sign out", signout_path, method: "delete" %>
+ </li>
</header>
</div>
+ <% if signed_in? %>
+ <li> <%= current_user.user_name %> </li>
+ <% end %>
+
<div class="container">
<%= yield %>
</div>