merged with mine

[zzz-floof.git] / floof / config / routing.py

diff --git a/floof/config/routing.py b/floof/config/routing.py
index c8f9e4e..c8b94b9 100644 (file)
--- a/floof/config/routing.py
+++ b/floof/config/routing.py
@@ -22,6 +22,7 @@ def make_map():
 
     map.connect('/', controller='main', action='index')
 
+    # User stuff
     map.connect('/account/login', controller='account', action='login')
     map.connect('/account/login_begin', controller='account', action='login_begin', **require_POST)
     map.connect('/account/login_finish', controller='account', action='login_finish')
@@ -29,6 +30,22 @@ def make_map():
     map.connect('/account/register', controller='account', action='register')
     map.connect('/account/register_finish', controller='account', action='register_finish', **require_POST)
 
+    map.connect('/users', controller='users', action='list')
+    map.connect('/users/{name}', controller='users', action='view')
+
+    # Art stuff
+    map.connect('/art/new', controller='art', action='new')
+    map.connect('/art/upload', controller='art', action='upload')
+    map.connect('/art/{id}', controller='art', action='show')
+    map.connect('/art/{id}/tag', controller='art', action='tag')
+
+    map.connect('/tag/{id}/delete', controller='tag', action='delete')
+
     map.connect('/search', controller='search', action='index')
 
+    # default routing is back so we can test stuff.
+    # please don't take it away until we have some more core features in.
+    map.connect('/{controller}/{action}')
+    map.connect('/{controller}/{action}/{id}')
+
     return map