Formatting
This commit is contained in:
@@ -6,7 +6,6 @@ language: php
|
|||||||
php:
|
php:
|
||||||
- '7.4'
|
- '7.4'
|
||||||
- '7.3'
|
- '7.3'
|
||||||
# - '7.2'
|
|
||||||
|
|
||||||
#env:
|
#env:
|
||||||
# - DB=mysql
|
# - DB=mysql
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ class Handler extends ExceptionHandler
|
|||||||
/**
|
/**
|
||||||
* Render an exception into an HTTP response.
|
* Render an exception into an HTTP response.
|
||||||
*
|
*
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
* @param \Throwable $exception
|
* @param \Throwable $exception
|
||||||
*
|
*
|
||||||
* @return mixed
|
* @return mixed
|
||||||
|
|||||||
@@ -1,19 +1,20 @@
|
|||||||
<table class="action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td align="center">
|
<td align="center">
|
||||||
<table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation">
|
<table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td align="center">
|
<td align="center">
|
||||||
<table border="0" cellpadding="0" cellspacing="0" role="presentation">
|
<table border="0" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<a href="{{ $url }}" class="button button-{{ $color ?? 'primary' }}" target="_blank" rel="noopener">{{ $slot }}</a>
|
<a href="{{ $url }}" class="button button-{{ $color ?? 'primary' }}" target="_blank"
|
||||||
</td>
|
rel="noopener">{{ $slot }}</a>
|
||||||
</tr>
|
</td>
|
||||||
</table>
|
</tr>
|
||||||
</td>
|
</table>
|
||||||
</tr>
|
</td>
|
||||||
</table>
|
</tr>
|
||||||
</td>
|
</table>
|
||||||
</tr>
|
</td>
|
||||||
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<table class="footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="content-cell" align="center">
|
<td class="content-cell" align="center">
|
||||||
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="header">
|
<td class="header">
|
||||||
<a href="{{ $url }}" style="display: inline-block;">
|
<a href="{{ $url }}" style="display: inline-block;">
|
||||||
@if (trim($slot) === 'Laravel')
|
@if (trim($slot) === 'Laravel')
|
||||||
<img src="https://laravel.com/img/notification-logo.png" class="logo" alt="Laravel Logo">
|
<img src="https://laravel.com/img/notification-logo.png" class="logo" alt="Laravel Logo">
|
||||||
@else
|
@else
|
||||||
{{ $slot }}
|
{{ $slot }}
|
||||||
@endif
|
@endif
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -1,54 +1,55 @@
|
|||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||||
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<head>
|
<head>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<style>
|
<style>
|
||||||
@media only screen and (max-width: 600px) {
|
@media only screen and (max-width: 600px) {
|
||||||
.inner-body {
|
.inner-body {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.footer {
|
.footer {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 500px) {
|
@media only screen and (max-width: 500px) {
|
||||||
.button {
|
.button {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<table class="wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td align="center">
|
<td align="center">
|
||||||
<table class="content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
{{ $header ?? '' }}
|
{{ $header ?? '' }}
|
||||||
|
|
||||||
<!-- Email Body -->
|
<!-- Email Body -->
|
||||||
<tr>
|
<tr>
|
||||||
<td class="body" width="100%" cellpadding="0" cellspacing="0">
|
<td class="body" width="100%" cellpadding="0" cellspacing="0">
|
||||||
<table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<!-- Body content -->
|
<!-- Body content -->
|
||||||
<tr>
|
<tr>
|
||||||
<td class="content-cell">
|
<td class="content-cell">
|
||||||
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
||||||
|
|
||||||
{{ $subcopy ?? '' }}
|
{{ $subcopy ?? '' }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
{{ $footer ?? '' }}
|
{{ $footer ?? '' }}
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,27 +1,27 @@
|
|||||||
@component('mail::layout')
|
@component('mail::layout')
|
||||||
{{-- Header --}}
|
{{-- Header --}}
|
||||||
@slot('header')
|
@slot('header')
|
||||||
@component('mail::header', ['url' => config('app.url')])
|
@component('mail::header', ['url' => config('app.url')])
|
||||||
{{ config('app.name') }}
|
{{ config('app.name') }}
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
|
|
||||||
{{-- Body --}}
|
{{-- Body --}}
|
||||||
{{ $slot }}
|
{{ $slot }}
|
||||||
|
|
||||||
{{-- Subcopy --}}
|
{{-- Subcopy --}}
|
||||||
@isset($subcopy)
|
@isset($subcopy)
|
||||||
@slot('subcopy')
|
@slot('subcopy')
|
||||||
@component('mail::subcopy')
|
@component('mail::subcopy')
|
||||||
{{ $subcopy }}
|
{{ $subcopy }}
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
@endisset
|
@endisset
|
||||||
|
|
||||||
{{-- Footer --}}
|
{{-- Footer --}}
|
||||||
@slot('footer')
|
@slot('footer')
|
||||||
@component('mail::footer')
|
@component('mail::footer')
|
||||||
© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
|
© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
@endcomponent
|
@endcomponent
|
||||||
|
|||||||
22
resources/views/vendor/mail/html/panel.blade.php
vendored
22
resources/views/vendor/mail/html/panel.blade.php
vendored
@@ -1,14 +1,14 @@
|
|||||||
<table class="panel" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="panel" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="panel-content">
|
<td class="panel-content">
|
||||||
<table width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
<table width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="panel-item">
|
<td class="panel-item">
|
||||||
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<table class="subcopy" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="subcopy" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
<div class="table">
|
<div class="table">
|
||||||
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ body,
|
|||||||
body *:not(html):not(style):not(br):not(tr):not(code) {
|
body *:not(html):not(style):not(br):not(tr):not(code) {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif,
|
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif,
|
||||||
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
|
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,13 +2,16 @@
|
|||||||
|
|
||||||
use App\Repositories\SettingRepository;
|
use App\Repositories\SettingRepository;
|
||||||
use App\Services\DatabaseService;
|
use App\Services\DatabaseService;
|
||||||
|
use Carbon\Carbon;
|
||||||
use GuzzleHttp\Client;
|
use GuzzleHttp\Client;
|
||||||
use GuzzleHttp\Handler\MockHandler;
|
use GuzzleHttp\Handler\MockHandler;
|
||||||
use GuzzleHttp\HandlerStack;
|
use GuzzleHttp\HandlerStack;
|
||||||
use GuzzleHttp\Psr7\Response;
|
use GuzzleHttp\Psr7\Response;
|
||||||
use Illuminate\Routing\Middleware\ThrottleRequests;
|
use Illuminate\Routing\Middleware\ThrottleRequests;
|
||||||
use Illuminate\Support\Facades\Artisan;
|
use Illuminate\Support\Facades\Artisan;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\Support\Facades\Notification;
|
use Illuminate\Support\Facades\Notification;
|
||||||
|
use Illuminate\Testing\TestResponse;
|
||||||
use Tests\CreatesApplication;
|
use Tests\CreatesApplication;
|
||||||
use Tests\TestData;
|
use Tests\TestData;
|
||||||
|
|
||||||
@@ -266,9 +269,9 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
|
|||||||
* @param array $headers
|
* @param array $headers
|
||||||
* @param null $user
|
* @param null $user
|
||||||
*
|
*
|
||||||
* @return Illuminate\Testing\TestResponse
|
* @return TestResponse
|
||||||
*/
|
*/
|
||||||
public function post($uri, array $data = [], array $headers = [], $user = null): Illuminate\Testing\TestResponse
|
public function post($uri, array $data = [], array $headers = [], $user = null): TestResponse
|
||||||
{
|
{
|
||||||
$data = $this->transformData($data);
|
$data = $this->transformData($data);
|
||||||
$req = parent::post($uri, $data, $this->headers($user, $headers));
|
$req = parent::post($uri, $data, $this->headers($user, $headers));
|
||||||
@@ -287,9 +290,9 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
|
|||||||
* @param array $headers
|
* @param array $headers
|
||||||
* @param null $user
|
* @param null $user
|
||||||
*
|
*
|
||||||
* @return Illuminate\Testing\TestResponse
|
* @return TestResponse
|
||||||
*/
|
*/
|
||||||
public function put($uri, array $data = [], array $headers = [], $user = null): Illuminate\Testing\TestResponse
|
public function put($uri, array $data = [], array $headers = [], $user = null): TestResponse
|
||||||
{
|
{
|
||||||
$req = parent::put($uri, $this->transformData($data), $this->headers($user, $headers));
|
$req = parent::put($uri, $this->transformData($data), $this->headers($user, $headers));
|
||||||
if ($req->isClientError() || $req->isServerError()) {
|
if ($req->isClientError() || $req->isServerError()) {
|
||||||
@@ -307,9 +310,9 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
|
|||||||
* @param array $headers
|
* @param array $headers
|
||||||
* @param null $user
|
* @param null $user
|
||||||
*
|
*
|
||||||
* @return Illuminate\Testing\TestResponse
|
* @return TestResponse
|
||||||
*/
|
*/
|
||||||
public function delete($uri, array $data = [], array $headers = [], $user = null): Illuminate\Testing\TestResponse
|
public function delete($uri, array $data = [], array $headers = [], $user = null): TestResponse
|
||||||
{
|
{
|
||||||
$req = parent::delete($uri, $this->transformData($data), $this->headers($user, $headers));
|
$req = parent::delete($uri, $this->transformData($data), $this->headers($user, $headers));
|
||||||
if ($req->isClientError() || $req->isServerError()) {
|
if ($req->isClientError() || $req->isServerError()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user