diff --git a/README.md b/README.md index 81f2f62..cf92638 100644 --- a/README.md +++ b/README.md @@ -1,78 +1,62 @@ -

+# BOGT / Tracabilité Loué -

-Build Status -Total Downloads -Latest Stable Version -License -

+## Installation +``` +composer install +cp .env.example .env +php artisan key:generate +php artisan storage:link +``` -## About Laravel +Éditez le fichier .env puis : +``` +php artisan migrate +``` -Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as: +Front : +``` +npm install && npm run prod +``` +Pour créer un compte admin : +``` +php artisan user:create +``` -- [Simple, fast routing engine](https://laravel.com/docs/routing). -- [Powerful dependency injection container](https://laravel.com/docs/container). -- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage. -- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent). -- Database agnostic [schema migrations](https://laravel.com/docs/migrations). -- [Robust background job processing](https://laravel.com/docs/queues). -- [Real-time event broadcasting](https://laravel.com/docs/broadcasting). +## Commande à mettre dans la crontab toutes les minutes en PROD +``` +php artisan schedule:run +``` -Laravel is accessible, powerful, and provides tools required for large, robust applications. +## Données +Pour synchroniser les aliments : +``` +php artisan cafel:food +``` +Pour synchroniser les données BEA (volaille) : +``` +php artisan cafel:bea_vol +``` +Pour synchroniser les mises en place (oeuf) : +``` +php artisan cafel:mep_egg +``` +Pour synchroniser les éleveurs (oeuf) : +``` +php artisan cafel:breeder_egg +``` +Pour synchroniser les éleveurs (volaille) : +``` +php artisan cafel:breeder_poultry +``` +Pour importer les XML (oeuf) : +``` +php artisan xml:egg +``` +Pour importer les XML (volaille) : +``` +php artisan xml:poultry +``` -## Learning Laravel - -Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework. - -If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library. - -## Laravel Sponsors - -We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell). - -- **[Vehikl](https://vehikl.com/)** -- **[Tighten Co.](https://tighten.co)** -- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)** -- **[64 Robots](https://64robots.com)** -- **[Cubet Techno Labs](https://cubettech.com)** -- **[Cyber-Duck](https://cyber-duck.co.uk)** -- **[British Software Development](https://www.britishsoftware.co)** -- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)** -- **[DevSquad](https://devsquad.com)** -- [UserInsights](https://userinsights.com) -- [Fragrantica](https://www.fragrantica.com) -- [SOFTonSOFA](https://softonsofa.com/) -- [User10](https://user10.com) -- [Soumettre.fr](https://soumettre.fr/) -- [CodeBrisk](https://codebrisk.com) -- [1Forge](https://1forge.com) -- [TECPRESSO](https://tecpresso.co.jp/) -- [Runtime Converter](http://runtimeconverter.com/) -- [WebL'Agence](https://weblagence.com/) -- [Invoice Ninja](https://www.invoiceninja.com) -- [iMi digital](https://www.imi-digital.de/) -- [Earthlink](https://www.earthlink.ro/) -- [Steadfast Collective](https://steadfastcollective.com/) -- [We Are The Robots Inc.](https://watr.mx/) -- [Understand.io](https://www.understand.io/) -- [Abdel Elrafa](https://abdelelrafa.com) -- [Hyper Host](https://hyper.host) -- [Appoly](https://www.appoly.co.uk) -- [OP.GG](https://op.gg) - -## Contributing - -Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions). - -## Code of Conduct - -In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct). - -## Security Vulnerabilities - -If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed. - -## License - -The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). +## TODO +- Mettre analytics dans cookie notice +- Cacher la colonne Code EDE dans le cas du filtrage sur volaille (/bo/eleveurs) \ No newline at end of file diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index cbb62c7..9d3b7d5 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -25,14 +25,4 @@ class LoginController extends Controller { $this->middleware('guest')->except('logout'); } - - /** - * Get user name column - * - * @return string - */ - public function username(): string - { - return 'username'; - } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 245c7f5..7ad84fe 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -26,10 +26,8 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { - // * LOCAL HTTPS FIX - if (!in_array(config('app.env'), ['local', 'testing'])) { - URL::forceScheme('https'); - } + URL::forceScheme('https'); + // * HA PROXY FIX App::singleton('clientIp', function () { if (config('app.env') === 'local') { diff --git a/database/migrations/2022_03_08_094949_create_aliments_table.php b/database/migrations/2022_03_08_094949_create_aliments_table.php index dd1cc98..f007bec 100644 --- a/database/migrations/2022_03_08_094949_create_aliments_table.php +++ b/database/migrations/2022_03_08_094949_create_aliments_table.php @@ -1,8 +1,6 @@ id(); - $table->string('code_lot', 50)->nullable() - ->comment('Code du lot d\'aliment'); - $table->date('date_livraison')->nullable() - ->comment('Date de livraison de l\'aliment'); - $table->string('type_aliment', 50)->nullable() - ->comment('le type de l\'aliment'); - }); - } else { - Schema::table('aliments', function (Blueprint $table) { - $table->string('code_lot', 50)->nullable() - ->comment('Code du lot d\'aliment')->change(); - $table->date('date_livraison')->nullable() - ->comment('Date de livraison de l\'aliment')->change(); - $table->string('type_aliment', 50)->nullable() - ->comment('le type de l\'aliment')->change(); - }); - } //end if + Schema::dropIfExists('aliments'); } /** diff --git a/package-lock.json b/package-lock.json index d1d5e97..d6b2e84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "bogt", + "name": "srcs", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 2730f44..7b10c56 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -12,12 +12,12 @@ @csrf
- +
- + - @error('username') + @error('email') {{ $message }} diff --git a/resources/views/back/layout/header.blade.php b/resources/views/back/layout/header.blade.php index f4292da..671532a 100644 --- a/resources/views/back/layout/header.blade.php +++ b/resources/views/back/layout/header.blade.php @@ -32,7 +32,7 @@