diff --git a/app/Administration/Livewire/AccessSetting.php b/app/Administration/Livewire/AccessSetting.php index 463e4327a..e21a9cb2c 100644 --- a/app/Administration/Livewire/AccessSetting.php +++ b/app/Administration/Livewire/AccessSetting.php @@ -2,42 +2,15 @@ namespace App\Administration\Livewire; -use App\Actions\MailTemplates\MailTemplatePopulateDefaultData; -use App\Actions\MailTemplates\MailTemplateRestoreDefaultData; use App\Actions\Settings\SettingUpdateAction; -use App\Infolists\Components\BladeEntry; -use App\Infolists\Components\VerticalTabs; -use App\Mail\Templates\TestMail; -use App\Mail\Templates\VerifyUserEmail; -use App\Models\MailTemplate; use Filament\Forms\Components\Actions; use Filament\Forms\Components\Actions\Action; use Filament\Forms\Components\Checkbox; use Filament\Forms\Components\Section; -use Filament\Forms\Components\Select; -use Filament\Forms\Components\TextInput; use Filament\Forms\Concerns\InteractsWithForms; use Filament\Forms\Contracts\HasForms; use Filament\Forms\Form; -use Filament\Infolists\Concerns\InteractsWithInfolists; -use Filament\Infolists\Contracts\HasInfolists; -use Filament\Infolists\Infolist; -use Filament\Notifications\Notification; -use Filament\Support\Enums\FontWeight; -use Filament\Tables\Actions\Action as TableAction; -use Filament\Tables\Actions\ActionGroup; -use Filament\Tables\Actions\EditAction; -use Filament\Tables\Columns\Layout\Split; -use Filament\Tables\Columns\Layout\Stack; -use Filament\Tables\Columns\TextColumn; -use Filament\Tables\Columns\TextColumn\TextColumnSize; -use Filament\Tables\Concerns\InteractsWithTable; -use Filament\Tables\Contracts\HasTable; -use Filament\Tables\Table; -use Illuminate\Support\Facades\Mail; -use Illuminate\Support\Str; use Livewire\Component; -use Mohamedsabil83\FilamentFormsTinyeditor\Components\TinyEditor; class AccessSetting extends Component implements HasForms { diff --git a/app/Administration/Livewire/DateAndTimeSetting.php b/app/Administration/Livewire/DateAndTimeSetting.php index d61efd7d3..0ae2d27e1 100644 --- a/app/Administration/Livewire/DateAndTimeSetting.php +++ b/app/Administration/Livewire/DateAndTimeSetting.php @@ -2,44 +2,16 @@ namespace App\Administration\Livewire; -use App\Actions\MailTemplates\MailTemplatePopulateDefaultData; -use App\Actions\MailTemplates\MailTemplateRestoreDefaultData; use App\Actions\Settings\SettingUpdateAction; -use App\Infolists\Components\BladeEntry; -use App\Infolists\Components\VerticalTabs; -use App\Mail\Templates\TestMail; -use App\Mail\Templates\VerifyUserEmail; -use App\Models\MailTemplate; use Filament\Forms\Components\Actions; use Filament\Forms\Components\Actions\Action; -use Filament\Forms\Components\Checkbox; use Filament\Forms\Components\Radio; use Filament\Forms\Components\Section; -use Filament\Forms\Components\Select; -use Filament\Forms\Components\TextInput; use Filament\Forms\Concerns\InteractsWithForms; use Filament\Forms\Contracts\HasForms; use Filament\Forms\Form; -use Filament\Infolists\Concerns\InteractsWithInfolists; -use Filament\Infolists\Contracts\HasInfolists; -use Filament\Infolists\Infolist; -use Filament\Notifications\Notification; -use Filament\Support\Enums\FontWeight; -use Filament\Tables\Actions\Action as TableAction; -use Filament\Tables\Actions\ActionGroup; -use Filament\Tables\Actions\EditAction; -use Filament\Tables\Columns\Layout\Split; -use Filament\Tables\Columns\Layout\Stack; -use Filament\Tables\Columns\TextColumn; -use Filament\Tables\Columns\TextColumn\TextColumnSize; -use Filament\Tables\Concerns\InteractsWithTable; -use Filament\Tables\Contracts\HasTable; -use Filament\Tables\Table; -use Illuminate\Support\Facades\Mail; use Illuminate\Support\HtmlString; -use Illuminate\Support\Str; use Livewire\Component; -use Mohamedsabil83\FilamentFormsTinyeditor\Components\TinyEditor; class DateAndTimeSetting extends Component implements HasForms { diff --git a/app/Administration/Pages/SiteSettings.php b/app/Administration/Pages/SiteSettings.php index b88583449..4d5fb5668 100644 --- a/app/Administration/Pages/SiteSettings.php +++ b/app/Administration/Pages/SiteSettings.php @@ -2,7 +2,6 @@ namespace App\Administration\Pages; -use App\Actions\Settings\SettingUpdateAction; use App\Actions\Site\SiteUpdateAction; use App\Administration\Livewire\AccessSetting; use App\Administration\Livewire\DateAndTimeSetting; @@ -12,7 +11,6 @@ use App\Infolists\Components\VerticalTabs; use Filament\Forms\Components\Actions; use Filament\Forms\Components\Actions\Action; -use Filament\Forms\Components\Radio; use Filament\Forms\Components\Section; use Filament\Forms\Components\SpatieMediaLibraryFileUpload; use Filament\Forms\Components\TextInput; @@ -24,7 +22,6 @@ use Filament\Infolists\Contracts\HasInfolists; use Filament\Infolists\Infolist; use Filament\Pages\Page; -use Illuminate\Support\HtmlString; class SiteSettings extends Page implements HasForms, HasInfolists { diff --git a/app/Http/Middleware/MustVerifyEmail.php b/app/Http/Middleware/MustVerifyEmail.php index 81a1b76c9..08e59c50d 100644 --- a/app/Http/Middleware/MustVerifyEmail.php +++ b/app/Http/Middleware/MustVerifyEmail.php @@ -15,19 +15,18 @@ class MustVerifyEmail */ public function handle(Request $request, Closure $next): Response { - if(!setting('must_verify_email')){ + if (! setting('must_verify_email')) { return $next($request); } - if(!$request->user()){ + if (! $request->user()) { return redirect()->route('livewirePageGroup.website.pages.login'); } - if(!$request->user()->hasVerifiedEmail()){ + if (! $request->user()->hasVerifiedEmail()) { return redirect()->route('livewirePageGroup.website.pages.email-verification'); } - return $next($request); } } diff --git a/app/Http/Middleware/Panel/PanelAuthenticate.php b/app/Http/Middleware/Panel/PanelAuthenticate.php index 7d554ff74..51f29fcaa 100644 --- a/app/Http/Middleware/Panel/PanelAuthenticate.php +++ b/app/Http/Middleware/Panel/PanelAuthenticate.php @@ -6,7 +6,6 @@ class PanelAuthenticate extends Authenticate { - protected function redirectTo($request): ?string { return route('livewirePageGroup.website.pages.login'); diff --git a/app/Models/User.php b/app/Models/User.php index 6431597d6..3b6eff8f2 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,7 +2,6 @@ namespace App\Models; - use App\Mail\Templates\VerifyUserEmail; use App\Models\Enums\ConferenceStatus; use App\Models\Enums\UserRole; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 1588a7c7a..914a84d13 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,16 +2,16 @@ namespace App\Providers; -use Illuminate\Support\Str; use App\Managers\BlockManager; use App\Managers\MetaTagManager; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\URL; -use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Storage; +use Illuminate\Support\Facades\URL; use Illuminate\Support\ServiceProvider; -use Illuminate\Database\Eloquent\Relations\Relation; +use Illuminate\Support\Str; class AppServiceProvider extends ServiceProvider { @@ -39,17 +39,17 @@ public function boot(): void $this->extendStr(); } - - protected function extendStr(){ + protected function extendStr() + { Str::macro('maskEmail', function ($email) { - $mail_parts = explode("@", $email); + $mail_parts = explode('@', $email); $domain_parts = explode('.', $mail_parts[1]); - + $mail_parts[0] = Str::mask($mail_parts[0], '*', 2, strlen($mail_parts[0])); // show first 2 letters and last 1 letter $domain_parts[0] = Str::mask($domain_parts[0], '*', 2, strlen($domain_parts[0])); // same here $mail_parts[1] = implode('.', $domain_parts); - - return implode("@", $mail_parts); + + return implode('@', $mail_parts); }); } diff --git a/app/Providers/Filament/PanelProvider.php b/app/Providers/Filament/PanelProvider.php index 1d9a9b118..2854f1b18 100644 --- a/app/Providers/Filament/PanelProvider.php +++ b/app/Providers/Filament/PanelProvider.php @@ -144,7 +144,7 @@ public static function getAuthMiddleware(): array { return [ PanelAuthenticate::class, - MustVerifyEmail::class + MustVerifyEmail::class, ]; } diff --git a/app/Website/Pages/EmailVerification.php b/app/Website/Pages/EmailVerification.php index bc93d12bd..1353d2d94 100644 --- a/app/Website/Pages/EmailVerification.php +++ b/app/Website/Pages/EmailVerification.php @@ -14,28 +14,27 @@ class EmailVerification extends Page public function mount() { - if(!setting('must_verify_email')){ + if (! setting('must_verify_email')) { return redirect()->route('filament.panel.tenant'); } - if(!auth()->check()){ + if (! auth()->check()) { return redirect()->route('livewirePageGroup.website.pages.login'); } - if(auth()->user()->hasVerifiedEmail()){ + if (auth()->user()->hasVerifiedEmail()) { return redirect()->route('filament.panel.tenant'); } } - - public function getBreadcrumbs() : array + + public function getBreadcrumbs(): array { return []; } - public function sendEmailVerificationLink() { - if(auth()->user()->hasVerifiedEmail()){ + if (auth()->user()->hasVerifiedEmail()) { return redirect()->route('filament.panel.tenant'); } diff --git a/helpers/helpers.php b/helpers/helpers.php index d3d669a01..0bd394a5e 100644 --- a/helpers/helpers.php +++ b/helpers/helpers.php @@ -41,4 +41,4 @@ function get_navigation_link(?string $type, string $default = '#'): string default => $default, }; } -} \ No newline at end of file +} diff --git a/lang/en/email.php b/lang/en/email.php index f96b8fa3c..766ce0c3a 100644 --- a/lang/en/email.php +++ b/lang/en/email.php @@ -2,7 +2,7 @@ return [ 'verification' => [ - 'throttle' => 'Please try again in :seconds seconds.' - ] + 'throttle' => 'Please try again in :seconds seconds.', + ], -]; \ No newline at end of file +]; diff --git a/routes/web.php b/routes/web.php index a817b15e2..2d2a3be9d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -34,4 +34,4 @@ $request->fulfill(); return redirect()->route('filament.panel.tenant'); -})->middleware(['auth', 'signed'])->name('verification.verify'); \ No newline at end of file +})->middleware(['auth', 'signed'])->name('verification.verify');