diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 18:40:38 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 18:40:38 -0500 |
| commit | 0329e2cee29367c82ef1b4ea5e8ab700f5d82bea (patch) | |
| tree | a54783b121877d9521f609290b839cb4f619f3bd | |
| parent | a364cf0a6f2b64ba34f89aefb2ebbcdecedffd4a (diff) | |
| parent | e6b04ece9e8b986cc7704c926c48d2c729a9f2e1 (diff) | |
last hope
Merge branch 'master' of https://github.com/LukeShu/leaguer
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e13a8df..9cc30bc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,7 +20,7 @@ <div id="log-buttons"> <% if signed_in? %> <%= current_user.user_name.upcase %> - <%= link_to "Sign out", session_path("/signout"), method: "delete", :class => "signout", :role => "button" %> + <%= link_to "Sign out", "/signout", method: "delete", :class => "signout", :role => "button" %> <% else %> <%= link_to "Log in", new_session_path, :class => "signin", :role => "button" %> <%= link_to "Sign up", new_user_path, :class => "signup", :role => "button" diff --git a/config/routes.rb b/config/routes.rb index a4badf9..90abea4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,11 +1,13 @@ Leaguer::Application.routes.draw do + resources :sessions, only: [:new, :create, :destroy] + + #creates sessions as a resource but limits it to these actions match '/signup', to: 'users#new', via: 'get' match '/signin', to: 'sessions#new', via: 'get' - match '/signout', to: 'sessions#destroy', via: 'delete' + match '/signout', to: 'sessions#destroy', via: 'get' - resources :sessions, only: [:new, :create, :destroy] resources :users |