From 1925c503a4f47d5c1c68254196fc0600aaf9b749 Mon Sep 17 00:00:00 2001 From: Paul Isaris <paulisaris@gmail.com> Date: Wed, 18 Oct 2023 14:07:06 +0300 Subject: [PATCH 1/4] Z-index --- resources/assets/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/css/style.css b/resources/assets/css/style.css index 422da65..547bf66 100644 --- a/resources/assets/css/style.css +++ b/resources/assets/css/style.css @@ -4,7 +4,7 @@ background-color: #2D2D2D; position: fixed; left: 25px; - z-index: 1; + z-index: 999999; color: #FFFFFF; -webkit-animation-name: slide_to_top; -webkit-animation-duration: 1.5s; From cfa380c74bfcd077f9709b6041d134f7e92c69a6 Mon Sep 17 00:00:00 2001 From: Paul Isaris <paulisaris@gmail.com> Date: Wed, 18 Oct 2023 14:07:32 +0300 Subject: [PATCH 2/4] Not automatically publishing the styles file, to avoid overriding --- src/LaravelCookiesConsentServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LaravelCookiesConsentServiceProvider.php b/src/LaravelCookiesConsentServiceProvider.php index 8b33e7e..67ee057 100644 --- a/src/LaravelCookiesConsentServiceProvider.php +++ b/src/LaravelCookiesConsentServiceProvider.php @@ -9,7 +9,7 @@ class LaravelCookiesConsentServiceProvider extends ServiceProvider { public function boot() { $this->publishes([ __DIR__ . '/../resources/assets' => public_path('vendor/cookies_consent'), - ], 'laravel-assets'); + ], 'cookies-consent-assets'); $this->publishes([ __DIR__ . '/../resources/views/components/' => resource_path('views/vendor/cookies_consent/components'), From d9d37666a8f89b09312418577f9e6f4d961e3454 Mon Sep 17 00:00:00 2001 From: Paul Isaris <paulisaris@gmail.com> Date: Wed, 18 Oct 2023 14:07:47 +0300 Subject: [PATCH 3/4] Composer libraries update --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index a35b6ab..8943b43 100644 --- a/composer.json +++ b/composer.json @@ -24,15 +24,15 @@ }, "require-dev": { "laravel/pint": "^1.6", - "nunomaduro/collision": "^6.0", + "nunomaduro/collision": "^7.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.0", - "pestphp/pest": "^1.21", - "pestphp/pest-plugin-laravel": "^1.1", + "orchestra/testbench": "^8.0", + "pestphp/pest": "^2.0", + "pestphp/pest-plugin-laravel": "^v2.2", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^10.4", "spatie/laravel-ray": "^1.26" }, "autoload": { From 3ed151b26374befe99195e99ee2d109fd5063b8f Mon Sep 17 00:00:00 2001 From: Paul Isaris <paulisaris@gmail.com> Date: Wed, 18 Oct 2023 14:07:56 +0300 Subject: [PATCH 4/4] Updated Readme instructions --- README.md | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f69b84b..a0c6e6b 100644 --- a/README.md +++ b/README.md @@ -39,17 +39,15 @@ You can install the package via composer: composer require scify/laravel-cookies-consent ``` -If on Laravel 9 or newer, the assets files (style.css) will **automatically** be published - -If on Laravel 8 or older, **make sure to manually publish** the styles file, by running: +**Make sure to manually publish** the styles file, by running: ```bash php artisan vendor:publish \ --provider="SciFY\LaravelCookiesConsent\LaravelCookiesConsentServiceProvider" \ ---tag="laravel-assets" +--tag="cookies-consent-assets" ``` -In both cases, the assets files will be copied to `public/vendor/cookies_consent`. +By doing so, the assets files will be copied to `public/vendor/cookies_consent`. You can then either decide to include the `public/vendor/cookies_consent/css/style.css` file to git (especially if you want to edit it first), or add it to `.gitignore`, and make sure to also run this command on the staging/production server. @@ -216,6 +214,39 @@ php artisan vendor:publish \ This will copy the `resources/views/components/laravel-cookies-consent` view file over to `resources/views/components/vendor/cookies_consent` directory. +## Development + +In order to locally run the package, you should use a local Laravel application, in which you are going to install it. + +Make sure that the `composer.json` file of the Laravel app has the following entry: + +```text + +"require": { + "scify/laravel-cookies-consent": "@dev", +} +... +... +"repositories": [ + { + "type": "path", + "url": "../path/to/laravel-cookies-consent/", + "options": { + "symlink": true + } + } + ] +``` + +This will tell composer that the code for the package is of the `"@dev"` version and that it exists in the specified path. + +Then run: +```bash +composer update scify/laravel-cookies-consent --prefer-source +``` + +To fetch the local package. + ## Testing This project uses [Pest](https://pestphp.com/) for testing. To execute the test suite, run: