From: Raphaël Gertz Date: Mon, 19 Oct 2020 01:59:19 +0000 (+0200) Subject: Cleanup .orig files X-Git-Tag: 0.1~48 X-Git-Url: https://git.rapsys.eu/airlibre/commitdiff_plain/a14c1bf92a49d2bc97a7e54d861ccfa878aaa0ae?ds=sidebyside Cleanup .orig files --- diff --git a/config/packages/rapsys_air.yaml.orig b/config/packages/rapsys_air.yaml.orig deleted file mode 100644 index a43b962..0000000 --- a/config/packages/rapsys_air.yaml.orig +++ /dev/null @@ -1,245 +0,0 @@ -#RapsysAir configuration -rapsys_air: - #Contact - contact: - name: 'Raphaël Gertz' - mail: 'airlibre@rapsys.eu' - #Copyright - copy: - long: 'Raphaël Gertz all rights reserved' - short: 'Copyright 2019' - -#RapsysUser configuration -rapsys_user: - #Class replacement - class: - group: 'Rapsys\AirBundle\Entity\Group' - title: 'Rapsys\AirBundle\Entity\Title' - user: 'Rapsys\AirBundle\Entity\User' - #Route replacement - route: - index: - name: 'rapsys_air' - #Contact replacement - contact: - name: '%rapsys_air.contact.name%' - mail: '%rapsys_air.contact.mail%' - #Login replacement - login: - route: - index: 'site_url' - 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%' - #Recover replacement - recover: - route: - index: 'site_url' - 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%' - mail: - subject: '%%recipient_name%% welcome back to %%site_title%%' - html: '@RapsysAir/mail/recover.html.twig' - text: '@RapsysAir/mail/recover.text.twig' - context: - #Mail recover replacement - recover_mail: - route: - index: 'site_url' - 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%' - mail: - subject: '%%recipient_name%% welcome back to %%site_title%%' - html: '@RapsysAir/mail/recover_mail.html.twig' - text: '@RapsysAir/mail/recover_mail.text.twig' - context: - #Register replacement - register: - route: - index: 'site_url' - 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%' - mail: - subject: '%%recipient_name%% welcome to %%site_title%%' - html: '@RapsysAir/mail/register.html.twig' - text: '@RapsysAir/mail/register.text.twig' - context: - -#Doctrine configuration -doctrine: - #Orm configuration - orm: - #Force resolution of UserBundle entities to AirBundle one - #XXX: without these lines, relations are lookup in parent namespace ignoring AirBundle extension - resolve_target_entities: - Rapsys\UserBundle\Entity\Group: Rapsys\AirBundle\Entity\Group - Rapsys\UserBundle\Entity\Title: Rapsys\AirBundle\Entity\Title - Rapsys\UserBundle\Entity\User: Rapsys\AirBundle\Entity\User - -#Security configuration -security: - #Set encoders - encoders: - #Rapsys\AirBundle\Entity\User: plaintext - Rapsys\AirBundle\Entity\User: - algorithm: 'bcrypt' - - #Set providers - providers: - database: - entity: - class: Rapsys\AirBundle\Entity\User - property: mail - - #Set firewall - firewalls: - #Disables authentication for assets and the profiler, adapt it according to your needs - dev: - pattern: ^/(_(profiler|wdt)|css|images|js)/ - security: false - - main: - #Allow anonymous access - anonymous: ~ - - #Disable logout on user change - logout_on_user_change: true - - #Activate database provider - provider: database - - #XXX: https://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate - #http_basic: ~ - - #Set form login - #XXX: https://symfony.com/doc/current/security/form_login_setup.html - form_login: - use_referer: false - login_path: rapsys_user_login - check_path: rapsys_user_login - username_parameter: 'login[mail]' - password_parameter: 'login[password]' - - #Set logout route - logout: - path: /logout - target: / - - #Set custom access denied handler - access_denied_handler: Rapsys\AirBundle\Security\AccessDeniedHandler - - #Set role hierarchy - role_hierarchy: - ROLE_GUEST: [ 'ROLE_USER' ] - ROLE_REGULAR: [ 'ROLE_USER', 'ROLE_GUEST' ] - ROLE_SENIOR: [ 'ROLE_USER', 'ROLE_GUEST', 'ROLE_REGULAR' ] - ROLE_ADMIN: [ 'ROLE_USER', 'ROLE_GUEST', 'ROLE_REGULAR', 'ROLE_SENIOR' ] - -##Framework configuration -#XXX: don't use that shit, it breaks assets._default_package url generation -#framework: -# #Assets configuration -# assets: -# #Set default base path -# #base_path: '/bundles/%%s' -# #Set default version -# version: 'x' -# #Set default format -# version_format: '%%s?v=%%s' -# -# packages: -# pack_package: -# base_path: '/bundles/%%s' - -#Service configuration -services: - #Register twig file_get_contents extension - #XXX: obsolete by email.image twig filter in "twig/extensions" or "twig/html-extra" - rapsys_air.twig.file_get_contents: - class: 'Rapsys\AirBundle\Twig\FileGetContentsExtension' - tags: [ 'twig.extension' ] - #Register twig base64 extension - rapsys_air.twig.base64: - class: 'Rapsys\AirBundle\Twig\Base64Extension' - tags: [ 'twig.extension' ] - #Register twig bb2html extension - rapsys_air.twig.bb2html: - class: 'Rapsys\AirBundle\Twig\Bb2htmlExtension' - tags: [ 'twig.extension' ] - #Register default controller - Rapsys\AirBundle\Controller\DefaultController: - arguments: [ '@service_container', '@router', '@rapsys_user.slugger', '@translator' ] - tags: [ 'controller.service_arguments' ] - #Register location controller - Rapsys\AirBundle\Controller\LocationController: - arguments: [ '@service_container', '@translator', '@router' ] - tags: [ 'controller.service_arguments' ] - #Register access denied handler - Rapsys\AirBundle\Security\AccessDeniedHandler: - arguments: [ '@service_container', '@twig', '@router', '@translator' ] - #Register air fixtures - Rapsys\AirBundle\DataFixtures\AirFixtures: - tags: [ 'doctrine.fixture.orm' ] - #Replace default package - #XXX: set base path to /bundles/ and disable versioning - assets._default_package: - class: 'Rapsys\PackBundle\Asset\PathPackage' - arguments: [ '/bundles/%%s', '@assets.empty_version_strategy', '@assets.context' ] -# arguments: [ '/', '@assets.static_version_strategy', '@assets.context' ] -# #Set version strategy -# assets.static_version_strategy: -# class: Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy -# arguments: [ 'x', '%%s?v=%%s' ] - -#Twig Configuration -twig: -# #Enforce debug -# debug: true -# auto_reload: ~ -# cache: false - #Fix form layout for css - #XXX: @RapsysAir is a shortcut to vendor/rapsys/airbundle/Resources/views directory here - form_theme: [ '@RapsysAir/form/form_div_layout.html.twig' ] - #Set twig paths - paths: - #Required by email.image(site_logo) directive - #XXX: Allow twig to resolve @RapsysAir/png/logo.png in vendor/rapsys/airbundle/Resources/public/png/logo.png - '%kernel.project_dir%/vendor/rapsys/airbundle/Resources/public': 'RapsysAir' diff --git a/config/packages/rapsys_pack.yaml.orig b/config/packages/rapsys_pack.yaml.orig deleted file mode 100644 index da45381..0000000 --- a/config/packages/rapsys_pack.yaml.orig +++ /dev/null @@ -1,11 +0,0 @@ -#Services configuration -services: - #Register assets pack package - assets.pack_package: - class: Rapsys\PackBundle\Asset\PathPackage - arguments: [ '/', '@assets.empty_version_strategy', '@assets.context' ] - #Register twig pack extension - rapsys_pack.twig.pack_extension: - class: Rapsys\PackBundle\Twig\PackExtension - arguments: [ '@file_locator', '@service_container', '@assets.pack_package' ] - tags: [ twig.extension ] diff --git a/config/packages/rapsys_user.yaml.orig b/config/packages/rapsys_user.yaml.orig deleted file mode 100644 index 374e499..0000000 --- a/config/packages/rapsys_user.yaml.orig +++ /dev/null @@ -1,11 +0,0 @@ -#Service configuration -services: - #Register default controller - Rapsys\UserBundle\Controller\DefaultController: - arguments: [ '@service_container', '@translator', '@router' ] - autowire: true - tags: [ 'controller.service_arguments' ] - #Register slugger utils service - rapsys_user.slugger: - class: Rapsys\UserBundle\Utils\Slugger - arguments: [ '@service_container' ] diff --git a/config/routes/rapsys_air.yaml.orig b/config/routes/rapsys_air.yaml.orig deleted file mode 100644 index 518cc02..0000000 --- a/config/routes/rapsys_air.yaml.orig +++ /dev/null @@ -1,34 +0,0 @@ -rapsys_air_index: - path: / - controller: Rapsys\AirBundle\Controller\DefaultController::index - methods: GET - -rapsys_air_contact: - path: /contact - controller: Rapsys\AirBundle\Controller\DefaultController::contact - methods: GET|POST - -rapsys_air_policy: - path: /policy - controller: Rapsys\AirBundle\Controller\DefaultController::policy - methods: GET - -rapsys_air_location: - path: /locations - controller: Rapsys\AirBundle\Controller\LocationController::index - methods: GET - -rapsys_air_location_show: - path: /location/{id<\d+>} - controller: Rapsys\AirBundle\Controller\LocationController::show - methods: GET - -rapsys_air_user: - path: /users - controller: Rapsys\AirBundle\Controller\UserController::index - methods: GET - -rapsys_air_user_show: - path: /user/{id<\d+>} - controller: Rapsys\AirBundle\Controller\UserController::show - methods: GET