diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 566d86fd..b315f8d7 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -22,6 +22,7 @@ use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; use Illuminate\Validation\ValidationException; +use Spatie\Permission\Models\Role; class RegisterController extends Controller { @@ -139,7 +140,7 @@ class RegisterController extends Controller ]); - $user->syncRoles(4); + $user->syncRoles(Role::findByName('User')); $response = $this->pterodactyl->application->post('/application/users', [ 'external_id' => null, @@ -151,15 +152,11 @@ class RegisterController extends Controller 'root_admin' => false, 'language' => 'en', ]); - + $user->update([ 'pterodactyl_id' => $response->json()['attributes']['id'], ]); - - - - if ($response->failed()) { $user->delete(); Log::error('Pterodactyl Registration Error: ' . $response->json()['errors'][0]['detail']); diff --git a/app/Models/User.php b/app/Models/User.php index 7c04a65b..584da015 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -66,6 +66,7 @@ class User extends Authenticatable implements MustVerifyEmail 'avatar', 'suspended', 'referral_code', + 'email_verified_reward', ]; /** @@ -88,6 +89,7 @@ class User extends Authenticatable implements MustVerifyEmail 'last_seen' => 'datetime', 'credits' => 'float', 'server_limit' => 'float', + 'email_verified_reward' => 'boolean' ]; public function __construct() @@ -280,9 +282,8 @@ class User extends Authenticatable implements MustVerifyEmail public function verifyEmail() { - $this->forceFill([ - 'email_verified_at' => now(), + 'email_verified_at' => now() ])->save(); } @@ -290,6 +291,7 @@ class User extends Authenticatable implements MustVerifyEmail { $this->forceFill([ 'email_verified_at' => null, + 'email_verified_reward' => true ])->save(); } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 2ac9182d..cc535566 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -9,9 +9,10 @@ use App\Listeners\CouponUsed; use App\Listeners\CreateInvoice; use App\Listeners\UnsuspendServers; use App\Listeners\UserPayment; -use App\Listeners\Verified; +use App\Listeners\Verified as ListenerVerified; use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; +use Illuminate\Auth\Events\Verified; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; use SocialiteProviders\Manager\SocialiteWasCalled; @@ -40,8 +41,8 @@ class EventServiceProvider extends ServiceProvider // ... other providers 'SocialiteProviders\\Discord\\DiscordExtendSocialite@handle', ], - 'Illuminate\Auth\Events\Verified' => [ - Verified::class, + Verified::class => [ + ListenerVerified::class, ], ]; diff --git a/config/view.php b/config/view.php index 22b8a18d..b9b20d53 100644 --- a/config/view.php +++ b/config/view.php @@ -14,7 +14,7 @@ return [ */ 'paths' => [ - resource_path('views'), + base_path('themes'), ], /* diff --git a/themes/default/views/profile/index.blade.php b/themes/default/views/profile/index.blade.php index ba95bca4..14117343 100644 --- a/themes/default/views/profile/index.blade.php +++ b/themes/default/views/profile/index.blade.php @@ -4,7 +4,7 @@
-
+

{{ __('Profile') }}

@@ -26,9 +26,9 @@
-
- @if (!Auth::user()->hasVerifiedEmail() && strtolower($force_email_verification) == 'true') -
+
+ @if (!Auth::user()->hasVerifiedEmail() && $force_email_verification) +
{{ __('Required Email verification!') }}
{{ __('You have not yet verified your email address') }} @@ -40,9 +40,9 @@
@endif - @if (is_null(Auth::user()->discordUser) && strtolower($force_discord_verification) == 'true') + @if (is_null(Auth::user()->discordUser) && $force_discord_verification) @if (!empty($discord_client_id) && !empty($discord_client_secret)) -
+
{{ __('Required Discord verification!') }}
@@ -52,7 +52,7 @@ {{ __('Please contact support If you face any issues.') }}
@else -
+
{{ __('Required Discord verification!') }}
@@ -72,8 +72,8 @@
-
-
+
-
-
-

{{ $user->name }}

+
+
+

{{ $user->name }}

{{ $user->email }} @if ($user->hasVerifiedEmail())

{{ $user->Credits() }} + class="mr-2 fa fa-coins">{{ $user->Credits() }}
@if($referral_enabled) @can("user.referral")
+ class="mr-2 fa fa-user-check"> {{__("Referral URL")}} : {{route("register")}}?ref={{$user->referral_code}} @else + class="mr-2 fa fa-user-check"> {{__("You can not see your Referral Code")}} @endcan
@@ -138,7 +138,7 @@ class="active nav-link">{{ __('Settings') }} -
+
@@ -189,7 +189,7 @@
-
+
{{ __('Change Password') }}
@@ -242,7 +242,7 @@
@if (!empty($discord_client_id) && !empty($discord_client_secret)) -
+
@if (is_null(Auth::user()->discordUser)) {{ __('Link your discord account!') }}
@@ -255,7 +255,7 @@
- {{ __('Login with Discord') }} + {{ __('Login with Discord') }} @else
@@ -263,7 +263,7 @@

{{ __('You are verified!') }}

-
+
@@ -282,7 +282,7 @@
{{ __('Re-Sync Discord') }} + class="mr-1 fab fa-discord">{{ __('Re-Sync Discord') }}