routes.rb in artfully_ose-1.2.0.pre.20

- old
+ new

@@ -69,18 +69,19 @@
     resource  :checkout, :only => :create do
       get "dook", :to => "checkouts#dook"
     end
   end
 
-  devise_for :members, :controllers => { :invitations => "members/invitations" }
+  devise_for :members, :controllers => { :invitations => "members/invitations", :passwords => "members/passwords" }
   devise_for :users, :controllers => {:sessions => "users/sessions"}
   devise_scope :user do
     get "sign_up", :to => "devise/registrations#new"
   end
 
   namespace :members do
     root :to => "index#index"
+    resources :people, :only => :update
   end
 
   resources :organizations do
     put :tax_info, :on => :member
     resources :user_memberships
@@ -129,12 +130,17 @@
     resources :actions
     resources :memberships do
       collection do
         post :bulk_update
       end
+    end    
+
+    member do
+      post :reset_password
     end
-    resources :membership_awards, :only => :new
+    resources :membership_comps, :only => :new
+    resources :membership_cancellations, :only => [:new, :create]
     resources :membership_changes, :only => :create
 
     ["get_action",
      "change_action",
      "refund_action",
@@ -164,11 +170,11 @@
     people_actions
   end
 
   def shared_search_segment_routes
     resources :actions, :only => [:new, :create]
-    resources :membership_awards, :only => :new
+    resources :membership_comps, :only => :new
 
     member do
       post :tag
     end
   end
@@ -203,13 +209,13 @@
         post :unpublished
       end
       collection do
         post :built
         post :on_sale
-        get :calendar
-        get :all, :to => :index, :range => :all
-        get :upcoming
+        get  :calendar
+        get  :upcoming
+        get  "/:year/:month", :as => :monthly, :action => :index
       end
     end
     resource :venue, :only => [:edit, :update]
   end
 
@@ -263,11 +269,11 @@
   resources :comps, :only => [ :new, :create ]
   resources :merges, :only => [ :new, :create ]
   resources :membership_types
   resources :rolling_membership_types,  :controller => :membership_types
   resources :seasonal_membership_types, :controller => :membership_types
-  resources :membership_awards, :only => :create
+  resources :membership_comps, :only => :create
 
   resources :imports do
     member do
       get :approve
       get :recall
@@ -282,9 +288,10 @@
   match '/recent_activity' => 'index#recent_activity', :as => :recent_activity
   match '/events/:event_id/charts/' => 'events#assign', :as => :assign_chart, :via => "post"
   match '/dashboard' => 'index#dashboard', :constraints => lambda{|r| r.env["warden"].authenticate?}
 
   get ':organization_slug/:controller(/:action(/:id))', controller: /store\/[^\/]+/
+  match '/:organization_slug' => 'store/events#index', :as => :store_organization_events
 
   root :to => 'index#dashboard'
 
 end