Skip to content

Commit

Permalink
chore: fix code style
Browse files Browse the repository at this point in the history
  • Loading branch information
rahmanramsi authored and github-actions[bot] committed Oct 5, 2023
1 parent e3701bc commit c00bcc9
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 87 deletions.
27 changes: 0 additions & 27 deletions app/Administration/Livewire/AccessSetting.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
28 changes: 0 additions & 28 deletions app/Administration/Livewire/DateAndTimeSetting.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
3 changes: 0 additions & 3 deletions app/Administration/Pages/SiteSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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
{
Expand Down
7 changes: 3 additions & 4 deletions app/Http/Middleware/MustVerifyEmail.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
1 change: 0 additions & 1 deletion app/Http/Middleware/Panel/PanelAuthenticate.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

class PanelAuthenticate extends Authenticate
{

protected function redirectTo($request): ?string
{
return route('livewirePageGroup.website.pages.login');
Expand Down
1 change: 0 additions & 1 deletion app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace App\Models;


use App\Mail\Templates\VerifyUserEmail;
use App\Models\Enums\ConferenceStatus;
use App\Models\Enums\UserRole;
Expand Down
20 changes: 10 additions & 10 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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);
});
}

Expand Down
2 changes: 1 addition & 1 deletion app/Providers/Filament/PanelProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public static function getAuthMiddleware(): array
{
return [
PanelAuthenticate::class,
MustVerifyEmail::class
MustVerifyEmail::class,
];
}

Expand Down
13 changes: 6 additions & 7 deletions app/Website/Pages/EmailVerification.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

Expand Down
2 changes: 1 addition & 1 deletion helpers/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ function get_navigation_link(?string $type, string $default = '#'): string
default => $default,
};
}
}
}
6 changes: 3 additions & 3 deletions lang/en/email.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

return [
'verification' => [
'throttle' => 'Please try again in :seconds seconds.'
]
'throttle' => 'Please try again in :seconds seconds.',
],

];
];
2 changes: 1 addition & 1 deletion routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
$request->fulfill();

return redirect()->route('filament.panel.tenant');
})->middleware(['auth', 'signed'])->name('verification.verify');
})->middleware(['auth', 'signed'])->name('verification.verify');

0 comments on commit c00bcc9

Please sign in to comment.