X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/d9db56e5acb06105b3cd05cc682936003500597d..HEAD:/urls.py

diff --git a/urls.py b/urls.py
index 091db55..774e399 100644
--- a/urls.py
+++ b/urls.py
@@ -3,12 +3,20 @@ import views
 from django.shortcuts import render_to_response
 
 urlpatterns = patterns('',
-	(r'^sandwiches/add/$', views.add_sandwich),
-	(r'^login/$', views.login_view),
-	(r'^newuser/$', views.create_user),
-	(r'^sandwiches/addingredient/$', views.add_ingredient),
-	(r'^sandwiches/all/$', views.all_sandwich),
-	(r'^sandwiches/new/$', views.newsandwiches),
-	(r'^sandwiches/(?P<slug>[-\w]+)/$', views.specific_sandwich),
-	(r'^sandwiches/(?P<year>[-\w]+)/(?P<month>[-\w]+)/$', views.sandwich_month),
+	url(r'^sandwich/index/$', views.index_sandwich, name='index_sandwich'),
+	url(r'^sandwich/add/$', views.add_sandwich, name='add_sandwich'),
+	url(r'^sandwich/all/$', views.all_sandwich, name='all_sandwiches'),
+	url(r'^users/(?P<username>[-\w]+)/sandwiches/', views.sandwich_user, name='sandwich_user'),
+	url(r'^users/(?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]+)/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'^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'),
 )