Fixed URLs of one-sandwich views. Fixed adding sandwiches.

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

diff --git a/urls.py b/urls.py
index dd6fede..b370aff 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -3,10 +3,12 @@ import views
 from django.shortcuts import render_to_response
 
 urlpatterns = patterns('',
-       (r'^addsandwich/$', views.add_sandwich),
+       (r'^sandwich/add/$', views.add_sandwich),
+       (r'^sandwich/addingredient/$', views.add_ingredient),
+       (r'^sandwich/all/$', views.all_sandwich),
+       (r'^sandwich/(?P<year>[-\w]+)/(?P<month>[-\w]+)/$', views.sandwich_month),
+       url(r'^sandwich/(?P<slug>[-\w]+)/$', views.specific_sandwich, name='sandwich_by_slug'),
        (r'^login/$', views.login_view),
-       (r'^addingredient/$', views.add_ingredient),
-       (r'^allsandwiches/$', views.all_sandwich),
-       (r'^newsandwiches/$', views.newsandwiches),
-       (r'^sandwich/(?P<slug>[-\w]+)/$', views.specific_sandwich),
+       (r'^signup/$', views.create_user),
+       (r'', views.baseview),
 )