Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/release-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ jobs:
DB_CONNECTION: sqlite
DB_DATABASE: database/database.sqlite
run: php artisan test
- name: Execute pint
run: vendor/bin/pint --test
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ jobs:
DB_CONNECTION: sqlite
DB_DATABASE: database/database.sqlite
run: php artisan test
- name: Execute pint
run: vendor/bin/pint --test
1 change: 0 additions & 1 deletion app/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ class Kernel extends ConsoleKernel
/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @return void
*/
protected function schedule(Schedule $schedule)
Expand Down
15 changes: 10 additions & 5 deletions bootstrap/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,27 @@
use Illuminate\Foundation\Configuration\Exceptions;
use Illuminate\Foundation\Configuration\Middleware;
use Juzaweb\Modules\Core\Application;
use Juzaweb\Modules\Core\Http\Middleware\Authenticate;
use Juzaweb\Modules\Core\Http\Middleware\Captcha;
use Juzaweb\Modules\Core\Http\Middleware\EnsureEmailIsVerified;
use Juzaweb\Modules\Core\Http\Middleware\ForceSchemeUrl;
use Juzaweb\Modules\Core\Http\Middleware\ValidateSignature;

return Application::configure(basePath: dirname(__DIR__))
->withMiddleware(
function (Middleware $middleware) {
$middleware->alias([
'auth' => \Juzaweb\Modules\Core\Http\Middleware\Authenticate::class,
'verified' => \Juzaweb\Modules\Core\Http\Middleware\EnsureEmailIsVerified::class,
'captcha' => \Juzaweb\Modules\Core\Http\Middleware\Captcha::class,
'signed' => \Juzaweb\Modules\Core\Http\Middleware\ValidateSignature::class,
'auth' => Authenticate::class,
'verified' => EnsureEmailIsVerified::class,
'captcha' => Captcha::class,
'signed' => ValidateSignature::class,
]);

if (! env('VERIFY_TOKEN', true)) {
$middleware->validateCsrfTokens(except: ['*']);
}

$middleware->append(\Juzaweb\Modules\Core\Http\Middleware\ForceSchemeUrl::class);
$middleware->append(ForceSchemeUrl::class);
}
)
->withExceptions(function (Exceptions $exceptions) {
Expand Down
7 changes: 5 additions & 2 deletions bootstrap/providers.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<?php

use App\Providers\AppServiceProvider;
use Juzaweb\Modules\Admin\Providers\AdminServiceProvider;

return [
\Juzaweb\Modules\Admin\Providers\AdminServiceProvider::class,
\App\Providers\AppServiceProvider::class,
AdminServiceProvider::class,
AppServiceProvider::class,
];
71 changes: 47 additions & 24 deletions config/app.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
<?php

use Illuminate\Auth\AuthServiceProvider;
use Illuminate\Auth\Passwords\PasswordResetServiceProvider;
use Illuminate\Broadcasting\BroadcastServiceProvider;
use Illuminate\Bus\BusServiceProvider;
use Illuminate\Cache\CacheServiceProvider;
use Illuminate\Cookie\CookieServiceProvider;
use Illuminate\Database\DatabaseServiceProvider;
use Illuminate\Encryption\EncryptionServiceProvider;
use Illuminate\Filesystem\FilesystemServiceProvider;
use Illuminate\Foundation\Providers\ConsoleSupportServiceProvider;
use Illuminate\Foundation\Providers\FoundationServiceProvider;
use Illuminate\Hashing\HashServiceProvider;
use Illuminate\Mail\MailServiceProvider;
use Illuminate\Notifications\NotificationServiceProvider;
use Illuminate\Pagination\PaginationServiceProvider;
use Illuminate\Pipeline\PipelineServiceProvider;
use Illuminate\Queue\QueueServiceProvider;
use Illuminate\Redis\RedisServiceProvider;
use Illuminate\Session\SessionServiceProvider;
use Illuminate\Support\Facades\Facade;
use Illuminate\Validation\ValidationServiceProvider;
use Illuminate\View\ViewServiceProvider;
use Spatie\TranslationLoader\TranslationServiceProvider;

return [

/*
Expand Down Expand Up @@ -54,7 +78,6 @@

'url' => env('APP_URL', 'http://localhost'),


'mix_url' => env('MIX_ASSET_URL'),

/*
Expand Down Expand Up @@ -146,32 +169,32 @@
/*
* Laravel Framework Service Providers...
*/
Illuminate\Auth\AuthServiceProvider::class,
Illuminate\Broadcasting\BroadcastServiceProvider::class,
Illuminate\Bus\BusServiceProvider::class,
Illuminate\Cache\CacheServiceProvider::class,
Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
Illuminate\Cookie\CookieServiceProvider::class,
Illuminate\Database\DatabaseServiceProvider::class,
Illuminate\Encryption\EncryptionServiceProvider::class,
Illuminate\Filesystem\FilesystemServiceProvider::class,
Illuminate\Foundation\Providers\FoundationServiceProvider::class,
Illuminate\Hashing\HashServiceProvider::class,
Illuminate\Mail\MailServiceProvider::class,
Illuminate\Notifications\NotificationServiceProvider::class,
Illuminate\Pagination\PaginationServiceProvider::class,
Illuminate\Pipeline\PipelineServiceProvider::class,
Illuminate\Queue\QueueServiceProvider::class,
Illuminate\Redis\RedisServiceProvider::class,
Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
Illuminate\Session\SessionServiceProvider::class,
\Spatie\TranslationLoader\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
AuthServiceProvider::class,
BroadcastServiceProvider::class,
BusServiceProvider::class,
CacheServiceProvider::class,
ConsoleSupportServiceProvider::class,
CookieServiceProvider::class,
DatabaseServiceProvider::class,
EncryptionServiceProvider::class,
FilesystemServiceProvider::class,
FoundationServiceProvider::class,
HashServiceProvider::class,
MailServiceProvider::class,
NotificationServiceProvider::class,
PaginationServiceProvider::class,
PipelineServiceProvider::class,
QueueServiceProvider::class,
RedisServiceProvider::class,
PasswordResetServiceProvider::class,
SessionServiceProvider::class,
TranslationServiceProvider::class,
ValidationServiceProvider::class,
ViewServiceProvider::class,
// App Service Providers
],

'aliases' => \Illuminate\Support\Facades\Facade::defaultAliases()->merge(
'aliases' => Facade::defaultAliases()->merge(
[
//
]
Expand Down
7 changes: 5 additions & 2 deletions config/auth.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?php

use Juzaweb\Modules\Admin\Models\User;
use Juzaweb\Modules\Core\Models\UserSocialConnection;

return [

/*
Expand Down Expand Up @@ -62,8 +65,8 @@
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => env('AUTH_MODEL', \Juzaweb\Modules\Admin\Models\User::class),
'social_connection_model' => \Juzaweb\Modules\Core\Models\UserSocialConnection::class,
'model' => env('AUTH_MODEL', User::class),
'social_connection_model' => UserSocialConnection::class,
],
],

Expand Down
13 changes: 9 additions & 4 deletions config/datatables.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<?php

use Yajra\DataTables\ApiResourceDataTable;
use Yajra\DataTables\CollectionDataTable;
use Yajra\DataTables\EloquentDataTable;
use Yajra\DataTables\QueryDataTable;

return [
/*
* DataTables search options.
Expand Down Expand Up @@ -45,10 +50,10 @@
* This is where you can register your custom DataTables builder.
*/
'engines' => [
'eloquent' => Yajra\DataTables\EloquentDataTable::class,
'query' => Yajra\DataTables\QueryDataTable::class,
'collection' => Yajra\DataTables\CollectionDataTable::class,
'resource' => Yajra\DataTables\ApiResourceDataTable::class,
'eloquent' => EloquentDataTable::class,
'query' => QueryDataTable::class,
'collection' => CollectionDataTable::class,
'resource' => ApiResourceDataTable::class,
],

/*
Expand Down
82 changes: 41 additions & 41 deletions config/debugbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
| Leaving it to null will allow localhost only.
*/
'storage' => [
'enabled' => true,
'open' => env('DEBUGBAR_OPEN_STORAGE'), // bool/callback.
'driver' => 'file', // redis, file, pdo, socket, custom
'path' => storage_path('debugbar'), // For file driver
'enabled' => true,
'open' => env('DEBUGBAR_OPEN_STORAGE'), // bool/callback.
'driver' => 'file', // redis, file, pdo, socket, custom
'path' => storage_path('debugbar'), // For file driver
'connection' => null, // Leave null for default connection (Redis/PDO)
'provider' => '', // Instance of StorageInterface for custom driver
'hostname' => '127.0.0.1', // Hostname to use with the "socket" driver
'port' => 2304, // Port to use with the "socket" driver
'provider' => '', // Instance of StorageInterface for custom driver
'hostname' => '127.0.0.1', // Hostname to use with the "socket" driver
'port' => 2304, // Port to use with the "socket" driver
],

/*
Expand Down Expand Up @@ -159,30 +159,30 @@
*/

'collectors' => [
'phpinfo' => true, // Php version
'messages' => true, // Messages
'time' => true, // Time Datalogger
'memory' => true, // Memory usage
'exceptions' => true, // Exception displayer
'log' => true, // Logs from Monolog (merged in messages if enabled)
'db' => true, // Show database (PDO) queries and bindings
'views' => true, // Views with their data
'route' => true, // Current route information
'auth' => false, // Display Laravel authentication status
'gate' => true, // Display Laravel Gate checks
'session' => true, // Display session data
'phpinfo' => true, // Php version
'messages' => true, // Messages
'time' => true, // Time Datalogger
'memory' => true, // Memory usage
'exceptions' => true, // Exception displayer
'log' => true, // Logs from Monolog (merged in messages if enabled)
'db' => true, // Show database (PDO) queries and bindings
'views' => true, // Views with their data
'route' => true, // Current route information
'auth' => false, // Display Laravel authentication status
'gate' => true, // Display Laravel Gate checks
'session' => true, // Display session data
'symfony_request' => true, // Only one can be enabled..
'mail' => true, // Catch mail messages
'laravel' => false, // Laravel version and environment
'events' => false, // All events fired
'mail' => true, // Catch mail messages
'laravel' => false, // Laravel version and environment
'events' => false, // All events fired
'default_request' => false, // Regular or special Symfony request logger
'logs' => false, // Add the latest log messages
'files' => false, // Show the included files
'config' => false, // Display config settings
'cache' => false, // Display cache events
'models' => true, // Display models
'livewire' => true, // Display Livewire (when available)
'jobs' => false, // Display dispatched jobs
'logs' => false, // Add the latest log messages
'files' => false, // Show the included files
'config' => false, // Display config settings
'cache' => false, // Display cache events
'models' => true, // Display models
'livewire' => true, // Display Livewire (when available)
'jobs' => false, // Display dispatched jobs
],

/*
Expand Down Expand Up @@ -211,32 +211,32 @@
'show_guards' => true, // Show the guards that are used
],
'db' => [
'with_params' => true, // Render SQL with the parameters substituted
'backtrace' => true, // Use a backtrace to find the origin of the query in your files.
'with_params' => true, // Render SQL with the parameters substituted
'backtrace' => true, // Use a backtrace to find the origin of the query in your files.
'backtrace_exclude_paths' => [], // Paths to exclude from backtrace. (in addition to defaults)
'timeline' => false, // Add the queries to the timeline
'duration_background' => true, // Show shaded background on each query relative to how long it took to execute.
'timeline' => false, // Add the queries to the timeline
'duration_background' => true, // Show shaded background on each query relative to how long it took to execute.
'explain' => [ // Show EXPLAIN output on queries
'enabled' => false,
'types' => ['SELECT'], // Deprecated setting, is always only SELECT
],
'hints' => false, // Show hints for common mistakes
'show_copy' => false, // Show copy button next to the query,
'slow_threshold' => false, // Only track queries that last longer than this time in ms
'memory_usage' => false, // Show queries memory usage
'soft_limit' => 100, // After the soft limit, no parameters/backtrace are captured
'hard_limit' => 500, // After the hard limit, queries are ignored
'hints' => false, // Show hints for common mistakes
'show_copy' => false, // Show copy button next to the query,
'slow_threshold' => false, // Only track queries that last longer than this time in ms
'memory_usage' => false, // Show queries memory usage
'soft_limit' => 100, // After the soft limit, no parameters/backtrace are captured
'hard_limit' => 500, // After the hard limit, queries are ignored
],
'mail' => [
'timeline' => false, // Add mails to the timeline
'show_body' => true,
],
'views' => [
'timeline' => false, // Add the views to the timeline (Experimental)
'data' => false, //true for all data, 'keys' for only names, false for no parameters.
'data' => false, // true for all data, 'keys' for only names, false for no parameters.
'group' => 50, // Group duplicate views. Pass value to auto-group, or true/false to force
'exclude_paths' => [ // Add the paths which you don't want to appear in the views
'vendor/filament' // Exclude Filament components by default
'vendor/filament', // Exclude Filament components by default
],
],
'route' => [
Expand Down
8 changes: 5 additions & 3 deletions config/log-viewer.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
use Opcodes\LogViewer\Enums\SortingMethod;
use Opcodes\LogViewer\Enums\SortingOrder;
use Opcodes\LogViewer\Enums\Theme;
use Opcodes\LogViewer\Http\Middleware\AuthorizeLogViewer;
use Opcodes\LogViewer\Http\Middleware\EnsureFrontendRequestsAreStateful;

return [

Expand Down Expand Up @@ -97,7 +99,7 @@

'middleware' => [
'web',
\Opcodes\LogViewer\Http\Middleware\AuthorizeLogViewer::class,
AuthorizeLogViewer::class,
],

/*
Expand All @@ -110,8 +112,8 @@
*/

'api_middleware' => [
\Opcodes\LogViewer\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
\Opcodes\LogViewer\Http\Middleware\AuthorizeLogViewer::class,
EnsureFrontendRequestsAreStateful::class,
AuthorizeLogViewer::class,
],

'api_stateful_domains' => env('LOG_VIEWER_API_STATEFUL_DOMAINS') ? explode(',', env('LOG_VIEWER_API_STATEFUL_DOMAINS')) : null,
Expand Down
3 changes: 2 additions & 1 deletion config/logging.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php

use Juzaweb\Modules\Core\Logging\AddCustomInformation;
use Monolog\Handler\NullHandler;
use Monolog\Handler\StreamHandler;
use Monolog\Handler\SyslogUdpHandler;
Expand Down Expand Up @@ -71,7 +72,7 @@
'level' => env('LOG_LEVEL', 'debug'),
'days' => env('LOG_DAILY_DAYS', 14),
'replace_placeholders' => true,
'tap' => [\Juzaweb\Modules\Core\Logging\AddCustomInformation::class],
'tap' => [AddCustomInformation::class],
],

'subscription' => [
Expand Down
4 changes: 3 additions & 1 deletion config/translatable.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

use Astrotomic\Translatable\Validation\RuleFactory;

return [

/*
Expand Down Expand Up @@ -141,7 +143,7 @@
*
*/
'rule_factory' => [
'format' => \Astrotomic\Translatable\Validation\RuleFactory::FORMAT_ARRAY,
'format' => RuleFactory::FORMAT_ARRAY,
'prefix' => '%',
'suffix' => '%',
],
Expand Down
Loading
Loading