From 59b2dc33ea83d5d5a52a72d14213f564afe8f0ce Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 15:04:26 -0500 Subject: Gemfile.lock --- app/controllers/users_controller.rb | 3 +++ app/views/layouts/application.html.erb | 25 ------------------------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 app/views/layouts/application.html.erb (limited to 'app') diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ebcc3ac..f4e1499 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,4 +3,7 @@ class UsersController < ApplicationController def new end + def show + @user = User.find(param[:id]) + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index e2b8e02..0000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,25 +0,0 @@ - - - - Leaguer - <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= javascript_include_tag "application", "data-turbolinks-track" => true %> - <%= csrf_meta_tags %> - - -

Leaguer

- <%= form_tag("/search", method: "get", :id => "search-bar") do %> - <%= text_field_tag(:query, nil, :placeholder => "Search") %> - <%= submit_tag("Go") %> - <% end %> -

- -<%= yield %> - - - - - -- cgit v1.2.3-2-g168b From 7d84062ebe272855c0e6ebbfd991ab277fdc079f Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 15:59:50 -0500 Subject: currently adding Session controller and view --- app/controllers/application_controller.rb | 4 ++++ app/views/layouts/application.html.erb | 29 ----------------------------- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 app/views/layouts/application.html.erb (limited to 'app') diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e..03ef797 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,8 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception + + #include sessionhelper for the session controller and view + include SessionHelper + end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index 0deede3..0000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,29 +0,0 @@ - - - - Leaguer - <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= javascript_include_tag "application", "data-turbolinks-track" => true %> - <%= csrf_meta_tags %> - - - -<%= yield %> - -

- - - - -- cgit v1.2.3-2-g168b