packages
parent
8ea67ca557
commit
b75daa5e4b
|
|
@ -1,21 +0,0 @@
|
||||||
# Number of days of inactivity before an issue becomes stale
|
|
||||||
daysUntilStale: 180
|
|
||||||
# Number of days of inactivity before a stale issue is closed
|
|
||||||
daysUntilClose: 7
|
|
||||||
# Issues with these labels will never be considered stale
|
|
||||||
exemptLabels:
|
|
||||||
- pinned
|
|
||||||
- security
|
|
||||||
- bug
|
|
||||||
- unconfirmed
|
|
||||||
- enhancement
|
|
||||||
- feature
|
|
||||||
# Label to use when marking an issue as stale
|
|
||||||
staleLabel: wontfix
|
|
||||||
# Comment to post when marking an issue as stale. Set to `false` to disable
|
|
||||||
markComment: >
|
|
||||||
This issue has been automatically marked as stale because it has not had
|
|
||||||
recent activity. It will be closed if no further activity occurs. Thank you
|
|
||||||
for your contributions.
|
|
||||||
# Comment to post when closing a stale issue. Set to `false` to disable
|
|
||||||
closeComment: false
|
|
||||||
|
|
@ -1,238 +0,0 @@
|
||||||
name: Laravel Dusk
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ 2.0 ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ 2.0 ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
laravel5:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
|
|
||||||
with:
|
|
||||||
php-version: '7.2'
|
|
||||||
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Composer Update
|
|
||||||
run: composer self-update --2
|
|
||||||
|
|
||||||
- name: Setup MySQL
|
|
||||||
# You may pin to the exact commit or the version.
|
|
||||||
# uses: mirromutth/mysql-action@de1fba8b3f90ce8db80f663a7043be3cf3231248
|
|
||||||
uses: mirromutth/mysql-action@v1.1
|
|
||||||
with:
|
|
||||||
# Version of MySQL to use
|
|
||||||
mysql version: 5.7
|
|
||||||
# MYSQL_ROOT_PASSWORD - root superuser password
|
|
||||||
mysql root password: 123456
|
|
||||||
# MYSQL_DATABASE - name for the default database that is created
|
|
||||||
mysql database: laravel
|
|
||||||
# MYSQL_USER - create the specified user with superuser power for created database
|
|
||||||
mysql user: root
|
|
||||||
# MYSQL_PASSWORD - specified superuser password which user is power for created database
|
|
||||||
mysql password: 123456
|
|
||||||
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: |
|
|
||||||
composer create-project --prefer-dist laravel/laravel laravel-tests 5.*
|
|
||||||
sh ./tests/bin/install-dep.sh
|
|
||||||
|
|
||||||
- name: Install Admin
|
|
||||||
run: sh ./tests/bin/install-admin.sh
|
|
||||||
|
|
||||||
# - name: Install Xvfb
|
|
||||||
# run: sudo apt-get install xvfb
|
|
||||||
|
|
||||||
- name: Start Server
|
|
||||||
run: sh ./tests/bin/start.sh
|
|
||||||
|
|
||||||
- name: Run test suite
|
|
||||||
run: cd ./laravel-tests && php artisan dusk
|
|
||||||
|
|
||||||
laravel6:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
|
|
||||||
with:
|
|
||||||
php-version: '7.3'
|
|
||||||
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Composer Update
|
|
||||||
run: composer self-update --2
|
|
||||||
|
|
||||||
- name: Setup MySQL
|
|
||||||
# You may pin to the exact commit or the version.
|
|
||||||
# uses: mirromutth/mysql-action@de1fba8b3f90ce8db80f663a7043be3cf3231248
|
|
||||||
uses: mirromutth/mysql-action@v1.1
|
|
||||||
with:
|
|
||||||
# Version of MySQL to use
|
|
||||||
mysql version: 5.7
|
|
||||||
# MYSQL_ROOT_PASSWORD - root superuser password
|
|
||||||
mysql root password: 123456
|
|
||||||
# MYSQL_DATABASE - name for the default database that is created
|
|
||||||
mysql database: laravel
|
|
||||||
# MYSQL_USER - create the specified user with superuser power for created database
|
|
||||||
mysql user: root
|
|
||||||
# MYSQL_PASSWORD - specified superuser password which user is power for created database
|
|
||||||
mysql password: 123456
|
|
||||||
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: |
|
|
||||||
composer create-project --prefer-dist laravel/laravel laravel-tests 6.*
|
|
||||||
sh ./tests/bin/install-dep.sh
|
|
||||||
|
|
||||||
- name: Install Admin
|
|
||||||
run: sh ./tests/bin/install-admin.sh
|
|
||||||
|
|
||||||
# - name: Install Xvfb
|
|
||||||
# run: sudo apt-get install xvfb
|
|
||||||
|
|
||||||
- name: Start Server
|
|
||||||
run: sh ./tests/bin/start.sh
|
|
||||||
|
|
||||||
- name: Run test suite
|
|
||||||
run: cd ./laravel-tests && php artisan dusk
|
|
||||||
|
|
||||||
laravel7:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
|
|
||||||
with:
|
|
||||||
php-version: '7.3'
|
|
||||||
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Composer Update
|
|
||||||
run: composer self-update --2
|
|
||||||
|
|
||||||
- name: Setup MySQL
|
|
||||||
# You may pin to the exact commit or the version.
|
|
||||||
# uses: mirromutth/mysql-action@de1fba8b3f90ce8db80f663a7043be3cf3231248
|
|
||||||
uses: mirromutth/mysql-action@v1.1
|
|
||||||
with:
|
|
||||||
# Version of MySQL to use
|
|
||||||
mysql version: 5.7
|
|
||||||
# MYSQL_ROOT_PASSWORD - root superuser password
|
|
||||||
mysql root password: 123456
|
|
||||||
# MYSQL_DATABASE - name for the default database that is created
|
|
||||||
mysql database: laravel
|
|
||||||
# MYSQL_USER - create the specified user with superuser power for created database
|
|
||||||
mysql user: root
|
|
||||||
# MYSQL_PASSWORD - specified superuser password which user is power for created database
|
|
||||||
mysql password: 123456
|
|
||||||
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: |
|
|
||||||
composer create-project --prefer-dist laravel/laravel laravel-tests 7.*
|
|
||||||
sh ./tests/bin/install-dep.sh
|
|
||||||
|
|
||||||
- name: Install Admin
|
|
||||||
run: sh ./tests/bin/install-admin.sh
|
|
||||||
|
|
||||||
# - name: Install Xvfb
|
|
||||||
# run: sudo apt-get install xvfb
|
|
||||||
|
|
||||||
- name: Start Server
|
|
||||||
run: sh ./tests/bin/start.sh
|
|
||||||
|
|
||||||
- name: Run test suite
|
|
||||||
run: cd ./laravel-tests && php artisan dusk
|
|
||||||
|
|
||||||
laravel8:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
|
|
||||||
with:
|
|
||||||
php-version: '8.0'
|
|
||||||
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Composer Update
|
|
||||||
run: composer self-update --2
|
|
||||||
|
|
||||||
- name: Setup MySQL
|
|
||||||
# You may pin to the exact commit or the version.
|
|
||||||
# uses: mirromutth/mysql-action@de1fba8b3f90ce8db80f663a7043be3cf3231248
|
|
||||||
uses: mirromutth/mysql-action@v1.1
|
|
||||||
with:
|
|
||||||
# Version of MySQL to use
|
|
||||||
mysql version: 5.7
|
|
||||||
# MYSQL_ROOT_PASSWORD - root superuser password
|
|
||||||
mysql root password: 123456
|
|
||||||
# MYSQL_DATABASE - name for the default database that is created
|
|
||||||
mysql database: laravel
|
|
||||||
# MYSQL_USER - create the specified user with superuser power for created database
|
|
||||||
mysql user: root
|
|
||||||
# MYSQL_PASSWORD - specified superuser password which user is power for created database
|
|
||||||
mysql password: 123456
|
|
||||||
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: |
|
|
||||||
composer create-project --prefer-dist laravel/laravel laravel-tests 8.*
|
|
||||||
sh ./tests/bin/install-dep.sh
|
|
||||||
|
|
||||||
- name: Install Admin
|
|
||||||
run: sh ./tests/bin/install-admin.sh
|
|
||||||
|
|
||||||
- name: Install Xvfb
|
|
||||||
run: sudo apt-get install xvfb
|
|
||||||
|
|
||||||
- name: Start Server
|
|
||||||
run: sh ./tests/bin/start.sh
|
|
||||||
|
|
||||||
- name: Run test suite
|
|
||||||
run: cd ./laravel-tests && php artisan dusk
|
|
||||||
|
|
||||||
laravel9:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
|
|
||||||
with:
|
|
||||||
php-version: '8.0'
|
|
||||||
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Composer Update
|
|
||||||
run: composer self-update --2
|
|
||||||
|
|
||||||
- name: Setup MySQL
|
|
||||||
# You may pin to the exact commit or the version.
|
|
||||||
# uses: mirromutth/mysql-action@de1fba8b3f90ce8db80f663a7043be3cf3231248
|
|
||||||
uses: mirromutth/mysql-action@v1.1
|
|
||||||
with:
|
|
||||||
# Version of MySQL to use
|
|
||||||
mysql version: 5.7
|
|
||||||
# MYSQL_ROOT_PASSWORD - root superuser password
|
|
||||||
mysql root password: 123456
|
|
||||||
# MYSQL_DATABASE - name for the default database that is created
|
|
||||||
mysql database: laravel
|
|
||||||
# MYSQL_USER - create the specified user with superuser power for created database
|
|
||||||
mysql user: root
|
|
||||||
# MYSQL_PASSWORD - specified superuser password which user is power for created database
|
|
||||||
mysql password: 123456
|
|
||||||
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: |
|
|
||||||
composer create-project --prefer-dist laravel/laravel laravel-tests 9.*
|
|
||||||
sh ./tests/bin/install-dep.sh
|
|
||||||
|
|
||||||
- name: Install Admin
|
|
||||||
run: sh ./tests/bin/install-admin.sh
|
|
||||||
|
|
||||||
- name: Install Xvfb
|
|
||||||
run: sudo apt-get install xvfb
|
|
||||||
|
|
||||||
- name: Start Server
|
|
||||||
run: sh ./tests/bin/start.sh
|
|
||||||
|
|
||||||
- name: Run test suite
|
|
||||||
run: cd ./laravel-tests && php artisan dusk
|
|
||||||
|
|
@ -274,7 +274,7 @@ class Manager
|
||||||
$it->rewind();
|
$it->rewind();
|
||||||
|
|
||||||
while ($it->valid()) {
|
while ($it->valid()) {
|
||||||
if ($it->getDepth() > 1 && $it->getFilename() === 'composer.json') {
|
if ($it->getDepth() >= 1 && $it->getFilename() === 'composer.json') {
|
||||||
$extensions[] = dirname($it->getPathname());
|
$extensions[] = dirname($it->getPathname());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,6 +61,7 @@ class ExtensionController extends Controller
|
||||||
$grid->disableDeleteButton();
|
$grid->disableDeleteButton();
|
||||||
$grid->disableViewButton();
|
$grid->disableViewButton();
|
||||||
$grid->disableActions();
|
$grid->disableActions();
|
||||||
|
$grid->disableRowSelector();
|
||||||
|
|
||||||
// $grid->tools([
|
// $grid->tools([
|
||||||
// new Marketplace(),
|
// new Marketplace(),
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Dcat\Admin\Traits;
|
||||||
|
|
||||||
|
use Illuminate\Http\Response;
|
||||||
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
|
||||||
|
trait JsonResponse
|
||||||
|
{
|
||||||
|
public function json($data, $code = Response::HTTP_OK, $message = '')
|
||||||
|
{
|
||||||
|
$result = ['data' => $data, 'code' => $code, 'message' => $message];
|
||||||
|
return response()->json($result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function success($data = null, $message = '')
|
||||||
|
{
|
||||||
|
return $this->json($data, Response::HTTP_OK, $message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function error($message = '', $code = Response::HTTP_BAD_REQUEST, $data = null)
|
||||||
|
{
|
||||||
|
return $this->json($data, $code, $message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function include($include = [], $key = 'include')
|
||||||
|
{
|
||||||
|
$request = request();
|
||||||
|
if ($request->filled($key)) {
|
||||||
|
$include1 = $request->input($key);
|
||||||
|
$include1 = is_array($include1) ? $include1 : explode(',', $include1);
|
||||||
|
$include = array_merge($include, $include1);
|
||||||
|
}
|
||||||
|
return $include;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function user($guard = null)
|
||||||
|
{
|
||||||
|
return Auth::guard($guard)->user();
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue