Skip to content

Commit

Permalink
Merge branch '5.x' into fix/empty-collection-checkbox-all-issue
Browse files Browse the repository at this point in the history
  • Loading branch information
abhaypithadiya authored Sep 21, 2023
2 parents 84a049e + 192484f commit 32ec6bc
Show file tree
Hide file tree
Showing 261 changed files with 12,327 additions and 18,695 deletions.
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Bug Report
description: File a bug report
title: "[Bug]: "
title: "Title"
body:
- type: markdown
attributes:
Expand Down Expand Up @@ -92,12 +92,12 @@ body:
id: Laravel
attributes:
label: Laravel
placeholder: ex. 9.0.1
placeholder: ex. 10.0.1
- type: input
id: Livewire
attributes:
label: Livewire
placeholder: ex. 2.10.1
placeholder: ex. 3.0.1
- type: input
id: Alpine-JS
attributes:
Expand All @@ -108,7 +108,6 @@ body:
label: Theme
multiple: true
options:
- Tailwind 2.x
- Tailwind 3.x
- Tailwind 3.x with tailwind/forms
- Bootstrap
Expand Down
36 changes: 23 additions & 13 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
name: Powergrid Tests

on: ['push', 'pull_request']
on:
push:
branches:
- "**"
paths-ignore:
- "art/**"
- "README.md"
pull_request:
types: [ready_for_review, synchronize, opened]
paths-ignore:
- "art/**"
- "README.md"

jobs:
build:
Expand Down Expand Up @@ -31,14 +42,10 @@ jobs:
php: [ 8.2, 8.1 ]
laravel: [ 10.* ]
dependency-version: [ prefer-stable ]
include:
- laravel: 10.*
testbench: 8.*
exclude:
- php: 8.0
laravel: 10.*

name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}(${{ matrix.dependency-version }})
name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}

if: github.ref != 'refs/heads/todo-tests'

steps:
- name: Checkout
Expand All @@ -61,14 +68,17 @@ jobs:
with:
path: $(composer config cache-files-dir)
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
restore-keys: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-

- name: Install Composer dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
rm composer.lock
composer require openspout/openspout
# composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
composer install
- name: Install openspout/openspout
if: matrix.php == '8.2'
run: composer require openspout/openspout

- name: Pint
if: matrix.php == '8.1'
run: composer test:pint
Expand All @@ -82,5 +92,5 @@ jobs:
- name: MySQL
run: composer test:mysql

- name: PostgreSQL
- name: PostGreSQL
run: composer test:pgsql
37 changes: 15 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">
<p><img src="art/header.jpg" alt="PowerGrid Logo"></p>
<p align="center">
<a href="https://packagist.org/packages/power-components/livewire-powergrid"><img alt="Latest Version" src="https://img.shields.io/static/v1?label=laravel&message=%E2%89%A59.0&color=0078BE&logo=laravel&style=flat-square"></a>
<a href="https://packagist.org/packages/power-components/livewire-powergrid"><img alt="Latest Version" src="https://img.shields.io/static/v1?label=laravel&message=%E2%89%A510.0&color=0078BE&logo=laravel&style=flat-square"></a>
<a href="https://packagist.org/packages/power-components/livewire-powergrid"><img alt="Total Downloads" src="https://img.shields.io/packagist/dt/power-components/livewire-powergrid"></a>
<a href="https://github.com/Power-Components/livewire-powergrid/actions">
<img alt="Tests Passing" src="https://github.com/Power-Components/livewire-powergrid/workflows/Powergrid%20Tests/badge.svg" />
Expand Down Expand Up @@ -33,7 +33,12 @@ PowerGrid creates modern, powerful and easy to customize Datatables based on Lar
<br/>

<p>
<img src="https://livewire-powergrid.com/_media/screenshot.png" alt="PowerGrid Screenshot">
<img src="art/screenshot_light.png" alt="PowerGrid Dark Screenshot">
</p>

Dark mode:
<p>
<img src="art/screenshot_dark.png" alt="PowerGrid Dark Screenshot">
</p>

<br/>
Expand All @@ -42,22 +47,6 @@ PowerGrid creates modern, powerful and easy to customize Datatables based on Lar

### [Online Demo](https://demo.livewire-powergrid.com) (tailwind)

Get a view of what PowerGrid can offer in just 2 commands:

Install

```bash
composer require power-components/livewire-powergrid
```

Run

```bash
php artisan powergrid:demo
```

<br/>

## Features

With PowerGrid you get right out of the box:
Expand All @@ -82,7 +71,7 @@ With PowerGrid you get right out of the box:

- **Click to edit**

- **Click to copy**
- **Responsive**

- **Link inside a table cell**

Expand All @@ -107,14 +96,18 @@ With PowerGrid you get right out of the box:
## 1. Requirements

- PHP 8.1+
- [Laravel 9+](https://laravel.com/docs/9.x/installation)
- [Livewire 2.10x](https://laravel-livewire.com)
- [Laravel 10+](https://laravel.com/docs/9.x/installation)
- [Livewire 3.0x](https://livewire.laravel.com)
- [Tailwind 3x](https://tailwindcss.com/docs/guides/laravel) or [Bootstrap 5](https://getbootstrap.com/docs/5.0/getting-started/introduction/)

<br/>

## 2. Install

```bash
composer require power-components/livewire-powergrid
```

Please follow the steps indicated in our [Documentation - Install](https://v4.livewire-powergrid.com/get-started/install.html) page.

<br/>
Expand Down Expand Up @@ -149,7 +142,7 @@ Created by: [Luan Freitas](https://twitter.com/luanfreitasdev) and [@DanSysAnaly
<p>Sponsored by:</p>
<p>
<!--DevSquad-->
<a href="http://devsquad.com" target="_blank">
<a href="https://devsquad.com" target="_blank">
<img src="https://livewire-powergrid.com/_media/logos/devsquad.png" alt="DevSquad" height="undefined">
</a>
</p>
Expand Down
Binary file added art/screenshot_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/screenshot_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 15 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"authors": [
{
"name": "Luan Freitas",
"email": "luanfreitasgoncalves@gmail.com",
"email": "luanfreitas10@protonmail.com",
"role": "Developer"
},
{
Expand All @@ -19,20 +19,17 @@
],
"require": {
"php": "^8.1",
"livewire/livewire": "^2.12.3",
"doctrine/dbal": "^3.6.2|2.12.1",
"illuminate/support": "^9.0|^10.0"
"doctrine/dbal": "2.12.1 | ^3.6.6",
"livewire/livewire": "^3.0.5"
},
"require-dev": {
"pestphp/pest": "^2.6.1",
"orchestra/testbench": "^7.0 | ^8.5.3",
"composer/composer": "^2.5.5",
"pestphp/pest-plugin-faker": "^2.0",
"pestphp/pest-plugin-livewire": "^2.0",
"laravel/pint": "^1.10",
"nunomaduro/larastan": "^2.6.0",
"laradumps/laradumps": "^1.12.1",
"spaze/phpstan-disallowed-calls": "^2.14.2"
"pestphp/pest": "^2.18.2",
"orchestra/testbench": "^8.10.2",
"composer/composer": "^2.6.3",
"laravel/pint": "^1.13.1",
"nunomaduro/larastan": "^2.6.4",
"laradumps/laradumps-core": "^0.3.0",
"spaze/phpstan-disallowed-calls": "^2.16"
},
"suggest": {
"openspout/openspout": "Required to export XLS and CSV"
Expand All @@ -48,7 +45,10 @@
"autoload-dev": {
"psr-4": {
"PowerComponents\\LivewirePowerGrid\\Tests\\" : "tests"
}
},
"files": [
"tests/Plugins/Autoload.php"
]
},
"extra": {
"laravel": {
Expand All @@ -59,7 +59,7 @@
},
"scripts": {
"pint:fix": "./vendor/bin/pint",
"test": "@test:sqlite",
"test": "@test:sqlite --bail",
"test:pint": "./vendor/bin/pint --test",
"test:sqlite": [
"./vendor/bin/pest --compact"
Expand Down
Loading

0 comments on commit 32ec6bc

Please sign in to comment.