From f1298ef9ccc94de1089e15e27216d472483c4fbb Mon Sep 17 00:00:00 2001 From: Arthur Monney Date: Wed, 27 Dec 2023 21:17:40 +0100 Subject: [PATCH] Update email verification link --- .env.example | 10 +- app/Events/CommentWasAdded.php | 4 +- app/Exceptions/CannotCreateUser.php | 4 +- app/Models/User.php | 4 +- app/Providers/EventServiceProvider.php | 8 +- app/Providers/FortifyServiceProvider.php | 14 +- app/Providers/RouteServiceProvider.php | 8 +- pint.json | 2 +- resources/views/components/header.blade.php | 3 - .../views/components/icon/twitter.blade.php | 4 +- .../send-mail-to-un-verified-users.blade.php | 2 +- resources/views/emails/welcome.blade.php | 2 +- resources/views/home.blade.php | 5 +- .../views/vendor/mail/html/card.blade.php | 34 ++--- .../views/vendor/mail/html/footer.blade.php | 121 ++++++++++-------- .../views/vendor/mail/html/header.blade.php | 18 +-- .../views/vendor/mail/html/message.blade.php | 4 +- 17 files changed, 128 insertions(+), 119 deletions(-) diff --git a/.env.example b/.env.example index d3a6f0cc..1bec7794 100644 --- a/.env.example +++ b/.env.example @@ -56,14 +56,6 @@ GITHUB_CLIENT_ID= GITHUB_CLIENT_SECRET= GITHUB_REDIRECT=${APP_URL}/auth/github/callback -TWITTER_CLIENT_ID= -TWITTER_CLIENT_SECRET= -TWITTER_REDIRECT=${APP_URL}/auth/twitter/callback -TWITTER_CONSUMER_KEY= -TWITTER_CONSUMER_SECRET= -TWITTER_ACCESS_TOKEN= -TWITTER_ACCESS_SECRET= - SLACK_WEBHOOK_URL= SLACK_TEAM_NAME="Laravel Cameroun" SLACK_API_TOKEN= @@ -71,7 +63,7 @@ SLACK_TEAM_URL="https://laravelcm.slack.com" MARKDOWNX_GIPHY_API_KEY= TORCHLIGHT_TOKEN= -MIX_TORCHLIGHT_TOKEN="${TORCHLIGHT_TOKEN}" +TORCHLIGHT_THEME=moonlight-ii UNSPLASH_ACCESS_KEY= TELEGRAM_BOT_TOKEN= diff --git a/app/Events/CommentWasAdded.php b/app/Events/CommentWasAdded.php index b6bd63c0..3c42b933 100644 --- a/app/Events/CommentWasAdded.php +++ b/app/Events/CommentWasAdded.php @@ -8,11 +8,11 @@ use App\Models\Reply; use Illuminate\Queue\SerializesModels; -final class CommentWasAdded +final readonly class CommentWasAdded { use SerializesModels; - public function __construct(public readonly Reply $reply, public readonly Discussion $discussion) + public function __construct(public Reply $reply, public Discussion $discussion) { } } diff --git a/app/Exceptions/CannotCreateUser.php b/app/Exceptions/CannotCreateUser.php index 888a7f94..9cdd8223 100644 --- a/app/Exceptions/CannotCreateUser.php +++ b/app/Exceptions/CannotCreateUser.php @@ -10,11 +10,11 @@ final class CannotCreateUser extends Exception { public static function duplicateEmailAddress(string $emailAddress): self { - return new static("Cet adresse e-mail [{$emailAddress}] existe déjà."); + return new CannotCreateUser("Cet adresse e-mail [{$emailAddress}] existe déjà."); } public static function duplicateUsername(string $username): self { - return new static("Ce pseudo [{$username}] existe déjà."); + return new CannotCreateUser("Ce pseudo [{$username}] existe déjà."); } } diff --git a/app/Models/User.php b/app/Models/User.php index 4f6e07ba..52ac0fcd 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -24,10 +24,10 @@ use Illuminate\Support\Facades\Auth; use Laravel\Sanctum\HasApiTokens; use Laravel\Socialite\Contracts\User as SocialUser; +use Laravelcm\Subscriptions\Traits\HasPlanSubscriptions; use LaravelFeature\Featurable\Featurable; use LaravelFeature\Featurable\FeaturableInterface; use QCod\Gamify\Gamify; -// use Rinvex\Subscriptions\Traits\HasPlanSubscriptions; use Spatie\MediaLibrary\HasMedia; use Spatie\MediaLibrary\InteractsWithMedia; use Spatie\Permission\Traits\HasRoles; @@ -41,7 +41,7 @@ final class User extends Authenticatable implements MustVerifyEmail, HasMedia, F use Gamify; use HasApiTokens; use HasFactory; - // use HasPlanSubscriptions; + use HasPlanSubscriptions; use HasProfilePhoto; use HasRoles; use HasSettings; diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 0818a193..9fd7c6ac 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -52,10 +52,10 @@ final class EventServiceProvider extends ServiceProvider \SocialiteProviders\Twitter\TwitterExtendSocialite::class.'@handle', ], - ApiRegistered::class => [ - SendCompanyEmailVerificationNotification::class, - SendWelcomeCompanyNotification::class, - ], + // ApiRegistered::class => [ + // SendCompanyEmailVerificationNotification::class, + // SendWelcomeCompanyNotification::class, + // ], SponsoringPaymentInitialize::class => [ SendPaymentNotification::class, diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php index ef49a264..d09ae9de 100644 --- a/app/Providers/FortifyServiceProvider.php +++ b/app/Providers/FortifyServiceProvider.php @@ -26,7 +26,7 @@ public function boot(): void Fortify::loginView(fn () => view('auth.login')); Fortify::registerView(fn () => view('auth.register')); Fortify::requestPasswordResetLinkView(fn () => view('auth.forgot-password')); - Fortify::resetPasswordView(fn ($request) => view('auth.reset-password', ['request' => $request])); + Fortify::resetPasswordView(fn (Request $request) => view('auth.reset-password', ['request' => $request])); Fortify::verifyEmailView(fn () => view('auth.verify-email')); Fortify::createUsersUsing(CreateNewUser::class); @@ -34,8 +34,16 @@ public function boot(): void Fortify::updateUserPasswordsUsing(UpdateUserPassword::class); Fortify::resetUserPasswordsUsing(ResetUserPassword::class); - RateLimiter::for('login', fn (Request $request) => Limit::perMinute(5)->by($request->email.$request->ip())); + RateLimiter::for( + 'login', + fn (Request $request) => Limit::perMinute(5) + ->by($request->email.$request->ip()) + ); - RateLimiter::for('two-factor', fn (Request $request) => Limit::perMinute(5)->by($request->session()->get('login.id'))); + RateLimiter::for( + 'two-factor', + fn (Request $request) => Limit::perMinute(5) + ->by($request->session()->get('login.id')) + ); } } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 7abdbe13..1cb83383 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -22,10 +22,10 @@ public function boot(): void $this->routeBindings(); $this->routes(function (): void { - Route::prefix('api') - ->middleware('api') - ->namespace($this->namespace) - ->group(base_path('routes/api.php')); + // Route::prefix('api') + // ->middleware('api') + // ->namespace($this->namespace) + // ->group(base_path('routes/api.php')); Route::middleware('web') ->namespace($this->namespace) diff --git a/pint.json b/pint.json index bd6ec48b..a210b741 100644 --- a/pint.json +++ b/pint.json @@ -37,6 +37,6 @@ "trim_array_spaces": true, "use_arrow_functions": true, "void_return": true, - "yoda_style": true + "yoda_style": false } } diff --git a/resources/views/components/header.blade.php b/resources/views/components/header.blade.php index 0e04ad3b..fbd99d98 100644 --- a/resources/views/components/header.blade.php +++ b/resources/views/components/header.blade.php @@ -17,9 +17,6 @@ {{ __('Discussions') }} - - {{ __('Vidéos') }} -
- + {{ __('Votre logo ici ?') }}
diff --git a/resources/views/vendor/mail/html/card.blade.php b/resources/views/vendor/mail/html/card.blade.php index 390106c3..7920211e 100644 --- a/resources/views/vendor/mail/html/card.blade.php +++ b/resources/views/vendor/mail/html/card.blade.php @@ -1,20 +1,20 @@ - - - + + + diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php index b1423cee..fca5ed8a 100644 --- a/resources/views/vendor/mail/html/footer.blade.php +++ b/resources/views/vendor/mail/html/footer.blade.php @@ -1,60 +1,69 @@ - - - - - - - + + + diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php index 899d3ca8..15c3bf8d 100644 --- a/resources/views/vendor/mail/html/header.blade.php +++ b/resources/views/vendor/mail/html/header.blade.php @@ -1,11 +1,11 @@ - - - @if (trim($slot) === 'Laravel') - - @else - {{ $slot }} - @endif - - + + + @if (trim($slot) === 'Laravel') + + @else + {{ $slot }} + @endif + + diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php index cd4baebd..e3407298 100644 --- a/resources/views/vendor/mail/html/message.blade.php +++ b/resources/views/vendor/mail/html/message.blade.php @@ -29,9 +29,9 @@ {{-- Footer --}} @slot('footer') @component('mail::footer') - Vous recevez cet e-mail car vous êtes devenu un membre précieux de la communauté Laravel Cameroun. + Vous recevez cet e-mail, car vous êtes devenu un membre précieux de la communauté Laravel Cameroun. © {{ date('Y') }} {{ config('app.name') }}. @lang('Tous droits reservés.') - Sable Bonamoussadi, Hotel Joanes Douala - Cameroun. + Akwa, Douala - Cameroun. @endcomponent @endslot