Add description context

[airbundle] / Resources / config / routes / rapsys_air.yaml

diff --git a/Resources/config/routes/rapsys_air.yaml b/Resources/config/routes/rapsys_air.yaml
index ca01a8c76afe0ec759106dbd7197569079870791..3b54bf881a4e5742fee423700d7de26e9d5e9dfc 100644 (file)
--- a/Resources/config/routes/rapsys_air.yaml
+++ b/Resources/config/routes/rapsys_air.yaml
@@ -18,6 +18,14 @@ rapsys_air_about:
     controller: Rapsys\AirBundle\Controller\DefaultController::about
     methods: GET
 
     controller: Rapsys\AirBundle\Controller\DefaultController::about
     methods: GET
 

+#TODO: drop it or should we keep it to be able to add an application from multiple places ???
+rapsys_air_application_add:
+    path:
+        en_gb: '/en/application'
+        fr_fr: '/reservation'
+    controller: Rapsys\AirBundle\Controller\ApplicationController::add
+    methods: GET|POST
+

 rapsys_air_contact:
     path:
         en_gb: '/en/contact/{id<\d*>?}/{user<[\w-]*>?}'
 rapsys_air_contact:
     path:
         en_gb: '/en/contact/{id<\d*>?}/{user<[\w-]*>?}'


@@ -25,17 +33,12 @@ rapsys_air_contact:
     controller: Rapsys\AirBundle\Controller\DefaultController::contact
     methods: GET|POST
 
     controller: Rapsys\AirBundle\Controller\DefaultController::contact
     methods: GET|POST
 

-rapsys_air_calendar:
-    path:
-        en_gb: '/en/calendar'
-        fr_fr: '/calendrier'
-    controller: Rapsys\AirBundle\Controller\CalendarController::index
-    methods: GET|POST
-
-rapsys_air_calendar_callback:
-    path: '/calendar/callback'
-    controller: Rapsys\AirBundle\Controller\CalendarController::callback
-    methods: GET
+#rapsys_air_calendar:
+#    path:
+#        en_gb: '/en/calendar'
+#        fr_fr: '/calendrier'
+#    controller: Rapsys\AirBundle\Controller\CalendarController::index
+#    methods: GET|POST

 
 rapsys_air_city:
     path:
 
 rapsys_air_city:
     path:


@@ -79,27 +82,11 @@ rapsys_air_frequently_asked_questions:
     controller: Rapsys\AirBundle\Controller\DefaultController::frequentlyAskedQuestions
     methods: GET
 
     controller: Rapsys\AirBundle\Controller\DefaultController::frequentlyAskedQuestions
     methods: GET
 

-rapsys_air_organizer_regulation:
-    path:
-        en_gb: '/en/organizer-regulation'
-        fr_fr: '/reglement-organisateur'
-    controller: Rapsys\AirBundle\Controller\DefaultController::organizerRegulation
-    methods: GET
-
-rapsys_air_terms_of_service:
-    path:
-        en_gb: '/en/terms-of-service'
-        fr_fr: '/conditions-generales-d-utilisation'
-    controller: Rapsys\AirBundle\Controller\DefaultController::termsOfService
+rapsys_air_google_callback:
+    path: '/google/callback'
+    controller: Rapsys\AirBundle\Controller\UserController::googleCallback

     methods: GET
 
     methods: GET
 

-rapsys_air_dispute:
-    path:
-        en_gb: '/en/dispute'
-        fr_fr: '/contestation'
-    controller: Rapsys\AirBundle\Controller\DefaultController::dispute
-    methods: GET|POST
-

 rapsys_air_location:
     path:
         en_gb: '/en/location'
 rapsys_air_location:
     path:
         en_gb: '/en/location'


@@ -114,12 +101,12 @@ rapsys_air_location_view:
     controller: Rapsys\AirBundle\Controller\LocationController::view
     methods: GET
 
     controller: Rapsys\AirBundle\Controller\LocationController::view
     methods: GET
 

-rapsys_air_application_add:
+rapsys_air_organizer_regulation:

     path:
     path:

-        en_gb: '/en/application'
-        fr_fr: '/reservation'
-    controller: Rapsys\AirBundle\Controller\ApplicationController::add
-    methods: GET|POST
+        en_gb: '/en/organizer-regulation'
+        fr_fr: '/reglement-organisateur'
+    controller: Rapsys\AirBundle\Controller\DefaultController::organizerRegulation
+    methods: GET

 
 rapsys_air_session:
     path:
 
 rapsys_air_session:
     path:


@@ -156,6 +143,13 @@ rapsys_air_snippet_edit:
     controller: Rapsys\AirBundle\Controller\SnippetController::edit
     methods: POST
 
     controller: Rapsys\AirBundle\Controller\SnippetController::edit
     methods: POST
 

+rapsys_air_terms_of_service:
+    path:
+        en_gb: '/en/terms-of-service'
+        fr_fr: '/conditions-generales-d-utilisation'
+    controller: Rapsys\AirBundle\Controller\DefaultController::termsOfService
+    methods: GET
+

 rapsys_air_user:
     path:
         en_gb: '/en/user'
 rapsys_air_user:
     path:
         en_gb: '/en/user'


@@ -163,13 +157,6 @@ rapsys_air_user:
     controller: Rapsys\AirBundle\Controller\DefaultController::userIndex
     methods: GET
 
     controller: Rapsys\AirBundle\Controller\DefaultController::userIndex
     methods: GET
 

-rapsys_air_user_view:
-    path:
-        en_gb: '/en/user/{id<\d+>}/{user<[\w-]+>?}'
-        fr_fr: '/utilisateur/{id<\d+>}/{user<[\w-]+>?}'
-    controller: Rapsys\AirBundle\Controller\DefaultController::userView
-    methods: GET|POST
-

 rapsys_air_user_milongaraphael:
     path:
         en_gb: '/en/milonga-raphael'
 rapsys_air_user_milongaraphael:
     path:
         en_gb: '/en/milonga-raphael'


@@ -180,11 +167,18 @@ rapsys_air_user_milongaraphael:
         id: 1
         user: 'milonga-raphael'
 
         id: 1
         user: 'milonga-raphael'
 

+rapsys_air_user_view:
+    path:
+        en_gb: '/en/user/{id<\d+>}/{user<[\w-]+>?}'
+        fr_fr: '/utilisateur/{id<\d+>}/{user<[\w-]+>?}'
+    controller: Rapsys\AirBundle\Controller\DefaultController::userView
+    methods: GET|POST
+

 rapsys_user_confirm:
     path:
         en_gb: '/en/confirm/{hash}/{mail}'
         fr_fr: '/confirmer/{hash}/{mail}'
 rapsys_user_confirm:
     path:
         en_gb: '/en/confirm/{hash}/{mail}'
         fr_fr: '/confirmer/{hash}/{mail}'

-    controller: Rapsys\UserBundle\Controller\DefaultController::confirm
+    controller: Rapsys\UserBundle\Controller\UserController::confirm

     requirements:
         mail: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'
     requirements:
         mail: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'


@@ -204,7 +198,7 @@ rapsys_user_login:
     path:
         en_gb: '/en/login/{hash}/{mail}'
         fr_fr: '/connecter/{hash}/{mail}'
     path:
         en_gb: '/en/login/{hash}/{mail}'
         fr_fr: '/connecter/{hash}/{mail}'

-    controller: Rapsys\UserBundle\Controller\DefaultController::login
+    controller: Rapsys\UserBundle\Controller\UserController::login

     defaults:
         mail: ~
         hash: ~
     defaults:
         mail: ~
         hash: ~


@@ -223,7 +217,7 @@ rapsys_user_recover:
     path:
         en_gb: '/en/recover/{hash}/{pass}/{mail}'
         fr_fr: '/recuperer/{hash}/{pass}/{mail}'
     path:
         en_gb: '/en/recover/{hash}/{pass}/{mail}'
         fr_fr: '/recuperer/{hash}/{pass}/{mail}'

-    controller: Rapsys\UserBundle\Controller\DefaultController::recover
+    controller: Rapsys\UserBundle\Controller\UserController::recover

     defaults:
         mail: ~
         pass: ~
     defaults:
         mail: ~
         pass: ~


@@ -238,7 +232,7 @@ rapsys_user_register:
     path:
         en_gb: '/en/register/{hash}/{field}/{mail}'
         fr_fr: '/enregistrer/{hash}/{field}/{mail}'
     path:
         en_gb: '/en/register/{hash}/{field}/{mail}'
         fr_fr: '/enregistrer/{hash}/{field}/{mail}'

-    controller: Rapsys\UserBundle\Controller\DefaultController::register
+    controller: Rapsys\UserBundle\Controller\UserController::register

     defaults:
         mail: ~
         field: ~
     defaults:
         mail: ~
         field: ~