From 94fd687a00a877ec83688abdd4e091e82b26c07d Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 10 Oct 2019 23:49:24 +0100 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07bdf4d..5c431e3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Topsite Application -[![Build Status](https://travis-ci.org/1e4/topsite.svg?branch=develop)](https://travis-ci.org/1e4/topsite) [![Maintainability](https://api.codeclimate.com/v1/badges/84627b35523d6894e261/maintainability)](https://codeclimate.com/github/1e4/topsite/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/84627b35523d6894e261/test_coverage)](https://codeclimate.com/github/1e4/topsite/test_coverage) +[![Build Status](https://travis-ci.org/1e4/topsite.svg?branch=develop)](https://travis-ci.org/1e4/topsite) [![Maintainability](https://api.codeclimate.com/v1/badges/8be22f945708dda410b6/maintainability)](https://codeclimate.com/github/pbbg/topsite/maintainability)[![Test Coverage](https://api.codeclimate.com/v1/badges/8be22f945708dda410b6/test_coverage)](https://codeclimate.com/github/pbbg/topsite/test_coverage) There are many different topsite applications out there, but none that are open source that have a range of features, we aim to address this, so whether it's a PBBG topsite, Minecraft topsite or any other topsite we aim to be to go solution From 543a9ffdd70202671239676c1db9c486706ee200 Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 11 Oct 2019 02:24:45 +0100 Subject: [PATCH 2/5] Fix for #37 --- .../Administration/GameController.php | 8 ++-- app/Http/Controllers/GameController.php | 39 +++++++++---------- app/Http/Requests/CreateGameRequest.php | 2 +- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/Administration/GameController.php b/app/Http/Controllers/Administration/GameController.php index f2a4dfe..de7f0ef 100644 --- a/app/Http/Controllers/Administration/GameController.php +++ b/app/Http/Controllers/Administration/GameController.php @@ -54,8 +54,8 @@ public function datatables(): JsonResponse public function create(): View { $categories = []; - $categories[] = "-- Select Category --"; - $categories = array_merge($categories, Category::all()->pluck('name')->toArray()); + $categories[0] = "-- Select Category --"; + $categories = array_merge($categories, Category::all()->pluck('name', 'slug')->toArray()); return view('administration.game.create', compact('categories')); } @@ -101,8 +101,8 @@ public function show(Game $game): View public function edit(Game $game): View { $categories = []; - $categories[] = "-- Select Category --"; - $categories = array_merge($categories, Category::all()->pluck('name')->toArray()); + $categories[0] = "-- Select Category --"; + $categories = array_merge($categories, Category::all()->pluck('name', 'slug')->toArray()); return view('administration.game.edit', compact('game', 'categories')); } diff --git a/app/Http/Controllers/GameController.php b/app/Http/Controllers/GameController.php index 963ee81..6cf8560 100644 --- a/app/Http/Controllers/GameController.php +++ b/app/Http/Controllers/GameController.php @@ -12,7 +12,8 @@ class GameController extends Controller { - public function index(): View { + public function index(): View + { $games = Game::where('created_by', auth()->user()->id) ->get(); @@ -20,10 +21,11 @@ public function index(): View { return view('games.index', compact('games')); } - public function create(): View { + public function create(): View + { $categories = []; - $categories[] = "-- Select Category --"; - $categories = array_merge($categories, Category::all()->pluck('name')->toArray()); + $categories[0] = "-- Select Category --"; + $categories = array_merge($categories, Category::all()->pluck('name', 'slug')->toArray()); return view('games.create', compact('categories')); } @@ -43,8 +45,7 @@ public function store(CreateGameRequest $request): RedirectResponse $game->is_premium = false; $game->uuid = \Str::uuid(); - if($request->has('banner_image')) - { + if ($request->has('banner_image')) { $banner = $request->file('banner_image'); $imageName = md5($banner->getClientOriginalName() . time()) . '.' . $banner->getClientOriginalExtension(); $banner->move(public_path('images/uploads'), $imageName); @@ -54,9 +55,8 @@ public function store(CreateGameRequest $request): RedirectResponse $game->save(); - if($request->has('images')) - { - ImageUpload::whereIn('filename', $request->input('images'))->each(function($image) use($game) { + if ($request->has('images')) { + ImageUpload::whereIn('filename', $request->input('images'))->each(function ($image) use ($game) { $image->game_id = $game->id; $image->save(); }); @@ -68,17 +68,18 @@ public function store(CreateGameRequest $request): RedirectResponse ->route('front.game.index'); } - public function edit(Game $game): View { + public function edit(Game $game): View + { $categories = []; - $categories[] = "-- Select Category --"; - $categories = array_merge($categories, Category::all()->pluck('name')->toArray()); + $categories[0] = "-- Select Category --"; + $categories = array_merge($categories, Category::all()->pluck('name', 'slug')->toArray()); + $images = ImageUpload::where('game_id', $game->id)->get(); $imageCache = []; - foreach($images as $image) - { + foreach ($images as $image) { $img['name'] = $image->filename; //get the filename in array $img['size'] = filesize(public_path('images/uploads/' . $image->filename)); //get the flesize in array $imageCache[] = $img; // copy it to another array @@ -96,9 +97,8 @@ public function update(CreateGameRequest $request, Game $game): RedirectResponse $game->is_premium = false; $game->slug = null; - if($request->has('banner_image')) - { - if($game->banner_image !== null) { + if ($request->has('banner_image')) { + if ($game->banner_image !== null) { // Remove old banner image $path = public_path() . '/images/uploads/' . $game->banner_image; @@ -116,9 +116,8 @@ public function update(CreateGameRequest $request, Game $game): RedirectResponse $game->save(); - if($request->has('images')) - { - ImageUpload::whereIn('filename', $request->input('images'))->each(function($image) use($game) { + if ($request->has('images')) { + ImageUpload::whereIn('filename', $request->input('images'))->each(function ($image) use ($game) { $image->game_id = $game->id; $image->save(); }); diff --git a/app/Http/Requests/CreateGameRequest.php b/app/Http/Requests/CreateGameRequest.php index 0ae42be..b1a9607 100644 --- a/app/Http/Requests/CreateGameRequest.php +++ b/app/Http/Requests/CreateGameRequest.php @@ -42,7 +42,7 @@ public function rules() ], 'category_id' => [ 'required', - 'exists:categories,id' + 'exists:categories,slug' ], 'callback_url' => [ 'nullable', From 2404cc43e379898a731d3c791257003d135716dd Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 11 Oct 2019 02:37:38 +0100 Subject: [PATCH 3/5] Fix for recaptcha --- app/Http/Requests/VoteIn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Requests/VoteIn.php b/app/Http/Requests/VoteIn.php index 784f598..ee06c77 100644 --- a/app/Http/Requests/VoteIn.php +++ b/app/Http/Requests/VoteIn.php @@ -24,7 +24,7 @@ public function authorize() public function rules() { return [ -// 'g-recaptcha-response' => 'required|captcha' + 'g-recaptcha-response' => 'required|captcha' ]; } } From 4eb0945b474e3489f5d8530b8960cd20412acc63 Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 11 Oct 2019 02:42:17 +0100 Subject: [PATCH 4/5] Add support for sparkpost #38 --- composer.json | 1 + composer.lock | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d0631e6..cfb290f 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ "php": "^7.2", "anhskohbo/no-captcha": "^3.1", "ccaglayan/discord-webhooks-php": "^0.1.0", + "clarification/sparkpost-laravel-driver": "^1.2", "cviebrock/eloquent-sluggable": "^6.0", "fideloper/proxy": "^4.0", "laracasts/flash": "^3.0", diff --git a/composer.lock b/composer.lock index d42f148..6850dc9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3ae5e97d7d5e02aedd8361e138cb0d65", + "content-hash": "e0c9396c2fa769d1b5eeda7b186c65a0", "packages": [ { "name": "anhskohbo/no-captcha", @@ -111,6 +111,58 @@ ], "time": "2018-12-21T14:36:44+00:00" }, + { + "name": "clarification/sparkpost-laravel-driver", + "version": "1.2.5", + "source": { + "type": "git", + "url": "https://github.com/clarification/sparkpost-laravel-driver.git", + "reference": "85ba3c5f996fc3adc08ded5f3f849108eb2c5673" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/clarification/sparkpost-laravel-driver/zipball/85ba3c5f996fc3adc08ded5f3f849108eb2c5673", + "reference": "85ba3c5f996fc3adc08ded5f3f849108eb2c5673", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": ">=5.0", + "illuminate/container": ">=5.0", + "swiftmailer/swiftmailer": "~5.1||~6.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Clarification\\MailDrivers\\Sparkpost\\SparkpostServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Clarification\\MailDrivers\\Sparkpost\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Robin Lidbetter", + "role": "Developer" + } + ], + "description": "Sparkpost mail driver for Laravel", + "homepage": "http://clarification.io", + "keywords": [ + "driver", + "laravel", + "mail", + "sparkpost" + ], + "time": "2019-09-26T17:03:11+00:00" + }, { "name": "cocur/slugify", "version": "v3.2", From 36225d386a460a3a7469ac3da2f878c40e338ef7 Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 11 Oct 2019 03:03:26 +0100 Subject: [PATCH 5/5] Fix for select category #37 --- app/Category.php | 6 + .../Administration/GameController.php | 14 +- app/Http/Controllers/GameController.php | 10 +- composer.json | 2 +- composer.lock | 231 +++++++++--------- .../views/administration/game/edit.blade.php | 2 +- resources/views/games/form.blade.php | 2 +- 7 files changed, 143 insertions(+), 124 deletions(-) diff --git a/app/Category.php b/app/Category.php index f59bde6..c33ecf0 100644 --- a/app/Category.php +++ b/app/Category.php @@ -11,6 +11,12 @@ class Category extends Model protected $fillable = ['name']; + + public function scopeFindBySlug($query, $slug): Category + { + return $query->whereSlug($slug)->firstOrFail(); + } + public function sluggable(): array { return [ diff --git a/app/Http/Controllers/Administration/GameController.php b/app/Http/Controllers/Administration/GameController.php index de7f0ef..e5a637c 100644 --- a/app/Http/Controllers/Administration/GameController.php +++ b/app/Http/Controllers/Administration/GameController.php @@ -54,7 +54,7 @@ public function datatables(): JsonResponse public function create(): View { $categories = []; - $categories[0] = "-- Select Category --"; + $categories["none__"] = "-- Select Category --"; $categories = array_merge($categories, Category::all()->pluck('name', 'slug')->toArray()); return view('administration.game.create', compact('categories')); @@ -68,11 +68,14 @@ public function create(): View */ public function store(CreateGameRequest $request): RedirectResponse { + $category = Category::findBySlug($request->input('category_id')); + $game = new Game(); - $game->fill($request->all('name', 'url', 'description', 'category_id', 'callback_url')); + $game->fill($request->all('name', 'url', 'description', 'callback_url')); $game->is_pending = $request->has('is_pending') ? false : true; $game->is_premium = $request->has('is_premium'); $game->uuid = \Str::uuid(); + $game->category_id = $category->id; $game->save(); flash('Game has been created')->success(); @@ -101,7 +104,7 @@ public function show(Game $game): View public function edit(Game $game): View { $categories = []; - $categories[0] = "-- Select Category --"; + $categories["none__"] = "-- Select Category --"; $categories = array_merge($categories, Category::all()->pluck('name', 'slug')->toArray()); return view('administration.game.edit', compact('game', 'categories')); @@ -116,8 +119,11 @@ public function edit(Game $game): View */ public function update(CreateGameRequest $request, Game $game): RedirectResponse { - $game->fill($request->all('name', 'url', 'description', 'category_id', 'callback_url')); + $category = Category::findBySlug($request->input('category_id')); + + $game->fill($request->all('name', 'url', 'description', 'callback_url')); $game->is_premium = $request->has('is_premium'); + $game->category_id = $category->id; $game->slug = null; $game->save(); diff --git a/app/Http/Controllers/GameController.php b/app/Http/Controllers/GameController.php index 6cf8560..e0cd6e6 100644 --- a/app/Http/Controllers/GameController.php +++ b/app/Http/Controllers/GameController.php @@ -24,7 +24,7 @@ public function index(): View public function create(): View { $categories = []; - $categories[0] = "-- Select Category --"; + $categories["none__"] = "-- Select Category --"; $categories = array_merge($categories, Category::all()->pluck('name', 'slug')->toArray()); return view('games.create', compact('categories')); @@ -39,10 +39,13 @@ public function show($slug): RedirectResponse public function store(CreateGameRequest $request): RedirectResponse { + $category = Category::findBySlug($request->input('category_id')); + $game = new Game(); $game->fill($request->all('name', 'url', 'description', 'category_id', 'callback_url')); $game->is_pending = true; $game->is_premium = false; + $game->category_id = $category->id; $game->uuid = \Str::uuid(); if ($request->has('banner_image')) { @@ -72,7 +75,7 @@ public function edit(Game $game): View { $categories = []; - $categories[0] = "-- Select Category --"; + $categories["none__"] = "-- Select Category --"; $categories = array_merge($categories, Category::all()->pluck('name', 'slug')->toArray()); $images = ImageUpload::where('game_id', $game->id)->get(); @@ -92,10 +95,13 @@ public function edit(Game $game): View public function update(CreateGameRequest $request, Game $game): RedirectResponse { + $category = Category::findBySlug($request->input('category_id')); + $game->fill($request->all('name', 'url', 'description', 'category_id', 'callback_url')); $game->is_pending = true; $game->is_premium = false; $game->slug = null; + $game->category_id = $category->id; if ($request->has('banner_image')) { if ($game->banner_image !== null) { diff --git a/composer.json b/composer.json index cfb290f..9cdecad 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "laracasts/flash": "^3.0", "laravel/framework": "^6.0", "laravel/tinker": "^1.0", - "netojose/laravel-bootstrap-4-forms": "^2.0", + "netojose/laravel-bootstrap-4-forms": "^3.0", "yajra/laravel-datatables-oracle": "~9.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 6850dc9..a80ca3c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e0c9396c2fa769d1b5eeda7b186c65a0", + "content-hash": "486de0ecc7840b5882aa4eeca2b1b883", "packages": [ { "name": "anhskohbo/no-captcha", @@ -230,16 +230,16 @@ }, { "name": "cviebrock/eloquent-sluggable", - "version": "6.0.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/cviebrock/eloquent-sluggable.git", - "reference": "509ced3930aed5ba327ab1d60a1c741c6018f934" + "reference": "20f39ae0eeb54c73756834570be7f514fa350cbb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cviebrock/eloquent-sluggable/zipball/509ced3930aed5ba327ab1d60a1c741c6018f934", - "reference": "509ced3930aed5ba327ab1d60a1c741c6018f934", + "url": "https://api.github.com/repos/cviebrock/eloquent-sluggable/zipball/20f39ae0eeb54c73756834570be7f514fa350cbb", + "reference": "20f39ae0eeb54c73756834570be7f514fa350cbb", "shasum": "" }, "require": { @@ -289,7 +289,7 @@ "slug", "sluggable" ], - "time": "2019-09-14T02:58:44+00:00" + "time": "2019-10-10T04:32:04+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -996,16 +996,16 @@ }, { "name": "laravel/framework", - "version": "v6.0.4", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "372e0add8a58e0e3deb78f87cbb2dc40d3e0ff08" + "reference": "cacce5a77fa94793cf25345d67387632134d75dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/372e0add8a58e0e3deb78f87cbb2dc40d3e0ff08", - "reference": "372e0add8a58e0e3deb78f87cbb2dc40d3e0ff08", + "url": "https://api.github.com/repos/laravel/framework/zipball/cacce5a77fa94793cf25345d67387632134d75dd", + "reference": "cacce5a77fa94793cf25345d67387632134d75dd", "shasum": "" }, "require": { @@ -1101,7 +1101,8 @@ "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", "moontoast/math": "Required to use ordered UUIDs (^1.1).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.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).", "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).", "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).", "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." @@ -1137,7 +1138,7 @@ "framework", "laravel" ], - "time": "2019-09-24T13:40:36+00:00" + "time": "2019-10-08T12:50:06+00:00" }, { "name": "laravel/tinker", @@ -1369,16 +1370,16 @@ }, { "name": "nesbot/carbon", - "version": "2.24.0", + "version": "2.25.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29" + "reference": "d59c6cea9c4a3547bb6c0dfec451319abdaa4fb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/934459c5ac0658bc765ad1e53512c7c77adcac29", - "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d59c6cea9c4a3547bb6c0dfec451319abdaa4fb1", + "reference": "d59c6cea9c4a3547bb6c0dfec451319abdaa4fb1", "shasum": "" }, "require": { @@ -1425,27 +1426,27 @@ "homepage": "http://github.com/kylekatarnls" } ], - "description": "A API extension for DateTime that supports 281 different languages.", + "description": "An API extension for DateTime that supports 281 different languages.", "homepage": "http://carbon.nesbot.com", "keywords": [ "date", "datetime", "time" ], - "time": "2019-08-31T16:37:55+00:00" + "time": "2019-10-05T15:52:23+00:00" }, { "name": "netojose/laravel-bootstrap-4-forms", - "version": "2.0.6", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/netojose/laravel-bootstrap-4-forms.git", - "reference": "b3d032ad8a21fe10f33f6580c3daffaa59879e73" + "reference": "47eef3e73c534df1f9d2ce10cc2521b71c09b383" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/netojose/laravel-bootstrap-4-forms/zipball/b3d032ad8a21fe10f33f6580c3daffaa59879e73", - "reference": "b3d032ad8a21fe10f33f6580c3daffaa59879e73", + "url": "https://api.github.com/repos/netojose/laravel-bootstrap-4-forms/zipball/47eef3e73c534df1f9d2ce10cc2521b71c09b383", + "reference": "47eef3e73c534df1f9d2ce10cc2521b71c09b383", "shasum": "" }, "type": "package", @@ -1484,7 +1485,7 @@ "package", "php" ], - "time": "2019-01-17T00:15:09+00:00" + "time": "2019-07-24T07:59:17+00:00" }, { "name": "nikic/php-parser", @@ -2147,16 +2148,16 @@ }, { "name": "symfony/console", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "de63799239b3881b8a08f8481b22348f77ed7b36" + "reference": "929ddf360d401b958f611d44e726094ab46a7369" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/de63799239b3881b8a08f8481b22348f77ed7b36", - "reference": "de63799239b3881b8a08f8481b22348f77ed7b36", + "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369", + "reference": "929ddf360d401b958f611d44e726094ab46a7369", "shasum": "" }, "require": { @@ -2218,20 +2219,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-10-07T12:36:49+00:00" }, { "name": "symfony/css-selector", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03" + "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/c6e5e2a00db768c92c3ae131532af4e1acc7bd03", - "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9", + "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9", "shasum": "" }, "require": { @@ -2271,20 +2272,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:07:54+00:00" + "time": "2019-10-02T08:36:26+00:00" }, { "name": "symfony/debug", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced" + "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/afcdea44a2e399c1e4b52246ec8d54c715393ced", - "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced", + "url": "https://api.github.com/repos/symfony/debug/zipball/cc5c1efd0edfcfd10b354750594a46b3dd2afbbe", + "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe", "shasum": "" }, "require": { @@ -2327,20 +2328,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:27:59+00:00" + "time": "2019-09-19T15:51:53+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2" + "reference": "6229f58993e5a157f6096fc7145c0717d0be8807" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/429d0a1451d4c9c4abe1959b2986b88794b9b7d2", - "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6229f58993e5a157f6096fc7145c0717d0be8807", + "reference": "6229f58993e5a157f6096fc7145c0717d0be8807", "shasum": "" }, "require": { @@ -2397,20 +2398,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:55:16+00:00" + "time": "2019-10-01T16:40:32+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.5", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "c61766f4440ca687de1084a5c00b08e167a2575c" + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c", - "reference": "c61766f4440ca687de1084a5c00b08e167a2575c", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18", + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18", "shasum": "" }, "require": { @@ -2455,20 +2456,20 @@ "interoperability", "standards" ], - "time": "2019-06-20T06:46:26+00:00" + "time": "2019-09-17T09:54:03+00:00" }, { "name": "symfony/finder", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2" + "reference": "5e575faa95548d0586f6bedaeabec259714e44d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/86c1c929f0a4b24812e1eb109262fc3372c8e9f2", - "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2", + "url": "https://api.github.com/repos/symfony/finder/zipball/5e575faa95548d0586f6bedaeabec259714e44d1", + "reference": "5e575faa95548d0586f6bedaeabec259714e44d1", "shasum": "" }, "require": { @@ -2504,20 +2505,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-08-14T12:26:46+00:00" + "time": "2019-09-16T11:29:48+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc" + "reference": "76590ced16d4674780863471bae10452b79210a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d804bea118ff340a12e22a79f9c7e7eb56b35adc", - "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/76590ced16d4674780863471bae10452b79210a5", + "reference": "76590ced16d4674780863471bae10452b79210a5", "shasum": "" }, "require": { @@ -2559,20 +2560,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:55:16+00:00" + "time": "2019-10-04T19:48:13+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52" + "reference": "5f08141850932e8019c01d8988bf3ed6367d2991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5e0fc71be03d52cd00c423061cfd300bd6f92a52", - "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5f08141850932e8019c01d8988bf3ed6367d2991", + "reference": "5f08141850932e8019c01d8988bf3ed6367d2991", "shasum": "" }, "require": { @@ -2651,20 +2652,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-08-26T16:47:42+00:00" + "time": "2019-10-07T15:06:41+00:00" }, { "name": "symfony/mime", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "987a05df1c6ac259b34008b932551353f4f408df" + "reference": "32f71570547b91879fdbd9cf50317d556ae86916" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/987a05df1c6ac259b34008b932551353f4f408df", - "reference": "987a05df1c6ac259b34008b932551353f4f408df", + "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916", + "reference": "32f71570547b91879fdbd9cf50317d556ae86916", "shasum": "" }, "require": { @@ -2710,7 +2711,7 @@ "mime", "mime-type" ], - "time": "2019-08-22T08:16:11+00:00" + "time": "2019-09-19T17:00:15+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3065,16 +3066,16 @@ }, { "name": "symfony/process", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a" + "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e89969c00d762349f078db1128506f7f3dcc0d4a", - "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a", + "url": "https://api.github.com/repos/symfony/process/zipball/50556892f3cc47d4200bfd1075314139c4c9ff4b", + "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b", "shasum": "" }, "require": { @@ -3110,20 +3111,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-09-26T21:17:10+00:00" }, { "name": "symfony/routing", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f" + "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/ff1049f6232dc5b6023b1ff1c6de56f82bcd264f", - "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f", + "url": "https://api.github.com/repos/symfony/routing/zipball/3b174ef04fe66696524efad1e5f7a6c663d822ea", + "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea", "shasum": "" }, "require": { @@ -3186,20 +3187,20 @@ "uri", "url" ], - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-10-04T20:57:10+00:00" }, { "name": "symfony/service-contracts", - "version": "v1.1.6", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3" + "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ea7263d6b6d5f798b56a45a5b8d686725f2719a3", - "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0", + "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0", "shasum": "" }, "require": { @@ -3244,20 +3245,20 @@ "interoperability", "standards" ], - "time": "2019-08-20T14:44:19+00:00" + "time": "2019-09-17T11:12:18+00:00" }, { "name": "symfony/translation", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "28498169dd334095fa981827992f3a24d50fed0f" + "reference": "fe6193b066c457c144333c06aaa869a2d42a167f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/28498169dd334095fa981827992f3a24d50fed0f", - "reference": "28498169dd334095fa981827992f3a24d50fed0f", + "url": "https://api.github.com/repos/symfony/translation/zipball/fe6193b066c457c144333c06aaa869a2d42a167f", + "reference": "fe6193b066c457c144333c06aaa869a2d42a167f", "shasum": "" }, "require": { @@ -3320,20 +3321,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:55:16+00:00" + "time": "2019-09-27T14:37:39+00:00" }, { "name": "symfony/translation-contracts", - "version": "v1.1.6", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a" + "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/325b17c24f3ee23cbecfa63ba809c6d89b5fa04a", - "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/364518c132c95642e530d9b2d217acbc2ccac3e6", + "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6", "shasum": "" }, "require": { @@ -3377,20 +3378,20 @@ "interoperability", "standards" ], - "time": "2019-08-02T12:15:04+00:00" + "time": "2019-09-17T11:12:18+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6" + "reference": "bde8957fc415fdc6964f33916a3755737744ff05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/641043e0f3e615990a0f29479f9c117e8a6698c6", - "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/bde8957fc415fdc6964f33916a3755737744ff05", + "reference": "bde8957fc415fdc6964f33916a3755737744ff05", "shasum": "" }, "require": { @@ -3453,7 +3454,7 @@ "debug", "dump" ], - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-10-04T19:48:13+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3561,16 +3562,16 @@ }, { "name": "yajra/laravel-datatables-oracle", - "version": "v9.6.1", + "version": "v9.7.0", "source": { "type": "git", "url": "https://github.com/yajra/laravel-datatables.git", - "reference": "42cba7ffae2e7b41981dacf7257c681f00aee1a5" + "reference": "bb6ff7b76bd6253396cb7a5a7b6c51c5ab14b1a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/42cba7ffae2e7b41981dacf7257c681f00aee1a5", - "reference": "42cba7ffae2e7b41981dacf7257c681f00aee1a5", + "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/bb6ff7b76bd6253396cb7a5a7b6c51c5ab14b1a8", + "reference": "bb6ff7b76bd6253396cb7a5a7b6c51c5ab14b1a8", "shasum": "" }, "require": { @@ -3628,7 +3629,7 @@ "jquery", "laravel" ], - "time": "2019-09-26T08:35:02+00:00" + "time": "2019-10-02T05:58:48+00:00" } ], "packages-dev": [ @@ -4039,16 +4040,16 @@ }, { "name": "mockery/mockery", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "4eff936d83eb809bde2c57a3cea0ee9643769031" + "reference": "b3453f75fd23d9fd41685f2148f4abeacabc6405" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/4eff936d83eb809bde2c57a3cea0ee9643769031", - "reference": "4eff936d83eb809bde2c57a3cea0ee9643769031", + "url": "https://api.github.com/repos/mockery/mockery/zipball/b3453f75fd23d9fd41685f2148f4abeacabc6405", + "reference": "b3453f75fd23d9fd41685f2148f4abeacabc6405", "shasum": "" }, "require": { @@ -4062,7 +4063,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -4100,7 +4101,7 @@ "test double", "testing" ], - "time": "2019-08-07T15:01:07+00:00" + "time": "2019-09-30T08:30:27+00:00" }, { "name": "myclabs/deep-copy", @@ -4468,22 +4469,22 @@ }, { "name": "phpspec/prophecy", - "version": "1.8.1", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76" + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76", - "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203", + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.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" }, @@ -4527,7 +4528,7 @@ "spy", "stub" ], - "time": "2019-06-13T12:50:23+00:00" + "time": "2019-10-03T11:07:50+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/resources/views/administration/game/edit.blade.php b/resources/views/administration/game/edit.blade.php index 06180c3..c51e97f 100644 --- a/resources/views/administration/game/edit.blade.php +++ b/resources/views/administration/game/edit.blade.php @@ -40,7 +40,7 @@ class="fas fa-cross fa-sm text-white-50"> Delete this game {!! \Form::text('url', 'Url') !!} {!! \Form::text('callback_url', 'Callback Url For Voting') !!} {!! \Form::textarea('description', 'Description') !!} - {!! \Form::select('category_id', 'Category', $categories, $game->category->id) !!} + {!! \Form::select('category_id', 'Category', $categories, $game->category->slug) !!} {!! \Form::checkbox('is_premium', 'Is Premium', 1) !!} {!! \Form::submit('Update Game') !!} {!! \Form::close() !!} diff --git a/resources/views/games/form.blade.php b/resources/views/games/form.blade.php index 021d533..08cf72a 100644 --- a/resources/views/games/form.blade.php +++ b/resources/views/games/form.blade.php @@ -2,6 +2,6 @@ {!! \Form::text('url', 'Url') !!} {!! \Form::text('callback_url', 'Callback Url For Votes') !!} {!! \Form::textarea('description', 'Description') !!} -{!! \Form::select('category_id', 'Category', $categories, $game->category->id ?? 'null') !!} +{!! \Form::select('category_id', 'Category', $categories, $game->category->slug ?? "none__") !!} {!! Form::file('banner_image', 'Banner Image') !!} @include('partials.dropzone')