Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
forxer committed Nov 3, 2023
2 parents 663eaa0 + 7ece7bd commit d7ae5e8
Show file tree
Hide file tree
Showing 24 changed files with 115 additions and 256 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/.editorconfig export-ignore
/.gitattributes export-ignore
/.php-cs-fixer.dist.php export-ignore
/.gitignore export-ignore
/pint.json export-ignore
/rector.php export-ignore
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/.rector_cache
/vendor
.php-cs-fixer.cache
composer.lock
164 changes: 0 additions & 164 deletions .php-cs-fixer.dist.php

This file was deleted.

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
CHANGELOG
=========

0.8.4 (2023-11-03)
------------------

- Updated QA tools


0.8.3 (2023-08-19)
------------------

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This package provides several Blade components prepared for use with Bootstrap (

This package was initially an extension of [Blade UI Kit](https://blade-ui-kit.com/) to provide pre-styled components for Bootstrap. But by making it evolve we decided to decouple it from its parent. This simplifies the code as well as its use in our case.

This package is therefore largely inspired by [Blade UI Kit](https://blade-ui-kit.com/). A very large part of the documentation comes from it. And we sincerely thank its contributors for the idea and what they have developed. This package wouldn't exist without it.
This package is therefore largely inspired by [Blade UI Kit](https://blade-ui-kit.com/). A large part of the documentation comes from it. And we sincerely thank its contributors for the idea and what they have developed. This package wouldn't exist without it.

Example
-------
Expand Down Expand Up @@ -128,21 +128,21 @@ You don't have to, but you can publish: the configuration file, the views and th

Publish the configuration file with this command:

```
```bash
php artisan vendor:publish --tag="blade-ui-kit-bootstrap-config"
```

Publish views with this command:

```
```bash
php artisan vendor:publish --tag="blade-ui-kit-bootstrap-views"
```

Note that it is not necessary to publish all views in your application. It is even recommended that you only keep published views that you have modified in your application.

Publish translation files with this command:

```
```bash
php artisan vendor:publish --tag="blade-ui-kit-bootstrap-translations"
```

Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@
"illuminate/view": "^10.0"
},
"require-dev": {
"driftingly/rector-laravel": "^0.21",
"rector/rector": "^0.17"
"laravel/pint": "^1.13.5",
"driftingly/rector-laravel": ">=0.26.2",
"rector/rector": ">=0.18.6"
},
"autoload": {
"psr-4": {
Expand Down
16 changes: 8 additions & 8 deletions config/blade-ui-kit-bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?php

use BladeUIKitBootstrap\Components\Forms\Inputs\Date;
use BladeUIKitBootstrap\Components\Forms\Inputs\Email;
use BladeUIKitBootstrap\Components;
use BladeUIKitBootstrap\Components\Buttons\FormButton;
use BladeUIKitBootstrap\Components\Buttons\Logout;
use BladeUIKitBootstrap\Components\Forms\Error;
use BladeUIKitBootstrap\Components\Forms\Form;
use BladeUIKitBootstrap\Components\Buttons\FormButton;
use BladeUIKitBootstrap\Components\Forms\Inputs\Date;
use BladeUIKitBootstrap\Components\Forms\Inputs\Email;
use BladeUIKitBootstrap\Components\Forms\Inputs\Hidden;
use BladeUIKitBootstrap\Components\Forms\Inputs\Input;
use BladeUIKitBootstrap\Components\Forms\Label;
use BladeUIKitBootstrap\Components\Buttons\Logout;
use BladeUIKitBootstrap\Components\Modals\Modal;
use BladeUIKitBootstrap\Components\Modals\Confirm;
use BladeUIKitBootstrap\Components\Forms\Inputs\Password;
use BladeUIKitBootstrap\Components\Forms\Inputs\Select;
use BladeUIKitBootstrap\Components\Forms\Inputs\Textarea;
use BladeUIKitBootstrap\Components\Forms\Inputs\Time;
use BladeUIKitBootstrap\Components;
use BladeUIKitBootstrap\Components\Forms\Label;
use BladeUIKitBootstrap\Components\Modals\Confirm;
use BladeUIKitBootstrap\Components\Modals\Modal;

return [

Expand Down
37 changes: 37 additions & 0 deletions pint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"preset": "laravel",
"rules": {
"line_ending": false,
"new_with_braces": {
"anonymous_class": false,
"named_class": true
},
"blank_line_before_statement": {
"statements": [
"break",
"case",
"continue",
"declare",
"default",
"do",
"exit",
"for",
"foreach",
"goto",
"if",
"include",
"include_once",
"phpdoc",
"require",
"require_once",
"return",
"switch",
"throw",
"try",
"while",
"yield",
"yield_from"
]
}
}
}
Loading

0 comments on commit d7ae5e8

Please sign in to comment.