diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa..e3a9f2d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,5 +12,6 @@ // //= require jquery //= require jquery_ujs +//= require bootstrap //= require turbolinks //= require_tree . diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 047893a..90543da 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,4 +1,5 @@ class SessionsController < ApplicationController + def new end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 79d2788..e99b734 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -8,4 +8,9 @@ def log_in(user) def current_user @current_user ||= User.find_by(id: session[:user_id]) end + + # Returns true if the user is logged in, false otherwise. + def logged_in? + !current_user.nil? + end end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 784095a..f582396 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -3,9 +3,26 @@ <%= link_to "sample app", root_path, id: "logo" %> diff --git a/kindling b/kindling new file mode 160000 index 0000000..881e8a2 --- /dev/null +++ b/kindling @@ -0,0 +1 @@ +Subproject commit 881e8a2a0d80b37c9eb21d949ea613d151015df8