diff --git a/.cpkgrc b/.cpkgrc deleted file mode 100755 index 64010a1..0000000 --- a/.cpkgrc +++ /dev/null @@ -1,4 +0,0 @@ -REPO=stable -DISTRIB=eole -VERSION=2.7.2 -pversion='' diff --git a/src/schedule-2.0/.dockerignore b/.dockerignore similarity index 100% rename from src/schedule-2.0/.dockerignore rename to .dockerignore diff --git a/src/schedule-2.0/.env b/.env similarity index 100% rename from src/schedule-2.0/.env rename to .env diff --git a/src/schedule-2.0/.env.test b/.env.test similarity index 100% rename from src/schedule-2.0/.env.test rename to .env.test diff --git a/.gitignore b/.gitignore index b25c15b..dbde60c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,27 @@ -*~ + +###> symfony/framework-bundle ### +/.env.local +/.env.local.php +/.env.*.local +/config/secrets/prod/prod.decrypt.private.php +/public/bundles/ +/var/ +/vendor/ +###< symfony/framework-bundle ### + +###> symfony/phpunit-bridge ### +.phpunit +.phpunit.result.cache +/phpunit.xml +###< symfony/phpunit-bridge ### + +###> symfony/webpack-encore-bundle ### +/node_modules/ +npm-debug.log +yarn-error.log +###< symfony/webpack-encore-bundle ### + +###> uploads ### +/public/uploads +/uploads +###> uploads ### diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..a223541 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "php.version": "7.4" +} \ No newline at end of file diff --git a/Makefile b/Makefile deleted file mode 100644 index 1a17041..0000000 --- a/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -################################ -# Makefile -################################ - -SOURCE=schedule -VERSION=2.0 -EOLE_VERSION=2.7 -EOLE_RELEASE=2.7.1 -PKGAPPS=web - -################################ -# Début de zone à ne pas éditer -################################ - -include eole.mk -include apps.mk - -################################ -# Fin de zone à ne pas éditer -################################ - -# Makefile rules dedicated to application -# if exists -ifneq (, $(strip $(wildcard $(SOURCE).mk))) -include $(SOURCE).mk -endif diff --git a/apps.mk b/apps.mk deleted file mode 100644 index 1efe7df..0000000 --- a/apps.mk +++ /dev/null @@ -1,64 +0,0 @@ -# -# NE PAS EDITER CE FICHIER -# -# Voir Makefile - - -########################## -# Application web envole # -########################## -ifneq (, $(filter oui web, $(PKGAPPS))) -# -# Sanity check -# -ifeq (, $(filter-out X.X, $(strip $(VERSION)))) -$(error $$(VERSION) variable has incorrect value '$(VERSION)') -endif - -# Where to store web application files -WEB_PATH := $(DESTDIR)/var/www/html - -# Envole -sharenvole_PROG_DIR := $(DESTDIR)/usr/share/envole/$(SOURCE) - -src_$(SOURCE)-$(VERSION)_REC_DIR := $(WEB_PATH)/$(SOURCE) -src_plugins-$(VERSION)_REC_DIR := $(WEB_PATH)/$(SOURCE)/plugin -src_lang-$(VERSION)_REC_DIR := $(WEB_PATH)/$(SOURCE)/lang - -endif - -########################## -# Application EOLE flask # -########################## -ifneq (, $(filter flask, $(PKGAPPS))) -# -# Sanity check -# -ifeq (, $(filter-out XXX, $(strip $(FLASK_MODULE)))) -$(error $$(FLASK_MODULE) variable has incorrect value '$(FLASK_MODULE)') -endif - -ifeq (, $(strip $(wildcard src/$(FLASK_MODULE).conf))) -$(error missing eoleflask configuration file 'src/$(FLASK_MODULE).conf') -endif - -# Everything is related to mount point -APPS_MOUNT_POINT := $(shell sed -ne 's|^"MOUNT_POINT"[[:space:]]*:[[:space:]]*"/\([^"]*\)",|\1|p' \ - src/$(FLASK_MODULE).conf) - -ifeq (, $(strip $(APPS_MOUNT_POINT))) -$(error no "MOUNT_POINT" in eoleflask configuration file 'src/$(FLASK_MODULE).conf') -endif - -# eole-flask configuration -src_DATA_DIR := $(DESTDIR)/etc/eole/flask/available - -# Where to store flask application files -FLASK_PATH := $(eole_DIR)/flask/$(APPS_MOUNT_POINT) - -# static files -src_$(FLASK_MODULE)_static_REC_DIR := $(FLASK_PATH)/static -src_$(FLASK_MODULE)_templates_REC_DIR := $(FLASK_PATH)/templates -src_$(FLASK_MODULE)_instance_REC_DIR := $(FLASK_PATH)/resources - -endif diff --git a/src/schedule-2.0/assets/js/app.js b/assets/js/app.js similarity index 100% rename from src/schedule-2.0/assets/js/app.js rename to assets/js/app.js diff --git a/src/schedule-2.0/assets/js/datatables.init.js b/assets/js/datatables.init.js similarity index 100% rename from src/schedule-2.0/assets/js/datatables.init.js rename to assets/js/datatables.init.js diff --git a/src/schedule-2.0/assets/js/dropzone.js b/assets/js/dropzone.js similarity index 100% rename from src/schedule-2.0/assets/js/dropzone.js rename to assets/js/dropzone.js diff --git a/src/schedule-2.0/assets/js/fullcalendar.js b/assets/js/fullcalendar.js similarity index 100% rename from src/schedule-2.0/assets/js/fullcalendar.js rename to assets/js/fullcalendar.js diff --git a/src/schedule-2.0/assets/js/timer.js b/assets/js/timer.js similarity index 100% rename from src/schedule-2.0/assets/js/timer.js rename to assets/js/timer.js diff --git a/src/schedule-2.0/bin/console b/bin/console similarity index 100% rename from src/schedule-2.0/bin/console rename to bin/console diff --git a/src/schedule-2.0/bin/phpunit b/bin/phpunit similarity index 100% rename from src/schedule-2.0/bin/phpunit rename to bin/phpunit diff --git a/src/schedule-2.0/composer.json b/composer.json similarity index 98% rename from src/schedule-2.0/composer.json rename to composer.json index 6fb6a0a..aa43c56 100644 --- a/src/schedule-2.0/composer.json +++ b/composer.json @@ -44,6 +44,7 @@ "tetranz/select2entity-bundle": "^3.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "*", "symfony/debug-pack": "*", "symfony/test-pack": "*" }, @@ -95,4 +96,4 @@ "require": "4.4.*" } } -} \ No newline at end of file +} diff --git a/src/schedule-2.0/composer.lock b/composer.lock similarity index 95% rename from src/schedule-2.0/composer.lock rename to composer.lock index 35eef78..92f2435 100644 --- a/src/schedule-2.0/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1ad3ebfcef7f9cf273d256ed17d9bfa1", + "content-hash": "b88b4bb7a5b2d82324133b372e47e930", "packages": [ { "name": "clue/stream-filter", @@ -8629,6 +8629,385 @@ } ], "packages-dev": [ + { + "name": "composer/pcre", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.3", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/1.0.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-01-21T20:24:37+00:00" + }, + { + "name": "composer/semver", + "version": "3.4.4", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95", + "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.4.4" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + } + ], + "time": "2025-08-20T19:15:30+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a", + "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a", + "shasum": "" + }, + "require": { + "composer/pcre": "^1", + "php": "^5.3.2 || ^7.0 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/2.0.5" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-02-24T20:20:32+00:00" + }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v2.19.3", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/75ac86f33fab4714ea5a39a396784d83ae3b5ed8", + "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8", + "shasum": "" + }, + "require": { + "composer/semver": "^1.4 || ^2.0 || ^3.0", + "composer/xdebug-handler": "^1.2 || ^2.0", + "doctrine/annotations": "^1.2", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^5.6 || ^7.0 || ^8.0", + "php-cs-fixer/diff": "^1.3", + "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", + "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", + "symfony/filesystem": "^3.0 || ^4.0 || ^5.0", + "symfony/finder": "^3.0 || ^4.0 || ^5.0", + "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0", + "symfony/polyfill-php70": "^1.0", + "symfony/polyfill-php72": "^1.4", + "symfony/process": "^3.0 || ^4.0 || ^5.0", + "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" + }, + "require-dev": { + "justinrainbow/json-schema": "^5.0", + "keradus/cli-executor": "^1.4", + "mikey179/vfsstream": "^1.6", + "php-coveralls/php-coveralls": "^2.4.2", + "php-cs-fixer/accessible-object": "^1.0", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", + "phpspec/prophecy-phpunit": "^1.1 || ^2.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5", + "phpunitgoodpractices/polyfill": "^1.5", + "phpunitgoodpractices/traits": "^1.9.1", + "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1", + "symfony/phpunit-bridge": "^5.2.1", + "symfony/yaml": "^3.0 || ^4.0 || ^5.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters.", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", + "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.19-dev" + } + }, + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + }, + "classmap": [ + "tests/Test/AbstractFixerTestCase.php", + "tests/Test/AbstractIntegrationCaseFactory.php", + "tests/Test/AbstractIntegrationTestCase.php", + "tests/Test/Assert/AssertTokensTrait.php", + "tests/Test/IntegrationCase.php", + "tests/Test/IntegrationCaseFactory.php", + "tests/Test/IntegrationCaseFactoryInterface.php", + "tests/Test/InternalIntegrationCaseFactory.php", + "tests/Test/IsIdenticalConstraint.php", + "tests/Test/TokensWithObservedTransformers.php", + "tests/TestCase.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "support": { + "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.3" + }, + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2021-11-15T17:17:55+00:00" + }, + { + "name": "php-cs-fixer/diff", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", + "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", + "symfony/process": "^3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "SpacePossum" + } + ], + "description": "sebastian/diff v2 backport support for PHP5.6", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "support": { + "issues": "https://github.com/PHP-CS-Fixer/diff/issues", + "source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1" + }, + "abandoned": true, + "time": "2020-10-14T08:39:05+00:00" + }, { "name": "symfony/browser-kit", "version": "v4.4.15", @@ -8996,7 +9375,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -9004,5 +9383,6 @@ "ext-ctype": "*", "ext-iconv": "*" }, - "platform-dev": [] + "platform-dev": {}, + "plugin-api-version": "2.6.0" } diff --git a/src/schedule-2.0/config/bootstrap.php b/config/bootstrap.php similarity index 100% rename from src/schedule-2.0/config/bootstrap.php rename to config/bootstrap.php diff --git a/src/schedule-2.0/config/bundles.php b/config/bundles.php similarity index 100% rename from src/schedule-2.0/config/bundles.php rename to config/bundles.php diff --git a/src/schedule-2.0/config/packages/assets.yaml b/config/packages/assets.yaml similarity index 100% rename from src/schedule-2.0/config/packages/assets.yaml rename to config/packages/assets.yaml diff --git a/src/schedule-2.0/config/packages/cache.yaml b/config/packages/cache.yaml similarity index 100% rename from src/schedule-2.0/config/packages/cache.yaml rename to config/packages/cache.yaml diff --git a/src/schedule-2.0/config/packages/dev/debug.yaml b/config/packages/dev/debug.yaml similarity index 100% rename from src/schedule-2.0/config/packages/dev/debug.yaml rename to config/packages/dev/debug.yaml diff --git a/src/schedule-2.0/config/packages/dev/easy_log_handler.yaml b/config/packages/dev/easy_log_handler.yaml similarity index 100% rename from src/schedule-2.0/config/packages/dev/easy_log_handler.yaml rename to config/packages/dev/easy_log_handler.yaml diff --git a/src/schedule-2.0/config/packages/dev/monolog.yaml b/config/packages/dev/monolog.yaml similarity index 100% rename from src/schedule-2.0/config/packages/dev/monolog.yaml rename to config/packages/dev/monolog.yaml diff --git a/src/schedule-2.0/config/packages/dev/swiftmailer.yaml b/config/packages/dev/swiftmailer.yaml similarity index 100% rename from src/schedule-2.0/config/packages/dev/swiftmailer.yaml rename to config/packages/dev/swiftmailer.yaml diff --git a/src/schedule-2.0/config/packages/dev/web_profiler.yaml b/config/packages/dev/web_profiler.yaml similarity index 100% rename from src/schedule-2.0/config/packages/dev/web_profiler.yaml rename to config/packages/dev/web_profiler.yaml diff --git a/src/schedule-2.0/config/packages/doctrine.yaml b/config/packages/doctrine.yaml similarity index 100% rename from src/schedule-2.0/config/packages/doctrine.yaml rename to config/packages/doctrine.yaml diff --git a/src/schedule-2.0/config/packages/doctrine_migrations.yaml b/config/packages/doctrine_migrations.yaml similarity index 100% rename from src/schedule-2.0/config/packages/doctrine_migrations.yaml rename to config/packages/doctrine_migrations.yaml diff --git a/src/schedule-2.0/config/packages/fos_ckeditor.yaml b/config/packages/fos_ckeditor.yaml similarity index 100% rename from src/schedule-2.0/config/packages/fos_ckeditor.yaml rename to config/packages/fos_ckeditor.yaml diff --git a/src/schedule-2.0/config/packages/fos_rest.yaml b/config/packages/fos_rest.yaml similarity index 100% rename from src/schedule-2.0/config/packages/fos_rest.yaml rename to config/packages/fos_rest.yaml diff --git a/src/schedule-2.0/config/packages/framework.yaml b/config/packages/framework.yaml similarity index 100% rename from src/schedule-2.0/config/packages/framework.yaml rename to config/packages/framework.yaml diff --git a/src/schedule-2.0/config/packages/http_client.yaml b/config/packages/http_client.yaml similarity index 100% rename from src/schedule-2.0/config/packages/http_client.yaml rename to config/packages/http_client.yaml diff --git a/src/schedule-2.0/config/packages/knp_snappy.yaml b/config/packages/knp_snappy.yaml similarity index 100% rename from src/schedule-2.0/config/packages/knp_snappy.yaml rename to config/packages/knp_snappy.yaml diff --git a/src/schedule-2.0/config/packages/mailer.yaml b/config/packages/mailer.yaml similarity index 100% rename from src/schedule-2.0/config/packages/mailer.yaml rename to config/packages/mailer.yaml diff --git a/src/schedule-2.0/config/packages/nelmio_api_doc.yaml b/config/packages/nelmio_api_doc.yaml similarity index 100% rename from src/schedule-2.0/config/packages/nelmio_api_doc.yaml rename to config/packages/nelmio_api_doc.yaml diff --git a/src/schedule-2.0/config/packages/one_upload.yaml b/config/packages/one_upload.yaml similarity index 100% rename from src/schedule-2.0/config/packages/one_upload.yaml rename to config/packages/one_upload.yaml diff --git a/src/schedule-2.0/config/packages/oneup_uploader.yaml b/config/packages/oneup_uploader.yaml similarity index 100% rename from src/schedule-2.0/config/packages/oneup_uploader.yaml rename to config/packages/oneup_uploader.yaml diff --git a/src/schedule-2.0/config/packages/prod/doctrine.yaml b/config/packages/prod/doctrine.yaml similarity index 100% rename from src/schedule-2.0/config/packages/prod/doctrine.yaml rename to config/packages/prod/doctrine.yaml diff --git a/src/schedule-2.0/config/packages/prod/monolog.yaml b/config/packages/prod/monolog.yaml similarity index 100% rename from src/schedule-2.0/config/packages/prod/monolog.yaml rename to config/packages/prod/monolog.yaml diff --git a/src/schedule-2.0/config/packages/prod/routing.yaml b/config/packages/prod/routing.yaml similarity index 100% rename from src/schedule-2.0/config/packages/prod/routing.yaml rename to config/packages/prod/routing.yaml diff --git a/src/schedule-2.0/config/packages/prod/webpack_encore.yaml b/config/packages/prod/webpack_encore.yaml similarity index 100% rename from src/schedule-2.0/config/packages/prod/webpack_encore.yaml rename to config/packages/prod/webpack_encore.yaml diff --git a/src/schedule-2.0/config/packages/routing.yaml b/config/packages/routing.yaml similarity index 100% rename from src/schedule-2.0/config/packages/routing.yaml rename to config/packages/routing.yaml diff --git a/src/schedule-2.0/config/packages/security.yaml b/config/packages/security.yaml similarity index 100% rename from src/schedule-2.0/config/packages/security.yaml rename to config/packages/security.yaml diff --git a/src/schedule-2.0/config/packages/sensio_framework_extra.yaml b/config/packages/sensio_framework_extra.yaml similarity index 100% rename from src/schedule-2.0/config/packages/sensio_framework_extra.yaml rename to config/packages/sensio_framework_extra.yaml diff --git a/src/schedule-2.0/config/packages/sentry.yaml b/config/packages/sentry.yaml similarity index 100% rename from src/schedule-2.0/config/packages/sentry.yaml rename to config/packages/sentry.yaml diff --git a/src/schedule-2.0/config/packages/swiftmailer.yaml b/config/packages/swiftmailer.yaml similarity index 100% rename from src/schedule-2.0/config/packages/swiftmailer.yaml rename to config/packages/swiftmailer.yaml diff --git a/src/schedule-2.0/config/packages/test/framework.yaml b/config/packages/test/framework.yaml similarity index 100% rename from src/schedule-2.0/config/packages/test/framework.yaml rename to config/packages/test/framework.yaml diff --git a/src/schedule-2.0/config/packages/test/monolog.yaml b/config/packages/test/monolog.yaml similarity index 100% rename from src/schedule-2.0/config/packages/test/monolog.yaml rename to config/packages/test/monolog.yaml diff --git a/src/schedule-2.0/config/packages/test/swiftmailer.yaml b/config/packages/test/swiftmailer.yaml similarity index 100% rename from src/schedule-2.0/config/packages/test/swiftmailer.yaml rename to config/packages/test/swiftmailer.yaml diff --git a/src/schedule-2.0/config/packages/test/twig.yaml b/config/packages/test/twig.yaml similarity index 100% rename from src/schedule-2.0/config/packages/test/twig.yaml rename to config/packages/test/twig.yaml diff --git a/src/schedule-2.0/config/packages/test/validator.yaml b/config/packages/test/validator.yaml similarity index 100% rename from src/schedule-2.0/config/packages/test/validator.yaml rename to config/packages/test/validator.yaml diff --git a/src/schedule-2.0/config/packages/test/web_profiler.yaml b/config/packages/test/web_profiler.yaml similarity index 100% rename from src/schedule-2.0/config/packages/test/web_profiler.yaml rename to config/packages/test/web_profiler.yaml diff --git a/src/schedule-2.0/config/packages/test/webpack_encore.yaml b/config/packages/test/webpack_encore.yaml similarity index 100% rename from src/schedule-2.0/config/packages/test/webpack_encore.yaml rename to config/packages/test/webpack_encore.yaml diff --git a/src/schedule-2.0/config/packages/translation.yaml b/config/packages/translation.yaml similarity index 100% rename from src/schedule-2.0/config/packages/translation.yaml rename to config/packages/translation.yaml diff --git a/src/schedule-2.0/config/packages/twig.yaml b/config/packages/twig.yaml similarity index 100% rename from src/schedule-2.0/config/packages/twig.yaml rename to config/packages/twig.yaml diff --git a/src/schedule-2.0/config/packages/validator.yaml b/config/packages/validator.yaml similarity index 100% rename from src/schedule-2.0/config/packages/validator.yaml rename to config/packages/validator.yaml diff --git a/src/schedule-2.0/config/packages/webpack_encore.yaml b/config/packages/webpack_encore.yaml similarity index 100% rename from src/schedule-2.0/config/packages/webpack_encore.yaml rename to config/packages/webpack_encore.yaml diff --git a/src/schedule-2.0/config/routes.yaml b/config/routes.yaml similarity index 100% rename from src/schedule-2.0/config/routes.yaml rename to config/routes.yaml diff --git a/src/schedule-2.0/config/routes/annotations.yaml b/config/routes/annotations.yaml similarity index 100% rename from src/schedule-2.0/config/routes/annotations.yaml rename to config/routes/annotations.yaml diff --git a/src/schedule-2.0/config/routes/dev/framework.yaml b/config/routes/dev/framework.yaml similarity index 100% rename from src/schedule-2.0/config/routes/dev/framework.yaml rename to config/routes/dev/framework.yaml diff --git a/src/schedule-2.0/config/routes/dev/web_profiler.yaml b/config/routes/dev/web_profiler.yaml similarity index 100% rename from src/schedule-2.0/config/routes/dev/web_profiler.yaml rename to config/routes/dev/web_profiler.yaml diff --git a/src/schedule-2.0/config/routes/nelmio_api_doc.yaml b/config/routes/nelmio_api_doc.yaml similarity index 100% rename from src/schedule-2.0/config/routes/nelmio_api_doc.yaml rename to config/routes/nelmio_api_doc.yaml diff --git a/src/schedule-2.0/config/routes/oneup_uploader.yaml b/config/routes/oneup_uploader.yaml similarity index 100% rename from src/schedule-2.0/config/routes/oneup_uploader.yaml rename to config/routes/oneup_uploader.yaml diff --git a/src/schedule-2.0/config/services.yaml b/config/services.yaml similarity index 100% rename from src/schedule-2.0/config/services.yaml rename to config/services.yaml diff --git a/db/gen/schedule-create-0.sql b/db/gen/schedule-create-0.sql deleted file mode 100644 index 0d4ccd7..0000000 --- a/db/gen/schedule-create-0.sql +++ /dev/null @@ -1,5 +0,0 @@ - - -SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; -CREATE DATABASE schedule DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; - diff --git a/dicos/25_schedule.xml b/dicos/25_schedule.xml deleted file mode 100644 index e9152fd..0000000 --- a/dicos/25_schedule.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - schedule - - - - - - - - - - - - - oui - - - - - - - - - - - - - - 09:00 - - - 17:30 - - - non - - - - - - non - - - - - - - - non - schedule - schedule - - - - non - schedule - schedule - - - - ['default', 'externe', 'local'] - - - local - schedule_dbserver - schedule_dbuser - schedule_dbport - schedule_dbpass - - - default - schedule_dbserver - schedule_dbuser - schedule_dbport - schedule_dbpass - schedule_allow_hosts - - - non - schedule_dolibarr_apikey - schedule_dolibarr_uri - - - non - schedule_sentry_dsn - - - - - Outils de gestion de Planning - - diff --git a/src/schedule-2.0/docker-compose.yml b/docker-compose.yml similarity index 93% rename from src/schedule-2.0/docker-compose.yml rename to docker-compose.yml index b613a44..1f72a9a 100644 --- a/src/schedule-2.0/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,6 @@ services: image: reg.cadoles.com/envole/schedule restart: unless-stopped volumes: - - ./.env.local:/app/.env.local:delegated - ./src:/app/src:delegated - ./templates:/app/templates:delegated - ./config:/app/config:delegated diff --git a/eole.mk b/eole.mk deleted file mode 100644 index 9730365..0000000 --- a/eole.mk +++ /dev/null @@ -1,231 +0,0 @@ -# -# NE PAS EDITER CE FICHIER -# -# Utiliser .mk à inclure à la fin de Makefile - -################# -# Sanity checks # -################# - -ifeq (, $(DESTDIR)) -$(warning $$(DESTDIR) is empty, installation will be done in /) -endif - -ifeq (, $(filter-out XXX-XXX, $(strip $(SOURCE)))) -$(error $$(SOURCE) variable has incorrect value '$(SOURCE)') -endif - -ifeq (, $(filter-out 2.X, $(strip $(EOLE_VERSION)))) -$(error $$(EOLE_VERSION) variable has incorrect value '$(EOLE_VERSION)') -endif - -ifeq (, $(filter-out 2.X.Y, $(strip $(EOLE_RELEASE)))) -$(error $$(EOLE_RELEASE) variable has incorrect value '$(EOLE_RELEASE)') -endif - -######################### -# Variables definitions # -######################### - -INSTALL := install -INSTALL_DATA := install -m 644 -INSTALL_PROGRAM := install -m 755 -INSTALL_DIRECTORY := install -m 755 -d -INSTALL_RECURSIVE := cp -dr --no-preserve=ownership - -# Standard path -bin_PROG_DIR := $(DESTDIR)/usr/bin -sbin_PROG_DIR := $(DESTDIR)/usr/sbin -man8_DATA_DIR := $(DESTDIR)/usr/share/man/fr.UTF-8/man8 - -# Base -eole_DIR := $(DESTDIR)/usr/share/eole - -ifeq ($(strip $(EOLE_VERSION)), 2.3) -diagnose_PROG_DIR := $(eole_DIR)/diagnose/module -else -diagnose_PROG_DIR := $(eole_DIR)/diagnose/ -endif - -# Creole -creole_DIR := $(eole_DIR)/creole -dicos_DATA_DIR := $(creole_DIR)/dicos -tmpl_DATA_DIR := $(creole_DIR)/distrib -preservice_PROG_DIR := $(eole_DIR)/preservice -pretemplate_PROG_DIR := $(eole_DIR)/pretemplate -posttemplate_PROG_DIR := $(eole_DIR)/posttemplate -postservice_PROG_DIR := $(eole_DIR)/postservice -ifeq ($(strip $(EOLE_VERSION)), 2.3) -firewall_DATA_DIR := $(eole_DIR)/firewall -endif -bacula_restore_DATA_DIR := $(eole_DIR)/bacula/restore -bareos_restore_DATA_DIR := $(eole_DIR)/bareos/restore -bacula_fichier_DATA_DIR := $(DESTDIR)/etc/bacula/baculafichiers.d -bareos_fichier_DATA_DIR := $(DESTDIR)/etc/bareos/bareosfichiers.d -ifeq ($(strip $(EOLE_VERSION)), 2.3) -schedule_pre_PROG_DIR := $(eole_DIR)/schedule/pre -schedule_post_PROG_DIR := $(eole_DIR)/schedule/post -else -schedule_scripts_PROG_DIR := $(eole_DIR)/schedule/scripts -endif -extra_REC_DIR := $(creole_DIR)/extra - -# Zéphir -zephir_DATA_DIR := $(DESTDIR)/usr/share/zephir -zephir_configs_DATA_DIR := $(zephir_DATA_DIR)/monitor/configs -zephir_srv_DATA_DIR := $(zephir_configs_DATA_DIR)/services -zephir_scripts_PROG_DIR := $(zephir_DATA_DIR)/scripts - -# SSO -sso_DATA_DIR := $(DESTDIR)/usr/share/sso -sso_filtres_DATA_DIR := $(sso_DATA_DIR)/app_filters -sso_user-info_DATA_DIR := $(sso_DATA_DIR)/user_infos - -# EAD -ead_DATA_DIR := $(DESTDIR)/usr/share/ead2/backend/config -ead_actions_DATA_DIR := $(ead_DATA_DIR)/actions -ead_perms_DATA_DIR := $(ead_DATA_DIR)/perms -ead_roles_DATA_DIR := $(ead_DATA_DIR)/roles - -# Program libraries goes under /usr/lib// -lib_$(SOURCE)_DATA_DIR := $(DESTDIR)/usr/lib/$(SOURCE) - -# Scripts Eole -scripts_PROG_DIR := $(eole_DIR)/sbin -lib_eole_DATA_DIR := $(DESTDIR)/usr/lib/eole - -# LDAP -ldap_passwords_DATA_DIR := $(eole_DIR)/annuaire/password_files - -# LXC -lxc_DATA_DIR := $(eole_DIR)/lxc -lxc_fstab_DATA_DIR := $(lxc_DATA_DIR)/fstab -lxc_hosts_DATA_DIR := $(lxc_DATA_DIR)/hosts - -# SQL -sql_DATA_DIR := $(eole_DIR)/mysql/$(SOURCE) -sql_gen_DATA_DIR := $(sql_DATA_DIR)/gen -sql_updates_DATA_DIR := $(sql_DATA_DIR)/updates - -sql_conf_gen_DATA_DIR := $(eole_DIR)/applications/gen -sql_conf_passwords_DATA_DIR := $(eole_DIR)/applications/passwords -sql_conf_updates_DATA_DIR := $(eole_DIR)/applications/updates/$(SOURCE) - -# EoleDB sql directory -db_DIR := $(eole_DIR)/db -db_gen_DATA_DIR := $(eole_DIR)/db/$(SOURCE)/gen -db_updates_DATA_DIR := $(eole_DIR)/db/$(SOURCE)/updates - -# Certifs -certs_DATA_DIR := $(eole_DIR)/certs - -# Logrotate -logrotate_DATA_DIR := $(DESTDIR)/etc/logrotate.d - -# Cron -cron_PROG_DIR := $(DESTDIR)/etc/cron.daily - -# Python modules -ifneq ($(DESTDIR),) -PYTHON_OPTS := --root $(DESTDIR) -endif - -# Translation -TRANSLATION_SRC := translation -TRANSLATION_DEST := $(DESTDIR)/usr/share/locale -PO_FILES = $(wildcard $(TRANSLATION_SRC)/*/*.po) -MO_FOLDERS = $(addprefix $(TRANSLATION_DEST), $(addsuffix LC_MESSAGES,$(subst $(TRANSLATION_SRC),,$(dir $(PO_FILES))))) - -############################################# -# Common directories and files installation # -############################################# - -all: - -$(MO_FOLDERS): - $(INSTALL_DIRECTORY) $@ - -$(PO_FILES): $(MO_FOLDERS) - msgfmt -o $(TRANSLATION_DEST)$(subst $(TRANSLATION_SRC),,$(addsuffix LC_MESSAGES,$(dir $@)))/$(notdir $(@:.po=.mo)) $@ - -install-lang: $(PO_FILES) - -install:: install-dirs install-files install-lang - -# $1 = command to run -# $2 = source directory -# $3 = destination directory -define fc_install_file - if [ -d $2 ]; then \ - for file in `ls -1 $2/`; do \ - $1 $2/$$file $3 || true; \ - done; \ - fi -endef - -## -## Directory creation -## - -# use % to catch local name in $* -# data, program and recursive directory require a corresponding -# directory in local sources -%_DATA_DIR %_PROG_DIR %REC_DIR: - test ! -d $(subst _,/,$*) || $(INSTALL_DIRECTORY) $($@) - -# Create the directory referenced by the variable without a local one. -%_DIR: - @: # do nothing - -## -## Install files present directly under data, program and recursive directories -## - -# $* : name of variable -# $($*): value of variable -%-instdata: - $(call fc_install_file, $(INSTALL_DATA), $(subst _,/,$(subst _DATA_DIR,,$*)), $($*)) - -%-instprog: - $(call fc_install_file, $(INSTALL_PROGRAM), $(subst _,/,$(subst _PROG_DIR,,$*)), $($*)) - -%-instrec: - $(call fc_install_file, $(INSTALL_RECURSIVE), $(subst _,/,$(subst _REC_DIR,,$*)), $($*)) - - -# Use second expansion as variables may be created in included -# Makefiles -.SECONDEXPANSION: - -# List of all directories -installdirs_LIST = $(foreach V, $(filter %_DIR, $(.VARIABLES)), \ - $(if $(filter file, $(origin $(V))), \ - $(V))) -# List of data directories -installdata_LIST = $(filter %_DATA_DIR, $(installdirs_LIST)) -# List of program directories -installprog_LIST = $(filter %_PROG_DIR, $(installdirs_LIST)) -# List of recursive directories -installrec_LIST = $(filter %_REC_DIR, $(installdirs_LIST)) - -# Expand directories to create as dependency -# Use double-colon to permit user to define additionnal install-dirs -install-dirs:: $$(installdirs_LIST) - -# Expand files to install as dependency -# Use double-colon to permit user to define additionnal install-files -install-files:: install-data-files install-prog-files install-rec-dirs - -install-data-files: $$(patsubst %,%-instdata,$$(installdata_LIST)) - -install-prog-files: $$(patsubst %,%-instprog,$$(installprog_LIST)) - -install-rec-dirs: $$(patsubst %,%-instrec,$$(installrec_LIST)) - -# Installation of python modules -ifeq ($(shell test -f setup.py && echo 0), 0) -install-files:: - python setup.py install --no-compile --install-layout=deb $(PYTHON_OPTS) -endif - -.PHONY: install install-dirs install-files install-data-files install-prog-files install-rec-dirs diff --git a/src/schedule-2.0/misc/docker/Dockerfile b/misc/docker/Dockerfile similarity index 100% rename from src/schedule-2.0/misc/docker/Dockerfile rename to misc/docker/Dockerfile diff --git a/src/schedule-2.0/misc/docker/apache.conf b/misc/docker/apache.conf similarity index 100% rename from src/schedule-2.0/misc/docker/apache.conf rename to misc/docker/apache.conf diff --git a/src/schedule-2.0/misc/script/reconfigure.sh b/misc/script/reconfigure.sh similarity index 100% rename from src/schedule-2.0/misc/script/reconfigure.sh rename to misc/script/reconfigure.sh diff --git a/src/schedule-2.0/package.json b/package.json similarity index 100% rename from src/schedule-2.0/package.json rename to package.json diff --git a/src/schedule-2.0/phpunit.xml.dist b/phpunit.xml.dist similarity index 100% rename from src/schedule-2.0/phpunit.xml.dist rename to phpunit.xml.dist diff --git a/postservice/25-schedule b/postservice/25-schedule deleted file mode 100755 index b2ab326..0000000 --- a/postservice/25-schedule +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -CreoleRun "/var/www/html/schedule/scripts/reconfigure.sh" web \ No newline at end of file diff --git a/pretemplate/25-schedule b/pretemplate/25-schedule deleted file mode 100755 index e7eb48b..0000000 --- a/pretemplate/25-schedule +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -CreoleRun "/var/www/html/schedule/scripts/genkey.sh" web -exit 0 \ No newline at end of file diff --git a/src/schedule-2.0/public/.htaccess b/public/.htaccess similarity index 100% rename from src/schedule-2.0/public/.htaccess rename to public/.htaccess diff --git a/src/schedule-2.0/public/images/admin.jpg b/public/images/admin.jpg similarity index 100% rename from src/schedule-2.0/public/images/admin.jpg rename to public/images/admin.jpg diff --git a/src/schedule-2.0/public/images/logo.png b/public/images/logo.png similarity index 100% rename from src/schedule-2.0/public/images/logo.png rename to public/images/logo.png diff --git a/src/schedule-2.0/public/images/noavatar.png b/public/images/noavatar.png similarity index 100% rename from src/schedule-2.0/public/images/noavatar.png rename to public/images/noavatar.png diff --git a/src/schedule-2.0/public/images/system.jpg b/public/images/system.jpg similarity index 100% rename from src/schedule-2.0/public/images/system.jpg rename to public/images/system.jpg diff --git a/src/schedule-2.0/public/index.php b/public/index.php similarity index 100% rename from src/schedule-2.0/public/index.php rename to public/index.php diff --git a/src/schedule-2.0/scripts/.env.model b/scripts/.env.model similarity index 100% rename from src/schedule-2.0/scripts/.env.model rename to scripts/.env.model diff --git a/src/schedule-2.0/scripts/.gitkeep b/scripts/.gitkeep similarity index 100% rename from src/schedule-2.0/scripts/.gitkeep rename to scripts/.gitkeep diff --git a/src/schedule-2.0/scripts/checkcomposer.php b/scripts/checkcomposer.php similarity index 100% rename from src/schedule-2.0/scripts/checkcomposer.php rename to scripts/checkcomposer.php diff --git a/src/schedule-2.0/scripts/cron.sh b/scripts/cron.sh similarity index 100% rename from src/schedule-2.0/scripts/cron.sh rename to scripts/cron.sh diff --git a/src/schedule-2.0/scripts/genkey.sh b/scripts/genkey.sh similarity index 100% rename from src/schedule-2.0/scripts/genkey.sh rename to scripts/genkey.sh diff --git a/src/schedule-2.0/scripts/perm.sh b/scripts/perm.sh similarity index 100% rename from src/schedule-2.0/scripts/perm.sh rename to scripts/perm.sh diff --git a/src/schedule-2.0/scripts/proxy.sh b/scripts/proxy.sh similarity index 100% rename from src/schedule-2.0/scripts/proxy.sh rename to scripts/proxy.sh diff --git a/src/schedule-2.0/scripts/reconfigure.sh b/scripts/reconfigure.sh similarity index 100% rename from src/schedule-2.0/scripts/reconfigure.sh rename to scripts/reconfigure.sh diff --git a/src/schedule-2.0/scripts/wkhtmltopdf/wkhtmltoimage b/scripts/wkhtmltopdf/wkhtmltoimage similarity index 100% rename from src/schedule-2.0/scripts/wkhtmltopdf/wkhtmltoimage rename to scripts/wkhtmltopdf/wkhtmltoimage diff --git a/src/schedule-2.0/scripts/wkhtmltopdf/wkhtmltopdf b/scripts/wkhtmltopdf/wkhtmltopdf similarity index 100% rename from src/schedule-2.0/scripts/wkhtmltopdf/wkhtmltopdf rename to scripts/wkhtmltopdf/wkhtmltopdf diff --git a/src/schedule-2.0/src/Command/AppInitCommand.php b/src/Command/AppInitCommand.php similarity index 100% rename from src/schedule-2.0/src/Command/AppInitCommand.php rename to src/Command/AppInitCommand.php diff --git a/src/schedule-2.0/src/Command/CronCommand.php b/src/Command/CronCommand.php similarity index 100% rename from src/schedule-2.0/src/Command/CronCommand.php rename to src/Command/CronCommand.php diff --git a/src/schedule-2.0/src/Command/CronInitCommand.php b/src/Command/CronInitCommand.php similarity index 100% rename from src/schedule-2.0/src/Command/CronInitCommand.php rename to src/Command/CronInitCommand.php diff --git a/src/schedule-2.0/src/Command/DumpBddCommand.php b/src/Command/DumpBddCommand.php similarity index 100% rename from src/schedule-2.0/src/Command/DumpBddCommand.php rename to src/Command/DumpBddCommand.php diff --git a/src/schedule-2.0/src/Command/ScriptCommand.php b/src/Command/ScriptCommand.php similarity index 100% rename from src/schedule-2.0/src/Command/ScriptCommand.php rename to src/Command/ScriptCommand.php diff --git a/src/schedule-2.0/src/Command/SendMailCommand.php b/src/Command/SendMailCommand.php similarity index 100% rename from src/schedule-2.0/src/Command/SendMailCommand.php rename to src/Command/SendMailCommand.php diff --git a/src/schedule-2.0/src/Command/SetPasswordCommand.php b/src/Command/SetPasswordCommand.php similarity index 100% rename from src/schedule-2.0/src/Command/SetPasswordCommand.php rename to src/Command/SetPasswordCommand.php diff --git a/src/schedule-2.0/src/Command/SetRolesCommand.php b/src/Command/SetRolesCommand.php similarity index 100% rename from src/schedule-2.0/src/Command/SetRolesCommand.php rename to src/Command/SetRolesCommand.php diff --git a/src/schedule-2.0/src/Controller/.gitignore b/src/Controller/.gitignore similarity index 100% rename from src/schedule-2.0/src/Controller/.gitignore rename to src/Controller/.gitignore diff --git a/src/schedule-2.0/src/Controller/ApiController.php b/src/Controller/ApiController.php similarity index 100% rename from src/schedule-2.0/src/Controller/ApiController.php rename to src/Controller/ApiController.php diff --git a/src/schedule-2.0/src/Controller/BreakdayController.php b/src/Controller/BreakdayController.php similarity index 100% rename from src/schedule-2.0/src/Controller/BreakdayController.php rename to src/Controller/BreakdayController.php diff --git a/src/schedule-2.0/src/Controller/BudgetController.php b/src/Controller/BudgetController.php similarity index 100% rename from src/schedule-2.0/src/Controller/BudgetController.php rename to src/Controller/BudgetController.php diff --git a/src/schedule-2.0/src/Controller/CronController.php b/src/Controller/CronController.php similarity index 100% rename from src/schedule-2.0/src/Controller/CronController.php rename to src/Controller/CronController.php diff --git a/src/schedule-2.0/src/Controller/CropController.php b/src/Controller/CropController.php similarity index 100% rename from src/schedule-2.0/src/Controller/CropController.php rename to src/Controller/CropController.php diff --git a/src/schedule-2.0/src/Controller/CustomerController.php b/src/Controller/CustomerController.php similarity index 100% rename from src/schedule-2.0/src/Controller/CustomerController.php rename to src/Controller/CustomerController.php diff --git a/src/schedule-2.0/src/Controller/DomaineController.php b/src/Controller/DomaineController.php similarity index 100% rename from src/schedule-2.0/src/Controller/DomaineController.php rename to src/Controller/DomaineController.php diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/Controller/EventController.php similarity index 100% rename from src/schedule-2.0/src/Controller/EventController.php rename to src/Controller/EventController.php diff --git a/src/schedule-2.0/src/Controller/ExportController.php b/src/Controller/ExportController.php similarity index 100% rename from src/schedule-2.0/src/Controller/ExportController.php rename to src/Controller/ExportController.php diff --git a/src/schedule-2.0/src/Controller/HomeController.php b/src/Controller/HomeController.php similarity index 100% rename from src/schedule-2.0/src/Controller/HomeController.php rename to src/Controller/HomeController.php diff --git a/src/schedule-2.0/src/Controller/JobController.php b/src/Controller/JobController.php similarity index 100% rename from src/schedule-2.0/src/Controller/JobController.php rename to src/Controller/JobController.php diff --git a/src/schedule-2.0/src/Controller/NatureController.php b/src/Controller/NatureController.php similarity index 100% rename from src/schedule-2.0/src/Controller/NatureController.php rename to src/Controller/NatureController.php diff --git a/src/schedule-2.0/src/Controller/OfferController.php b/src/Controller/OfferController.php similarity index 100% rename from src/schedule-2.0/src/Controller/OfferController.php rename to src/Controller/OfferController.php diff --git a/src/schedule-2.0/src/Controller/ProjectController.php b/src/Controller/ProjectController.php similarity index 100% rename from src/schedule-2.0/src/Controller/ProjectController.php rename to src/Controller/ProjectController.php diff --git a/src/schedule-2.0/src/Controller/ReportController.php b/src/Controller/ReportController.php similarity index 100% rename from src/schedule-2.0/src/Controller/ReportController.php rename to src/Controller/ReportController.php diff --git a/src/schedule-2.0/src/Controller/RestController.php b/src/Controller/RestController.php similarity index 100% rename from src/schedule-2.0/src/Controller/RestController.php rename to src/Controller/RestController.php diff --git a/src/schedule-2.0/src/Controller/SecurityController.php b/src/Controller/SecurityController.php similarity index 100% rename from src/schedule-2.0/src/Controller/SecurityController.php rename to src/Controller/SecurityController.php diff --git a/src/schedule-2.0/src/Controller/ServiceController.php b/src/Controller/ServiceController.php similarity index 100% rename from src/schedule-2.0/src/Controller/ServiceController.php rename to src/Controller/ServiceController.php diff --git a/src/schedule-2.0/src/Controller/StatController.php b/src/Controller/StatController.php similarity index 100% rename from src/schedule-2.0/src/Controller/StatController.php rename to src/Controller/StatController.php diff --git a/src/schedule-2.0/src/Controller/TaskController.php b/src/Controller/TaskController.php similarity index 100% rename from src/schedule-2.0/src/Controller/TaskController.php rename to src/Controller/TaskController.php diff --git a/src/schedule-2.0/src/Controller/TimerController.php b/src/Controller/TimerController.php similarity index 100% rename from src/schedule-2.0/src/Controller/TimerController.php rename to src/Controller/TimerController.php diff --git a/src/schedule-2.0/src/Controller/UserController.php b/src/Controller/UserController.php similarity index 100% rename from src/schedule-2.0/src/Controller/UserController.php rename to src/Controller/UserController.php diff --git a/src/schedule-2.0/src/Controller/ValidationController.php b/src/Controller/ValidationController.php similarity index 100% rename from src/schedule-2.0/src/Controller/ValidationController.php rename to src/Controller/ValidationController.php diff --git a/src/schedule-2.0/src/Controller/YearController.php b/src/Controller/YearController.php similarity index 100% rename from src/schedule-2.0/src/Controller/YearController.php rename to src/Controller/YearController.php diff --git a/src/schedule-2.0/src/Entity/.gitignore b/src/Entity/.gitignore similarity index 100% rename from src/schedule-2.0/src/Entity/.gitignore rename to src/Entity/.gitignore diff --git a/src/schedule-2.0/src/Entity/Breakday.php b/src/Entity/Breakday.php similarity index 100% rename from src/schedule-2.0/src/Entity/Breakday.php rename to src/Entity/Breakday.php diff --git a/src/schedule-2.0/src/Entity/Cron.php b/src/Entity/Cron.php similarity index 100% rename from src/schedule-2.0/src/Entity/Cron.php rename to src/Entity/Cron.php diff --git a/src/schedule-2.0/src/Entity/Customer.php b/src/Entity/Customer.php similarity index 100% rename from src/schedule-2.0/src/Entity/Customer.php rename to src/Entity/Customer.php diff --git a/src/schedule-2.0/src/Entity/Domaine.php b/src/Entity/Domaine.php similarity index 100% rename from src/schedule-2.0/src/Entity/Domaine.php rename to src/Entity/Domaine.php diff --git a/src/schedule-2.0/src/Entity/Event.php b/src/Entity/Event.php similarity index 100% rename from src/schedule-2.0/src/Entity/Event.php rename to src/Entity/Event.php diff --git a/src/schedule-2.0/src/Entity/Job.php b/src/Entity/Job.php similarity index 100% rename from src/schedule-2.0/src/Entity/Job.php rename to src/Entity/Job.php diff --git a/src/schedule-2.0/src/Entity/Nature.php b/src/Entity/Nature.php similarity index 100% rename from src/schedule-2.0/src/Entity/Nature.php rename to src/Entity/Nature.php diff --git a/src/schedule-2.0/src/Entity/Offer.php b/src/Entity/Offer.php similarity index 100% rename from src/schedule-2.0/src/Entity/Offer.php rename to src/Entity/Offer.php diff --git a/src/schedule-2.0/src/Entity/Penalty.php b/src/Entity/Penalty.php similarity index 100% rename from src/schedule-2.0/src/Entity/Penalty.php rename to src/Entity/Penalty.php diff --git a/src/schedule-2.0/src/Entity/Project.php b/src/Entity/Project.php similarity index 100% rename from src/schedule-2.0/src/Entity/Project.php rename to src/Entity/Project.php diff --git a/src/schedule-2.0/src/Entity/Script.php b/src/Entity/Script.php similarity index 100% rename from src/schedule-2.0/src/Entity/Script.php rename to src/Entity/Script.php diff --git a/src/schedule-2.0/src/Entity/Service.php b/src/Entity/Service.php similarity index 100% rename from src/schedule-2.0/src/Entity/Service.php rename to src/Entity/Service.php diff --git a/src/schedule-2.0/src/Entity/Task.php b/src/Entity/Task.php similarity index 100% rename from src/schedule-2.0/src/Entity/Task.php rename to src/Entity/Task.php diff --git a/src/schedule-2.0/src/Entity/Timer.php b/src/Entity/Timer.php similarity index 100% rename from src/schedule-2.0/src/Entity/Timer.php rename to src/Entity/Timer.php diff --git a/src/schedule-2.0/src/Entity/User.php b/src/Entity/User.php similarity index 100% rename from src/schedule-2.0/src/Entity/User.php rename to src/Entity/User.php diff --git a/src/schedule-2.0/src/Entity/Userproject.php b/src/Entity/Userproject.php similarity index 100% rename from src/schedule-2.0/src/Entity/Userproject.php rename to src/Entity/Userproject.php diff --git a/src/schedule-2.0/src/Entity/Year.php b/src/Entity/Year.php similarity index 100% rename from src/schedule-2.0/src/Entity/Year.php rename to src/Entity/Year.php diff --git a/src/schedule-2.0/src/Entity/Yeardomaine.php b/src/Entity/Yeardomaine.php similarity index 100% rename from src/schedule-2.0/src/Entity/Yeardomaine.php rename to src/Entity/Yeardomaine.php diff --git a/src/schedule-2.0/src/Entity/Yearproject.php b/src/Entity/Yearproject.php similarity index 100% rename from src/schedule-2.0/src/Entity/Yearproject.php rename to src/Entity/Yearproject.php diff --git a/src/schedule-2.0/src/Form/BreakdayType.php b/src/Form/BreakdayType.php similarity index 100% rename from src/schedule-2.0/src/Form/BreakdayType.php rename to src/Form/BreakdayType.php diff --git a/src/schedule-2.0/src/Form/CronType.php b/src/Form/CronType.php similarity index 100% rename from src/schedule-2.0/src/Form/CronType.php rename to src/Form/CronType.php diff --git a/src/schedule-2.0/src/Form/CustomerType.php b/src/Form/CustomerType.php similarity index 100% rename from src/schedule-2.0/src/Form/CustomerType.php rename to src/Form/CustomerType.php diff --git a/src/schedule-2.0/src/Form/DomaineType.php b/src/Form/DomaineType.php similarity index 100% rename from src/schedule-2.0/src/Form/DomaineType.php rename to src/Form/DomaineType.php diff --git a/src/schedule-2.0/src/Form/JobType.php b/src/Form/JobType.php similarity index 100% rename from src/schedule-2.0/src/Form/JobType.php rename to src/Form/JobType.php diff --git a/src/schedule-2.0/src/Form/NatureType.php b/src/Form/NatureType.php similarity index 100% rename from src/schedule-2.0/src/Form/NatureType.php rename to src/Form/NatureType.php diff --git a/src/schedule-2.0/src/Form/OfferType.php b/src/Form/OfferType.php similarity index 100% rename from src/schedule-2.0/src/Form/OfferType.php rename to src/Form/OfferType.php diff --git a/src/schedule-2.0/src/Form/OfferdolibarrType.php b/src/Form/OfferdolibarrType.php similarity index 100% rename from src/schedule-2.0/src/Form/OfferdolibarrType.php rename to src/Form/OfferdolibarrType.php diff --git a/src/schedule-2.0/src/Form/ProjectType.php b/src/Form/ProjectType.php similarity index 100% rename from src/schedule-2.0/src/Form/ProjectType.php rename to src/Form/ProjectType.php diff --git a/src/schedule-2.0/src/Form/ServiceType.php b/src/Form/ServiceType.php similarity index 100% rename from src/schedule-2.0/src/Form/ServiceType.php rename to src/Form/ServiceType.php diff --git a/src/schedule-2.0/src/Form/TaskType.php b/src/Form/TaskType.php similarity index 100% rename from src/schedule-2.0/src/Form/TaskType.php rename to src/Form/TaskType.php diff --git a/src/schedule-2.0/src/Form/TimerType.php b/src/Form/TimerType.php similarity index 100% rename from src/schedule-2.0/src/Form/TimerType.php rename to src/Form/TimerType.php diff --git a/src/schedule-2.0/src/Form/UserType.php b/src/Form/UserType.php similarity index 100% rename from src/schedule-2.0/src/Form/UserType.php rename to src/Form/UserType.php diff --git a/src/schedule-2.0/src/Form/YearType.php b/src/Form/YearType.php similarity index 100% rename from src/schedule-2.0/src/Form/YearType.php rename to src/Form/YearType.php diff --git a/src/schedule-2.0/src/Form/YeardomaineType.php b/src/Form/YeardomaineType.php similarity index 100% rename from src/schedule-2.0/src/Form/YeardomaineType.php rename to src/Form/YeardomaineType.php diff --git a/src/schedule-2.0/src/Form/YearprojectType.php b/src/Form/YearprojectType.php similarity index 100% rename from src/schedule-2.0/src/Form/YearprojectType.php rename to src/Form/YearprojectType.php diff --git a/src/schedule-2.0/src/Kernel.php b/src/Kernel.php similarity index 100% rename from src/schedule-2.0/src/Kernel.php rename to src/Kernel.php diff --git a/src/schedule-2.0/src/Migrations/.gitignore b/src/Migrations/.gitignore similarity index 100% rename from src/schedule-2.0/src/Migrations/.gitignore rename to src/Migrations/.gitignore diff --git a/src/schedule-2.0/src/Repository/.gitignore b/src/Repository/.gitignore similarity index 100% rename from src/schedule-2.0/src/Repository/.gitignore rename to src/Repository/.gitignore diff --git a/src/schedule-2.0/src/Repository/BreakdayRepository.php b/src/Repository/BreakdayRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/BreakdayRepository.php rename to src/Repository/BreakdayRepository.php diff --git a/src/schedule-2.0/src/Repository/CronRepository.php b/src/Repository/CronRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/CronRepository.php rename to src/Repository/CronRepository.php diff --git a/src/schedule-2.0/src/Repository/CustomerRepository.php b/src/Repository/CustomerRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/CustomerRepository.php rename to src/Repository/CustomerRepository.php diff --git a/src/schedule-2.0/src/Repository/DomaineRepository.php b/src/Repository/DomaineRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/DomaineRepository.php rename to src/Repository/DomaineRepository.php diff --git a/src/schedule-2.0/src/Repository/EventRepository.php b/src/Repository/EventRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/EventRepository.php rename to src/Repository/EventRepository.php diff --git a/src/schedule-2.0/src/Repository/JobRepository.php b/src/Repository/JobRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/JobRepository.php rename to src/Repository/JobRepository.php diff --git a/src/schedule-2.0/src/Repository/NatureRepository.php b/src/Repository/NatureRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/NatureRepository.php rename to src/Repository/NatureRepository.php diff --git a/src/schedule-2.0/src/Repository/OfferRepository.php b/src/Repository/OfferRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/OfferRepository.php rename to src/Repository/OfferRepository.php diff --git a/src/schedule-2.0/src/Repository/PenaltyRepository.php b/src/Repository/PenaltyRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/PenaltyRepository.php rename to src/Repository/PenaltyRepository.php diff --git a/src/schedule-2.0/src/Repository/ProjectRepository.php b/src/Repository/ProjectRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/ProjectRepository.php rename to src/Repository/ProjectRepository.php diff --git a/src/schedule-2.0/src/Repository/ScriptRepository.php b/src/Repository/ScriptRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/ScriptRepository.php rename to src/Repository/ScriptRepository.php diff --git a/src/schedule-2.0/src/Repository/ServiceRepository.php b/src/Repository/ServiceRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/ServiceRepository.php rename to src/Repository/ServiceRepository.php diff --git a/src/schedule-2.0/src/Repository/TaskRepository.php b/src/Repository/TaskRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/TaskRepository.php rename to src/Repository/TaskRepository.php diff --git a/src/schedule-2.0/src/Repository/TimerRepository.php b/src/Repository/TimerRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/TimerRepository.php rename to src/Repository/TimerRepository.php diff --git a/src/schedule-2.0/src/Repository/UserRepository.php b/src/Repository/UserRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/UserRepository.php rename to src/Repository/UserRepository.php diff --git a/src/schedule-2.0/src/Repository/UserprojectRepository.php b/src/Repository/UserprojectRepository.php similarity index 100% rename from src/schedule-2.0/src/Repository/UserprojectRepository.php rename to src/Repository/UserprojectRepository.php diff --git a/src/schedule-2.0/src/Service/dolibarrApi.php b/src/Service/dolibarrApi.php similarity index 100% rename from src/schedule-2.0/src/Service/dolibarrApi.php rename to src/Service/dolibarrApi.php diff --git a/src/schedule-2.0/src/Service/icsService.php b/src/Service/icsService.php similarity index 100% rename from src/schedule-2.0/src/Service/icsService.php rename to src/Service/icsService.php diff --git a/src/schedule-2.0/src/Service/notificationService.php b/src/Service/notificationService.php similarity index 100% rename from src/schedule-2.0/src/Service/notificationService.php rename to src/Service/notificationService.php diff --git a/src/schedule-2.0/src/Service/passwordEncoder.php b/src/Service/passwordEncoder.php similarity index 100% rename from src/schedule-2.0/src/Service/passwordEncoder.php rename to src/Service/passwordEncoder.php diff --git a/src/schedule-2.0/src/Service/sessionListener.php b/src/Service/sessionListener.php similarity index 100% rename from src/schedule-2.0/src/Service/sessionListener.php rename to src/Service/sessionListener.php diff --git a/src/schedule-2.0/src/Service/uploadListener.php b/src/Service/uploadListener.php similarity index 100% rename from src/schedule-2.0/src/Service/uploadListener.php rename to src/Service/uploadListener.php diff --git a/src/schedule-2.0/.gitignore b/src/schedule-2.0/.gitignore deleted file mode 100644 index dbde60c..0000000 --- a/src/schedule-2.0/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ - -###> symfony/framework-bundle ### -/.env.local -/.env.local.php -/.env.*.local -/config/secrets/prod/prod.decrypt.private.php -/public/bundles/ -/var/ -/vendor/ -###< symfony/framework-bundle ### - -###> symfony/phpunit-bridge ### -.phpunit -.phpunit.result.cache -/phpunit.xml -###< symfony/phpunit-bridge ### - -###> symfony/webpack-encore-bundle ### -/node_modules/ -npm-debug.log -yarn-error.log -###< symfony/webpack-encore-bundle ### - -###> uploads ### -/public/uploads -/uploads -###> uploads ### diff --git a/src/schedule-2.0/README.md b/src/schedule-2.0/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/src/schedule-2.0/public/uploads/avatar/admin.jpg b/src/schedule-2.0/public/uploads/avatar/admin.jpg deleted file mode 100644 index 0fa3174..0000000 Binary files a/src/schedule-2.0/public/uploads/avatar/admin.jpg and /dev/null differ diff --git a/src/schedule-2.0/public/uploads/avatar/noavatar.png b/src/schedule-2.0/public/uploads/avatar/noavatar.png deleted file mode 100644 index 6867515..0000000 Binary files a/src/schedule-2.0/public/uploads/avatar/noavatar.png and /dev/null differ diff --git a/src/schedule-2.0/public/uploads/avatar/system.jpg b/src/schedule-2.0/public/uploads/avatar/system.jpg deleted file mode 100644 index 4c8a16b..0000000 Binary files a/src/schedule-2.0/public/uploads/avatar/system.jpg and /dev/null differ diff --git a/sso/filtres/schedule.ini b/sso/filtres/schedule.ini deleted file mode 100644 index f61e4ce..0000000 --- a/sso/filtres/schedule.ini +++ /dev/null @@ -1,14 +0,0 @@ -[user] -user=uid - -[username] -username=uid - -[firstname] -firstname=givenName - -[lastname] -lastname=sn - -[email] -email=mail \ No newline at end of file diff --git a/sso/filtres/schedule_apps.ini b/sso/filtres/schedule_apps.ini deleted file mode 100644 index eeb6a81..0000000 --- a/sso/filtres/schedule_apps.ini +++ /dev/null @@ -1,6 +0,0 @@ -[schedule] -baseurl=/schedule/ -scheme=both -addr=0/0 -typeaddr=ip -filter=schedule diff --git a/src/schedule-2.0/symfony.lock b/symfony.lock similarity index 100% rename from src/schedule-2.0/symfony.lock rename to symfony.lock diff --git a/src/schedule-2.0/templates/Breakday/edit.html.twig b/templates/Breakday/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Breakday/edit.html.twig rename to templates/Breakday/edit.html.twig diff --git a/src/schedule-2.0/templates/Breakday/list.html.twig b/templates/Breakday/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Breakday/list.html.twig rename to templates/Breakday/list.html.twig diff --git a/src/schedule-2.0/templates/Budget/edit.html.twig b/templates/Budget/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Budget/edit.html.twig rename to templates/Budget/edit.html.twig diff --git a/src/schedule-2.0/templates/Budget/list.html.twig b/templates/Budget/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Budget/list.html.twig rename to templates/Budget/list.html.twig diff --git a/src/schedule-2.0/templates/Cron/edit.html.twig b/templates/Cron/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Cron/edit.html.twig rename to templates/Cron/edit.html.twig diff --git a/src/schedule-2.0/templates/Cron/list.html.twig b/templates/Cron/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Cron/list.html.twig rename to templates/Cron/list.html.twig diff --git a/src/schedule-2.0/templates/Cron/logs.html.twig b/templates/Cron/logs.html.twig similarity index 100% rename from src/schedule-2.0/templates/Cron/logs.html.twig rename to templates/Cron/logs.html.twig diff --git a/src/schedule-2.0/templates/Crop/crop01.html.twig b/templates/Crop/crop01.html.twig similarity index 100% rename from src/schedule-2.0/templates/Crop/crop01.html.twig rename to templates/Crop/crop01.html.twig diff --git a/src/schedule-2.0/templates/Crop/crop02.html.twig b/templates/Crop/crop02.html.twig similarity index 100% rename from src/schedule-2.0/templates/Crop/crop02.html.twig rename to templates/Crop/crop02.html.twig diff --git a/src/schedule-2.0/templates/Customer/edit.html.twig b/templates/Customer/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Customer/edit.html.twig rename to templates/Customer/edit.html.twig diff --git a/src/schedule-2.0/templates/Customer/list.html.twig b/templates/Customer/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Customer/list.html.twig rename to templates/Customer/list.html.twig diff --git a/src/schedule-2.0/templates/Domaine/edit.html.twig b/templates/Domaine/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Domaine/edit.html.twig rename to templates/Domaine/edit.html.twig diff --git a/src/schedule-2.0/templates/Domaine/list.html.twig b/templates/Domaine/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Domaine/list.html.twig rename to templates/Domaine/list.html.twig diff --git a/src/schedule-2.0/templates/Event/list.html.twig b/templates/Event/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Event/list.html.twig rename to templates/Event/list.html.twig diff --git a/src/schedule-2.0/templates/Export/export_full_worked_days.csv.twig b/templates/Export/export_full_worked_days.csv.twig similarity index 100% rename from src/schedule-2.0/templates/Export/export_full_worked_days.csv.twig rename to templates/Export/export_full_worked_days.csv.twig diff --git a/src/schedule-2.0/templates/Export/export_month_charged_days.csv.twig b/templates/Export/export_month_charged_days.csv.twig similarity index 100% rename from src/schedule-2.0/templates/Export/export_month_charged_days.csv.twig rename to templates/Export/export_month_charged_days.csv.twig diff --git a/src/schedule-2.0/templates/Export/export_offers.csv.twig b/templates/Export/export_offers.csv.twig similarity index 100% rename from src/schedule-2.0/templates/Export/export_offers.csv.twig rename to templates/Export/export_offers.csv.twig diff --git a/src/schedule-2.0/templates/Export/export_penalty_additional.csv.twig b/templates/Export/export_penalty_additional.csv.twig similarity index 100% rename from src/schedule-2.0/templates/Export/export_penalty_additional.csv.twig rename to templates/Export/export_penalty_additional.csv.twig diff --git a/src/schedule-2.0/templates/Export/export_project_weekly.csv.twig b/templates/Export/export_project_weekly.csv.twig similarity index 100% rename from src/schedule-2.0/templates/Export/export_project_weekly.csv.twig rename to templates/Export/export_project_weekly.csv.twig diff --git a/src/schedule-2.0/templates/Export/list.html.twig b/templates/Export/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Export/list.html.twig rename to templates/Export/list.html.twig diff --git a/src/schedule-2.0/templates/Form/fields.html.twig b/templates/Form/fields.html.twig similarity index 100% rename from src/schedule-2.0/templates/Form/fields.html.twig rename to templates/Form/fields.html.twig diff --git a/src/schedule-2.0/templates/Home/admin.html.twig b/templates/Home/admin.html.twig similarity index 100% rename from src/schedule-2.0/templates/Home/admin.html.twig rename to templates/Home/admin.html.twig diff --git a/src/schedule-2.0/templates/Home/customer.html.twig b/templates/Home/customer.html.twig similarity index 100% rename from src/schedule-2.0/templates/Home/customer.html.twig rename to templates/Home/customer.html.twig diff --git a/src/schedule-2.0/templates/Home/home.html.twig b/templates/Home/home.html.twig similarity index 100% rename from src/schedule-2.0/templates/Home/home.html.twig rename to templates/Home/home.html.twig diff --git a/src/schedule-2.0/templates/Home/login.html.twig b/templates/Home/login.html.twig similarity index 100% rename from src/schedule-2.0/templates/Home/login.html.twig rename to templates/Home/login.html.twig diff --git a/src/schedule-2.0/templates/Job/edit.html.twig b/templates/Job/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Job/edit.html.twig rename to templates/Job/edit.html.twig diff --git a/src/schedule-2.0/templates/Job/list.html.twig b/templates/Job/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Job/list.html.twig rename to templates/Job/list.html.twig diff --git a/src/schedule-2.0/templates/Nature/edit.html.twig b/templates/Nature/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Nature/edit.html.twig rename to templates/Nature/edit.html.twig diff --git a/src/schedule-2.0/templates/Nature/list.html.twig b/templates/Nature/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Nature/list.html.twig rename to templates/Nature/list.html.twig diff --git a/src/schedule-2.0/templates/Notif/attentevalidation.html.twig b/templates/Notif/attentevalidation.html.twig similarity index 100% rename from src/schedule-2.0/templates/Notif/attentevalidation.html.twig rename to templates/Notif/attentevalidation.html.twig diff --git a/src/schedule-2.0/templates/Notif/validation.html.twig b/templates/Notif/validation.html.twig similarity index 100% rename from src/schedule-2.0/templates/Notif/validation.html.twig rename to templates/Notif/validation.html.twig diff --git a/src/schedule-2.0/templates/Offer/dolibarr.html.twig b/templates/Offer/dolibarr.html.twig similarity index 100% rename from src/schedule-2.0/templates/Offer/dolibarr.html.twig rename to templates/Offer/dolibarr.html.twig diff --git a/src/schedule-2.0/templates/Offer/edit.html.twig b/templates/Offer/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Offer/edit.html.twig rename to templates/Offer/edit.html.twig diff --git a/src/schedule-2.0/templates/Offer/list.html.twig b/templates/Offer/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Offer/list.html.twig rename to templates/Offer/list.html.twig diff --git a/src/schedule-2.0/templates/Project/edit.html.twig b/templates/Project/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Project/edit.html.twig rename to templates/Project/edit.html.twig diff --git a/src/schedule-2.0/templates/Project/list.html.twig b/templates/Project/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Project/list.html.twig rename to templates/Project/list.html.twig diff --git a/src/schedule-2.0/templates/Project/users.html.twig b/templates/Project/users.html.twig similarity index 100% rename from src/schedule-2.0/templates/Project/users.html.twig rename to templates/Project/users.html.twig diff --git a/src/schedule-2.0/templates/Report/holiday.html.twig b/templates/Report/holiday.html.twig similarity index 100% rename from src/schedule-2.0/templates/Report/holiday.html.twig rename to templates/Report/holiday.html.twig diff --git a/src/schedule-2.0/templates/Report/planning.html.twig b/templates/Report/planning.html.twig similarity index 100% rename from src/schedule-2.0/templates/Report/planning.html.twig rename to templates/Report/planning.html.twig diff --git a/src/schedule-2.0/templates/Report/report.html.twig b/templates/Report/report.html.twig similarity index 100% rename from src/schedule-2.0/templates/Report/report.html.twig rename to templates/Report/report.html.twig diff --git a/src/schedule-2.0/templates/Report/synthese.html.twig b/templates/Report/synthese.html.twig similarity index 100% rename from src/schedule-2.0/templates/Report/synthese.html.twig rename to templates/Report/synthese.html.twig diff --git a/src/schedule-2.0/templates/Service/edit.html.twig b/templates/Service/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Service/edit.html.twig rename to templates/Service/edit.html.twig diff --git a/src/schedule-2.0/templates/Service/list.html.twig b/templates/Service/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Service/list.html.twig rename to templates/Service/list.html.twig diff --git a/src/schedule-2.0/templates/Stat/view.html.twig b/templates/Stat/view.html.twig similarity index 100% rename from src/schedule-2.0/templates/Stat/view.html.twig rename to templates/Stat/view.html.twig diff --git a/src/schedule-2.0/templates/Task/edit.html.twig b/templates/Task/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Task/edit.html.twig rename to templates/Task/edit.html.twig diff --git a/src/schedule-2.0/templates/Task/list.html.twig b/templates/Task/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Task/list.html.twig rename to templates/Task/list.html.twig diff --git a/src/schedule-2.0/templates/Timer/edit.html.twig b/templates/Timer/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Timer/edit.html.twig rename to templates/Timer/edit.html.twig diff --git a/src/schedule-2.0/templates/Timer/list.cal.html.twig b/templates/Timer/list.cal.html.twig similarity index 100% rename from src/schedule-2.0/templates/Timer/list.cal.html.twig rename to templates/Timer/list.cal.html.twig diff --git a/src/schedule-2.0/templates/Timer/list.html.twig b/templates/Timer/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Timer/list.html.twig rename to templates/Timer/list.html.twig diff --git a/src/schedule-2.0/templates/User/edit.html.twig b/templates/User/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/User/edit.html.twig rename to templates/User/edit.html.twig diff --git a/src/schedule-2.0/templates/User/list.html.twig b/templates/User/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/User/list.html.twig rename to templates/User/list.html.twig diff --git a/src/schedule-2.0/templates/Validation/validation.html.twig b/templates/Validation/validation.html.twig similarity index 100% rename from src/schedule-2.0/templates/Validation/validation.html.twig rename to templates/Validation/validation.html.twig diff --git a/src/schedule-2.0/templates/Validation/validationholiday.html.twig b/templates/Validation/validationholiday.html.twig similarity index 100% rename from src/schedule-2.0/templates/Validation/validationholiday.html.twig rename to templates/Validation/validationholiday.html.twig diff --git a/src/schedule-2.0/templates/Validation/validationtimer.html.twig b/templates/Validation/validationtimer.html.twig similarity index 100% rename from src/schedule-2.0/templates/Validation/validationtimer.html.twig rename to templates/Validation/validationtimer.html.twig diff --git a/src/schedule-2.0/templates/Year/edit.html.twig b/templates/Year/edit.html.twig similarity index 100% rename from src/schedule-2.0/templates/Year/edit.html.twig rename to templates/Year/edit.html.twig diff --git a/src/schedule-2.0/templates/Year/list.html.twig b/templates/Year/list.html.twig similarity index 100% rename from src/schedule-2.0/templates/Year/list.html.twig rename to templates/Year/list.html.twig diff --git a/src/schedule-2.0/templates/base.html.twig b/templates/base.html.twig similarity index 100% rename from src/schedule-2.0/templates/base.html.twig rename to templates/base.html.twig diff --git a/src/schedule-2.0/tests/bootstrap.php b/tests/bootstrap.php similarity index 100% rename from src/schedule-2.0/tests/bootstrap.php rename to tests/bootstrap.php diff --git a/tmpl/schedule-apache.conf b/tmpl/schedule-apache.conf deleted file mode 100644 index 28ae165..0000000 --- a/tmpl/schedule-apache.conf +++ /dev/null @@ -1,9 +0,0 @@ -Alias /schedule /var/www/html/schedule/public - - - AllowOverride All - Order Allow,Deny - Allow from All - Options Indexes FollowSymLinks MultiViews - php_admin_flag allow_url_fopen On - \ No newline at end of file diff --git a/tmpl/schedule-db.yml b/tmpl/schedule-db.yml deleted file mode 100644 index dcb0883..0000000 --- a/tmpl/schedule-db.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -%set dmode = %%getVar('schedule_db_mode','non') -%if %%dmode == "externe" -dbhost: %%schedule_dbserver -dbport: %%schedule_dbport -dbroot: %%schedule_dbuser -dbrootpwd: %%schedule_dbpass -%else if %%dmode == "local" -dbhost: 127.0.0.1 -%end if -dbtype: mysql -dbname: schedule -dbuser: schedule -dbpass: "changeme" -%set allow_hosts = %%getVar('schedule_allow_hosts', '') -%if %%dmode == "local" -client_hosts: ["127.0.0.1", "localhost" %slurp -%else if %%dmode == "externe" -client_hosts: ["%%adresse_ip_eth0" %slurp -%end if -%if %%dmode != "default" - %if %%is_empty(%%allow_hosts) -] - %else - %for %%hst in %%allow_hosts -,"%%hst" %slurp - %end for -] - %end if -%end if - -createscript: "/usr/share/eole/db/schedule/gen/schedule-create-0.sql" - -%set cnt_prefix = %%getVar('container_path_reseau', '') -pwd_files: - - {file: '%%cnt_prefix/var/www/html/schedule/.env.local', - pattern: 'DATABASE_PASSWORD=', - owner: 'root:www-data', - mod: '660' } diff --git a/tmpl/schedule-env.local b/tmpl/schedule-env.local deleted file mode 100644 index 436c9f3..0000000 --- a/tmpl/schedule-env.local +++ /dev/null @@ -1,53 +0,0 @@ -# Basic = Redefine local -APP_ENV=prod -APP_SECRET=%%pwdreader("","/var/www/html/schedule/.key") -APP_AUTH=CAS - - -# MAIL sendmail / smtp -MAILER_METHOD=smtp -MAILER_URL=%%getVar('schedule_email_url', '') -MAILER_NOREPLY=noreply@noreply.fr -MAILER_DEFAULT_NOTIF=%%getVar('schedule_email_global_notif', '') - -# Bdd = Redefine local -DATABASE_NAME=schedule -DATABASE_USER=schedule -DATABASE_PASSWORD=tochange -%if %%getVar("ninegate_db_mode", 'non') == "externe" -DATABASE_HOST=%%ninegate_dbserver -%else if %%getVar("ninegate_db_mode", 'non') == "default" - %set dbhost = %%getVar('edb_host', 'non') - %if %%dbhost == 'non' and %%mode_conteneur_actif == 'oui': -DATABASE_HOST=%%adresse_ip_mysql - %else - %if %%dbhost == 'non' -DATABASE_HOST=localhost - %else -DATABASE_HOST=localhost - %end if - %end if -%else -DATABASE_HOST=%%adresse_ip_mysql -%end if - - -# CAS = Redefine local -CAS_HOST=%%eolesso_adresse -CAS_PORT=%%eolesso_port -CAS_PATH=%%eolesso_cas_folder - -OFFICE_HOUR_START=%%getVar('schedule_office_hour_start', '') -OFFICE_HOUR_END=%%getVar('schedule_office_hour_end', '') - -## Sentry DSN -SENTRY_DSN=%%getVar('schedule_sentry_dsn', '') - -## Dolibarr -%if %%getVar('schedule_dolibarr_api', '') == 'oui' -DOLIBARR_ACTIVE=true -%else -DOLIBARR_ACTIVE=false -%end if -DOLIBARR_API_KEY=%%getVar('schedule_dolibarr_apikey', '') -DOLIBARR_URI=%%getVar('schedule_dolibarr_uri', '') \ No newline at end of file diff --git a/tmpl/schedule-proxy.sh b/tmpl/schedule-proxy.sh deleted file mode 100755 index d35a3eb..0000000 --- a/tmpl/schedule-proxy.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Si besoin export des valeurs de HTTP_PROXY et HTTPS_PROXY -%if %%activer_proxy_client == 'oui' -export HTTP_PROXY="%%proxy_client_adresse:%%proxy_client_port" -export HTTPS_PROXY="%%proxy_client_adresse:%%proxy_client_port" -%end if diff --git a/tmpl/schedule.cron b/tmpl/schedule.cron deleted file mode 100644 index d414f4b..0000000 --- a/tmpl/schedule.cron +++ /dev/null @@ -1 +0,0 @@ -* * * * * root /var/www/html/schedule/scripts/cron.sh &>/dev/null diff --git a/src/schedule-2.0/translations/.gitignore b/translations/.gitignore similarity index 100% rename from src/schedule-2.0/translations/.gitignore rename to translations/.gitignore diff --git a/src/schedule-2.0/webpack.config.js b/webpack.config.js similarity index 100% rename from src/schedule-2.0/webpack.config.js rename to webpack.config.js