mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-01 21:21:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into bundle-update-2017-12-11-160933

Browse Source
This commit is contained in:
Shiny
2017-12-12 12:36:54 +13:00
committed by GitHub
parent 291f865f7f 7207a39039
commit 3be1454a69
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
config/routes.rb
View File

@@ -10,9 +10,9 @@ Growstuff::Application.routes.draw do
omniauth_callbacks: "omniauth_callbacks"
}
devise_scope :member do
get '/members/unsubscribe/:message' => 'members#unsubscribe', :as => 'unsubscribe_member'
get '/members/unsubscribe/:message' => 'members#unsubscribe', as: 'unsubscribe_member'
end
match '/members/:id/finish_signup' => 'members#finish_signup', via: %i(get patch), :as => :finish_signup
match '/members/:id/finish_signup' => 'members#finish_signup', via: %i(get patch), as: :finish_signup
resources :members
@@ -24,30 +24,30 @@ Growstuff::Application.routes.draw do
resources :plantings do
resources :harvests
end
get '/plantings/owner/:owner' => 'plantings#index', :as => 'plantings_by_owner'
get '/plantings/crop/:crop' => 'plantings#index', :as => 'plantings_by_crop'
get '/plantings/owner/:owner' => 'plantings#index', as: 'plantings_by_owner'
get '/plantings/crop/:crop' => 'plantings#index', as: 'plantings_by_crop'
resources :gardens
get '/gardens/owner/:owner' => 'gardens#index', :as => 'gardens_by_owner'
get '/gardens/owner/:owner' => 'gardens#index', as: 'gardens_by_owner'
resources :seeds
get '/seeds/owner/:owner' => 'seeds#index', :as => 'seeds_by_owner'
get '/seeds/crop/:crop' => 'seeds#index', :as => 'seeds_by_crop'
get '/seeds/owner/:owner' => 'seeds#index', as: 'seeds_by_owner'
get '/seeds/crop/:crop' => 'seeds#index', as: 'seeds_by_crop'
resources :harvests
get '/harvests/owner/:owner' => 'harvests#index', :as => 'harvests_by_owner'
get '/harvests/crop/:crop' => 'harvests#index', :as => 'harvests_by_crop'
get '/harvests/owner/:owner' => 'harvests#index', as: 'harvests_by_owner'
get '/harvests/crop/:crop' => 'harvests#index', as: 'harvests_by_crop'
resources :posts
get '/posts/author/:author' => 'posts#index', :as => 'posts_by_author'
get '/posts/author/:author' => 'posts#index', as: 'posts_by_author'
resources :scientific_names
resources :alternate_names
get 'crops/requested' => 'crops#requested', :as => 'requested_crops'
get 'crops/wrangle' => 'crops#wrangle', :as => 'wrangle_crops'
get 'crops/hierarchy' => 'crops#hierarchy', :as => 'crops_hierarchy'
get 'crops/search' => 'crops#search', :as => 'crops_search'
get 'crops/requested' => 'crops#requested', as: 'requested_crops'
get 'crops/wrangle' => 'crops#wrangle', as: 'wrangle_crops'
get 'crops/hierarchy' => 'crops#hierarchy', as: 'crops_hierarchy'
get 'crops/search' => 'crops#search', as: 'crops_search'
resources :crops do
get 'photos' => 'photos#index'
end
@@ -60,20 +60,20 @@ Growstuff::Application.routes.draw do
end
resources :follows, only: %i(create destroy)
get '/members/:login_name/follows' => 'members#view_follows', :as => 'member_follows'
get '/members/:login_name/followers' => 'members#view_followers', :as => 'member_followers'
get '/members/:login_name/follows' => 'members#view_follows', as: 'member_follows'
get '/members/:login_name/followers' => 'members#view_followers', as: 'member_followers'
get '/places' => 'places#index'
get '/places/search' => 'places#search', :as => 'search_places'
get '/places/:place' => 'places#show', :as => 'place'
get '/places/search' => 'places#search', as: 'search_places'
get '/places/:place' => 'places#show', as: 'place'
# everything for paid accounts etc
resources :account_types
resources :accounts
resources :orders
get 'orders/:id/checkout' => 'orders#checkout', :as => 'checkout_order'
get 'orders/:id/complete' => 'orders#complete', :as => 'complete_order'
get 'orders/:id/cancel' => 'orders#cancel', :as => 'cancel_order'
get 'orders/:id/checkout' => 'orders#checkout', as: 'checkout_order'
get 'orders/:id/complete' => 'orders#complete', as: 'complete_order'
get 'orders/:id/cancel' => 'orders#cancel', as: 'cancel_order'
resources :order_items
resources :products
@@ -93,7 +93,7 @@ Growstuff::Application.routes.draw do
get '/admin/orders' => 'admin/orders#index'
get '/admin/orders/:action' => 'admin/orders#:action'
get '/admin' => 'admin#index'
get '/admin/newsletter' => 'admin#newsletter', :as => :admin_newsletter
get '/admin/newsletter' => 'admin#newsletter', as: :admin_newsletter
get '/admin/:action' => 'admin#:action'
namespace :api do