diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d416eb4..c321a8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,4 +62,9 @@ phpunit: dependencies: - composer script: + - mkdir storage/public + - mkdir storage/public/images + - mkdir storage/public/thumbnail + - chown -R $USER:www-data storage/ + - chmod -R g+w storage/ - phpunit --coverage-text --colors=never diff --git a/app/Http/Controllers/AuthUserController.php b/app/Http/Controllers/AuthUserController.php index 970dd33..db62bdc 100644 --- a/app/Http/Controllers/AuthUserController.php +++ b/app/Http/Controllers/AuthUserController.php @@ -9,6 +9,6 @@ class AuthUserController extends Controller { public function show() { - return New UserResource(auth()->user()); + return new UserResource(auth()->user()); } } diff --git a/app/Http/Controllers/BookmarkController.php b/app/Http/Controllers/BookmarkController.php index 11b91b0..24d6d72 100644 --- a/app/Http/Controllers/BookmarkController.php +++ b/app/Http/Controllers/BookmarkController.php @@ -66,18 +66,19 @@ class BookmarkController extends Controller $promise = $client->requestAsync('GET', $url); $response = $promise->wait(); $page = $response->getBody()->getContents(); - preg_match("/\(.*)\<\/title\>/i",$page,$title); + preg_match("/\(.*)\<\/title\>/i", $page, $title); $metas['title'] = $title[1]; - preg_match('/\/i',$page,$favicon); - if(isset($favicon[1])) { - preg_match('/href="(.*)/i',$favicon[1],$favicon); + preg_match('/\/i', $page, $favicon); + if (isset($favicon[1])) { + preg_match('/href="(.*)/i', $favicon[1], $favicon); $metas['favicon'] = $favicon[1]; preg_match('/http/', $metas['favicon'], $matches); - if(empty($matches)) { - $metas['favicon'] = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST).$metas['favicon']; + if (empty($matches)) { + $url = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST); + $metas['favicon'] = $url.$metas['favicon']; } //dd($metas['favicon'], $matches, !isset($matches[1]), empty($matches)); } else { diff --git a/app/Http/Controllers/EventCategoryController.php b/app/Http/Controllers/EventCategoryController.php index d0f552a..81c6d18 100644 --- a/app/Http/Controllers/EventCategoryController.php +++ b/app/Http/Controllers/EventCategoryController.php @@ -75,7 +75,7 @@ class EventCategoryController extends Controller */ public function destroy(EventCategory $category) { - if(auth()->user()->isAdmin()) { + if (auth()->user()->isAdmin()) { $category->delete(); return response()->json([], 204); } else { diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php index 483057d..8db32b5 100644 --- a/app/Http/Controllers/ImageController.php +++ b/app/Http/Controllers/ImageController.php @@ -14,7 +14,7 @@ class ImageController extends Controller public function users(User $user) { foreach (auth()->user()->images as $image) { - if(File::exists(storage_path('app/public/'.$image->path))) { + if (File::exists(storage_path('app/public/'.$image->path))) { File::delete(storage_path('app/public/'.$image->path)); auth()->user()->images()->where('id', $image->id)->delete(); } @@ -39,7 +39,7 @@ class ImageController extends Controller public function memos(Memo $memo) { foreach ($memo->images as $image) { - if(File::exists(storage_path('app/public/'.$image->path))) { + if (File::exists(storage_path('app/public/'.$image->path))) { File::delete(storage_path('app/public/'.$image->path)); $memo->images()->where('id', $image->id)->delete(); } diff --git a/app/Http/Controllers/MeteoController.php b/app/Http/Controllers/MeteoController.php index 00c8ffd..f51e4bf 100644 --- a/app/Http/Controllers/MeteoController.php +++ b/app/Http/Controllers/MeteoController.php @@ -18,6 +18,5 @@ class MeteoController extends Controller $response = $promise->wait(); return $response->getBody()->getContents(); - } } diff --git a/app/Http/Controllers/ToDoController.php b/app/Http/Controllers/ToDoController.php index 94f29d2..5d2e4d1 100644 --- a/app/Http/Controllers/ToDoController.php +++ b/app/Http/Controllers/ToDoController.php @@ -63,7 +63,7 @@ class ToDoController extends Controller { $this->authorize('update', $toDoList); - ($toDo->checked_at) ? $toDo->checked_at = NULL : $toDo->checked_at = now(); + ($toDo->checked_at) ? $toDo->checked_at = null : $toDo->checked_at = now(); $toDo->save(); return (new ToDoResource($toDo)) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 72c0b68..efb04e1 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -2,12 +2,10 @@ namespace App\Http\Controllers; -use App\Mail\newUserInvitation; +use App\Jobs\SendMailNewUserJob; use App\User; use App\Http\Resources\User as UserResource; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Mail; use Illuminate\Support\Str; use Symfony\Component\HttpFoundation\Response; @@ -27,7 +25,7 @@ class UserController extends Controller request()['password'] = Hash::make(Str::random(30)); $user = User::create($this->validateData()); - Mail::to($user->email)->send(new newUserInvitation($user)); + SendMailNewUserJob::dispatch($user); return (new UserResource($user)) ->response() @@ -36,7 +34,7 @@ class UserController extends Controller public function show(User $user) { - return New UserResource($user); + return new UserResource($user); } private function validateData() diff --git a/app/Jobs/SendMailNewUserJob.php b/app/Jobs/SendMailNewUserJob.php new file mode 100644 index 0000000..db18734 --- /dev/null +++ b/app/Jobs/SendMailNewUserJob.php @@ -0,0 +1,39 @@ +user = $user; + } + + /** + * Execute the job. + * + * @return void + */ + public function handle() + { + Mail::to($this->user->email)->send(new NewUserInvitation($this->user)); + } +} diff --git a/app/Mail/newUserInvitation.php b/app/Mail/NewUserInvitation.php similarity index 94% rename from app/Mail/newUserInvitation.php rename to app/Mail/NewUserInvitation.php index 6bfb574..4aa3acc 100644 --- a/app/Mail/newUserInvitation.php +++ b/app/Mail/NewUserInvitation.php @@ -8,7 +8,7 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -class newUserInvitation extends Mailable +class NewUserInvitation extends Mailable { use Queueable, SerializesModels; diff --git a/database/migrations/2020_08_14_212453_create_jobs_table.php b/database/migrations/2020_08_14_212453_create_jobs_table.php new file mode 100644 index 0000000..1be9e8a --- /dev/null +++ b/database/migrations/2020_08_14_212453_create_jobs_table.php @@ -0,0 +1,36 @@ +bigIncrements('id'); + $table->string('queue')->index(); + $table->longText('payload'); + $table->unsignedTinyInteger('attempts'); + $table->unsignedInteger('reserved_at')->nullable(); + $table->unsignedInteger('available_at'); + $table->unsignedInteger('created_at'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('jobs'); + } +} diff --git a/database/migrations/2020_07_19_081942_create_event_categories_table.php b/database/migrations/2020_08_15_081942_create_event_categories_table.php similarity index 100% rename from database/migrations/2020_07_19_081942_create_event_categories_table.php rename to database/migrations/2020_08_15_081942_create_event_categories_table.php diff --git a/database/migrations/2020_07_19_085105_create_events_table.php b/database/migrations/2020_08_15_085105_create_events_table.php similarity index 100% rename from database/migrations/2020_07_19_085105_create_events_table.php rename to database/migrations/2020_08_15_085105_create_events_table.php diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php new file mode 100644 index 0000000..e74fe55 --- /dev/null +++ b/resources/views/vendor/mail/html/button.blade.php @@ -0,0 +1,19 @@ + + + + + diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php new file mode 100644 index 0000000..3ff41f8 --- /dev/null +++ b/resources/views/vendor/mail/html/footer.blade.php @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php new file mode 100644 index 0000000..77369e2 --- /dev/null +++ b/resources/views/vendor/mail/html/header.blade.php @@ -0,0 +1,11 @@ + + + +@if (trim($slot) === 'Laravel') + +@else +{{ $slot }} +@endif + + + diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php new file mode 100644 index 0000000..02a54e2 --- /dev/null +++ b/resources/views/vendor/mail/html/layout.blade.php @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php new file mode 100644 index 0000000..9779f2f --- /dev/null +++ b/resources/views/vendor/mail/html/message.blade.php @@ -0,0 +1,27 @@ +@component('mail::layout') +{{-- Header --}} +@slot('header') +@component('mail::header', ['url' => config('app.url')]) + +@endcomponent +@endslot + +{{-- Body --}} +{{ $slot }} + +{{-- Subcopy --}} +@isset($subcopy) +@slot('subcopy') +@component('mail::subcopy') +{{ $subcopy }} +@endcomponent +@endslot +@endisset + +{{-- Footer --}} +@slot('footer') +@component('mail::footer') +© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') +@endcomponent +@endslot +@endcomponent diff --git a/resources/views/vendor/mail/html/panel.blade.php b/resources/views/vendor/mail/html/panel.blade.php new file mode 100644 index 0000000..2975a60 --- /dev/null +++ b/resources/views/vendor/mail/html/panel.blade.php @@ -0,0 +1,14 @@ + + + + + + diff --git a/resources/views/vendor/mail/html/subcopy.blade.php b/resources/views/vendor/mail/html/subcopy.blade.php new file mode 100644 index 0000000..790ce6c --- /dev/null +++ b/resources/views/vendor/mail/html/subcopy.blade.php @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/views/vendor/mail/html/table.blade.php b/resources/views/vendor/mail/html/table.blade.php new file mode 100644 index 0000000..a5f3348 --- /dev/null +++ b/resources/views/vendor/mail/html/table.blade.php @@ -0,0 +1,3 @@ +
+{{ Illuminate\Mail\Markdown::parse($slot) }} +
diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css new file mode 100644 index 0000000..350fb83 --- /dev/null +++ b/resources/views/vendor/mail/html/themes/default.css @@ -0,0 +1,289 @@ +/* Base */ + +body, +body *:not(html):not(style):not(br):not(tr):not(code) { + box-sizing: border-box; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, + 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; + position: relative; +} + +body { + -webkit-text-size-adjust: none; + background-color: #ffffff; + color: #718096; + height: 100%; + line-height: 1.4; + margin: 0; + padding: 0; + width: 100% !important; +} + +p, +ul, +ol, +blockquote { + line-height: 1.4; + text-align: left; +} + +a { + color: #3869d4; +} + +a img { + border: none; +} + +/* Typography */ + +h1 { + color: #3d4852; + font-size: 18px; + font-weight: bold; + margin-top: 0; + text-align: left; +} + +h2 { + font-size: 16px; + font-weight: bold; + margin-top: 0; + text-align: left; +} + +h3 { + font-size: 14px; + font-weight: bold; + margin-top: 0; + text-align: left; +} + +p { + font-size: 16px; + line-height: 1.5em; + margin-top: 0; + text-align: left; +} + +p.sub { + font-size: 12px; +} + +img { + max-width: 100%; +} + +/* Layout */ + +.wrapper { + -premailer-cellpadding: 0; + -premailer-cellspacing: 0; + -premailer-width: 100%; + background-color: #edf2f7; + margin: 0; + padding: 0; + width: 100%; +} + +.content { + -premailer-cellpadding: 0; + -premailer-cellspacing: 0; + -premailer-width: 100%; + margin: 0; + padding: 0; + width: 100%; +} + +/* Header */ + +.header { + padding: 25px 0; + text-align: center; +} + +.header a { + color: #3d4852; + font-size: 19px; + font-weight: bold; + text-decoration: none; +} + +/* Logo */ + +.logo { + height: 75px; + width: 75px; +} + +/* Body */ + +.body { + -premailer-cellpadding: 0; + -premailer-cellspacing: 0; + -premailer-width: 100%; + background-color: #edf2f7; + border-bottom: 1px solid #edf2f7; + border-top: 1px solid #edf2f7; + margin: 0; + padding: 0; + width: 100%; +} + +.inner-body { + -premailer-cellpadding: 0; + -premailer-cellspacing: 0; + -premailer-width: 570px; + background-color: #ffffff; + border-color: #e8e5ef; + border-radius: 2px; + border-width: 1px; + box-shadow: 0 2px 0 rgba(0, 0, 150, 0.025), 2px 4px 0 rgba(0, 0, 150, 0.015); + margin: 0 auto; + padding: 0; + width: 570px; +} + +/* Subcopy */ + +.subcopy { + border-top: 1px solid #e8e5ef; + margin-top: 25px; + padding-top: 25px; +} + +.subcopy p { + font-size: 14px; +} + +/* Footer */ + +.footer { + -premailer-cellpadding: 0; + -premailer-cellspacing: 0; + -premailer-width: 570px; + margin: 0 auto; + padding: 0; + text-align: center; + width: 570px; +} + +.footer p { + color: #b0adc5; + font-size: 12px; + text-align: center; +} + +.footer a { + color: #b0adc5; + text-decoration: underline; +} + +/* Tables */ + +.table table { + -premailer-cellpadding: 0; + -premailer-cellspacing: 0; + -premailer-width: 100%; + margin: 30px auto; + width: 100%; +} + +.table th { + border-bottom: 1px solid #edeff2; + margin: 0; + padding-bottom: 8px; +} + +.table td { + color: #74787e; + font-size: 15px; + line-height: 18px; + margin: 0; + padding: 10px 0; +} + +.content-cell { + max-width: 100vw; + padding: 32px; +} + +/* Buttons */ + +.action { + -premailer-cellpadding: 0; + -premailer-cellspacing: 0; + -premailer-width: 100%; + margin: 30px auto; + padding: 0; + text-align: center; + width: 100%; +} + +.button { + -webkit-text-size-adjust: none; + border-radius: 4px; + color: #fff; + display: inline-block; + overflow: hidden; + text-decoration: none; +} + +.button-blue, +.button-primary { + background-color: #2d3748; + border-bottom: 8px solid #2d3748; + border-left: 18px solid #2d3748; + border-right: 18px solid #2d3748; + border-top: 8px solid #2d3748; +} + +.button-green, +.button-success { + background-color: #48bb78; + border-bottom: 8px solid #48bb78; + border-left: 18px solid #48bb78; + border-right: 18px solid #48bb78; + border-top: 8px solid #48bb78; +} + +.button-red, +.button-error { + background-color: #e53e3e; + border-bottom: 8px solid #e53e3e; + border-left: 18px solid #e53e3e; + border-right: 18px solid #e53e3e; + border-top: 8px solid #e53e3e; +} + +/* Panels */ + +.panel { + border-left: #2d3748 solid 4px; + margin: 21px 0; +} + +.panel-content { + background-color: #edf2f7; + color: #718096; + padding: 16px; +} + +.panel-content p { + color: #718096; +} + +.panel-item { + padding: 0; +} + +.panel-item p:last-of-type { + margin-bottom: 0; + padding-bottom: 0; +} + +/* Utilities */ + +.break-all { + word-break: break-all; +} diff --git a/resources/views/vendor/mail/text/button.blade.php b/resources/views/vendor/mail/text/button.blade.php new file mode 100644 index 0000000..97444eb --- /dev/null +++ b/resources/views/vendor/mail/text/button.blade.php @@ -0,0 +1 @@ +{{ $slot }}: {{ $url }} diff --git a/resources/views/vendor/mail/text/footer.blade.php b/resources/views/vendor/mail/text/footer.blade.php new file mode 100644 index 0000000..3338f62 --- /dev/null +++ b/resources/views/vendor/mail/text/footer.blade.php @@ -0,0 +1 @@ +{{ $slot }} diff --git a/resources/views/vendor/mail/text/header.blade.php b/resources/views/vendor/mail/text/header.blade.php new file mode 100644 index 0000000..aaa3e57 --- /dev/null +++ b/resources/views/vendor/mail/text/header.blade.php @@ -0,0 +1 @@ +[{{ $slot }}]({{ $url }}) diff --git a/resources/views/vendor/mail/text/layout.blade.php b/resources/views/vendor/mail/text/layout.blade.php new file mode 100644 index 0000000..9378baa --- /dev/null +++ b/resources/views/vendor/mail/text/layout.blade.php @@ -0,0 +1,9 @@ +{!! strip_tags($header) !!} + +{!! strip_tags($slot) !!} +@isset($subcopy) + +{!! strip_tags($subcopy) !!} +@endisset + +{!! strip_tags($footer) !!} diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php new file mode 100644 index 0000000..1ae9ed8 --- /dev/null +++ b/resources/views/vendor/mail/text/message.blade.php @@ -0,0 +1,27 @@ +@component('mail::layout') + {{-- Header --}} + @slot('header') + @component('mail::header', ['url' => config('app.url')]) + {{ config('app.name') }} + @endcomponent + @endslot + + {{-- Body --}} + {{ $slot }} + + {{-- Subcopy --}} + @isset($subcopy) + @slot('subcopy') + @component('mail::subcopy') + {{ $subcopy }} + @endcomponent + @endslot + @endisset + + {{-- Footer --}} + @slot('footer') + @component('mail::footer') + © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') + @endcomponent + @endslot +@endcomponent diff --git a/resources/views/vendor/mail/text/panel.blade.php b/resources/views/vendor/mail/text/panel.blade.php new file mode 100644 index 0000000..3338f62 --- /dev/null +++ b/resources/views/vendor/mail/text/panel.blade.php @@ -0,0 +1 @@ +{{ $slot }} diff --git a/resources/views/vendor/mail/text/subcopy.blade.php b/resources/views/vendor/mail/text/subcopy.blade.php new file mode 100644 index 0000000..3338f62 --- /dev/null +++ b/resources/views/vendor/mail/text/subcopy.blade.php @@ -0,0 +1 @@ +{{ $slot }} diff --git a/resources/views/vendor/mail/text/table.blade.php b/resources/views/vendor/mail/text/table.blade.php new file mode 100644 index 0000000..3338f62 --- /dev/null +++ b/resources/views/vendor/mail/text/table.blade.php @@ -0,0 +1 @@ +{{ $slot }}