Added Games and Users nav links. Renamed game_server to game_servers

jwang47 · Mar 8, 2013 · c2df7f2 · c2df7f2
1 parent ad8dcf1
commit c2df7f2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/app/controllers/game_server_controller.rb → app/controllers/game_servers_controller.rb b/app/controllers/game_server_controller.rb → app/controllers/game_servers_controller.rb
@@ -1,4  1,4 @@
-class GameServerController < ApplicationController
 class GameServersController < ApplicationController
 
   def check_servers
     GameServer.check_servers()

diff --git a/app/views/game_server/index.html.erb → app/views/game_servers/index.html.erb b/app/views/game_server/index.html.erb → app/views/game_servers/index.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -23,6  23,8 @@
         <div class="nav-collapse">
           <ul class="nav pull-right">
             <% if user_signed_in? %>
             <li><%= link_to "Games", game_servers_path %></li>
             <li><%= link_to "Users", users_path %></li>
             <li><%= link_to "Logged in as "   current_user.email, "javascript:void(0)" %></li>
             <li><%= link_to "Logout", destroy_user_session_path, :method => :delete %></li>
             <% else %>

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,12  1,13 @@
 CoPlatform::Application.routes.draw do
 
-  root :to => 'users#index'
   root :to => 'game_servers#index'
 
   post 'friendships' => 'friendships#create'
   get 'friendships' => 'friendships#index'
 
   get 'users/:id/friends' => 'users#friends'
 
   get 'users' => 'users#index', :as => 'users'
   devise_for :users
   devise_scope :users do
     namespace :api do
@@ -16,10  17,9 @@
     end
   end
 
-  get 'game_server/:id/heartbeat' => 'game_server#heartbeat'
-  get 'game_server/check' => 'game_server#check_servers'
-
-  resources :game_server
   get 'game_servers/:id/heartbeat' => 'game_servers#heartbeat'
   get 'game_servers/check' => 'game_servers#check_servers'
   resources :game_servers
 
   # The priority is based upon order of creation:
   # first created -> highest priority.