X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/983e21db2e3ccc5f645f40a5f076d35e2b7897c2..e7f943c715d7104fd4f22fe59a79a5d52e71a7c4:/config/routes.rb?ds=inline diff --git a/config/routes.rb b/config/routes.rb index da7e0de71..b245e8fec 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,52 +6,52 @@ OpenStreetMap::Application.routes.draw do get "capabilities" => "api#capabilities" get "permissions" => "api#permissions" - put "changeset/create" => "changeset#create" - post "changeset/:id/upload" => "changeset#upload", :id => /\d+/ - get "changeset/:id/download" => "changeset#download", :as => :changeset_download, :id => /\d+/ - post "changeset/:id/expand_bbox" => "changeset#expand_bbox", :id => /\d+/ - get "changeset/:id" => "changeset#read", :as => :changeset_read, :id => /\d+/ - post "changeset/:id/subscribe" => "changeset#subscribe", :as => :changeset_subscribe, :id => /\d+/ - post "changeset/:id/unsubscribe" => "changeset#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/ - put "changeset/:id" => "changeset#update", :id => /\d+/ - put "changeset/:id/close" => "changeset#close", :id => /\d+/ - get "changesets" => "changeset#query" - post "changeset/:id/comment" => "changeset#comment", :as => :changeset_comment, :id => /\d+/ - post "changeset/comment/:id/hide" => "changeset#hide_comment", :as => :changeset_comment_hide, :id => /\d+/ - post "changeset/comment/:id/unhide" => "changeset#unhide_comment", :as => :changeset_comment_unhide, :id => /\d+/ - - put "node/create" => "node#create" - get "node/:id/ways" => "way#ways_for_node", :id => /\d+/ - get "node/:id/relations" => "relation#relations_for_node", :id => /\d+/ - get "node/:id/history" => "old_node#history", :id => /\d+/ - post "node/:id/:version/redact" => "old_node#redact", :version => /\d+/, :id => /\d+/ - get "node/:id/:version" => "old_node#version", :id => /\d+/, :version => /\d+/ - get "node/:id" => "node#read", :id => /\d+/ - put "node/:id" => "node#update", :id => /\d+/ - delete "node/:id" => "node#delete", :id => /\d+/ - get "nodes" => "node#nodes" - - put "way/create" => "way#create" - get "way/:id/history" => "old_way#history", :id => /\d+/ - get "way/:id/full" => "way#full", :id => /\d+/ - get "way/:id/relations" => "relation#relations_for_way", :id => /\d+/ - post "way/:id/:version/redact" => "old_way#redact", :version => /\d+/, :id => /\d+/ - get "way/:id/:version" => "old_way#version", :id => /\d+/, :version => /\d+/ - get "way/:id" => "way#read", :id => /\d+/ - put "way/:id" => "way#update", :id => /\d+/ - delete "way/:id" => "way#delete", :id => /\d+/ - get "ways" => "way#ways" - - put "relation/create" => "relation#create" - get "relation/:id/relations" => "relation#relations_for_relation", :id => /\d+/ - get "relation/:id/history" => "old_relation#history", :id => /\d+/ - get "relation/:id/full" => "relation#full", :id => /\d+/ - post "relation/:id/:version/redact" => "old_relation#redact", :version => /\d+/, :id => /\d+/ - get "relation/:id/:version" => "old_relation#version", :id => /\d+/, :version => /\d+/ - get "relation/:id" => "relation#read", :id => /\d+/ - put "relation/:id" => "relation#update", :id => /\d+/ - delete "relation/:id" => "relation#delete", :id => /\d+/ - get "relations" => "relation#relations" + put "changeset/create" => "changesets#create" + post "changeset/:id/upload" => "changesets#upload", :id => /\d+/ + get "changeset/:id/download" => "changesets#download", :as => :changeset_download, :id => /\d+/ + post "changeset/:id/expand_bbox" => "changesets#expand_bbox", :id => /\d+/ + get "changeset/:id" => "changesets#read", :as => :changeset_read, :id => /\d+/ + post "changeset/:id/subscribe" => "changesets#subscribe", :as => :changeset_subscribe, :id => /\d+/ + post "changeset/:id/unsubscribe" => "changesets#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/ + put "changeset/:id" => "changesets#update", :id => /\d+/ + put "changeset/:id/close" => "changesets#close", :id => /\d+/ + get "changesets" => "changesets#query" + post "changeset/:id/comment" => "changeset_comments#create", :as => :changeset_comment, :id => /\d+/ + post "changeset/comment/:id/hide" => "changeset_comments#destroy", :as => :changeset_comment_hide, :id => /\d+/ + post "changeset/comment/:id/unhide" => "changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/ + + put "node/create" => "nodes#create" + get "node/:id/ways" => "ways#ways_for_node", :id => /\d+/ + get "node/:id/relations" => "relations#relations_for_node", :id => /\d+/ + get "node/:id/history" => "old_nodes#history", :id => /\d+/ + post "node/:id/:version/redact" => "old_nodes#redact", :version => /\d+/, :id => /\d+/ + get "node/:id/:version" => "old_nodes#version", :id => /\d+/, :version => /\d+/ + get "node/:id" => "nodes#read", :id => /\d+/ + put "node/:id" => "nodes#update", :id => /\d+/ + delete "node/:id" => "nodes#delete", :id => /\d+/ + get "nodes" => "nodes#nodes" + + put "way/create" => "ways#create" + get "way/:id/history" => "old_ways#history", :id => /\d+/ + get "way/:id/full" => "ways#full", :id => /\d+/ + get "way/:id/relations" => "relations#relations_for_way", :id => /\d+/ + post "way/:id/:version/redact" => "old_ways#redact", :version => /\d+/, :id => /\d+/ + get "way/:id/:version" => "old_ways#version", :id => /\d+/, :version => /\d+/ + get "way/:id" => "ways#read", :id => /\d+/ + put "way/:id" => "ways#update", :id => /\d+/ + delete "way/:id" => "ways#delete", :id => /\d+/ + get "ways" => "ways#ways" + + put "relation/create" => "relations#create" + get "relation/:id/relations" => "relations#relations_for_relation", :id => /\d+/ + get "relation/:id/history" => "old_relations#history", :id => /\d+/ + get "relation/:id/full" => "relations#full", :id => /\d+/ + post "relation/:id/:version/redact" => "old_relations#redact", :version => /\d+/, :id => /\d+/ + get "relation/:id/:version" => "old_relations#version", :id => /\d+/, :version => /\d+/ + get "relation/:id" => "relations#read", :id => /\d+/ + put "relation/:id" => "relations#update", :id => /\d+/ + delete "relation/:id" => "relations#delete", :id => /\d+/ + get "relations" => "relations#relations" get "map" => "api#map" @@ -64,10 +64,10 @@ OpenStreetMap::Application.routes.draw do get "relations/search" => "search#search_relations" get "nodes/search" => "search#search_nodes" - get "user/:id" => "user#api_read", :id => /\d+/ - get "user/details" => "user#api_details" - get "user/gpx_files" => "user#api_gpx_files" - get "users" => "user#api_users", :as => :api_users + get "user/:id" => "users#api_read", :id => /\d+/ + get "user/details" => "users#api_details" + get "user/gpx_files" => "users#api_gpx_files" + get "users" => "users#api_users", :as => :api_users get "user/preferences" => "user_preferences#read" get "user/preferences/:preference_key" => "user_preferences#read_one" @@ -116,14 +116,14 @@ OpenStreetMap::Application.routes.draw do get "/relation/:id" => "browse#relation", :id => /\d+/, :as => :relation get "/relation/:id/history" => "browse#relation_history", :id => /\d+/ get "/changeset/:id" => "browse#changeset", :as => :changeset, :id => /\d+/ - get "/changeset/:id/comments/feed" => "changeset#comments_feed", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" } + get "/changeset/:id/comments/feed" => "changeset_comments#index", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" } get "/note/:id" => "browse#note", :id => /\d+/, :as => "browse_note" get "/note/new" => "browse#new_note" - get "/user/:display_name/history" => "changeset#index" - get "/user/:display_name/history/feed" => "changeset#feed", :defaults => { :format => :atom } + get "/user/:display_name/history" => "changesets#index" + get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom } get "/user/:display_name/notes" => "notes#mine" - get "/history/friends" => "changeset#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html } - get "/history/nearby" => "changeset#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html } + get "/history/friends" => "changesets#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html } + get "/history/nearby" => "changesets#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html } get "/browse/way/:id", :to => redirect(:path => "/way/%{id}") get "/browse/way/:id/history", :to => redirect(:path => "/way/%{id}/history") @@ -150,37 +150,37 @@ OpenStreetMap::Application.routes.draw do get "/fixthemap" => "site#fixthemap" get "/help" => "site#help" get "/about" => "site#about" - get "/history" => "changeset#index" - get "/history/feed" => "changeset#feed", :defaults => { :format => :atom } - get "/history/comments/feed" => "changeset#comments_feed", :as => :changesets_comments_feed, :defaults => { :format => "rss" } + get "/history" => "changesets#index" + get "/history/feed" => "changesets#feed", :defaults => { :format => :atom } + get "/history/comments/feed" => "changeset_comments#index", :as => :changesets_comments_feed, :defaults => { :format => "rss" } get "/export" => "site#export" - match "/login" => "user#login", :via => [:get, :post] - match "/logout" => "user#logout", :via => [:get, :post] + match "/login" => "users#login", :via => [:get, :post] + match "/logout" => "users#logout", :via => [:get, :post] get "/offline" => "site#offline" get "/key" => "site#key" get "/id" => "site#id" get "/query" => "browse#query" - get "/user/new" => "user#new" - post "/user/new" => "user#create" - get "/user/terms" => "user#terms" - post "/user/save" => "user#save" - get "/user/:display_name/confirm/resend" => "user#confirm_resend" - match "/user/:display_name/confirm" => "user#confirm", :via => [:get, :post] - match "/user/confirm" => "user#confirm", :via => [:get, :post] - match "/user/confirm-email" => "user#confirm_email", :via => [:get, :post] - post "/user/go_public" => "user#go_public" - match "/user/reset-password" => "user#reset_password", :via => [:get, :post] - match "/user/forgot-password" => "user#lost_password", :via => [:get, :post] - get "/user/suspended" => "user#suspended" + get "/user/new" => "users#new" + post "/user/new" => "users#create" + get "/user/terms" => "users#terms" + post "/user/save" => "users#save" + get "/user/:display_name/confirm/resend" => "users#confirm_resend" + match "/user/:display_name/confirm" => "users#confirm", :via => [:get, :post] + match "/user/confirm" => "users#confirm", :via => [:get, :post] + match "/user/confirm-email" => "users#confirm_email", :via => [:get, :post] + post "/user/go_public" => "users#go_public" + match "/user/reset-password" => "users#reset_password", :via => [:get, :post] + match "/user/forgot-password" => "users#lost_password", :via => [:get, :post] + get "/user/suspended" => "users#suspended" get "/index.html", :to => redirect(:path => "/") get "/create-account.html", :to => redirect(:path => "/user/new") get "/forgot-password.html", :to => redirect(:path => "/user/forgot-password") # omniauth - get "/auth/failure" => "user#auth_failure" - match "/auth/:provider/callback" => "user#auth_success", :via => [:get, :post], :as => :auth_success - match "/auth/:provider" => "user#auth", :via => [:get, :post], :as => :auth + get "/auth/failure" => "users#auth_failure" + match "/auth/:provider/callback" => "users#auth_success", :via => [:get, :post], :as => :auth_success + match "/auth/:provider" => "users#auth", :via => [:get, :post], :as => :auth # permalink get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/ @@ -214,36 +214,36 @@ OpenStreetMap::Application.routes.draw do post "/trace/:id/delete" => "traces#delete", :id => /\d+/ # diary pages - match "/diary/new" => "diary_entry#new", :via => [:get, :post] - get "/diary/friends" => "diary_entry#list", :friends => true, :as => "friend_diaries" - get "/diary/nearby" => "diary_entry#list", :nearby => true, :as => "nearby_diaries" - get "/user/:display_name/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss } - get "/diary/:language/rss" => "diary_entry#rss", :defaults => { :format => :rss } - get "/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss } - get "/user/:display_name/diary/comments/:page" => "diary_entry#comments", :page => /[1-9][0-9]*/ - get "/user/:display_name/diary/comments/" => "diary_entry#comments" - get "/user/:display_name/diary" => "diary_entry#list" - get "/diary/:language" => "diary_entry#list" - get "/diary" => "diary_entry#list" - get "/user/:display_name/diary/:id" => "diary_entry#show", :id => /\d+/, :as => :diary_entry - post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/ - match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/ - post "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :id => /\d+/, :as => :hide_diary_entry - post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entry#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment - post "/user/:display_name/diary/:id/subscribe" => "diary_entry#subscribe", :as => :diary_entry_subscribe, :id => /\d+/ - post "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/ + match "/diary/new" => "diary_entries#new", :via => [:get, :post] + get "/diary/friends" => "diary_entries#index", :friends => true, :as => "friend_diaries" + get "/diary/nearby" => "diary_entries#index", :nearby => true, :as => "nearby_diaries" + get "/user/:display_name/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss } + get "/diary/:language/rss" => "diary_entries#rss", :defaults => { :format => :rss } + get "/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss } + get "/user/:display_name/diary/comments/:page" => "diary_entries#comments", :page => /[1-9][0-9]*/ + get "/user/:display_name/diary/comments/" => "diary_entries#comments" + get "/user/:display_name/diary" => "diary_entries#index" + get "/diary/:language" => "diary_entries#index" + get "/diary" => "diary_entries#index" + get "/user/:display_name/diary/:id" => "diary_entries#show", :id => /\d+/, :as => :diary_entry + post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/ + match "/user/:display_name/diary/:id/edit" => "diary_entries#edit", :via => [:get, :post], :id => /\d+/ + post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry + post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment + post "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :as => :diary_entry_subscribe, :id => /\d+/ + post "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/ # user pages - get "/user/:display_name" => "user#show", :as => "user" - match "/user/:display_name/make_friend" => "user#make_friend", :via => [:get, :post], :as => "make_friend" - match "/user/:display_name/remove_friend" => "user#remove_friend", :via => [:get, :post], :as => "remove_friend" - match "/user/:display_name/account" => "user#account", :via => [:get, :post] - get "/user/:display_name/set_status" => "user#set_status", :as => :set_status_user - get "/user/:display_name/delete" => "user#delete", :as => :delete_user + get "/user/:display_name" => "users#show", :as => "user" + match "/user/:display_name/make_friend" => "users#make_friend", :via => [:get, :post], :as => "make_friend" + match "/user/:display_name/remove_friend" => "users#remove_friend", :via => [:get, :post], :as => "remove_friend" + match "/user/:display_name/account" => "users#account", :via => [:get, :post] + get "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user + get "/user/:display_name/delete" => "users#delete", :as => :delete_user # user lists - match "/users" => "user#list", :via => [:get, :post] - match "/users/:status" => "user#list", :via => [:get, :post] + match "/users" => "users#index", :via => [:get, :post] + match "/users/:status" => "users#index", :via => [:get, :post] # geocoder get "/search" => "geocoder#search" @@ -262,7 +262,9 @@ OpenStreetMap::Application.routes.draw do get "/export/embed" => "export#embed" # messages - resources :messages, :only => [:create, :show] do + resources :messages, :only => [:create, :show, :destroy] do + post :mark + match :reply, :via => [:get, :post] collection do get :inbox get :outbox @@ -272,9 +274,6 @@ OpenStreetMap::Application.routes.draw do get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox") get "/message/new/:display_name" => "messages#new", :as => "new_message" get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}") - post "/message/mark/:message_id" => "messages#mark", :as => "mark_message" - match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message" - post "/message/delete/:message_id" => "messages#destroy", :as => "destroy_message" # oauth admin pages (i.e: for setting up new clients, etc...) scope "/user/:display_name" do