From da27907625e55067dd8d8d5f1c850adb38fcd2b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 17 Jun 2022 09:28:41 +0200 Subject: [PATCH 1/8] Add missing models name into trans --- resources/lang/en/models.php | 1 + resources/lang/fr/models.php | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/lang/en/models.php b/resources/lang/en/models.php index a90e8fc..897db6c 100644 --- a/resources/lang/en/models.php +++ b/resources/lang/en/models.php @@ -12,5 +12,6 @@ return [ 'files' => 'Files', 'sites' => 'Sites', 'brands' => 'Brands', + 'labels' => 'Labels', ] ]; diff --git a/resources/lang/fr/models.php b/resources/lang/fr/models.php index c3c3b0d..d599f0d 100644 --- a/resources/lang/fr/models.php +++ b/resources/lang/fr/models.php @@ -12,5 +12,6 @@ return [ 'files' => 'Fichiers', 'sites' => 'Sites', 'brands' => 'Marques', + 'labels' => 'Labels', ] ]; From 9bc9f8007a6dca0f207e8276abcb6c8b9263f69b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 17 Jun 2022 09:37:21 +0200 Subject: [PATCH 2/8] Hotfix create ticket --- app/Http/Controllers/TicketController.php | 7 ++++--- resources/views/ticket/form-inputs.blade.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php index 263cbb1..c0a87ae 100644 --- a/app/Http/Controllers/TicketController.php +++ b/app/Http/Controllers/TicketController.php @@ -190,13 +190,14 @@ class TicketController extends Controller $ticket->file2 = ToolboxHelper::storeImage($ticket->getTable(), $fileTicket2); } - if ($request->labels) { - $ticket->labels()->sync($request->labels); - } $ticket->user()->associate(auth()->user()); $ticket->site()->associate($site); $ticket->saveOrFail(); + if ($request->labels) { + $ticket->labels()->sync($request->labels); + } + $user->subscriptions()->toggle($ticket->id); if (config('mail.MAIL_ADMIN')) { diff --git a/resources/views/ticket/form-inputs.blade.php b/resources/views/ticket/form-inputs.blade.php index e55d018..d3c67c0 100644 --- a/resources/views/ticket/form-inputs.blade.php +++ b/resources/views/ticket/form-inputs.blade.php @@ -41,7 +41,7 @@ $userPr = Auth::user()->sites ?? collect([]); @php $dataVue = [ 'name' => 'labels', - 'value' => old('labels', optional($ticket ?? null)->labels), + 'value' => optional($ticket ?? null)->labels, 'labels' => \App\Models\Label::all() ]; @endphp From d0cf2278b92a13b1f3b74a58371f980fe5826aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 20 Jul 2022 11:09:04 +0200 Subject: [PATCH 3/8] Message incident 19/07/2022 --- resources/views/home.blade.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 4d76543..c606b42 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -11,6 +11,21 @@

Changements

+
+
+

Incident du 19 au 20 Juillet 2022

+

Il s'est produit un incident sur les serveurs OVH à Roubaix suite au fortes chaleurs, + occasionnant un pannes général des site et applications LDC.
+ Nous faisont le nécessaire pour le rétablissement des services.
+ Si vous constatez un problème suite au rétablissement des services,
+ Merci de contacter Vincent bridier sur Teams ou par téléphone 02 43 55 91 33
+ Il vous est également possible de créer un ticket sur support web.
+
+ Merci de votre compréhension.
+ L'équipe LDC Web. +

+
+
{!! $changelog !!} From 9817b0f7cae057cef3b9d4a8804734527f9e5bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 20 Jul 2022 11:18:03 +0200 Subject: [PATCH 4/8] overhal incident message --- resources/views/home.blade.php | 16 +--------------- resources/views/incident.blade.php | 15 +++++++++++++++ resources/views/ticket/index.blade.php | 1 + 3 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 resources/views/incident.blade.php diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index c606b42..dbff3ff 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -8,24 +8,10 @@

Pour consulter vos tickets, merci de vous connecter : Connexion

+ @include('incident')

Changements

-
-
-

Incident du 19 au 20 Juillet 2022

-

Il s'est produit un incident sur les serveurs OVH à Roubaix suite au fortes chaleurs, - occasionnant un pannes général des site et applications LDC.
- Nous faisont le nécessaire pour le rétablissement des services.
- Si vous constatez un problème suite au rétablissement des services,
- Merci de contacter Vincent bridier sur Teams ou par téléphone 02 43 55 91 33
- Il vous est également possible de créer un ticket sur support web.
-
- Merci de votre compréhension.
- L'équipe LDC Web. -

-
-
{!! $changelog !!} diff --git a/resources/views/incident.blade.php b/resources/views/incident.blade.php new file mode 100644 index 0000000..a27d831 --- /dev/null +++ b/resources/views/incident.blade.php @@ -0,0 +1,15 @@ +
+
+

Incident du 19 au 20 Juillet 2022

+

Il s'est produit un incident sur les serveurs OVH à Roubaix suite au fortes chaleurs,
+ occasionnant une panne générale des sites et applications LDC.
+ Nous faisons le nécessaire pour le rétablissement des services.
+ Si vous constatez un problème suite au rétablissement des services,
+ Merci de contacter Vincent Bridier sur Teams ou par téléphone 02 43 55 91 33
+ Il vous est également possible de créer un ticket sur support web.
+
+ Merci de votre compréhension.
+ L'équipe LDC Web. +

+
+
diff --git a/resources/views/ticket/index.blade.php b/resources/views/ticket/index.blade.php index c589a28..9ab1924 100644 --- a/resources/views/ticket/index.blade.php +++ b/resources/views/ticket/index.blade.php @@ -7,6 +7,7 @@ $userPr = Auth::user()->sites ?? collect([]); @endphp
+ @include('incident')
From be746784f30acbda85e5776659d2636a70f95420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 20 Jul 2022 12:41:35 +0200 Subject: [PATCH 5/8] Change message Incident handled --- resources/views/incident.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/incident.blade.php b/resources/views/incident.blade.php index a27d831..beac960 100644 --- a/resources/views/incident.blade.php +++ b/resources/views/incident.blade.php @@ -3,7 +3,7 @@

Incident du 19 au 20 Juillet 2022

Il s'est produit un incident sur les serveurs OVH à Roubaix suite au fortes chaleurs,
occasionnant une panne générale des sites et applications LDC.
- Nous faisons le nécessaire pour le rétablissement des services.
+ Le nécessaire à été fait pour le rétablissement des services.
Si vous constatez un problème suite au rétablissement des services,
Merci de contacter Vincent Bridier sur Teams ou par téléphone 02 43 55 91 33
Il vous est également possible de créer un ticket sur support web.
From e167425f015e4ce376a7bdffdaae99e7b95b0807 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Mon, 22 Aug 2022 15:38:36 +0200 Subject: [PATCH 6/8] Handle user soft delete on planning --- app/Http/Controllers/ScheduleController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php index 525e4c9..8802cb9 100644 --- a/app/Http/Controllers/ScheduleController.php +++ b/app/Http/Controllers/ScheduleController.php @@ -8,6 +8,7 @@ use App\Models\Schedule; use App\Models\User; use Illuminate\Http\Request; use Carbon\CarbonImmutable; +use Illuminate\Database\Eloquent\Builder; /** * Alternate planner for Dev Team @@ -41,13 +42,16 @@ class ScheduleController extends Controller $users[$user->id] = ['name' => $user->name]; } - $schedules = Schedule::whereDate('date', '>=', $date) + $schedules = Schedule::whereHas('user', function(Builder $query) { + $query->where('deleted_at', NULL); + }) + ->whereDate('date', '>=', $date) ->whereDate('date', '<=', $date->addDays($nbweeks * 7 - 1)) ->orderBy('user_id') ->orderBy('slot') ->orderBy('date') ->get(); - + $arSchedules = array(); $prevUserId = null; $prevDate = null; From 7fe50bc84771dc54f6748478a1b0068596f40eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 30 Aug 2022 06:41:39 +0000 Subject: [PATCH 7/8] Evol planning force object --- app/Http/Requests/StoreScheduleRequest.php | 33 ++- app/Models/Project.php | 21 +- app/Models/ProjetSite.php | 9 - app/Models/Site.php | 26 +-- ...6_112109_change_sites_projets_relation.php | 44 ++++ package-lock.json | 190 +++++++----------- resources/js/components/ScheduleComponent.vue | 2 +- 7 files changed, 158 insertions(+), 167 deletions(-) delete mode 100644 app/Models/ProjetSite.php create mode 100644 database/migrations/2022_08_26_112109_change_sites_projets_relation.php diff --git a/app/Http/Requests/StoreScheduleRequest.php b/app/Http/Requests/StoreScheduleRequest.php index 339c5c2..c7de0b8 100644 --- a/app/Http/Requests/StoreScheduleRequest.php +++ b/app/Http/Requests/StoreScheduleRequest.php @@ -32,7 +32,18 @@ class StoreScheduleRequest extends FormRequest 'date' => 'date_format:d/m/Y', 'activity' => [ 'required', - new EnumIsValidRule(ActivityType::class) + new EnumIsValidRule(ActivityType::class), + function ($attribute, $value, $fail) { + if ( + \in_array($value, [ + \strval(ActivityType::dev()->value), + \strval(ActivityType::projects()->value), + ]) and + is_null($this->id_lie) + ) { + $fail(trans("$attribute : Il est obligatoire d'assigner un type d'élement lié au ticket")); + } + } ], 'slot' => [ 'required', @@ -42,8 +53,26 @@ class StoreScheduleRequest extends FormRequest 'nullable', new EnumIsValidRule(CellModel::class) ], - 'id_lie' => 'required_with:model_lie|nullable|numeric', + 'id_lie' => [ + 'required_with:model_lie', + 'nullable', + 'numeric', + ], 'description' => 'required|string|min:3|max:90' ]; } + + /** + * Get custom attributes for validator errors. + * + * @return array + */ + public function attributes(): array + { + return [ + 'activity' => trans('catégorie'), + 'model_lie' => trans('type d\'élement lié'), + 'id_lie' => trans('élement lié') + ]; + } } diff --git a/app/Models/Project.php b/app/Models/Project.php index 6735e9c..713c1b1 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -8,6 +8,7 @@ use App\Models\MacroSchedule\Activity; use App\Models\MacroSchedule\Marker; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Str; use Kwaadpepper\CrudPolicies\Enums\CrudAction; use Kwaadpepper\CrudPolicies\Enums\CrudType; use Kwaadpepper\CrudPolicies\Traits\IsCrudModel; @@ -40,7 +41,7 @@ class Project extends Model */ protected $fillable = [ 'name', 'status', - 'description', 'todo', 'sites' + 'description', 'todo', 'site_id' ]; /** @@ -129,12 +130,10 @@ class Project extends Model CrudAction::update(), ] ], - 'sites' => [ - 'label' => trans('Sites'), - 'type' => CrudType::belongsToMany(), - 'belongsToMany' => Site::class, - 'belongsToManyLabel' => 'name', - 'nullable' => true, + 'site_id' => [ + 'label' => Str::singular(trans('models.classes.sites')), + 'type' => CrudType::belongsTo(), + 'belongsTo' => Site::class, 'readonly' => function () { /** @var \App\Models\User */ $user = auth()->user(); @@ -176,13 +175,13 @@ class Project extends Model // * RELATIONSHIPS. /** - * BelongsToMany Site + * BelongsTo Site * - * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function sites() + public function site() { - return $this->belongsToMany(Site::class, 'project_site'); + return $this->belongsTo(Site::class); } /** diff --git a/app/Models/ProjetSite.php b/app/Models/ProjetSite.php deleted file mode 100644 index e51ff3a..0000000 --- a/app/Models/ProjetSite.php +++ /dev/null @@ -1,9 +0,0 @@ - [ - 'label' => trans('models.classes.projects'), - 'type' => CrudType::belongsToMany(), - 'belongsToMany' => Project::class, - 'belongsToManyLabel' => 'name', - 'nullable' => true, - 'readonly' => function () { - /** @var \App\Models\User */ - $user = auth()->user(); - return !$user->isAdmin(); - }, - 'actions' => [ - CrudAction::viewAny(), - CrudAction::view(), - CrudAction::create(), - CrudAction::update() - ] ] ]; parent::__construct($attributes); @@ -213,13 +195,13 @@ class Site extends Model } /** - * BelongsToMany Project relation + * BelongsTo Project relation * - * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function projects() + public function project() { - return $this->belongsToMany(Project::class); + return $this->belongsTo(Project::class); } /** diff --git a/database/migrations/2022_08_26_112109_change_sites_projets_relation.php b/database/migrations/2022_08_26_112109_change_sites_projets_relation.php new file mode 100644 index 0000000..e2b55d2 --- /dev/null +++ b/database/migrations/2022_08_26_112109_change_sites_projets_relation.php @@ -0,0 +1,44 @@ +get(); + Schema::table('projects', function (Blueprint $table) { + $table->foreignId('site_id')->nullable()->after('todo'); + }); + collect($project_siteIds)->map(function (object $project_site) { + DB::table('projects')->where('id', $project_site->project_id) + ->update(['site_id' => $project_site->site_id]); + }); + Schema::table('projects', function (Blueprint $table) { + $table->foreignId('site_id')->nullable(false)->change(); + $table->foreign('site_id')->on('sites')->references('id'); + }); + Schema::drop('project_site'); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('projects', function (Blueprint $table) { + $table->dropForeign('admins_post_id_foreign'); + $table->dropColumn('post_id'); + }); + } +} diff --git a/package-lock.json b/package-lock.json index 3025b67..413e3c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,7 @@ "requires": true, "packages": { "": { + "name": "supportweb", "devDependencies": { "@babel/plugin-transform-async-to-generator": "^7.16.8", "@fortawesome/fontawesome-free": "^6.1.1", @@ -1726,6 +1727,30 @@ "node": ">=6.0.0" } }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.13", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", @@ -5504,9 +5529,9 @@ } }, "node_modules/html-minifier-terser/node_modules/terser": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", - "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz", + "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==", "dev": true, "dependencies": { "commander": "^2.20.0", @@ -6459,12 +6484,6 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, - "node_modules/lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, "node_modules/lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -6809,9 +6828,9 @@ } }, "node_modules/moment": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", - "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==", + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", "dev": true, "engines": { "node": "*" @@ -9522,14 +9541,14 @@ } }, "node_modules/terser": { - "version": "5.13.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.13.1.tgz", - "integrity": "sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", + "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", "dev": true, "dependencies": { + "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.8.0-beta.0", "source-map-support": "~0.5.20" }, "bin": { @@ -9597,18 +9616,6 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, - "node_modules/terser/node_modules/source-map": { - "version": "0.8.0-beta.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", - "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", - "dev": true, - "dependencies": { - "whatwg-url": "^7.0.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/thunky": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", @@ -9669,24 +9676,6 @@ "node": ">=0.6" } }, - "node_modules/tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/tr46/node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/trim-newlines": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.0.2.tgz", @@ -10051,12 +10040,6 @@ "minimalistic-assert": "^1.0.0" } }, - "node_modules/webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true - }, "node_modules/webpack": { "version": "5.72.1", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.1.tgz", @@ -10520,17 +10503,6 @@ "node": ">=0.8.0" } }, - "node_modules/whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", - "dev": true, - "dependencies": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -11888,6 +11860,29 @@ "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==", "dev": true }, + "@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + } + } + }, "@jridgewell/sourcemap-codec": { "version": "1.4.13", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", @@ -14908,9 +14903,9 @@ "dev": true }, "terser": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", - "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz", + "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==", "dev": true, "requires": { "commander": "^2.20.0", @@ -15607,12 +15602,6 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, - "lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -15881,9 +15870,9 @@ } }, "moment": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", - "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==", + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", "dev": true }, "ms": { @@ -17874,14 +17863,14 @@ "dev": true }, "terser": { - "version": "5.13.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.13.1.tgz", - "integrity": "sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", + "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", "dev": true, "requires": { + "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.8.0-beta.0", "source-map-support": "~0.5.20" }, "dependencies": { @@ -17890,15 +17879,6 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true - }, - "source-map": { - "version": "0.8.0-beta.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", - "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", - "dev": true, - "requires": { - "whatwg-url": "^7.0.0" - } } } }, @@ -17976,23 +17956,6 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, - "tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "dev": true, - "requires": { - "punycode": "^2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - } - } - }, "trim-newlines": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.0.2.tgz", @@ -18292,12 +18255,6 @@ "minimalistic-assert": "^1.0.0" } }, - "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true - }, "webpack": { "version": "5.72.1", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.1.tgz", @@ -18619,17 +18576,6 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, - "whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", - "dev": true, - "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/resources/js/components/ScheduleComponent.vue b/resources/js/components/ScheduleComponent.vue index c32d2b2..52dc543 100644 --- a/resources/js/components/ScheduleComponent.vue +++ b/resources/js/components/ScheduleComponent.vue @@ -78,7 +78,7 @@