X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Frouting.yml;h=d4defca02b2d7fdd04697427dca8ad2f33915ea5;hb=c1a201a4729ff05719ba8ec752baecd6615cda1e;hp=e8bf08a570a7314866a2bf25baa08bfe75c7975d;hpb=7e63b892f9682e62f6758bb51c6912499f5bd8d1;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/config/routing.yml b/app/config/routing.yml
index e8bf08a5..d4defca0 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,32 +1,97 @@
+wallabag_annotation:
+  type : rest
+  resource: "@WallabagAnnotationBundle/Resources/config/routing_annotations.yml"
+
+wallabag_import:
+    resource: "@WallabagImportBundle/Controller/"
+    type: annotation
+    prefix: /import
+
+wallabag_user:
+    resource: "@WallabagUserBundle/Controller/"
+    type: annotation
+    prefix: /users
+
 wallabag_api:
-    resource: "@WallabagApiBundle/Resources/config/routing.yml"
-    prefix:   /
+    resource: "@WallabagApiBundle/Controller/"
+    type: annotation
+    prefix: /
 
 app:
-    resource: @WallabagCoreBundle/Controller/
-    type:     annotation
+    resource: "@WallabagCoreBundle/Controller/"
+    type: annotation
 
 doc-api:
     resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
     prefix: /api/doc
 
-login:
-    pattern:   /login
-    defaults:  { _controller: WallabagCoreBundle:Security:login }
-
-login_check:
-    pattern:   /login_check
-
-logout:
-    path:   /logout
-
 rest :
     type : rest
     resource : "routing_rest.yml"
     prefix : /api
 
 homepage:
-    pattern:   "/{page}"
-    defaults:  { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 }
+    path: "/{page}"
+    defaults:
+        _controller: WallabagCoreBundle:Entry:showUnread
+        page : 1
     requirements:
-        page:  \d+
+        page: \d+
+
+fos_user:
+    resource: "@FOSUserBundle/Resources/config/routing/all.xml"
+
+fos_oauth_server_token:
+    resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"
+
+craue_config_settings_modify:
+    path: /settings
+    defaults:
+        _controller: CraueConfigBundle:Settings:modify
+
+fos_js_routing:
+    resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
+
+2fa_login:
+    path: /2fa
+    defaults:
+        _controller: "scheb_two_factor.form_controller:form"
+
+2fa_login_check:
+    path: /2fa_check
+
+# redirect RSS feed to Atom
+rss_to_atom_unread:
+    path: /{username}/{token}/unread.xml
+    defaults:
+        _controller: FrameworkBundle:Redirect:redirect
+        route: unread_feed
+        permanent: true
+
+rss_to_atom_archive:
+    path: /{username}/{token}/archive.xml
+    defaults:
+        _controller: FrameworkBundle:Redirect:redirect
+        route: archive_feed
+        permanent: true
+
+rss_to_atom_starred:
+    path: /{username}/{token}/starred.xml
+    defaults:
+        _controller: FrameworkBundle:Redirect:redirect
+        route: starred_feed
+        permanent: true
+
+rss_to_atom_all:
+    path: /{username}/{token}/all.xml
+    defaults:
+        _controller: FrameworkBundle:Redirect:redirect
+        route: all_feed
+        permanent: true
+
+rss_to_atom_tags:
+    path: /{username}/{token}/tags/{slug}.xml
+    defaults:
+        _controller: FrameworkBundle:Redirect:redirect
+        route: tag_feed
+        permanent: true