From 9542e3f7173e8ae25e7139e29adb8b6e0a7bf38b Mon Sep 17 00:00:00 2001 From: Ken Johnson Date: Thu, 25 Apr 2013 00:46:26 -0400 Subject: [PATCH] undid some mistakes --- app/controllers/sessions_controller.rb | 4 +-- app/controllers/tutorials_controller.rb | 6 +++++ app/controllers/users_controller.rb | 2 +- app/views/layouts/shared/_header.html.erb | 7 +---- app/views/layouts/tutorials.html.erb | 31 +++++++++++++++++++++++ app/views/tutorials/injection.html.erb | 0 config/routes.rb | 15 ++++++++--- 7 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 app/views/layouts/tutorials.html.erb create mode 100644 app/views/tutorials/injection.html.erb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 2ec2920..fa014dc 100755 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -3,14 +3,14 @@ class SessionsController < ApplicationController skip_before_filter :authenticated, :only => [:new, :create] def new - redirect_to dashboard_home_path(:dashboard_id => current_user.id) if current_user && current_user.id + redirect_to home_dashboard_index_path if current_user end def create user = User.authenticate(params[:email], params[:password]) if user session[:id] = user.id if User.where(:id => user.id).exists? - redirect_to dashboard_home_path(:dashboard_id => user.id) + redirect_to home_dashboard_index_path else render "new" end diff --git a/app/controllers/tutorials_controller.rb b/app/controllers/tutorials_controller.rb index 4e75115..a635d25 100755 --- a/app/controllers/tutorials_controller.rb +++ b/app/controllers/tutorials_controller.rb @@ -1,2 +1,8 @@ class TutorialsController < ApplicationController + + skip_before_filter :authenticated + + def injection + end + end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1686101..152a54b 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -10,7 +10,7 @@ class UsersController < ApplicationController user = User.new(params[:user]) if user.save session[:id] = user.id - redirect_to dashboard_home_path(:dashboard_id => user.id) + redirect_to home_dashboard_index_path else @user = User.new render :new diff --git a/app/views/layouts/shared/_header.html.erb b/app/views/layouts/shared/_header.html.erb index 36a90ce..8864c07 100755 --- a/app/views/layouts/shared/_header.html.erb +++ b/app/views/layouts/shared/_header.html.erb @@ -11,12 +11,7 @@