user creation broken with all the routes... fixed

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 828e0f40d368a19c4cac6129cf7eba458a904a4d..ec32b518859ef5b6b8ad3412331a95a84db74a3e 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,15 +1,70 @@
 ActionController::Routing::Routes.draw do |map|
-  map.connect ':controller/service.wsdl', :action => 'wsdl'
 
+  # API
+  map.connect "api/#{API_VERSION}/node/create", :controller => 'node', :action => 'create'
+  map.connect "api/#{API_VERSION}/node/:id/history", :controller => 'old_node', :action => 'history', :id => nil
+  map.connect "api/#{API_VERSION}/node/:id", :controller => 'node', :action => 'rest', :id => nil 
+  map.connect "api/#{API_VERSION}/nodes", :controller => 'node', :action => 'nodes', :id => nil
+  
+  map.connect "api/#{API_VERSION}/segment/create", :controller => 'segment', :action => 'create'
+  map.connect "api/#{API_VERSION}/segment/:id/history", :controller => 'old_segment', :action => 'history'
+  map.connect "api/#{API_VERSION}/segment/:id", :controller => 'segment', :action => 'rest'
+  map.connect "api/#{API_VERSION}/segments", :controller => 'segment', :action => 'segments', :id => nil
+  
+  map.connect "api/#{API_VERSION}/way/create", :controller => 'way', :action => 'create'
+  map.connect "api/#{API_VERSION}/way/:id/history", :controller => 'old_way', :action => 'history', :id => nil
+  map.connect "api/#{API_VERSION}/way/:id", :controller => 'way', :action => 'rest', :id => nil
+  map.connect "api/#{API_VERSION}/ways", :controller => 'way', :action => 'ways', :id => nil
 
-  map.connect '/api/0.4/node/:id', :controller => 'node', :action => 'rest'
-  map.connect '/api/0.4/node/create', :controller => 'node', :action => 'create'
+  map.connect "api/#{API_VERSION}/map", :controller => 'api', :action => 'map'
+  
+  map.connect "api/#{API_VERSION}/user/details", :controller => 'user', :action => 'api_details'
+  map.connect "api/#{API_VERSION}/user/gpx_files", :controller => 'user', :action => 'api_gpx_files'
  
-  map.connect '/api/0.4/segment/:id', :controller => 'segment', :action => 'rest'
-  map.connect '/api/0.4/segment/create', :controller => 'segment', :action => 'create'
+  map.connect "api/#{API_VERSION}/gpx/create/:filename/:description/:tags", :controller => 'trace', :action => 'api_create'
+  map.connect "api/#{API_VERSION}/gpx/:id/details", :controller => 'trace', :action => 'api_details'
+  map.connect "api/#{API_VERSION}/gpx/:id/data", :controller => 'trace', :action => 'api_data'
+  
+  # web site
 
-  map.connect '/api/0.4/way/:id', :controller => 'way', :action => 'rest'
-  map.connect '/api/0.4/way/create', :controller => 'way', :action => 'create'
- 
-  map.connect ':controller/:action/:id'
+  map.connect '/', :controller => 'site', :action => 'index'
+  map.connect '/user/save', :controller => 'user', :action => 'save'
+  map.connect '/index.html', :controller => 'site', :action => 'index'
+  map.connect '/edit.html', :controller => 'site', :action => 'edit'
+  map.connect '/search.html', :controller => 'way_tag', :action => 'search'
+  map.connect '/login.html', :controller => 'user', :action => 'login'
+  map.connect '/logout.html', :controller => 'user', :action => 'logout'
+  map.connect '/create-account.html', :controller => 'user', :action => 'new'
+  map.connect '/forgot-password.html', :controller => 'user', :action => 'lost_password'
+
+  # traces  
+  map.connect '/traces', :controller => 'trace', :action => 'list'
+  map.connect '/traces/page/:page', :controller => 'trace', :action => 'list'
+  map.connect '/traces/mine', :controller => 'trace', :action => 'mine'
+  map.connect '/traces/mine/page/:page', :controller => 'trace', :action => 'mine'
+  map.connect '/traces/mine/tag/:tag', :controller => 'trace', :action => 'mine'
+  map.connect '/traces/mine/tag/:tag/page/:page', :controller => 'trace', :action => 'mine'
+  map.connect '/traces/rss', :controller => 'trace', :action => 'georss'
+  map.connect '/user/:display_name/traces', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/user/:display_name/traces/page/:page', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/user/:display_name/traces/:id', :controller => 'trace', :action => 'view', :id => nil
+  map.connect '/user/:display_name/traces/:id/picture', :controller => 'trace', :action => 'picture', :id => nil
+  map.connect '/user/:display_name/traces/:id/icon', :controller => 'trace', :action => 'icon', :id => nil
+  map.connect '/traces/tag/:tag', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list', :id => nil
+
+  # user pages
+  map.connect '/user/:display_name', :controller => 'user', :action => 'view'
+  map.connect '/user/:display_name/diary', :controller => 'user', :action => 'diary'
+  map.connect '/user/:display_name/diary/newpost', :controller => 'diary_entry', :action => 'new'
+  map.connect '/user/:display_name/edit', :controller => 'user', :action => 'edit'
+  map.connect '/user/:display_name/account', :controller => 'user', :action => 'account'
+
+  # test pages
+  map.connect '/test/populate/:table/:from/:count', :controller => 'test', :action => 'populate'
+  map.connect '/test/populate/:table/:count', :controller => 'test', :action => 'populate', :from => 1
+
+  # fall through
+  map.connect ':controller/:id/:action'
+  map.connect ':controller/:action'
 end