Redirects to error pages for most pages work. Still todo: adding/editing sandwiches...

[~kgodey/maayanwich.git] / urls.py

diff --git a/urls.py b/urls.py
index 2f8f17e..67695c8 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -4,13 +4,13 @@ from django.shortcuts import render_to_response
 
 urlpatterns = patterns('',
        url(r'^sandwich/add/$', views.add_sandwich, name='add_sandwich'),
 
 urlpatterns = patterns('',
        url(r'^sandwich/add/$', views.add_sandwich, name='add_sandwich'),

-       url(r'^sandwich/addingredient/$', views.add_ingredient, name='add_ingredient'),

        url(r'^sandwich/all/$', views.all_sandwich, name='all_sandwiches'),
        url(r'^sandwich/all/$', views.all_sandwich, name='all_sandwiches'),

+       url(r'^sandwich/(?P<gusername>[-\w]+)/edit/', views.edit_user, name='edit_user'),

        url(r'^sandwich/(?P<slug>[-\w]+)/edit/', views.edit_sandwich, name='edit_sandwich'),
        url(r'^sandwich/(?P<slug>[-\w]+)/edit/', views.edit_sandwich, name='edit_sandwich'),

+       url(r'^sandwich/(?P<slug>[-\w]+)/delete/', views.del_sandwich, name='del_sandwich'),

        url(r'^sandwich/(?P<slug>[-\w]+)/$', views.specific_sandwich, name='sandwich_by_slug'),
        url(r'^sandwich/(?P<year>[-\w]+)/(?P<month>[-\w]+)/$', views.sandwich_month, name='sandwich_by_month'),
        url(r'^login/$', views.login_view, name='login'),
        url(r'^sandwich/(?P<slug>[-\w]+)/$', views.specific_sandwich, name='sandwich_by_slug'),
        url(r'^sandwich/(?P<year>[-\w]+)/(?P<month>[-\w]+)/$', views.sandwich_month, name='sandwich_by_month'),
        url(r'^login/$', views.login_view, name='login'),

-       url(r'^login2/$', views.login_view2, name='login2'),

        url(r'^logout/$', views.logout_view, name='logout'),
        url(r'^signup/$', views.create_user, name='signup'),
        url(r'^ajaxfun', views.ajaxfun, name='ajaxfun'),
        url(r'^logout/$', views.logout_view, name='logout'),
        url(r'^signup/$', views.create_user, name='signup'),
        url(r'^ajaxfun', views.ajaxfun, name='ajaxfun'),