From baef9a1df0fcd4c156bb42030ba8f4b9a25b4090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lagac=C3=A9=20Mathieu?= Date: Sat, 1 Feb 2020 13:17:32 -0500 Subject: [PATCH] 3.2.5 --- app/Config.php | 5 + app/Course.php | 5 + app/Event.php | 70 + app/GoogleDriveFile.php | 39 + app/Http/Controllers/AdminController.php | 6 + app/Http/Controllers/ConfigController.php | 28 +- app/Http/Controllers/EventController.php | 31 +- .../Controllers/GoogleDriveController.php | 117 ++ app/Permission.php | 30 + app/Providers/GoogleDriveServiceProvider.php | 44 + composer.json | 1 + composer.lock | 1254 ++++++++++++----- config/app.php | 1 + config/filesystems.php | 9 + database/seeds/ConfigsTableSeeder.php | 20 + public/android-chrome-192x192.png | Bin 0 -> 4042 bytes public/android-chrome-512x512.png | Bin 0 -> 7241 bytes public/apple-touch-icon.png | Bin 0 -> 3564 bytes public/css/custom.css | 26 +- public/favicon-16x16.png | Bin 0 -> 290 bytes public/favicon-32x32.png | Bin 0 -> 532 bytes public/favicon.ico | Bin 0 -> 15406 bytes public/js/plugins/schedule/editor.js | 21 +- resources/assets/fullcalendar/core/main.d.ts | 2 +- resources/custom.css | 26 +- .../admin/calendar/calendar_display.blade.php | 21 +- resources/views/admin/configs/file.blade.php | 73 +- resources/views/admin/dashboard.blade.php | 19 +- .../admin/files/Google Drive/index.blade.php | 68 + .../admin/schedule/editor/course.blade.php | 1 + .../views/admin/schedule/event/add.blade.php | 56 +- resources/views/admin/status/index.blade.php | 93 ++ resources/views/layouts/admin/head.blade.php | 9 +- .../views/layouts/admin/header.blade.php | 7 +- .../views/layouts/admin/scripts.blade.php | 8 +- .../views/layouts/admin/sidebar.blade.php | 68 +- routes/web.php | 5 +- 37 files changed, 1662 insertions(+), 501 deletions(-) create mode 100644 app/GoogleDriveFile.php create mode 100644 app/Http/Controllers/GoogleDriveController.php create mode 100644 app/Providers/GoogleDriveServiceProvider.php create mode 100644 public/android-chrome-192x192.png create mode 100644 public/android-chrome-512x512.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon-16x16.png create mode 100644 public/favicon-32x32.png create mode 100644 public/favicon.ico create mode 100644 resources/views/admin/files/Google Drive/index.blade.php create mode 100644 resources/views/admin/status/index.blade.php diff --git a/app/Config.php b/app/Config.php index ae98428e..6a5096a2 100644 --- a/app/Config.php +++ b/app/Config.php @@ -24,4 +24,9 @@ class Config extends Model { return $this->morphMany('App\Log', 'logable'); } + + public static function find($name) + { + return Config::where('name',$name)->first(); + } } diff --git a/app/Course.php b/app/Course.php index d0c7493b..9222c2eb 100644 --- a/app/Course.php +++ b/app/Course.php @@ -25,4 +25,9 @@ class Course extends Model { return $this->morphMany('App\Log', 'logable'); } + + public function use_course() + { + return $this->name == "" && $this->ocom == ""; + } } diff --git a/app/Event.php b/app/Event.php index ce14abe5..37952ed7 100644 --- a/app/Event.php +++ b/app/Event.php @@ -59,4 +59,74 @@ class Event extends Model } return $events; } + + public static function checkForError() + { + $events = Event::all(); + + $warning = []; + $danger = []; + + foreach ($events as $event) + { + if($event->date_begin == null) + { + array_push($warning,'Évènement ID:'.$event->id.' - "date_begin", Incorrect'); + } + if($event->date_end == null) + { + array_push($warning,'Évènement ID:'.$event->id.' - "date_end", Incorrect'); + } + if($event->type == null || $event->type == "" || !\App\EventType::all()->has($event->type)) + { + $event->type = 1; + //$event->save(); + array_push($warning,'Évènement ID:'.$event->id.' - "type", Incorrect... Réinitialisé à la valeur par défaut'); + clog('error','danger','Évènement ID:'.$event->id.' - "type", Incorrect... Réinitialisé à la valeur par défaut'); + } + if($event->is_mandatory == null && $event->is_mandatory != 0) + { + array_push($warning,'Évènement ID:'.$event->id.' - "is_mandatory", Incorrect... Réinitialisé à la valeur par défaut'); + clog('error','danger','Évènement ID:'.$event->id.' - "is_mandatory", Incorrect... Réinitialisé à la valeur par défaut'); + } + if($event->use_weekly_msg == null && $event->use_weekly_msg != 0) + { + array_push($warning,'Évènement ID:'.$event->id.' - "use_weekly_msg", Incorrect... Réinitialisé à la valeur par défaut'); + clog('error','danger','Évènement ID:'.$event->id.' - "use_weekly_msg", Incorrect... Réinitialisé à la valeur par défaut'); + } + if($event->use_schedule == null && $event->use_schedule != 0) + { + array_push($warning,'Évènement ID:'.$event->id.' - "use_schedule", Incorrect... Réinitialisé à la valeur par défaut'); + clog('error','danger','Évènement ID:'.$event->id.' - "use_schedule", Incorrect... Réinitialisé à la valeur par défaut'); + } + if($event->schedule == null) + { + $event->schedule = '{"periodes":[{"name":"Periode 1","begin_time":"19:00","end_time":"20:10"},{"name":"Periode 2","begin_time":"20:30","end_time":"21:20"}],"niveaux":[{"name":"Niveau 1"},{"name":"Niveau 2"},{"name":"Niveau 3"}]}'; + $event->save(); + array_push($warning,'Évènement ID:'.$event->id.' - "schedule", Incorrect... Réinitialisé à la valeur par défaut'); + clog('error','danger','Évènement ID:'.$event->id.' - "schedule", Incorrect... Réinitialisé à la valeur par défaut'); + } + if($event->location == null || $event->location == "") + { + array_push($warning,'Évènement ID:'.$event->id.' - "location", Incorrect... Réinitialisé à la valeur par défaut'); + clog('error','danger','Évènement ID:'.$event->id.' - "location", Incorrect... Réinitialisé à la valeur par défaut'); + } + if($event->calendar_color == null || $event->calendar_color == "") + { + $event->calendar_color = '#A4A4A4'; + $event->save(); + array_push($warning,'Évènement ID:'.$event->id.' - "calendar_color", Incorrect... Réinitialisé à la valeur par défaut'); + clog('error','danger','Évènement ID:'.$event->id.' - "calendar_color", Incorrect... Réinitialisé à la valeur par défaut'); + } + if($event->calendar_icon == null || $event->calendar_icon == "") + { + $event->calendar_icon = 'fas fa-book'; + $event->save(); + array_push($warning,'Évènement ID:'.$event->id.' - "calendar_icon", Incorrect... Réinitialisé à la valeur par défaut'); + clog('error','danger','Évènement ID:'.$event->id.' - "calendar_icon", Incorrect... Réinitialisé à la valeur par défaut'); + } + } + + return [$warning,$danger]; + } } diff --git a/app/GoogleDriveFile.php b/app/GoogleDriveFile.php new file mode 100644 index 00000000..4b31fc48 --- /dev/null +++ b/app/GoogleDriveFile.php @@ -0,0 +1,39 @@ + $alerts]); + } + } diff --git a/app/Http/Controllers/ConfigController.php b/app/Http/Controllers/ConfigController.php index 01c4a54a..af29cc44 100644 --- a/app/Http/Controllers/ConfigController.php +++ b/app/Http/Controllers/ConfigController.php @@ -137,13 +137,33 @@ class ConfigController extends Controller public function editfilesConfig() { - $config = \App\Config::all()->where('name','cadet_list')->first(); + $configList = [ + 'cadet_list' + ]; - $config->data = [\request('cadet_list')]; + $configListEncrypt = [ + 'GOOGLE_DRIVE_CLIENT_ID', + 'GOOGLE_DRIVE_CLIENT_SECRET', + 'GOOGLE_DRIVE_REFRESH_TOKEN', + 'GOOGLE_DRIVE_FOLDER_ID' + ]; - $config->save(); - clog('edit','success','a modifié la configuration'); + foreach ($configList as $configName) + { + $config = \App\Config::find($configName); + $config->data = [\request($configName)]; + $config->save(); + } + + foreach ($configListEncrypt as $configName) + { + $config = \App\Config::find($configName); + $config->data = [\Crypt::encryptString(\request($configName))]; + $config->save(); + } + + clog('edit','success','a modifié la configuration des fichiers'); return redirect('/admin/config/files')->with('success','Modification sauvegarder avec succès !'); } } diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index 09aa5c1d..aec86a6b 100644 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -38,6 +38,8 @@ class EventController extends Controller { $event = new Event(); + + $event->name = request('name'); $event->date_begin = request('begin_time'); $event->date_end = request('end_time'); @@ -51,7 +53,7 @@ class EventController extends Controller $event->is_mandatory = 0; } - $event->desc = ''; + $event->desc = \request('admin_desc'); if(\request("use_weekly_msg")) { @@ -95,10 +97,10 @@ class EventController extends Controller ]); $nbPeriode++; } - $event->schedule = [ 'periodes' => $periodes, - 'niveaux' => $niveaux + 'niveaux' => $niveaux, + 'courses' => [] ]; $event->save(); @@ -106,7 +108,7 @@ class EventController extends Controller if ($event->use_schedule) { for ($l=1; $l < $nbLevel; $l++) { for ($p=1; $p < $nbPeriode; $p++) { - + $course = new \App\Course(); $users = \App\User::all(); @@ -119,16 +121,26 @@ class EventController extends Controller } } - $course->name = request('name_n'.$l.'_p'.$p); $course->user_id = $instructor; - $course->ocom = request('ocom_n'.$l.'_p'.$p); $course->location = request('location_n'.$l.'_p'.$p); $course->periode = $p; $course->level = $l; - $course->comment = ""; $course->event_id = $event->id; + if(\request("use_course_n".$l."_p".$p) == 'on') + { + $course->name = request('name_n'.$l.'_p'.$p); + $course->ocom = request('ocom_n'.$l.'_p'.$p); + $course->comment = ""; + } + else + { + $course->name = ""; + $course->ocom = ""; + $course->comment = request('desc_n'.$l.'_p'.$p); + } + $course->save(); } } @@ -253,4 +265,9 @@ class EventController extends Controller { // } + + public function checkEvent() + { + // + } } diff --git a/app/Http/Controllers/GoogleDriveController.php b/app/Http/Controllers/GoogleDriveController.php new file mode 100644 index 00000000..411b321b --- /dev/null +++ b/app/Http/Controllers/GoogleDriveController.php @@ -0,0 +1,117 @@ +listContents($dir, $recursive)); + + return $contents->where('type', '=', 'file'); // files + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + // + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return bool + */ + public function store(Request $request) + { + $path = Storage::cloud()->makeDirectory('Test Dir'); + dd($path); + } + + /** + * Display the specified resource. + * + * @param $filename + * @return \Illuminate\Http\Response + * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException + */ + public function show() + { + $filename = \request('file'); + $recursive = false; // Get subdirectories also? + $contents = collect(Storage::cloud()->listContents('/1nEe35-GvLX598RketTI-UoaOxIMNxfka', true)); + + $file = $contents + ->where('type', '=', 'file') + ->where('filename', '=', pathinfo($filename, PATHINFO_FILENAME)) + ->where('extension', '=', pathinfo($filename, PATHINFO_EXTENSION)) + ->first(); // there can be duplicate file names! + + //return $file; // array with file info + + $rawData = Storage::cloud()->get($file['path']); + + return response($rawData, 200) + ->header('ContentType', $file['mimetype']) + ->header('Content-Disposition', "attachment; filename='$filename'"); + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } + + public function list() + { + $dir = '/'; + $recursive = false; // Get subdirectories also? + $contents = collect(Storage::cloud()->listContents($dir, $recursive)); + + return view('admin.files.Google Drive.index',['directories' => $contents->where('type', '=', 'dir'), 'files' => $contents->where('type', '=', 'file')]); + //return $contents->where('type', '=', 'file'); // files + } +} diff --git a/app/Permission.php b/app/Permission.php index 9f60eee4..9fcf3cb7 100644 --- a/app/Permission.php +++ b/app/Permission.php @@ -272,6 +272,36 @@ class Permission extends Model 'icon' => 'fa-eye', 'valeur' => 0 ], + ], + 'file' => [ + 'file_see' => [ + 'ckey' => 'file_see', + 'communName' => 'Voir les fichiers', + 'desc' => 'L\'utilisateur peut-il consulter les fichiers', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'file_add' => [ + 'ckey' => 'file_add', + 'communName' => 'Ajouter un fichier', + 'desc' => 'L\'utilisateur peut-il ajouter un fichier', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'file_edit' => [ + 'ckey' => 'file_edit', + 'communName' => 'Modifier un fichier', + 'desc' => 'L\'utilisateur peut-il modifier un fichier', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'file_delete' => [ + 'ckey' => 'file_delete', + 'communName' => 'Supprimer un fichier', + 'desc' => 'L\'utilisateur peut-il supprimer un fichier', + 'icon' => 'fa-eye', + 'valeur' => 0 + ] ] ]; diff --git a/app/Providers/GoogleDriveServiceProvider.php b/app/Providers/GoogleDriveServiceProvider.php new file mode 100644 index 00000000..3afc03d1 --- /dev/null +++ b/app/Providers/GoogleDriveServiceProvider.php @@ -0,0 +1,44 @@ +setClientId(\Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_CLIENT_ID'))); + $client->setClientSecret(\Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_CLIENT_SECRET'))); + $client->refreshToken(\Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_REFRESH_TOKEN'))); + $service = new \Google_Service_Drive($client); + + $options = []; + if(isset($config['teamDriveId'])) { + $options['teamDriveId'] = $config['teamDriveId']; + } + + $adapter = new GoogleDriveAdapter($service, \Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_FOLDER_ID')), $options); + + return new \League\Flysystem\Filesystem($adapter); + }); + } +} diff --git a/composer.json b/composer.json index 9168163f..fef011c9 100644 --- a/composer.json +++ b/composer.json @@ -14,6 +14,7 @@ "laravel/helpers": "^1.1", "laravel/nexmo-notification-channel": "^2.2", "laravel/tinker": "^1.0", + "nao-pon/flysystem-google-drive": "^1.1", "nexmo/client": "^2.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index bcb3ec1f..fef88117 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "eb2e0f9a332c6bc503c5535d872c50e7", + "content-hash": "57f87b1252c823a7d2a41bf3f850e726", "packages": [ { "name": "barryvdh/laravel-dompdf", @@ -184,16 +184,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.2.5", + "version": "1.2.6", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "62e8fc2dc550e5d6d8c9360c7721662670f58149" + "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/62e8fc2dc550e5d6d8c9360c7721662670f58149", - "reference": "62e8fc2dc550e5d6d8c9360c7721662670f58149", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/47fe531de31fca4a1b997f87308e7d7804348f7e", + "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e", "shasum": "" }, "require": { @@ -236,20 +236,20 @@ "ssl", "tls" ], - "time": "2019-12-11T14:44:42+00:00" + "time": "2020-01-13T10:02:55+00:00" }, { "name": "composer/composer", - "version": "1.9.1", + "version": "1.9.2", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "bb01f2180df87ce7992b8331a68904f80439dd2f" + "reference": "7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/bb01f2180df87ce7992b8331a68904f80439dd2f", - "reference": "bb01f2180df87ce7992b8331a68904f80439dd2f", + "url": "https://api.github.com/repos/composer/composer/zipball/7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb", + "reference": "7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb", "shasum": "" }, "require": { @@ -316,28 +316,27 @@ "dependency", "package" ], - "time": "2019-11-01T16:20:17+00:00" + "time": "2020-01-14T15:30:32+00:00" }, { "name": "composer/semver", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e" + "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e", - "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e", + "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de", + "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.5 || ^5.0.5", - "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" + "phpunit/phpunit": "^4.5 || ^5.0.5" }, "type": "library", "extra": { @@ -378,7 +377,7 @@ "validation", "versioning" ], - "time": "2019-03-19T17:25:45+00:00" + "time": "2020-01-13T12:06:48+00:00" }, { "name": "composer/spdx-licenses", @@ -601,16 +600,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.10.0", + "version": "v2.10.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934" + "reference": "c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/0c9a646775ef549eb0a213a4f9bd4381d9b4d934", - "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8", + "reference": "c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8", "shasum": "" }, "require": { @@ -689,7 +688,7 @@ "sqlserver", "sqlsrv" ], - "time": "2019-11-03T16:50:43+00:00" + "time": "2020-01-04T12:56:21+00:00" }, { "name": "doctrine/event-manager", @@ -898,28 +897,28 @@ }, { "name": "dompdf/dompdf", - "version": "v0.8.3", + "version": "v0.8.4", "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "75f13c700009be21a1965dc2c5b68a8708c22ba2" + "reference": "8f49b3b01693f51037dd50da81090beba1b5c005" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/75f13c700009be21a1965dc2c5b68a8708c22ba2", - "reference": "75f13c700009be21a1965dc2c5b68a8708c22ba2", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/8f49b3b01693f51037dd50da81090beba1b5c005", + "reference": "8f49b3b01693f51037dd50da81090beba1b5c005", "shasum": "" }, "require": { "ext-dom": "*", "ext-mbstring": "*", - "phenx/php-font-lib": "0.5.*", - "phenx/php-svg-lib": "0.3.*", - "php": ">=5.4.0" + "phenx/php-font-lib": "^0.5.1", + "phenx/php-svg-lib": "^0.3.3", + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^4.8|^5.5|^6.5", - "squizlabs/php_codesniffer": "2.*" + "phpunit/phpunit": "^7.5", + "squizlabs/php_codesniffer": "^3.5" }, "suggest": { "ext-gd": "Needed to process images", @@ -960,7 +959,7 @@ ], "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", "homepage": "https://github.com/dompdf/dompdf", - "time": "2018-12-14T02:40:31+00:00" + "time": "2020-01-20T17:00:46+00:00" }, { "name": "dragonmantank/cron-expression", @@ -1018,27 +1017,27 @@ }, { "name": "egulias/email-validator", - "version": "2.1.11", + "version": "2.1.15", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23" + "reference": "e834eea5306d85d67de5a05db5882911d5b29357" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/92dd169c32f6f55ba570c309d83f5209cefb5e23", - "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e834eea5306d85d67de5a05db5882911d5b29357", + "reference": "e834eea5306d85d67de5a05db5882911d5b29357", "shasum": "" }, "require": { "doctrine/lexer": "^1.0.1", - "php": ">= 5.5" + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.10" }, "require-dev": { - "dominicsayers/isemail": "dev-master", - "phpunit/phpunit": "^4.8.35||^5.7||^6.0", - "satooshi/php-coveralls": "^1.0.1", - "symfony/phpunit-bridge": "^4.4@dev" + "dominicsayers/isemail": "^3.0.7", + "phpunit/phpunit": "^4.8.36|^7.5.15", + "satooshi/php-coveralls": "^1.0.1" }, "suggest": { "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" @@ -1072,66 +1071,20 @@ "validation", "validator" ], - "time": "2019-08-13T17:33:27+00:00" - }, - { - "name": "erusev/parsedown", - "version": "1.7.3", - "source": { - "type": "git", - "url": "https://github.com/erusev/parsedown.git", - "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7", - "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35" - }, - "type": "library", - "autoload": { - "psr-0": { - "Parsedown": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Emanuil Rusev", - "email": "hello@erusev.com", - "homepage": "http://erusev.com" - } - ], - "description": "Parser for Markdown.", - "homepage": "http://parsedown.org", - "keywords": [ - "markdown", - "parser" - ], - "time": "2019-03-17T18:48:37+00:00" + "time": "2020-01-20T21:40:59+00:00" }, { "name": "fideloper/proxy", - "version": "4.2.1", + "version": "4.2.2", "source": { "type": "git", "url": "https://github.com/fideloper/TrustedProxy.git", - "reference": "03085e58ec7bee24773fa5a8850751a6e61a7e8a" + "reference": "790194d5d3da89a713478875d2e2d05855a90a81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/03085e58ec7bee24773fa5a8850751a6e61a7e8a", - "reference": "03085e58ec7bee24773fa5a8850751a6e61a7e8a", + "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/790194d5d3da89a713478875d2e2d05855a90a81", + "reference": "790194d5d3da89a713478875d2e2d05855a90a81", "shasum": "" }, "require": { @@ -1172,20 +1125,215 @@ "proxy", "trusted proxy" ], - "time": "2019-09-03T16:45:42+00:00" + "time": "2019-12-20T13:11:11+00:00" }, { - "name": "guzzlehttp/guzzle", - "version": "6.5.0", + "name": "firebase/php-jwt", + "version": "v5.0.0", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5" + "url": "https://github.com/firebase/php-jwt.git", + "reference": "9984a4d3a32ae7673d6971ea00bae9d0a1abba0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5", - "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/9984a4d3a32ae7673d6971ea00bae9d0a1abba0e", + "reference": "9984a4d3a32ae7673d6971ea00bae9d0a1abba0e", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": " 4.8.35" + }, + "type": "library", + "autoload": { + "psr-4": { + "Firebase\\JWT\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Neuman Vong", + "email": "neuman+pear@twilio.com", + "role": "Developer" + }, + { + "name": "Anant Narayanan", + "email": "anant@php.net", + "role": "Developer" + } + ], + "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", + "homepage": "https://github.com/firebase/php-jwt", + "time": "2017-06-27T22:17:23+00:00" + }, + { + "name": "google/apiclient", + "version": "v2.4.0", + "source": { + "type": "git", + "url": "https://github.com/googleapis/google-api-php-client.git", + "reference": "cd3c37998020d91ae4eafca4f26a92da4dabba83" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/cd3c37998020d91ae4eafca4f26a92da4dabba83", + "reference": "cd3c37998020d91ae4eafca4f26a92da4dabba83", + "shasum": "" + }, + "require": { + "firebase/php-jwt": "~2.0||~3.0||~4.0||~5.0", + "google/apiclient-services": "~0.13", + "google/auth": "^1.0", + "guzzlehttp/guzzle": "~5.3.1||~6.0", + "guzzlehttp/psr7": "^1.2", + "monolog/monolog": "^1.17|^2.0", + "php": ">=5.4", + "phpseclib/phpseclib": "~0.3.10||~2.0" + }, + "require-dev": { + "cache/filesystem-adapter": "^0.3.2", + "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0", + "phpcompatibility/php-compatibility": "^9.2", + "phpunit/phpunit": "~4.8.36", + "squizlabs/php_codesniffer": "~2.3", + "symfony/css-selector": "~2.1", + "symfony/dom-crawler": "~2.1" + }, + "suggest": { + "cache/filesystem-adapter": "For caching certs and tokens (using Google_Client::setCache)" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-0": { + "Google_": "src/" + }, + "classmap": [ + "src/Google/Service/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Client library for Google APIs", + "homepage": "http://developers.google.com/api-client-library/php", + "keywords": [ + "google" + ], + "time": "2019-09-11T17:38:10+00:00" + }, + { + "name": "google/apiclient-services", + "version": "v0.123", + "source": { + "type": "git", + "url": "https://github.com/googleapis/google-api-php-client-services.git", + "reference": "a8c3c7563729ecb98a9ed66f675366527bcbad4d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/a8c3c7563729ecb98a9ed66f675366527bcbad4d", + "reference": "a8c3c7563729ecb98a9ed66f675366527bcbad4d", + "shasum": "" + }, + "require": { + "php": ">=5.4" + }, + "require-dev": { + "phpunit/phpunit": "^4.8|^5" + }, + "type": "library", + "autoload": { + "psr-0": { + "Google_Service_": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Client library for Google APIs", + "homepage": "http://developers.google.com/api-client-library/php", + "keywords": [ + "google" + ], + "time": "2020-01-19T00:24:13+00:00" + }, + { + "name": "google/auth", + "version": "v1.6.1", + "source": { + "type": "git", + "url": "https://github.com/googleapis/google-auth-library-php.git", + "reference": "45635ac69d0b95f38885531d4ebcdfcb2ebb6f36" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/45635ac69d0b95f38885531d4ebcdfcb2ebb6f36", + "reference": "45635ac69d0b95f38885531d4ebcdfcb2ebb6f36", + "shasum": "" + }, + "require": { + "firebase/php-jwt": "~2.0|~3.0|~4.0|~5.0", + "guzzlehttp/guzzle": "~5.3.1|~6.0", + "guzzlehttp/psr7": "^1.2", + "php": ">=5.4", + "psr/cache": "^1.0", + "psr/http-message": "^1.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^1.11", + "guzzlehttp/promises": "0.1.1|^1.3", + "phpseclib/phpseclib": "^2", + "phpunit/phpunit": "^4.8.36|^5.7", + "sebastian/comparator": ">=1.2.3" + }, + "suggest": { + "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings or for token management. Please require version ^2." + }, + "type": "library", + "autoload": { + "psr-4": { + "Google\\Auth\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Google Auth Library for PHP", + "homepage": "http://github.com/google/google-auth-library-php", + "keywords": [ + "Authentication", + "google", + "oauth2" + ], + "time": "2019-10-29T20:13:04+00:00" + }, + { + "name": "guzzlehttp/guzzle", + "version": "6.5.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "43ece0e75098b7ecd8d13918293029e555a50f82" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82", + "reference": "43ece0e75098b7ecd8d13918293029e555a50f82", "shasum": "" }, "require": { @@ -1239,7 +1387,7 @@ "rest", "web service" ], - "time": "2019-12-07T18:20:45+00:00" + "time": "2019-12-23T11:57:10+00:00" }, { "name": "guzzlehttp/promises", @@ -1519,26 +1667,27 @@ }, { "name": "laravel/framework", - "version": "v6.7.0", + "version": "v6.12.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ba4204f3a8b9672b6116398c165bd9c0c6eac077" + "reference": "8e189a8dee7ff76bf50acb7e80aa1a36afaf54d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ba4204f3a8b9672b6116398c165bd9c0c6eac077", - "reference": "ba4204f3a8b9672b6116398c165bd9c0c6eac077", + "url": "https://api.github.com/repos/laravel/framework/zipball/8e189a8dee7ff76bf50acb7e80aa1a36afaf54d4", + "reference": "8e189a8dee7ff76bf50acb7e80aa1a36afaf54d4", "shasum": "" }, "require": { "doctrine/inflector": "^1.1", "dragonmantank/cron-expression": "^2.0", "egulias/email-validator": "^2.1.10", - "erusev/parsedown": "^1.7", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", + "league/commonmark": "^1.1", + "league/commonmark-ext-table": "^2.1", "league/flysystem": "^1.0.8", "monolog/monolog": "^1.12|^2.0", "nesbot/carbon": "^2.0", @@ -1598,14 +1747,13 @@ "filp/whoops": "^2.4", "guzzlehttp/guzzle": "^6.3", "league/flysystem-cached-adapter": "^1.0", - "mockery/mockery": "^1.2.3", + "mockery/mockery": "^1.3.1", "moontoast/math": "^1.1", "orchestra/testbench-core": "^4.0", "pda/pheanstalk": "^4.0", - "phpunit/phpunit": "^8.3", + "phpunit/phpunit": "^7.5.15|^8.4|^9.0", "predis/predis": "^1.1.1", - "symfony/cache": "^4.3", - "true/punycode": "^2.1" + "symfony/cache": "^4.3.4" }, "suggest": { "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).", @@ -1623,6 +1771,7 @@ "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", "moontoast/math": "Required to use ordered UUIDs (^1.1).", + "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).", @@ -1661,7 +1810,7 @@ "framework", "laravel" ], - "time": "2019-12-10T16:01:57+00:00" + "time": "2020-01-21T15:10:03+00:00" }, { "name": "laravel/helpers", @@ -1892,17 +2041,153 @@ "time": "2019-05-24T18:30:49+00:00" }, { - "name": "league/flysystem", - "version": "1.0.61", + "name": "league/commonmark", + "version": "1.2.2", "source": { "type": "git", - "url": "https://github.com/thephpleague/flysystem.git", - "reference": "4fb13c01784a6c9f165a351e996871488ca2d8c9" + "url": "https://github.com/thephpleague/commonmark.git", + "reference": "34cf4ddb3892c715ae785c880e6691d839cff88d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4fb13c01784a6c9f165a351e996871488ca2d8c9", - "reference": "4fb13c01784a6c9f165a351e996871488ca2d8c9", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/34cf4ddb3892c715ae785c880e6691d839cff88d", + "reference": "34cf4ddb3892c715ae785c880e6691d839cff88d", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": "^7.1" + }, + "replace": { + "colinodell/commonmark-php": "*" + }, + "require-dev": { + "cebe/markdown": "~1.0", + "commonmark/commonmark.js": "0.29.1", + "erusev/parsedown": "~1.0", + "ext-json": "*", + "michelf/php-markdown": "~1.4", + "mikehaertl/php-shellcommand": "^1.4", + "phpstan/phpstan-shim": "^0.11.5", + "phpunit/phpunit": "^7.5", + "scrutinizer/ocular": "^1.5", + "symfony/finder": "^4.2" + }, + "suggest": { + "league/commonmark-extras": "Library of useful extensions including smart punctuation" + }, + "bin": [ + "bin/commonmark" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "League\\CommonMark\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com", + "role": "Lead Developer" + } + ], + "description": "PHP Markdown parser based on the CommonMark spec", + "homepage": "https://commonmark.thephpleague.com", + "keywords": [ + "commonmark", + "markdown", + "parser" + ], + "time": "2020-01-16T01:18:13+00:00" + }, + { + "name": "league/commonmark-ext-table", + "version": "v2.1.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/commonmark-ext-table.git", + "reference": "3228888ea69636e855efcf6636ff8e6316933fe7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/commonmark-ext-table/zipball/3228888ea69636e855efcf6636ff8e6316933fe7", + "reference": "3228888ea69636e855efcf6636ff8e6316933fe7", + "shasum": "" + }, + "require": { + "league/commonmark": "~0.19.3|^1.0", + "php": "^7.1" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.14", + "phpstan/phpstan": "~0.11", + "phpunit/phpunit": "^7.0|^8.0", + "symfony/var-dumper": "^4.0", + "vimeo/psalm": "^3.0" + }, + "type": "commonmark-extension", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-4": { + "League\\CommonMark\\Ext\\Table\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Martin Hasoň", + "email": "martin.hason@gmail.com" + }, + { + "name": "Webuni s.r.o.", + "homepage": "https://www.webuni.cz" + }, + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com" + } + ], + "description": "Table extension for league/commonmark", + "homepage": "https://github.com/thephpleague/commonmark-ext-table", + "keywords": [ + "commonmark", + "extension", + "markdown", + "table" + ], + "time": "2019-09-26T13:28:33+00:00" + }, + { + "name": "league/flysystem", + "version": "1.0.63", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem.git", + "reference": "8132daec326565036bc8e8d1876f77ec183a7bd6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8132daec326565036bc8e8d1876f77ec183a7bd6", + "reference": "8132daec326565036bc8e8d1876f77ec183a7bd6", "shasum": "" }, "require": { @@ -1973,20 +2258,67 @@ "sftp", "storage" ], - "time": "2019-12-08T21:46:50+00:00" + "time": "2020-01-04T16:30:31+00:00" }, { - "name": "monolog/monolog", - "version": "2.0.1", + "name": "league/flysystem-cached-adapter", + "version": "1.0.9", "source": { "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c" + "url": "https://github.com/thephpleague/flysystem-cached-adapter.git", + "reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9d56fd2f5533322caccdfcddbb56aedd622ef1c", - "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c", + "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/08ef74e9be88100807a3b92cc9048a312bf01d6f", + "reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f", + "shasum": "" + }, + "require": { + "league/flysystem": "~1.0", + "psr/cache": "^1.0.0" + }, + "require-dev": { + "mockery/mockery": "~0.9", + "phpspec/phpspec": "^3.4", + "phpunit/phpunit": "^5.7", + "predis/predis": "~1.0", + "tedivm/stash": "~0.12" + }, + "suggest": { + "ext-phpredis": "Pure C implemented extension for PHP" + }, + "type": "library", + "autoload": { + "psr-4": { + "League\\Flysystem\\Cached\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "frankdejonge", + "email": "info@frenky.net" + } + ], + "description": "An adapter decorator to enable meta-data caching.", + "time": "2018-07-09T20:51:04+00:00" + }, + { + "name": "monolog/monolog", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c861fcba2ca29404dc9e617eedd9eff4616986b8", + "reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8", "shasum": "" }, "require": { @@ -2054,20 +2386,110 @@ "logging", "psr-3" ], - "time": "2019-11-13T10:27:43+00:00" + "time": "2019-12-20T14:22:59+00:00" }, { - "name": "nesbot/carbon", - "version": "2.27.0", + "name": "nao-pon/flysystem-cached-extra", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "13b8485a8690f103bf19cba64879c218b102b726" + "url": "https://github.com/nao-pon/flysystem-cached-extra.git", + "reference": "189abdafa0a86d92781e148ee8740ef80f4c5859" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/13b8485a8690f103bf19cba64879c218b102b726", - "reference": "13b8485a8690f103bf19cba64879c218b102b726", + "url": "https://api.github.com/repos/nao-pon/flysystem-cached-extra/zipball/189abdafa0a86d92781e148ee8740ef80f4c5859", + "reference": "189abdafa0a86d92781e148ee8740ef80f4c5859", + "shasum": "" + }, + "require": { + "league/flysystem-cached-adapter": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Hypweb\\Flysystem\\Cached\\Extra\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Naoki Sawada", + "email": "hypweb@gmail.com" + } + ], + "description": "Extra traits for Flysystem cached adapter", + "time": "2018-02-16T01:44:38+00:00" + }, + { + "name": "nao-pon/flysystem-google-drive", + "version": "1.1.11", + "source": { + "type": "git", + "url": "https://github.com/nao-pon/flysystem-google-drive.git", + "reference": "b99f4f8c1a344937984082a00f5bb33075c8410d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nao-pon/flysystem-google-drive/zipball/b99f4f8c1a344937984082a00f5bb33075c8410d", + "reference": "b99f4f8c1a344937984082a00f5bb33075c8410d", + "shasum": "" + }, + "require": { + "google/apiclient": "^2.0", + "league/flysystem": "~1.0", + "nao-pon/flysystem-cached-extra": "~1.0", + "php": ">=5.4.0" + }, + "require-dev": { + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-api_v2": "1.0.x-dev", + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hypweb\\Flysystem\\GoogleDrive\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Naoki Sawada", + "email": "hypweb@gmail.com" + } + ], + "description": "Flysystem adapter for Google Drive", + "time": "2019-05-03T07:49:07+00:00" + }, + { + "name": "nesbot/carbon", + "version": "2.29.1", + "source": { + "type": "git", + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "e509be5bf2d703390e69e14496d9a1168452b0a2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e509be5bf2d703390e69e14496d9a1168452b0a2", + "reference": "e509be5bf2d703390e69e14496d9a1168452b0a2", "shasum": "" }, "require": { @@ -2078,7 +2500,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", "kylekatarnls/multi-tester": "^1.1", - "phpmd/phpmd": "dev-php-7.1-compatibility", + "phpmd/phpmd": "^2.8", "phpstan/phpstan": "^0.11", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" @@ -2124,7 +2546,7 @@ "datetime", "time" ], - "time": "2019-11-20T06:59:06+00:00" + "time": "2020-01-21T09:36:43+00:00" }, { "name": "nexmo/client", @@ -2651,16 +3073,16 @@ }, { "name": "php-http/httplug", - "version": "v2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "b3842537338c949f2469557ef4ad4bdc47b58603" + "reference": "72d2b129a48f0490d55b7f89be0d6aa0597ffb06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/b3842537338c949f2469557ef4ad4bdc47b58603", - "reference": "b3842537338c949f2469557ef4ad4bdc47b58603", + "url": "https://api.github.com/repos/php-http/httplug/zipball/72d2b129a48f0490d55b7f89be0d6aa0597ffb06", + "reference": "72d2b129a48f0490d55b7f89be0d6aa0597ffb06", "shasum": "" }, "require": { @@ -2670,13 +3092,13 @@ "psr/http-message": "^1.0" }, "require-dev": { - "henrikbjorn/phpspec-code-coverage": "^1.0", - "phpspec/phpspec": "^2.4" + "friends-of-phpspec/phpspec-code-coverage": "^4.1", + "phpspec/phpspec": "^4.3.4|^5.0|^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2704,7 +3126,7 @@ "client", "http" ], - "time": "2018-10-31T09:14:44+00:00" + "time": "2019-12-27T10:07:11+00:00" }, { "name": "php-http/promise", @@ -2758,28 +3180,29 @@ }, { "name": "phpoption/phpoption", - "version": "1.6.1", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "a8593bf5176bf3d3f2966942c530be19b44ec87c" + "reference": "77f7c4d2e65413aff5b5a8cc8b3caf7a28d81959" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/a8593bf5176bf3d3f2966942c530be19b44ec87c", - "reference": "a8593bf5176bf3d3f2966942c530be19b44ec87c", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/77f7c4d2e65413aff5b5a8cc8b3caf7a28d81959", + "reference": "77f7c4d2e65413aff5b5a8cc8b3caf7a28d81959", "shasum": "" }, "require": { "php": "^5.5.9 || ^7.0" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.3", "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { @@ -2808,7 +3231,145 @@ "php", "type" ], - "time": "2019-12-11T13:45:14+00:00" + "time": "2019-12-15T19:35:24+00:00" + }, + { + "name": "phpseclib/phpseclib", + "version": "2.0.23", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/phpseclib.git", + "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c78eb5058d5bb1a183133c36d4ba5b6675dfa099", + "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phing/phing": "~2.7", + "phpunit/phpunit": "^4.8.35|^5.7|^6.0", + "sami/sami": "~2.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "suggest": { + "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", + "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", + "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", + "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." + }, + "type": "library", + "autoload": { + "files": [ + "phpseclib/bootstrap.php" + ], + "psr-4": { + "phpseclib\\": "phpseclib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jim Wigginton", + "email": "terrafrost@php.net", + "role": "Lead Developer" + }, + { + "name": "Patrick Monnerat", + "email": "pm@datasphere.ch", + "role": "Developer" + }, + { + "name": "Andreas Fischer", + "email": "bantu@phpbb.com", + "role": "Developer" + }, + { + "name": "Hans-Jürgen Petrich", + "email": "petrich@tronic-media.com", + "role": "Developer" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com", + "role": "Developer" + } + ], + "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", + "homepage": "http://phpseclib.sourceforge.net", + "keywords": [ + "BigInteger", + "aes", + "asn.1", + "asn1", + "blowfish", + "crypto", + "cryptography", + "encryption", + "rsa", + "security", + "sftp", + "signature", + "signing", + "ssh", + "twofish", + "x.509", + "x509" + ], + "time": "2019-09-17T03:41:22+00:00" + }, + { + "name": "psr/cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "time": "2016-08-06T20:24:11+00:00" }, { "name": "psr/container", @@ -3221,22 +3782,22 @@ }, { "name": "ramsey/uuid", - "version": "3.9.1", + "version": "3.9.2", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "5ac2740e0c8c599d2bbe7f113a939f2b5b216c67" + "reference": "7779489a47d443f845271badbdcedfe4df8e06fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/5ac2740e0c8c599d2bbe7f113a939f2b5b216c67", - "reference": "5ac2740e0c8c599d2bbe7f113a939f2b5b216c67", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/7779489a47d443f845271badbdcedfe4df8e06fb", + "reference": "7779489a47d443f845271badbdcedfe4df8e06fb", "shasum": "" }, "require": { "ext-json": "*", "paragonie/random_compat": "^1 | ^2 | 9.99.99", - "php": "^5.4 | ^7", + "php": "^5.4 | ^7 | ^8", "symfony/polyfill-ctype": "^1.8" }, "replace": { @@ -3246,13 +3807,13 @@ "codeception/aspect-mock": "^1 | ^2", "doctrine/annotations": "^1.2", "goaop/framework": "1.0.0-alpha.2 | ^1 | ^2.1", - "jakub-onderka/php-parallel-lint": "^0.9.0", - "mockery/mockery": "^0.9.9", + "jakub-onderka/php-parallel-lint": "^1", + "mockery/mockery": "^0.9.11 | ^1", "moontoast/math": "^1.1", "paragonie/random-lib": "^2", "php-mock/php-mock-phpunit": "^0.3 | ^1.1", "phpunit/phpunit": "^4.8 | ^5.4 | ^6.5", - "squizlabs/php_codesniffer": "^2.3" + "squizlabs/php_codesniffer": "^3.5" }, "suggest": { "ext-ctype": "Provides support for PHP Ctype functions", @@ -3304,7 +3865,7 @@ "identifier", "uuid" ], - "time": "2019-12-01T04:55:27+00:00" + "time": "2019-12-17T08:18:51+00:00" }, { "name": "sabberworm/php-css-parser", @@ -3402,16 +3963,16 @@ }, { "name": "seld/phar-utils", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/Seldaek/phar-utils.git", - "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a" + "reference": "84715761c35808076b00908a20317a3a8a67d17e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a", - "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/84715761c35808076b00908a20317a3a8a67d17e", + "reference": "84715761c35808076b00908a20317a3a8a67d17e", "shasum": "" }, "require": { @@ -3442,7 +4003,7 @@ "keywords": [ "phra" ], - "time": "2015-10-13T18:44:15+00:00" + "time": "2020-01-13T10:41:09+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -3508,16 +4069,16 @@ }, { "name": "symfony/console", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201" + "reference": "e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/f0aea3df20d15635b3cb9730ca5eea1c65b7f201", - "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201", + "url": "https://api.github.com/repos/symfony/console/zipball/e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f", + "reference": "e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f", "shasum": "" }, "require": { @@ -3580,20 +4141,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-12-01T10:06:17+00:00" + "time": "2020-01-10T21:54:01+00:00" }, { "name": "symfony/css-selector", - "version": "v5.0.1", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "19d29e7098b7b2c3313cb03902ca30f100dcb837" + "reference": "ff60c90cb7950b592ebc84ad1289d0345bf24f9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/19d29e7098b7b2c3313cb03902ca30f100dcb837", - "reference": "19d29e7098b7b2c3313cb03902ca30f100dcb837", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/ff60c90cb7950b592ebc84ad1289d0345bf24f9f", + "reference": "ff60c90cb7950b592ebc84ad1289d0345bf24f9f", "shasum": "" }, "require": { @@ -3633,20 +4194,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-11-18T17:27:11+00:00" + "time": "2020-01-04T14:08:26+00:00" }, { "name": "symfony/debug", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "b8600a1d7d20b0e80906398bb1f50612fa074a8e" + "reference": "89c3fd5c299b940333bc6fe9f1b8db1b0912c759" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/b8600a1d7d20b0e80906398bb1f50612fa074a8e", - "reference": "b8600a1d7d20b0e80906398bb1f50612fa074a8e", + "url": "https://api.github.com/repos/symfony/debug/zipball/89c3fd5c299b940333bc6fe9f1b8db1b0912c759", + "reference": "89c3fd5c299b940333bc6fe9f1b8db1b0912c759", "shasum": "" }, "require": { @@ -3689,20 +4250,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-11-28T13:33:56+00:00" + "time": "2020-01-08T17:29:02+00:00" }, { "name": "symfony/error-handler", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "a1ad02d62789efed1d2b2796f1c15e0c6a00fc3b" + "reference": "a59789092e40ad08465dc2cdc55651be503d0d5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/a1ad02d62789efed1d2b2796f1c15e0c6a00fc3b", - "reference": "a1ad02d62789efed1d2b2796f1c15e0c6a00fc3b", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/a59789092e40ad08465dc2cdc55651be503d0d5a", + "reference": "a59789092e40ad08465dc2cdc55651be503d0d5a", "shasum": "" }, "require": { @@ -3745,20 +4306,20 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", - "time": "2019-12-01T08:46:01+00:00" + "time": "2020-01-08T17:29:02+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "b3c3068a72623287550fe20b84a2b01dcba2686f" + "reference": "9e3de195e5bc301704dd6915df55892f6dfc208b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b3c3068a72623287550fe20b84a2b01dcba2686f", - "reference": "b3c3068a72623287550fe20b84a2b01dcba2686f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9e3de195e5bc301704dd6915df55892f6dfc208b", + "reference": "9e3de195e5bc301704dd6915df55892f6dfc208b", "shasum": "" }, "require": { @@ -3815,7 +4376,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-11-28T13:33:56+00:00" + "time": "2020-01-10T21:54:01+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -3877,16 +4438,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "40c2606131d56eff6f193b6e2ceb92414653b591" + "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/40c2606131d56eff6f193b6e2ceb92414653b591", - "reference": "40c2606131d56eff6f193b6e2ceb92414653b591", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/266c9540b475f26122b61ef8b23dd9198f5d1cfd", + "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd", "shasum": "" }, "require": { @@ -3923,20 +4484,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-11-26T23:16:41+00:00" + "time": "2020-01-21T08:20:44+00:00" }, { "name": "symfony/finder", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ce8743441da64c41e2a667b8eb66070444ed911e" + "reference": "3a50be43515590faf812fbd7708200aabc327ec3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ce8743441da64c41e2a667b8eb66070444ed911e", - "reference": "ce8743441da64c41e2a667b8eb66070444ed911e", + "url": "https://api.github.com/repos/symfony/finder/zipball/3a50be43515590faf812fbd7708200aabc327ec3", + "reference": "3a50be43515590faf812fbd7708200aabc327ec3", "shasum": "" }, "require": { @@ -3972,20 +4533,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-11-17T21:56:56+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5" + "reference": "c33998709f3fe9b8e27e0277535b07fbf6fde37a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8bccc59e61b41963d14c3dbdb23181e5c932a1d5", - "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c33998709f3fe9b8e27e0277535b07fbf6fde37a", + "reference": "c33998709f3fe9b8e27e0277535b07fbf6fde37a", "shasum": "" }, "require": { @@ -4027,20 +4588,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-11-28T13:33:56+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "e4187780ed26129ee86d5234afbebf085e144f88" + "reference": "16f2aa3c54b08483fba5375938f60b1ff83b6bd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e4187780ed26129ee86d5234afbebf085e144f88", - "reference": "e4187780ed26129ee86d5234afbebf085e144f88", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/16f2aa3c54b08483fba5375938f60b1ff83b6bd2", + "reference": "16f2aa3c54b08483fba5375938f60b1ff83b6bd2", "shasum": "" }, "require": { @@ -4117,20 +4678,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-12-01T14:06:38+00:00" + "time": "2020-01-21T13:23:17+00:00" }, { "name": "symfony/mime", - "version": "v5.0.1", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "0e6a4ced216e49d457eddcefb61132173a876d79" + "reference": "2a3c7fee1f1a0961fa9cf360d5da553d05095e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/0e6a4ced216e49d457eddcefb61132173a876d79", - "reference": "0e6a4ced216e49d457eddcefb61132173a876d79", + "url": "https://api.github.com/repos/symfony/mime/zipball/2a3c7fee1f1a0961fa9cf360d5da553d05095e59", + "reference": "2a3c7fee1f1a0961fa9cf360d5da553d05095e59", "shasum": "" }, "require": { @@ -4179,7 +4740,7 @@ "mime", "mime-type" ], - "time": "2019-11-30T14:12:50+00:00" + "time": "2020-01-04T14:08:26+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4534,16 +5095,16 @@ }, { "name": "symfony/process", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "51c0135ef3f44c5803b33dc60e96bf4f77752726" + "reference": "f5697ab4cb14a5deed7473819e63141bf5352c36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/51c0135ef3f44c5803b33dc60e96bf4f77752726", - "reference": "51c0135ef3f44c5803b33dc60e96bf4f77752726", + "url": "https://api.github.com/repos/symfony/process/zipball/f5697ab4cb14a5deed7473819e63141bf5352c36", + "reference": "f5697ab4cb14a5deed7473819e63141bf5352c36", "shasum": "" }, "require": { @@ -4579,20 +5140,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-11-28T13:33:56+00:00" + "time": "2020-01-09T09:50:08+00:00" }, { "name": "symfony/routing", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "51f3f20ad29329a0bdf5c0e2f722d3764b065273" + "reference": "7bf4e38573728e317b926ca4482ad30470d0e86a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/51f3f20ad29329a0bdf5c0e2f722d3764b065273", - "reference": "51f3f20ad29329a0bdf5c0e2f722d3764b065273", + "url": "https://api.github.com/repos/symfony/routing/zipball/7bf4e38573728e317b926ca4482ad30470d0e86a", + "reference": "7bf4e38573728e317b926ca4482ad30470d0e86a", "shasum": "" }, "require": { @@ -4655,7 +5216,7 @@ "uri", "url" ], - "time": "2019-12-01T08:39:58+00:00" + "time": "2020-01-08T17:29:02+00:00" }, { "name": "symfony/service-contracts", @@ -4717,16 +5278,16 @@ }, { "name": "symfony/translation", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "897fb68ee7933372517b551d6f08c6d4bb0b8c40" + "reference": "f5d2ac46930238b30a9c2f1b17c905f3697d808c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/897fb68ee7933372517b551d6f08c6d4bb0b8c40", - "reference": "897fb68ee7933372517b551d6f08c6d4bb0b8c40", + "url": "https://api.github.com/repos/symfony/translation/zipball/f5d2ac46930238b30a9c2f1b17c905f3697d808c", + "reference": "f5d2ac46930238b30a9c2f1b17c905f3697d808c", "shasum": "" }, "require": { @@ -4789,7 +5350,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-11-12T17:18:47+00:00" + "time": "2020-01-15T13:29:06+00:00" }, { "name": "symfony/translation-contracts", @@ -4850,16 +5411,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.1", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0a89a1dbbedd9fb2cfb2336556dec8305273c19a" + "reference": "7cfa470bc3b1887a7b2a47c0a702a84ad614fa92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0a89a1dbbedd9fb2cfb2336556dec8305273c19a", - "reference": "0a89a1dbbedd9fb2cfb2336556dec8305273c19a", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7cfa470bc3b1887a7b2a47c0a702a84ad614fa92", + "reference": "7cfa470bc3b1887a7b2a47c0a702a84ad614fa92", "shasum": "" }, "require": { @@ -4922,7 +5483,7 @@ "debug", "dump" ], - "time": "2019-11-28T13:33:56+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -5095,6 +5656,7 @@ "psr", "psr-7" ], + "abandoned": "laminas/laminas-diactoros", "time": "2019-11-13T19:16:13+00:00" } ], @@ -5155,78 +5717,18 @@ ], "time": "2019-10-21T16:45:58+00:00" }, - { - "name": "facebook/webdriver", - "version": "1.7.1", - "source": { - "type": "git", - "url": "https://github.com/facebook/php-webdriver.git", - "reference": "e43de70f3c7166169d0f14a374505392734160e5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5", - "reference": "e43de70f3c7166169d0f14a374505392734160e5", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*", - "ext-zip": "*", - "php": "^5.6 || ~7.0", - "symfony/process": "^2.8 || ^3.1 || ^4.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "jakub-onderka/php-parallel-lint": "^0.9.2", - "php-coveralls/php-coveralls": "^2.0", - "php-mock/php-mock-phpunit": "^1.1", - "phpunit/phpunit": "^5.7", - "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0", - "squizlabs/php_codesniffer": "^2.6", - "symfony/var-dumper": "^3.3 || ^4.0" - }, - "suggest": { - "ext-SimpleXML": "For Firefox profile creation" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-community": "1.5-dev" - } - }, - "autoload": { - "psr-4": { - "Facebook\\WebDriver\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "A PHP client for Selenium WebDriver", - "homepage": "https://github.com/facebook/php-webdriver", - "keywords": [ - "facebook", - "php", - "selenium", - "webdriver" - ], - "time": "2019-06-13T08:02:18+00:00" - }, { "name": "filp/whoops", - "version": "2.5.0", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "cde50e6720a39fdacb240159d3eea6865d51fd96" + "reference": "fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/cde50e6720a39fdacb240159d3eea6865d51fd96", - "reference": "cde50e6720a39fdacb240159d3eea6865d51fd96", + "url": "https://api.github.com/repos/filp/whoops/zipball/fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130", + "reference": "fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130", "shasum": "" }, "require": { @@ -5235,8 +5737,8 @@ }, "require-dev": { "mockery/mockery": "^0.9 || ^1.0", - "phpunit/phpunit": "^4.8.35 || ^5.7", - "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0", + "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0" }, "suggest": { "symfony/var-dumper": "Pretty print complex values better with var-dumper available", @@ -5245,7 +5747,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -5260,8 +5762,8 @@ "authors": [ { "name": "Filipe Dobreira", - "role": "Developer", - "homepage": "https://github.com/filp" + "homepage": "https://github.com/filp", + "role": "Developer" } ], "description": "php error handling for cool kids", @@ -5274,20 +5776,20 @@ "throwable", "whoops" ], - "time": "2019-08-07T09:00:00+00:00" + "time": "2020-01-15T10:00:00+00:00" }, { "name": "fzaninotto/faker", - "version": "v1.9.0", + "version": "v1.9.1", "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "27a216cbe72327b2d6369fab721a5843be71e57d" + "reference": "fc10d778e4b84d5bd315dad194661e091d307c6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/27a216cbe72327b2d6369fab721a5843be71e57d", - "reference": "27a216cbe72327b2d6369fab721a5843be71e57d", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/fc10d778e4b84d5bd315dad194661e091d307c6f", + "reference": "fc10d778e4b84d5bd315dad194661e091d307c6f", "shasum": "" }, "require": { @@ -5300,7 +5802,9 @@ }, "type": "library", "extra": { - "branch-alias": [] + "branch-alias": { + "dev-master": "1.9-dev" + } }, "autoload": { "psr-4": { @@ -5322,7 +5826,7 @@ "faker", "fixtures" ], - "time": "2019-11-14T13:13:06+00:00" + "time": "2019-12-12T13:22:17+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -5374,26 +5878,26 @@ }, { "name": "laravel/dusk", - "version": "v5.6.3", + "version": "v5.8.2", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "c342e3e802607d0ca081b6b8021811e218b5fe5d" + "reference": "c95d70b5fff000c54a9186c2011b236592fcf948" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/c342e3e802607d0ca081b6b8021811e218b5fe5d", - "reference": "c342e3e802607d0ca081b6b8021811e218b5fe5d", + "url": "https://api.github.com/repos/laravel/dusk/zipball/c95d70b5fff000c54a9186c2011b236592fcf948", + "reference": "c95d70b5fff000c54a9186c2011b236592fcf948", "shasum": "" }, "require": { "ext-json": "*", "ext-zip": "*", - "facebook/webdriver": "^1.7", "illuminate/console": "~5.7.0|~5.8.0|^6.0|^7.0", "illuminate/support": "~5.7.0|~5.8.0|^6.0|^7.0", "nesbot/carbon": "^1.20|^2.0", "php": ">=7.1.0", + "php-webdriver/webdriver": "^1.7", "symfony/console": "^4.0|^5.0", "symfony/finder": "^4.0|^5.0", "symfony/process": "^4.0|^5.0", @@ -5438,27 +5942,26 @@ "testing", "webdriver" ], - "time": "2019-12-03T21:07:05+00:00" + "time": "2020-01-21T20:57:39+00:00" }, { "name": "mockery/mockery", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "5571962a4f733fbb57bede39778f71647fae8e66" + "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/5571962a4f733fbb57bede39778f71647fae8e66", - "reference": "5571962a4f733fbb57bede39778f71647fae8e66", + "url": "https://api.github.com/repos/mockery/mockery/zipball/f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", + "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", "shasum": "" }, "require": { "hamcrest/hamcrest-php": "~2.0", "lib-pcre": ">=7.0", - "php": ">=5.6.0", - "sebastian/comparator": "^1.2.4|^3.0" + "php": ">=5.6.0" }, "require-dev": { "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0" @@ -5466,7 +5969,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -5504,20 +6007,20 @@ "test double", "testing" ], - "time": "2019-11-24T07:54:50+00:00" + "time": "2019-12-26T09:49:15+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.9.3", + "version": "1.9.5", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea" + "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea", - "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef", + "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef", "shasum": "" }, "require": { @@ -5552,7 +6055,7 @@ "object", "object graph" ], - "time": "2019-08-09T12:45:53+00:00" + "time": "2020-01-17T21:11:47+00:00" }, { "name": "nunomaduro/collision", @@ -5720,6 +6223,66 @@ "description": "Library for handling version information and constraints", "time": "2018-07-08T19:19:57+00:00" }, + { + "name": "php-webdriver/webdriver", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/php-webdriver/php-webdriver.git", + "reference": "e43de70f3c7166169d0f14a374505392734160e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5", + "reference": "e43de70f3c7166169d0f14a374505392734160e5", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-zip": "*", + "php": "^5.6 || ~7.0", + "symfony/process": "^2.8 || ^3.1 || ^4.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.0", + "jakub-onderka/php-parallel-lint": "^0.9.2", + "php-coveralls/php-coveralls": "^2.0", + "php-mock/php-mock-phpunit": "^1.1", + "phpunit/phpunit": "^5.7", + "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0", + "squizlabs/php_codesniffer": "^2.6", + "symfony/var-dumper": "^3.3 || ^4.0" + }, + "suggest": { + "ext-SimpleXML": "For Firefox profile creation" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-community": "1.5-dev" + } + }, + "autoload": { + "psr-4": { + "Facebook\\WebDriver\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "A PHP client for Selenium WebDriver", + "homepage": "https://github.com/facebook/php-webdriver", + "keywords": [ + "facebook", + "php", + "selenium", + "webdriver" + ], + "time": "2019-06-13T08:02:18+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "2.0.0", @@ -5774,16 +6337,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.2", + "version": "4.3.4", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e" + "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e", - "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c", + "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c", "shasum": "" }, "require": { @@ -5795,6 +6358,7 @@ "require-dev": { "doctrine/instantiator": "^1.0.5", "mockery/mockery": "^1.0", + "phpdocumentor/type-resolver": "0.4.*", "phpunit/phpunit": "^6.4" }, "type": "library", @@ -5821,7 +6385,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2019-09-12T14:27:41+00:00" + "time": "2019-12-28T18:55:12+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -5872,33 +6436,33 @@ }, { "name": "phpspec/prophecy", - "version": "1.9.0", + "version": "v1.10.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203" + "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203", - "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2bb97ed7f5b14b831cd9", + "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.1|^2.0|^3.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0" + "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" }, "require-dev": { - "phpspec/phpspec": "^2.5|^3.2", + "phpspec/phpspec": "^2.5 || ^3.2", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.10.x-dev" } }, "autoload": { @@ -5931,7 +6495,7 @@ "spy", "stub" ], - "time": "2019-10-03T11:07:50+00:00" + "time": "2020-01-20T15:57:02+00:00" }, { "name": "phpunit/php-code-coverage", @@ -6187,16 +6751,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.18", + "version": "7.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "fcf6c4bfafaadc07785528b06385cce88935474d" + "reference": "9467db479d1b0487c99733bb1e7944d32deded2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fcf6c4bfafaadc07785528b06385cce88935474d", - "reference": "fcf6c4bfafaadc07785528b06385cce88935474d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c", + "reference": "9467db479d1b0487c99733bb1e7944d32deded2c", "shasum": "" }, "require": { @@ -6267,7 +6831,7 @@ "testing", "xunit" ], - "time": "2019-12-06T05:14:37+00:00" + "time": "2020-01-08T08:45:45+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", diff --git a/config/app.php b/config/app.php index 5bc7a0ae..2df0d0a4 100644 --- a/config/app.php +++ b/config/app.php @@ -173,6 +173,7 @@ return [ // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, + App\Providers\GoogleDriveServiceProvider::class, ], diff --git a/config/filesystems.php b/config/filesystems.php index 77fa5ded..0c492a36 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -64,6 +64,15 @@ return [ 'url' => env('AWS_URL'), ], + 'google' => [ + 'driver' => 'google', + 'clientId' => '', + 'clientSecret' => '', + 'refreshToken' => '', + 'folderId' => '', + // 'teamDriveId' => env('GOOGLE_DRIVE_TEAM_DRIVE_ID'), + ], + ], ]; diff --git a/database/seeds/ConfigsTableSeeder.php b/database/seeds/ConfigsTableSeeder.php index 1c0292b0..091dfc38 100644 --- a/database/seeds/ConfigsTableSeeder.php +++ b/database/seeds/ConfigsTableSeeder.php @@ -231,6 +231,26 @@ class ConfigsTableSeeder extends Seeder 'name' => 'cadet_list', 'state' => 0, 'data' => '["#"]' + ], + [ + 'name' => 'GOOGLE_DRIVE_CLIENT_ID', + 'state' => 0, + 'data' => '["'.\Crypt::encryptString('').'"]' + ], + [ + 'name' => 'GOOGLE_DRIVE_CLIENT_SECRET', + 'state' => 0, + 'data' => '["'.\Crypt::encryptString('').'"]' + ], + [ + 'name' => 'GOOGLE_DRIVE_REFRESH_TOKEN', + 'state' => 0, + 'data' => '["'.\Crypt::encryptString('').'"]' + ], + [ + 'name' => 'GOOGLE_DRIVE_FOLDER_ID', + 'state' => 0, + 'data' => '["'.\Crypt::encryptString('null').'"]' ] ]; diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..4e8daed8b79ea08d11cf8fad9e9d8b26b2d4d548 GIT binary patch literal 4042 zcmY*cX*iT^{~p}K46+tdF_uX7Y?Cd6A+j%pu}o#(TQrs|-ST)+iONzDT5MyTFc^dT zkt|u0Wtxn69%TzdgvT=e`oG8f;r(zezw=57%*=_Z;jj5AjO!!eFpNR_D!~ z4$k)93&DM`JADo1fx!ebt;{hl(RoYxaWy`!QC;U`GDJ)wyyZ<${8%0#Q?a@*q0DIbm`11fbMwHe8Cw;ELwZtL`4h3xZtho;KJtl^(8fJkR|(NdSVG%Em}= zHp%qtZFlJtmIr;7r#B7SZVY^xC5#2k>`YN-7pWT_v*bZqTs0gc1h~qfJ!{$s24FiJ z@&g~mlI0MmEj4^robLd9RJtgTCA(!lvn#UepuwChMwJ4PCK#s5QDa;4nc{_U&$9!zqvpPBcIy1pxP{^kYDZ?ADGzo)0()+9QkO$Y&9}n8>HhVF4}^unXQ5OEy5n zD(o!ARN^hgIZ#krEZGPVYZ3V;-YjRJS_OaQno6l2s6G?P7T&Y2sU}E+C~?p^Hjjkw@e2X8^BybFp8$8R>tl#rY8$fa}p3ggvSi1Lr+$fg+6mb zXU`hP*%iN_?i>N0$kJCD>hZHV`1{N##vUJt6uw;r%;tph%=d#_EjtpxRavxE!^5Hn zuneYqr$rMA3nZepW<~N7%{P(7F`Ig&N+8zH5c{rV-%XL)JJflyZXW?%!}{o*=cn~9 z=tI|`3eM`C$+QFeJ_rG&(#ace>4B;kKjCqH5sOH-`*KuN@0kDiR|T|Q^&wDFCc3Kg*&pynh$``xGhOup;uYm+*wgxd1#i@CcB{-? zYVeA9!gQVVRxgzSaUUW}FVjBHIfKuGry=7GVFwYM^klhk$d4KGUz-&Wb# zQ3@M(Q*rxyaaY6;h4!kk$L*wxc`7xwb^N&9^2HJHHKU(Sh?g<1b*wTKAx1uY(TJqgO{X*toMcRkxZDjT&v+rx5!TNajMOmLZrzG_1CEjl*v!l- zD@1X3F)t%MCoOzc>Pg`hU-dupTY1(g?BO^=Fim*(9&;YZQ-|j-7)fC|5q24GPpsZD zjxZ{j0LE>63k0YqhH%MX4CAUWx=>q;)KYJ%(GjP@$>Yms$q<;U3^{U-{QMqs5jZ~N zOaWNGq*B{6fxIE-7x3y;spNKH=#gloxw?^RblIi^kd6pH-!4pDFD37B1ppCtzwfpY zJ3Is3B$;S~S2=3G8WNcg@GqN*Q=|52TJ5%$8mLAsj(`eJMuVV;Ne!8)5D{>5Xz6!_ zxdlrgaN4=QHC_taEHnew;1O!8+q31(b$^u2sauo2yFenH+?0QWTI@DndGuc5gMvuO z-x&uF#Ik%pifZ9nn;-np6M=MSg+_8{S9k&H&gN9&<0Mvk^EiC{&39R2U)aRc1}qYEb%R9uZdK% zZ`UM#>T<d^;TH}n81y!)koicKmotH{iC4J0$UuoEip=r#`v z;=|n?H-l6_b$gB6O{BNeQ2dNMGtV`Uh_}M%zEIy{A(!jzR$j?2kGcVE`QL&zq~Q!A zGRR4n&rZ4h;s~%`c<&<=emKwb{Y0bei&VjG@AJwA#){EqsmZZK{66P0;VP$qN5fco z>J`+p{9>fq0@K^T_1eI2pJhNd<3d`@VCGWR(Zjnh7WwDne5VF3RC=pznWiQ;J6|-d zn{HuGf2~HU|8;I**n$iE(cC!IR{Fk~i)xVv(m)&578c#oa4uV5x)R5Lw!fS z)nX-N>8xw3H=NCRdjI$};jSaA3ni#yyUBu}n6cUC62(0k=XBG|^Lo z&LsjKFRy+T?|u265yr9*kD?FS@oQdMSp)RPA2#p~IOFyzthQr{651XFpPOejA79fu zmG9&*8F+b9%D73hn6LG@$!zm*&0NKaxhAR75`KEXcPVpH1rErVVo%D@z3czDK)Rn-W#CkLy0C|J< zp~+ZMvL5wo&NkAa&_s^$W>pd{9fhf1q@K%3*}h?HB`G4cgdJfd=#gDxM6q9Ga5(>sJxc7UbX z9&r-f7x$Dwze03P`CN2blj(F(bdg>X*)?4Wf*fOxCz@n)*GdaqNPS)@L;JgOK-9k{ zSgq2gaJ9%m*yALcNcXwZ;Tti*cqo_>JKRC)z)fEI@N_h|*->*}aMa!mq&MH%)&!ZI zr1INQL=lnTs+U=+Lt>ZSdSBG|n*r#H^V+`A0dKf`&<&yu46>9TUrG5iqDDLVtAmfQ z+kl#|kGzL>=FAsJk;lO(R*{iq15+Y^oS)h>74@xB5uSMRQROf=?Mr-bAgWG0-SH(Whd-AMffZuX`1yBiufT1>Uv@Cmro8lV6rbZmv9n4;jq13TOr^TUu>9< zYP4%`9;CMyY3s;uDZb5EDOd5u5#=&3mU`LqGGwX^&$-GFZCc$N{my8Y7a;6@ZS?nM zQjd3urOgDN*FBcYTDq@>C`K|)PUN=Z@0O4HyWgv9VkFF^;iaK6a1_aJT`CzSl6Nw9 zW+|};l`GeX%VrJ7C7FH?EWzh9fr!KlA`t(9ILBE@2M94j;P zbt$H`-VS>4ZnpdH-Q~fP;IA|-?y`{Ap>#IzbMqm- zKj2d~_!_g+sZVdkgRgXK3EN6T{X%oC_6G~@pn5ssnHiPp1mj|fAc%E
p^j#o9pN_uYzTbiDMHf*o$ejjQN8pheVr?tQTH6fKQJ8}6QuB_A`|o+R0~Ck58;iD{l_h zRB(@pd$8HpAwgfh+ad6_Y*q8Hf#rFx`%AHqON4Zw3djN3D_{TF1rU(jerIjZDYz+Y z6*6tXku$bvRiVD#<0X4i%JAyEZ;9dvHkvZ{Sfwxe&J6-*v_j~Hkg)1f zLKgFhdqMWcgse1ub8UII+;IWSqwX_;4|H-nz%a@D?27TZI^TzjWkzTE(X_Iq%B4x! zE$39-K4H%{!}DX4s<&dTUyoD<=&*18SaT&Cz}=QJD7dp#FPKYuo^l{Dhb^2jD1F+fQ2HyK}^Z%@nCSnM*B8kKZ2$%6iX*Edto^`)D3?jt0SjIJ$5(gowgn96 zH`B0P`S-wQX7_3Ol<r7S~b{u4yYKA8laY!7Agt`@KxCf509DvK`>U!Ly$*#SQ8V_RH?@Y z5=4+!K$0MVK$HXoj6iKcs~FrNfFOylf;$Lk*$@dP+#U3s@4NTA{iFPm{aZ6@)~s2q zwPwxCnO%W9mwdYNQvd*#fPUL|1Ar+CO@U7qpdaMNZXE!uS_*F8viHZL(ZTcwExqBr zZ?z5T8ve|qTzmHV=gU1=e(kO%rs==(A*GOT04K>uUt$f)++&Vk9X!EvUVYtx%5dzf0> zvF4aTHsU$FZ@6f%vE^tLs?6M9hBAiitX~YY{<04MXzN5m0!0@JWXzWcV*?`qsjG;g$f0HCjlGHDjv3`m6O*{lr!%|2?CfrYL#Oes_)spglG2a8$X0<`ZeKQ`Ch ze>NK(49PzQ{10U<%HWy;troA7-!;zzS{F!!Bj$~$q*#R<3#@w8dPf~(0?fAF z=Kz3GNhZ;47GY+i)&IWfg^BvrWt-o})d z6j-|fAu=pB#b-W{VJ8*(WP3j_fBijt-7G_?dAizY{gB;N^jO_epBqO79ZLa91>5Y2 z(PW@Va{_rr_?J1q<8y#g&SnqHwZditsAVjAgx+hIA@WN;*m*z{{IqoHgCN~6h%F)6 zm6)|2NI?ble-va1Wln6Bxe|JSuJc%I zUY_~0#NLWwbgteulU1$+3?RNnnS75t8vyrnOBMkk{uoSx2Y=WUuy`aikaS(6)%%0w z3xNkUY_o=DDA^RKJ4`m`nGXa`besUbRR~qZtke9I#ICe3di-TbsOlHGRB+8!kNs+! zcvKfUbjh36yNiBd2zk}kGOeB0_n3@5nZ@VEVBtHdcHwy?6_rxq(eo*fO!^*g%52*S z$v5O;u|3L5B~_IYp*CKRGr0f>BhuT--jpG3*5zb^2lHA@wJTBncs*4)zV8hy!QW?% zuO(HvCvEd`)fHCHwv@!uni`}Cca=PN{lyGnjlLQf?3>8A>8QWee3&J6htc)6okX!Jy^_>i16m_?mH0hw^A9pwZ?lbIFx}VsB@eM{*a@f3)Rmawz zu_+0wWH%lk_-Q7(o@(Rt^6GpX8%yvxiM37+YpmYTbIduYn|S|_XwJP4-|gx8KO#i=@vBYx;!N* z{pH0pJr~7cLT)53QhH>?TVOa1D!L>CJDnu&19}90k@1D>6+Mp6A=B9SH+Ub4^gs!dS(HlRw`X77UAs~a#0ks>If{w1PJmc!@wd6o_+ z)Yw){s`v_tk!y$qHrUFpkY+Cb6)Gdk2(mH~11Ui~%)~2jaT=&*Fy9aXY(SS8-d~9{ zn2OiJD3bmkB+?Ya=fnHUw7iyoW(35L<*#VTc`lj>h5FOhp%if=Y520?TVTUlStH3Z z_kSZaw-u|N@{^k!^yh&%G#jxng||{D>0cX3iV-Uz^@3Ib-{Tlu{eO^D$bhV5DY;{$ zbSt2+M`+lKDU_u&SqfT~WORhel<=?a16Tj_Oqfq4dd;Pge+YrcZtvM|F|B4jA6 zZl~NpJWSU8M41eLm+bd^)L`s7kRpajqTE@nx%e6)a7DMSFkm^6uE?`?)H?%-`-%xfzcOsoS%na*bp3Vhw)(hrMT<5FqWIi| zwYXKLD(CvdkG9Bj<6`#^_#2-J zvyPW)9@lDvTrhbEzT^8MH)0}ry?xhutKJ;Gx!L((dZ)ZC-*-4JBIvUBV)qDii1bYR zA26)V=sZm3-Z()Bt!g4LS4UqP3#gr5D_u65#63uASrpgvYhmAvV%&|7#m--{n=T4M zo#j9rZGL3m14FE?SitfAhkGC__0FZFR$V{w&uDT(r=(0TMVbR_nO{a1L9xtFMVi>i zmE32Bx|i#kuXsr1fi3FmQ0B?@wX&WprO?I7Cgiii{%NXmrvk%1{fbBz*~E^mC$`wc zp+;Rqii?M}n<| zA<5NO0^&X3J6i_OX7lfhdddj~ZA49w&;3UaL-FH8pMjNVjS`pA4BBA(S@1WkpSwb) zt1`Tz$w!aGhzR#e&JMLya2q^Cntyl3qrYW{Nm)Qc6Zg=9j>D5JPMf5ZNw=AE2Xx0A z9tm$x+&zUHgpc|W6X>v3y|aoQLBAz|Z?BcLYqPCukr@Z6u-AGMtAVFJ@U@#$O?ok_ zg3t4LE@j?@uS031+EFI2sg z+kFbH&!RoS)L6!+F0H{8YW;HD@m7asSAuo(D_W7{5fsa?6lqG3jiMtD9-^T^U!=!U zbb}5`VZ5K~ugjRh^v!9?wvghnPI!Hz-^AIBf{L+p6ERtzh1pdW1dlW;4knjSCY^ETvg>=*ezl_$5@Et9?OaVy zCfY--(j|+ycMKrEBgz8aLMW|ui-?-y-@D%Ehj~$cJ~u)!jHV_qE2#EhukiL4dPD5W z+Q$-M3)i}DA$@A=!CaO+Tr*X>H+9{He$=m-B}gCgHA|!kg|$VcqlP*ycEM52n9Z?s z0+zOt*Rf;3Q6`Xctn*$juNP)js4KPWHAH%%rDlwh3TIrOX5co@*jvOg-Y3M6_H_T@ z3Z$)b$wancZjX3*{y6oxkbXXePi8t1TFX@Qhxx~EvWEw{uO7*IKT-VdX0%(XR({57 zdCtL^bdjdOO*Lxi`Qz>FTq+&sT*KbdvzXtjjDg>Fr4eiYP(Uxr*7rPig4osTEfVQY zl42-!numl$pG)0Ph^&r1x1-1!bEE>Hvi#|*+}k}1(UKwxf78tjqMhBXiraJwVSB%jZU8hYkQ}9A3vum-4tduztO)>Eat1j9bIpxwGi}U z)M`0NRF{uk5PpAhM^AoFNc3Qu-bVXK*Bi2r-X;Ap$h`V`I@HF9l{p&YE;j)$eR1J50LNB;>R<8-YIJI`QOxgMjq(8AB4C3 zx^jey$tk7vF$>LOnJTy$hU(xd%^%s!o zKG{!|B8RS3MSOpxGSfaH(>0(aOBeIIR7yvy48^jmHM(18dX!6Wx6bwqEV8F&atGU* zuW{`|gA1WH-nH6zvEWkt$!}iyjFmg2ye{bHA-rq%OQHhSKH;zFQFr1tw|I`^6OPnT zm9dItPA)lC`VG4hIsg~KnO{5&K-NaWN%&P7%Xpebn+&Yyz^_h_eK zw|d4L&bjOz7HmrZIrxBZU0nDn%A_NFhJ%m!C2~5e_{eTdjvWZ$`SNZu7<3sOnd`kL z*p3j2a+7ub;b=NvOE`cMU6ulQw-Tm7cn~d?LYs&%n1hG=peXn&sgN5GRD=h2BC&8? ziqtcIGswYy#XMa@rT>X?OOO>!hv9oDcNY}(N+=at@*H+?cxJjGw1bZGzlsMLx!ztL zwggnG(J*r1#_5w5*2Xd@Ol2LML(3v(oc{$pn5^wbt_+|K zP>;3W#^Lc93A)7>UeTV~ftstxmCenR)ByTLl(=~xuA}c3X@0=4zXBm@(=&-=B+w&d$Rv{uvLJrykLCY0ok_ z_&=Imk`~@9XItjsW4gU1@1CVU|2&b2F@Ps* zG-D&Phl`dN{cQlqkw{tY%=Z1)rVD3LPYfO6zQ+mKCOP;RC13t0TPjosnU~-}$Jb@Z z3YLU2`5SIA4-dw|g^DOG&vW@MkkjPCq{!_FVh(oRAHv}&&QH%t-cI6lQ>U|M(d>N(2J`Ss22m4ltfox< z8*7n)kGW+C*DYQZG2!r&9e6)&6LTtQD`wGFj^r&Ag^P+N+XT8|LCC(@gV~;Rf-;$l zbNUAerRnOC$L-dhA?rB2+&u658+Xy4`Eh!}bcI6lGqFD&pt*EeL(VbY~8AU7<{Nc!lJ1c+)x^61uI!Go+NmJ450+S8u165jg@! zra=6)ND~0>a70s$mm+GRqf%HiPBS5Krp9Anx1W~0qS=x-X->>Y@p^c^GuU(!32pmU zDjWx0<3Wf#lLxzt^SOz^ezn?fYh77TNdb=+wz@UeA5)9DnV!g`H7WoPr8Q_BdZwQ*I?evd`P5*Us!)6y*q|sqF z%mWXm9Hh(50%6+0i;`y$V^!h>%48xv=b}UgF|5RF)M1fG+ZeY&j!Kb1NEIjfQIlZ8 z;*DGBX4#U55W{jE>Yu)Jw`@s)cebi7W1&d-l=rsUh?PQw#Lo zkLO_p>MyBsGUiK#9u*!q@U4oYI-8L}No`~=@!KsJQ81P+?P>cKAJYaguwB{6X?)BT zh_R%rj50~1Cv)7x3{0QIdhCX^pxY%?SjIp7683Tg&aw)?5iRAvk{tjGsuTRi*S7vU zMH~Yblp+zP=xv3r1ZlT}U$Iup@&L!~wjn$CXNd8McsJZhf|B^!r8GWNn8$lT9Jg&H zN`+pKRX&eBvmYkR3#p_`ntS#AipTY!nxP{^nkBfn?>N|zdc@kadM^g$Tr)R}@8Jq| zJ}b1XhRxb)B1agIO#v?&=nl_09ZCJkuO)rf6K%aomrk`(JhbGk#7^_FG2784iZg+06ruWJ> z-l-#q$a*!lo%Kpk5={FZD(q@!1T$XFezud^u4=!#iVd}m}GoYAoL*uFQ_Q8v+ zA@o`?&pq#_I{KFcA74L=)vl|vgTmY25T-~2$>&&K=x>n@lU?J;MT(x`$DT}a_ zqdIOsh8|m^t8^OV=2W!&`f;l67(-z_&Hp`1az6ZX=*6e=HaA`Q&7+ji)Iw&GtD0O0 zX|a;w5OqFFC5<8Hg()p1Li3b2qSp#0dP!{2)7GARLw%U6Mhl;StoxMFO*T2Rb=!qh zC7&`GMOB7*z8mrmr|-)+<$Sa4mW<2{)-iWB3>PuC=#K5|5k~Y_Pw&`k3DBq_P3N*B z)-8{O5!oyom-^vbV@NROUJNI?%G*LbD>5`B>|`vDbb(g*;p z8O9O5M)uWzgU!FH>9J9kLKrcGietx+Ym<#CN`(85e)wveP~kMHvSUu8%vFZ0sn}KACsa6AaxiYj#6PQ08DiWOFY`< zKP4%~O@P;BWaf)`mKk|`wHeU2txETBp$kwO*n&P7WKt#*9Bu-)Z1vVat2I^W8kA^q zlkkyXFWU#GvRUQ;&3xG^0~*!wIs%YE@J}&$NBa-D=`qJ_-vk{0`aej5FaUsIbezBQ ze@2ZX{oqTfgaAs!P(?A3W<&1B@(*yq94q+-XHhgv(G+j?|XjSyVkj9Wns*Z5JMa|aDd7^(YU{mn?9^`k20a`r2dhgJr zHpuLaeJHH%dO6-U_T|2eSz-~Gy}>wsn!4lK-496C~(jpwhxt|jqXS>Bw9pjBa@^9kqcWomwTC(KVi)m-f21nU@EshCywj=%>2?lp!Vk!+hR492uke?K~b9 z8lqeSDDu`5L?=nmHJFZ~IL8&N?78&u?osGHs(kf*>&49;P!!3c+=%q8;)96uTdEf2)gH~}6P0j>_B>)|V*82r?UlL_jM zg<^sY-;Jp7GGkKp1<%yR#3YgpAl*R-#j}RnL?9=mh=QUy&y_%oJMa`CWI(FF(1&Um zGiqs@V@69Jtnp-Y*Qtl-;&gEewO>NIn`yrOQ+Fngt?K++=iQ({DM(fZWO$p>pqJZn zQ^1pF>5 z>(v09sN>Opjg<9vw{(~$eq$0Ike-Zix$#JE@0a8|sGGdWemq8L-=IbLP0_Mp!%PSu$M$bHl11`i2t& zdm3P^FCq%W(YT_(*lsuThLv`*k#=lZrf>h`uOLcTtq)Hu{GB`P!r$!cii3GDi<1bszI#3EzFwxI(U$1+=TLy8u=7#A9!X(mJ1sk+<|d!o1CRu4CL zB`;^ZwQuKKzcDBZc4a(om>Sq{&GcO#u557!m)JC4 zM0oJq8MvqRL>Rz`b^68tOItk({NFD)1nB`w>Q6XMp@FOVor#i6qgv;n(AygRB6^KY zl#oN4haVEj{;N&umUE*G(OBWhGWY`m-MH^<^;IBvtLNXaWoMJcO88eZdg_kG%bR*b z!K2s9NL`wd@hP9PpNKilt55d9-OQeHcC|J$if7U5%Mt9;z23PKE&pFa7TvO{n?75B z+1ckS%Gc&V9Y<7v&QxJqd`egLnLKJ>*I`BrW!_%BO zDok_#Sqd{f5%h2>0vzh?e4u3?TTsCt>j2!VFD?Z+-+tkWQY24|M`7FjsUutd>M{^3tRh1_+taINo8O>fiBGlJ{?(1EOE}!s z+uaPinJDRFtF+1>(MR|Sa<;;ervuKEd10HipZ4>O-ZL)AUH%MX?n`U_$Fxibu;29^ zF-&VLj~Hrf+OAewNk^UzJd^dETPf6yU5AmqRqmjvSVBu6zn4~(wtXsw>gmQ$ZOPv` z3znZJGi&^?dsn$}!S?v0vc}ZVEY97~{QIo1wqprpaHH>6r)b~;d@Oy~Q9?7=R;eGu z8e}_d&Ig@Y|MjyTRGErui?%YuR06w{q01L7eZx=PU!IYk3i|HcOt1| z!UeV7#$_ALafHr8X-53omlsWexID9dRmZTc%7=MT#!Tt}?a;Yg)77{M@$vu-Q!{Pn zpoAfMCZl{~D}gj#*6Hjva|zH%krcJP#&N2PXs~BKe}iU~4cw4@wA`l^LTLFFUezX1 zbE&Up*KElreTHJU>N)!gcG4)VsyxR@dVSVCud^#(BT-ow1)?|%YMKS=1ibNb7?R*XF<0TBdvO7`nE z53=(Df|0g>8ID1Rk5tw1sPy-`F~g};>YCq`sT=ZR*kOP)^UOsN?uVyhSb?rV>l9jh>eG-WPRlpHs1U(+Sjoms+{LeLNblNk7tj96fmo!Kz*&eyQ$+i6bH&+WE2-BCoKN3$tTz5`X!UI3IwVAkMIB?V&g`Od1Z;g9bgQDgbqsHl!kODMg>dQC zzL!FXkMOx7S!7aL0i)mI5q40aHn7+@sCwkoEKR1<&haGAJYp`RUXKy>k6y@|9K2;= z`5Ozt3W*^Z{{(0Jsth_uH=`F_H^eUOMOMhXG-c@E**tR|qcVdkwI>mAq`yWmKRuCV zevixTgP58>%3WRB)Y6 zL0kP#zOCr<=sjdU&C7MCa5%+au?Eg(r8-(^F~}_<9>Oiwb?@x~L)&Mw@98^8KZWQw z7;LQ8%FgxUA^t7;mNC|K=l22Fiq6?U`wn-9jwrQ-edW>q*N~+_n`XMF4Hu)_9z??e z;Vzb{mh%ZejzfX4R-P2|6>caG)xt)03g;7-10VDLa#0@eZQn>l&1Zgz_IxVw1><18 z7}1jPrNE4B1|@?TKn5TPE6Ucg_lkxZ)V>~<40rI^Tnbl#aairacFMm*pnu!zQnR$o z!@P=xRTvQV1IMAx!U)$h>G7vR4*EP1cZwcCIJey-wNX61#0_5)%Fmq&ez8-qHvCQH zGW{UPb4l8-e1x^;2hl@@>(3&cAMO+#5=`#Y7_-4E3MI8K4c!K|Wg=4r&CJOmxg+=9 z)(GxCyH5-3zz(EHZ5q5*&CRg|@=gyqRAr3>i!=j=@U4hlzSjm-_J9(_fo~L(BcdtY?2TZmczw{)HAhHfUsa7KsjTW$ zzUA|;l>yJLx+bXO#pmvc4#^(#@}^tm(3179Qq>Xh`w8$+XSdN+ff)PU?S))g@|r;q zb?c32gcT|NzaVnB$v9kzfN zKvf?)0+FEIJu`vR)EnJ={>Kig)LP5#Ini)<@%UmYE%1m$-qjK#oL%OpTajprA2nT! zIToC`g&z(+VzhmV1w6Mg{xskHT-1n67HN>#FL)$Iz5L(E^1mKVg+IEr=gI|s-pkTrA7?{#rqdv;v=c4Sc}oFpZNnvP)pywvcdjj!O;Z|;LS>f@;n?2x@F?tqD*g#kmK G1pXhBHOFiK literal 0 HcmV?d00001 diff --git a/public/css/custom.css b/public/css/custom.css index c85e0091..4a9e28b0 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -1,3 +1,27 @@ +.text-excel { + color: #0f9d58; +} + +.text-word { + color: #4b87e4; +} + +.text-image { + color: #d93025; +} + +.text-pdf { + color: #ea4335; +} + +.text-powerpoint { + color: #fd7541; +} + +.text-code { + color: #e16156; +} + .word-wrap { white-space: normal; word-break: break-word; @@ -1724,4 +1748,4 @@ td{ } h2 { text-transform: capitalize !important; -} \ No newline at end of file +} diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..105533388187f76ddac2724ba56068de42ba48f5 GIT binary patch literal 290 zcmV+-0p0$IP){14=z;J$+=hW%x z@jMQ9UEOteeZO6QZfZ_g3!S>0I(Rg^gsWk}k#H0aLP9U>hW%kA_XRu{XTJegiuRE9^F{^1ViI-2{(^&9EG%!$z^@PFM}y#?Mp| ou7{bSppu{)X8$AD3iEY2-!SCtyE`y01poj507*qoM6N<$f>Pgo7ytkO literal 0 HcmV?d00001 diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..c83c79999f09ec793550448106d92d52de2de391 GIT binary patch literal 532 zcmV+v0_**WP)S z*;yz`tds>MAqyFg#dp-{YreVnn=|*`TW4|Zeb4(mz4yKEg@jAkEv!h%kpk}!UJHX& z3G@pJzl8N=!@Gn}K|o=oXy9VuoUknH>k(XGM%W&nZ4gctA@N4|EDVRT+qB*Z_l4hu z^o1}w3$)ehD?;FW8v+{_0=QII6z%usgntui(YfXG6*w;3j`k~szc~b+MrT$DuY}cE zurtD4VL;d!KC{V?upY&I$RTh&s^E)ouU}Xz>=!PF+*@LStnvf zg^pNYiST2N12e)U;bjhio5I74n6cSj!$cchp1Mx8>VvWb)-}Vo36Dz@xGJpq5APD5 zmk8I!=Uk5~&>5Pi4ET4Ux79p2D*P-E{#MwWHI%jr?+bvBn|CbR7`syo1pXsj%mr?e zs0mkW459hLzX&~T!<$5=69i7D!fV3E1c5uL0-JmFyy<$7nauWpAHRzc889IdO_WxBRo&>lnU}Qyv9xPW?^YVFUVbxxMi)*^^{$f zuR}VL|5g#X96a(Aylt|2%mLV36kj%|n|y{$25Jj^P`OVXg-Ep*<=dgc#9L{8Tgt=#iCZju!Rx=U% z{@N0Uzt%kFwq)&_Jb|luvb^1+@h4YlV4bC1v>0L9l&4 zl|1a2fsoD#^(|FjWSq)EKTq=u(cM1QHt3k+^PNvx_e;*La)YnCPhj00o00H85SH0B zS?5h5yFvc!h)f4;alVr6!o0XCJx7`?Lhh1%6xjbAIrgp~lv;BGzEZJV6{GF}hHj;_ zm0vDTmtp^u^7WUJkT2=SrO*^;T|O51hP-DXy-UC^tYxt0qX-jno&MnTEllc2m{&_0wmpz#G+Qe9w<0{ari;q+9)EC^2T59AkUT0xdn7nlKH z{|TC$YM2GVnSH?i19WFWmQ)w$9gX^>^@?9QgI#?W?w9H@$d2Hj58&kex2nBHXO!SSA?Jh2bp!#zAwooNjSN&xL?NZ|Ip?dV#xFezV z=L~H2ss%!~4qXrREnfaf2EXl-kI~&5YT?FEX|COi9s&E>1hM;LQW~(KcWql$ing(w z^}|?W5^eX$e6rsotOh^#bZ9ATRqb>EGytx~*=4zRJKm8;fxO3Z1 z{-zESAnvPkgWlyD_C7r?<;tb%H)F!Sr{I4D!TM0QlJB@XO%?XYcrxG9&Vzy)kkf5J_@k9V)+OiJ`TO> zvfuM=%-XTzWGZ@TYk3J`UElN$uROh?==sh1uQ=^HHScY*6KURf)d$zQnUf(OpWX+W zEkk*80sL#j@_?^YY|rhTB6`5Ish#v3lY!KyX$x&nnbvU_#C=}5-)3rk>|N}n(4MBW z{p|N=LR@b9uR!LY9DRMT(*RAT%qO%<*VY8}dx~*tM><&zN($!SqMp z(A?bWf4h8FyJqP)F0<_|KjT=x-F5|+Ef-(4d9n)_mQ{#f>-;EG!*Nn>ee8Xlzh+d@ z2ljohW4Tsq$8W|~(e^qA8j$Z+J3QrT((fwl`EC{Q0%!?%iu8xwvlqg*2-5v(J=CvU ztF_~|??dV{jRsF=XauyB-#WHkG@JY$5NnM6R_<%k=hhBSIhu6dnZe-DvnP9;2Kzk< z`=$%K_3>EWgP?1S&VT*JFipYs!^)gG=$M+ACX~gom@8;o9pC;K(s!_G{?}F9TJ1~q z8_?jJMmuh<vU>yn0L7yZl!5hI%vJ|4$42 E3rxZMZU6uP literal 0 HcmV?d00001 diff --git a/public/js/plugins/schedule/editor.js b/public/js/plugins/schedule/editor.js index c6d18b37..7bf39432 100644 --- a/public/js/plugins/schedule/editor.js +++ b/public/js/plugins/schedule/editor.js @@ -36,7 +36,24 @@ function initScheduleEditor(id, eventType) } }); $('.richeditor').trumbowyg({ - lang: 'fr' + lang: 'fr', + btns: [ + ['viewHTML'], + ['emoji'], + ['undo', 'redo'], // Only supported in Blink browsers + ['strong', 'em', 'del'], + ['superscript', 'subscript'], + ['fontfamily'], + ['fontsize'], + ['foreColor', 'backColor'], + ['link'], + ['insertImage'], + ['justifyLeft', 'justifyCenter', 'justifyRight', 'justifyFull'], + ['unorderedList', 'orderedList'], + ['horizontalRule'], + ['removeformat'], + ['fullscreen'] + ] }); $('select').selectpicker(); @@ -264,6 +281,7 @@ function selectCourseMode(mode, niveau, periode) $('#nameContainer'+niveau+'-'+periode).removeClass('d-none'); $('#modeSwitchC'+niveau+'-'+periode).addClass('active'); $('#modeSwitchO'+niveau+'-'+periode).removeClass('active'); + $('#use_course_n'+niveau+'_p'+periode).prop("checked", true); } else { @@ -274,6 +292,7 @@ function selectCourseMode(mode, niveau, periode) $('#nameContainer'+niveau+'-'+periode).addClass('d-none'); $('#modeSwitchC'+niveau+'-'+periode).removeClass('active'); $('#modeSwitchO'+niveau+'-'+periode).addClass('active'); + $('#use_course_n'+niveau+'_p'+periode).prop("checked", false); } } diff --git a/resources/assets/fullcalendar/core/main.d.ts b/resources/assets/fullcalendar/core/main.d.ts index cfd23435..8defc99e 100644 --- a/resources/assets/fullcalendar/core/main.d.ts +++ b/resources/assets/fullcalendar/core/main.d.ts @@ -2630,7 +2630,7 @@ declare module '@fullcalendar/core/structs/view-config' { class?: ViewClass; [optionName: string]: any; } - export type ViewConfigInput = ViewClass | ViewConfigObjectInput; + export type ViewConfigInput = ViewClass | ViewConfigObjectInput; export type ViewConfigInputHash = { [viewType: string]: ViewConfigInput; }; diff --git a/resources/custom.css b/resources/custom.css index c85e0091..4a9e28b0 100644 --- a/resources/custom.css +++ b/resources/custom.css @@ -1,3 +1,27 @@ +.text-excel { + color: #0f9d58; +} + +.text-word { + color: #4b87e4; +} + +.text-image { + color: #d93025; +} + +.text-pdf { + color: #ea4335; +} + +.text-powerpoint { + color: #fd7541; +} + +.text-code { + color: #e16156; +} + .word-wrap { white-space: normal; word-break: break-word; @@ -1724,4 +1748,4 @@ td{ } h2 { text-transform: capitalize !important; -} \ No newline at end of file +} diff --git a/resources/views/admin/calendar/calendar_display.blade.php b/resources/views/admin/calendar/calendar_display.blade.php index 037f47e7..c6e1cf60 100644 --- a/resources/views/admin/calendar/calendar_display.blade.php +++ b/resources/views/admin/calendar/calendar_display.blade.php @@ -33,24 +33,7 @@ @endsection @section('breadcrumb') -
-
-
-
-

{{ trans('calendar.admin_page_title')}}

-
-
-
-
-
-
-
    -
  1. {{ trans('calendar.admin_breadcrumb')}}
    2. -
-
-
-
-
+ Horaire @endsection @section('custom_scripts') @@ -80,4 +63,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/configs/file.blade.php b/resources/views/admin/configs/file.blade.php index ed5ff7d5..e7f9eab4 100644 --- a/resources/views/admin/configs/file.blade.php +++ b/resources/views/admin/configs/file.blade.php @@ -4,12 +4,47 @@
-

Configuration Générale

+

Configuration du système de fichier

@csrf
+

Configuration Google Drive

+
+ +
+
+
+ + + ID de client Google Drive +
+
+
+
+ + + ID secret du disque Google Drive +
+
+
+
+ + + Token de rafraichissement du disque Google Drive +
+
+
+
+ + + ID du dossier Google Drive, "null" pour la racine +
+
+

Configuration de la liste nominale

@@ -28,42 +63,8 @@ @endsection @section('breadcrumb') -
-
-
-
-

Configuration des fichiers

-
-
-
-
-
-
-
    -
  1. Configuration/Fichier
    2. -
-
-
-
-
+Configuration du système de fichier @endsection @section('custom_scripts') - @endsection diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index c6164e36..d08fb4c1 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -143,24 +143,7 @@ @endsection @section('breadcrumb') -
-
-
-
-

{{ trans('admin/dashboard.page_title')}}

-
-
-
-
-
-
-
    -
  1. {{ trans('admin/dashboard.breadcrumb')}}
    2. -
-
-
-
-
+ Dashboard @endsection @section('scripts') diff --git a/resources/views/admin/files/Google Drive/index.blade.php b/resources/views/admin/files/Google Drive/index.blade.php new file mode 100644 index 00000000..66df72f4 --- /dev/null +++ b/resources/views/admin/files/Google Drive/index.blade.php @@ -0,0 +1,68 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+

Full header coloured

+

Category subtitle

+
+
+ + + + + + + + + + + + + + @foreach($directories as $directory) + + + + + + @endforeach + @foreach($files as $file) + + + + + + @endforeach + +
#Nom
..
{{$directory['name']}} + + + +
{{$file['name']}} + + + +
+
+
+@endsection + +@section('breadcrumb') + Fichier / Google Drive +@endsection + +@section('scripts') +@endsection diff --git a/resources/views/admin/schedule/editor/course.blade.php b/resources/views/admin/schedule/editor/course.blade.php index 8cb62f88..ec3bf608 100644 --- a/resources/views/admin/schedule/editor/course.blade.php +++ b/resources/views/admin/schedule/editor/course.blade.php @@ -1,3 +1,4 @@ +
diff --git a/resources/views/admin/schedule/event/add.blade.php b/resources/views/admin/schedule/event/add.blade.php index 27f4c538..a96e71de 100644 --- a/resources/views/admin/schedule/event/add.blade.php +++ b/resources/views/admin/schedule/event/add.blade.php @@ -49,6 +49,34 @@ Veuillez entrer le lieu de l'événement
+
+
+
+
+ + +
+
+
+
+ +
+
+ +
+ + Remove + + Select file + Change + + + +
+
+
+
+
@@ -58,34 +86,6 @@
-
- -
-
-
-
-
- - -
-
-
- -
- -
-
-
-
-
-
+ @yield('breadcrumb')
- +
- \ No newline at end of file + diff --git a/resources/views/layouts/admin/scripts.blade.php b/resources/views/layouts/admin/scripts.blade.php index e21c6505..ddbe095d 100644 --- a/resources/views/layouts/admin/scripts.blade.php +++ b/resources/views/layouts/admin/scripts.blade.php @@ -19,6 +19,8 @@ + + @@ -26,8 +28,12 @@ - + + + + + diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index 97420d7e..8e1728bc 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -26,14 +26,14 @@