X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/cf85775b60d096583ec64a257e8a6afe47e21cd2..851d4e0ba5381535c55fe4347103aaa53c785606:/urls.py

diff --git a/urls.py b/urls.py
index dd6fede..08e08e5 100644
--- a/urls.py
+++ b/urls.py
@@ -3,10 +3,13 @@ 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'^logout/$', views.logout_view),
+	(r'^signup/$', views.create_user),
+	(r'', views.current_home),
 )