X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/2d13c64cccabf18b2ee17dac2f0c54280edd9327..12de092f5614a8b7b1cb7ad7ac7470bdf75d4b8d:/urls.py

diff --git a/urls.py b/urls.py
index 84cb5ae..fa3969c 100644
--- a/urls.py
+++ b/urls.py
@@ -3,12 +3,19 @@ import views
 from django.shortcuts import render_to_response
 
 urlpatterns = patterns('',
-	(r'^addsandwich/$', views.add_sandwich),
-	(r'^login/$', views.login_view),
-	(r'^newuser/$', views.create_user),
-	(r'^addingredient/$', views.add_ingredient),
-	(r'^allsandwiches/$', views.all_sandwich),
-	(r'^newsandwiches/$', views.newsandwiches),
-	(r'^sandwich/(?P<slug>[-\w]+)/$', views.specific_sandwich),
-	(r'^sandwich/(?P<year>[-\w]+)/(?P<month>[-\w]+)/$', views.sandwich_month),
+	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/(?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'^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'^comments/posted/$', views.comment_posted, name='comment_posted'),
+	(r'^comments/', include('django.contrib.comments.urls')),
+	url(r'^home/$', views.current_home, name='index'),
 )