Cleanup structure

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

diff --git a/Resources/config/packages/rapsys_air.yaml b/Resources/config/packages/rapsys_air.yaml
index 5e17d574c1b499736536e8036faa6d282b19dc49..4553fb8b5c6f3124c1d1fe2d66726167ccdc4735 100644 (file)
--- a/Resources/config/packages/rapsys_air.yaml
+++ b/Resources/config/packages/rapsys_air.yaml
@@ -6,8 +6,7 @@ rapsys_air:
         mail: 'airlibre@rapsys.eu'
     #Copyright
     copy:
         mail: 'airlibre@rapsys.eu'
     #Copyright
     copy:

-        long: 'Raphaël Gertz all rights reserved'
-        short: 'Copyright 2019'
+        short: 'Copyright 2019-2020'

 
 #RapsysUser configuration
 rapsys_user:
 
 #RapsysUser configuration
 rapsys_user:


@@ -16,10 +15,20 @@ rapsys_user:
         group: 'Rapsys\AirBundle\Entity\Group'
         title: 'Rapsys\AirBundle\Entity\Title'
         user: 'Rapsys\AirBundle\Entity\User'
         group: 'Rapsys\AirBundle\Entity\Group'
         title: 'Rapsys\AirBundle\Entity\Title'
         user: 'Rapsys\AirBundle\Entity\User'

+    #Default replacement
+    default:
+        group: [ 'Senior' ]
+        title: 'Mister'

     #Route replacement
     route:
         index:
             name: 'rapsys_air'
     #Route replacement
     route:
         index:
             name: 'rapsys_air'

+    #Translate replacement
+    translate: [ 'title', 'site.title', 'copy.long', 'copy.short' ]
+    #Languages replacement
+    languages:
+        en: 'English'
+        fr: 'French'

     #Contact replacement
     contact:
         name: '%rapsys_air.contact.name%'
     #Contact replacement
     contact:
         name: '%rapsys_air.contact.name%'


@@ -27,78 +36,90 @@ rapsys_user:
     #Login replacement
     login:
         route:
     #Login replacement
     login:
         route:

-            index: 'site_url'
+            index: 'site.url'

         view:
             name: '@RapsysAir/form/login.html.twig'
             context:
                 title: 'Login'
         view:
             name: '@RapsysAir/form/login.html.twig'
             context:
                 title: 'Login'

-                copy_long: '%rapsys_air.copy.long%'
-                copy_short: '%rapsys_air.copy.short%'
-                site_ico: '%rapsys_air.site.ico%'
-                site_logo: '%rapsys_air.site.logo%'
-                site_png: '%rapsys_air.site.png%'
-                site_svg: '%rapsys_air.site.svg%'
-                site_title: '%rapsys_air.site.title%'
+                copy:
+                    long: '%rapsys_air.copy.long%'
+                    short: '%rapsys_air.copy.short%'
+                site:
+                    ico: '%rapsys_air.site.ico%'
+                    logo: '%rapsys_air.site.logo%'
+                    png: '%rapsys_air.site.png%'
+                    svg: '%rapsys_air.site.svg%'
+                    title: '%rapsys_air.site.title%'
+                    url: '%rapsys_air.site.url%'

     #Recover replacement
     recover:
         route:
     #Recover replacement
     recover:
         route:

-            index: 'site_url'
+            index: 'site.url'

             recover_mail: 'recover_url'
         view:
             name: '@RapsysAir/form/recover.html.twig'
             context:
                 title: 'Recover'
             recover_mail: 'recover_url'
         view:
             name: '@RapsysAir/form/recover.html.twig'
             context:
                 title: 'Recover'

-                copy_long: '%rapsys_air.copy.long%'
-                copy_short: '%rapsys_air.copy.short%'
-                site_ico: '%rapsys_air.site.ico%'
-                site_logo: '%rapsys_air.site.logo%'
-                site_png: '%rapsys_air.site.png%'
-                site_svg: '%rapsys_air.site.svg%'
-                site_title: '%rapsys_air.site.title%'
+                copy:
+                    long: '%rapsys_air.copy.long%'
+                    short: '%rapsys_air.copy.short%'
+                site:
+                    ico: '%rapsys_air.site.ico%'
+                    logo: '%rapsys_air.site.logo%'
+                    png: '%rapsys_air.site.png%'
+                    svg: '%rapsys_air.site.svg%'
+                    title: '%rapsys_air.site.title%'
+                    url: '%rapsys_air.site.url%'

         mail:
         mail:

-            subject: '%%recipient_name%% welcome back to %%site_title%%'
+            subject: 'Welcome back %%recipient_name%% to %%site.title%%'

             html: '@RapsysAir/mail/recover.html.twig'
             text: '@RapsysAir/mail/recover.text.twig'
             context:
     #Mail recover replacement
     recover_mail:
         route:
             html: '@RapsysAir/mail/recover.html.twig'
             text: '@RapsysAir/mail/recover.text.twig'
             context:
     #Mail recover replacement
     recover_mail:
         route:

-            index: 'site_url'
+            index: 'site.url'

             recover_mail: 'recover_url'
         view:
             name: '@RapsysAir/form/recover_mail.html.twig'
             context:
                 title: 'Mail recover'
             recover_mail: 'recover_url'
         view:
             name: '@RapsysAir/form/recover_mail.html.twig'
             context:
                 title: 'Mail recover'

-                copy_long: '%rapsys_air.copy.long%'
-                copy_short: '%rapsys_air.copy.short%'
-                site_ico: '%rapsys_air.site.ico%'
-                site_logo: '%rapsys_air.site.logo%'
-                site_png: '%rapsys_air.site.png%'
-                site_svg: '%rapsys_air.site.svg%'
-                site_title: '%rapsys_air.site.title%'
+                copy:
+                    long: '%rapsys_air.copy.long%'
+                    short: '%rapsys_air.copy.short%'
+                site:
+                    ico: '%rapsys_air.site.ico%'
+                    logo: '%rapsys_air.site.logo%'
+                    png: '%rapsys_air.site.png%'
+                    svg: '%rapsys_air.site.svg%'
+                    title: '%rapsys_air.site.title%'
+                    url: '%rapsys_air.site.url%'

         mail:
         mail:

-            subject: '%%recipient_name%% welcome back to %%site_title%%'
+            subject: 'Welcome back %%recipient_name%% to %%site.title%%'

             html: '@RapsysAir/mail/recover_mail.html.twig'
             text: '@RapsysAir/mail/recover_mail.text.twig'
             context:
     #Register replacement
     register:
         route:
             html: '@RapsysAir/mail/recover_mail.html.twig'
             text: '@RapsysAir/mail/recover_mail.text.twig'
             context:
     #Register replacement
     register:
         route:

-            index: 'site_url'
+            index: 'site.url'

         view:
             form: 'Rapsys\AirBundle\Form\RegisterType'
             name: '@RapsysAir/form/register.html.twig'
             context:
                 title: 'Register'
         view:
             form: 'Rapsys\AirBundle\Form\RegisterType'
             name: '@RapsysAir/form/register.html.twig'
             context:
                 title: 'Register'

-                copy_long: '%rapsys_air.copy.long%'
-                copy_short: '%rapsys_air.copy.short%'
-                site_ico: '%rapsys_air.site.ico%'
-                site_logo: '%rapsys_air.site.logo%'
-                site_png: '%rapsys_air.site.png%'
-                site_svg: '%rapsys_air.site.svg%'
-                site_title: '%rapsys_air.site.title%'
+                copy:
+                    long: '%rapsys_air.copy.long%'
+                    short: '%rapsys_air.copy.short%'
+                site:
+                    ico: '%rapsys_air.site.ico%'
+                    logo: '%rapsys_air.site.logo%'
+                    png: '%rapsys_air.site.png%'
+                    svg: '%rapsys_air.site.svg%'
+                    title: '%rapsys_air.site.title%'
+                    url: '%rapsys_air.site.url%'

         mail:
         mail:

-            subject: '%%recipient_name%% welcome to %%site_title%%'
+            subject: 'Welcome %%recipient_name%% to %%site.title%%'

             html: '@RapsysAir/mail/register.html.twig'
             text: '@RapsysAir/mail/register.text.twig'
             context:
             html: '@RapsysAir/mail/register.html.twig'
             text: '@RapsysAir/mail/register.text.twig'
             context:


@@ -186,6 +207,7 @@ framework:
         handler_id: ~
         cookie_secure: 'auto'
         cookie_samesite: 'lax'
         handler_id: ~
         cookie_secure: 'auto'
         cookie_samesite: 'lax'

+    disallow_search_engine_index: false

 #framework:
 #    error_controller: Rapsys\AirBundle\Controller\ErrorController::show
 #
 #framework:
 #    error_controller: Rapsys\AirBundle\Controller\ErrorController::show
 #


@@ -218,30 +240,51 @@ services:
     rapsys_air.twig.bb2html:
         class: 'Rapsys\AirBundle\Twig\Bb2htmlExtension'
         tags: [ 'twig.extension' ]
     rapsys_air.twig.bb2html:
         class: 'Rapsys\AirBundle\Twig\Bb2htmlExtension'
         tags: [ 'twig.extension' ]

+    #new TwigFilter('markdown_to_html', ['Twig\\Extra\\Markdown\\MarkdownRuntime', 'convert'], ['is_safe' => ['all']]),
+    #new TwigFilter('html_to_markdown', 'Twig\\Extra\\Markdown\\twig_html_to_markdown', ['is_safe' => ['all']]),
+    #Register twig markdown_to_html extension
+    #    #class: 'Twig\Extra\Markdown\DefaultMarkdown'
+    #rapsys_air.twig.markdown_eruse:
+    #    class: 'Twig\Extra\Markdown\DefaultMarkdown'
+    #rapsys_air.twig.markdown_runtime:
+    #    class: 'Twig\Extra\Markdown\MarkdownRuntime'
+    #    arguments: [ '@rapsys_air.twig.markdown_eruse' ]
+    #rapsys_air.markdown:
+    #    class: 'Twig\Extra\Markdown\MarkdownExtension'
+    #    tags: [ 'twig.extension' ]
+    #Register twig pack extension
+    #rapsys_pack.pack_extension:
+    #    class: 'Rapsys\PackBundle\Twig\PackExtension'
+    #    arguments: [ '@file_locator', '@service_container', '@rapsys_pack.path_package' ]
+    #    tags: [ 'twig.extension' ]
+    #Register application controller
+    Rapsys\AirBundle\Controller\ApplicationController:
+        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+        tags: [ 'controller.service_arguments' ]

     #Register default controller
     Rapsys\AirBundle\Controller\DefaultController:
     #Register default controller
     Rapsys\AirBundle\Controller\DefaultController:

-        arguments: [ '@service_container', '@router', '@rapsys.slugger', '@translator' ]
+        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register location controller
     Rapsys\AirBundle\Controller\LocationController:
         tags: [ 'controller.service_arguments' ]
     #Register location controller
     Rapsys\AirBundle\Controller\LocationController:

-        arguments: [ '@service_container', '@router', '@rapsys.slugger', '@translator' ]
+        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+        tags: [ 'controller.service_arguments' ]
+    #Register organizer controller
+    Rapsys\AirBundle\Controller\OrganizerController:
+        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register session controller
     Rapsys\AirBundle\Controller\SessionController:
         tags: [ 'controller.service_arguments' ]
     #Register session controller
     Rapsys\AirBundle\Controller\SessionController:

-        arguments: [ '@service_container', '@router', '@rapsys.slugger', '@translator' ]
-        tags: [ 'controller.service_arguments' ]
-    #Register application controller
-    Rapsys\AirBundle\Controller\ApplicationController:
-        arguments: [ '@service_container', '@router', '@rapsys.slugger', '@translator' ]
+        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]

         tags: [ 'controller.service_arguments' ]
         tags: [ 'controller.service_arguments' ]

-    #Register user controller
-    Rapsys\AirBundle\Controller\UserController:
-        arguments: [ '@service_container', '@router', '@rapsys.slugger', '@translator' ]
+    #Register snippet controller
+    Rapsys\AirBundle\Controller\SnippetController:
+        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register error controller
         tags: [ 'controller.service_arguments' ]
     #Register error controller

-    Rapsys\AirBundle\Controller\ErrorController:
-        arguments: [ '@service_container', '@router', '@rapsys.slugger', '@translator' ]
-        tags: [ 'controller.service_arguments' ]
+#    Rapsys\AirBundle\Controller\ErrorController:
+#        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+#        tags: [ 'controller.service_arguments' ]

     #Register locale event subscriber
     Rapsys\AirBundle\EventSubscriber\LocaleSubscriber:
         arguments: [ '@router', '%rapsys_air.locales%' ]
     #Register locale event subscriber
     Rapsys\AirBundle\EventSubscriber\LocaleSubscriber:
         arguments: [ '@router', '%rapsys_air.locales%' ]


@@ -258,7 +301,7 @@ services:
     #Replace assets packages
     assets.packages:
         class: 'Symfony\Component\Asset\Packages'
     #Replace assets packages
     assets.packages:
         class: 'Symfony\Component\Asset\Packages'

-        arguments: [ '@rapsys.path_package' ]
+        arguments: [ '@rapsys_pack.path_package' ]

 #   #Set version strategy
 #   assets.static_version_strategy:
 #       class: Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy
 #   #Set version strategy
 #   assets.static_version_strategy:
 #       class: Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy


@@ -266,6 +309,18 @@ services:
     Rapsys\AirBundle\Form\ApplicationType:
         arguments: [ '@doctrine', '@translator' ]
         tags: [ 'form.type' ]
     Rapsys\AirBundle\Form\ApplicationType:
         arguments: [ '@doctrine', '@translator' ]
         tags: [ 'form.type' ]

+    Rapsys\AirBundle\Form\SessionEditType:
+        arguments: [ '@doctrine' ]
+        tags: [ 'form.type' ]
+    Rapsys\AirBundle\Form\Extension\Type\HiddenEntityType:
+        arguments: [ '@doctrine' ]
+        tags: [ 'form.type' ]
+    Rapsys\AirBundle\Command\AttributeCommand:
+        arguments: [ '@doctrine' ]
+        tags: [ 'console.command' ]
+    Rapsys\AirBundle\Command\WeatherCommand:
+        arguments: [ '@doctrine' ]
+        tags: [ 'console.command' ]

 
 #Twig Configuration
 twig:
 
 #Twig Configuration
 twig: