charlestehio/memefast
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
ct
2025-07-02 01:08:11 +08:00
parent 209c022f1d
commit 68a47ec916
19 changed files with 503 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/RegisteredUserController.php
View File

@@ -31,7 +31,7 @@ public function create(): Response
public function store(Request $request): RedirectResponse
{
$request->validate([
'email' => 'required|string|lowercase|email|max:255|unique:' . User::class,
'email' => 'required|string|lowercase|email|max:255|unique:'.User::class,
'password' => ['required', 'confirmed', Rules\Password::defaults()],
]);

4
app/Http/Controllers/Auth/VerifyEmailController.php
View File

@@ -15,7 +15,7 @@ class VerifyEmailController extends Controller
public function __invoke(EmailVerificationRequest $request): RedirectResponse
{
if ($request->user()->hasVerifiedEmail()) {
return redirect()->intended(route(config('platform.general.authed_route_redirect'), absolute: false) . '?verified=1');
return redirect()->intended(route(config('platform.general.authed_route_redirect'), absolute: false).'?verified=1');
}
if ($request->user()->markEmailAsVerified()) {
@@ -25,6 +25,6 @@ public function __invoke(EmailVerificationRequest $request): RedirectResponse
event(new Verified($user));
}
return redirect()->intended(route(config('platform.general.authed_route_redirect'), absolute: false) . '?verified=1');
return redirect()->intended(route(config('platform.general.authed_route_redirect'), absolute: false).'?verified=1');
}
}

7
app/Http/Controllers/SocialAuthController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App;
use App\Models\Plan;
use App\Models\User;
use App\Models\UserPlan;
use Illuminate\Support\Facades\Auth;
@@ -64,7 +65,7 @@ public function handleGoogleCallback()
return redirect()->intended(route('home'))->with('success', "You're now logged in!");
} catch (\Exception $e) {
throw $e;
//throw $e;
$error_message = 'Google login failed. Please try again.';
if (config('app.debug')) {
$error_message = $e->getMessage();
@@ -78,10 +79,10 @@ private function setupUser($user)
{
$user_plan = UserPlan::where('user_id', $user->id)->first();
if (!$user_plan) {
if (! $user_plan) {
$user_plan = UserPlan::create([
'user_id' => $user->id,
'plan_id' => 'free',
'plan_id' => Plan::where('tier', 'free')->first()->id,
]);
}
}

10
app/Http/Controllers/UserPurchaseController.php
View File

@@ -32,8 +32,8 @@ public function subscribe(Request $request)
$payload = [
'mode' => 'subscription',
'success_url' => route('subscribe.success') . '?' . 'session_id={CHECKOUT_SESSION_ID}',
'cancel_url' => route('subscribe.cancelled') . '?' . 'session_id={CHECKOUT_SESSION_ID}',
'success_url' => route('subscribe.success').'?'.'session_id={CHECKOUT_SESSION_ID}',
'cancel_url' => route('subscribe.cancelled').'?'.'session_id={CHECKOUT_SESSION_ID}',
'line_items' => [[
'price' => $price_id,
'quantity' => 1,
@@ -81,8 +81,8 @@ public function purchase(Request $request)
$price_id = $request->input('price_id');
$payload = [
'success_url' => route('subscribe.success') . '?' . 'session_id={CHECKOUT_SESSION_ID}',
'cancel_url' => route('subscribe.cancelled') . '?' . 'session_id={CHECKOUT_SESSION_ID}',
'success_url' => route('subscribe.success').'?'.'session_id={CHECKOUT_SESSION_ID}',
'cancel_url' => route('subscribe.cancelled').'?'.'session_id={CHECKOUT_SESSION_ID}',
];
$checkout_session = Auth::user()->checkout([$price_id => 1], $payload);
@@ -107,7 +107,7 @@ public function purchaseSuccess(Request $request)
Session::forget('checkout_session_id');
return redirect()->route('home')->with('success', "Thank you for purchasing! Your purchase should be active momentarily. Please refresh the page if you do not see your plan.");
return redirect()->route('home')->with('success', 'Thank you for purchasing! Your purchase should be active momentarily. Please refresh the page if you do not see your plan.');
}
public function purchaseCancelled(Request $request)

8
app/Http/Middleware/HandleInertiaRequests.php
View File

@@ -47,15 +47,15 @@ public function share(Request $request): array
'user' => $request->user(),
'user_is_admin' => user_is_master_admin($request->user()),
],
'ziggy' => fn(): array => [
'ziggy' => fn (): array => [
...(new Ziggy)->toArray(),
'location' => $request->url(),
],
'sidebarOpen' => ! $request->hasCookie('sidebar_state') || $request->cookie('sidebar_state') === 'true',
'flash' => [
'message' => fn() => $request->session()->get('message'),
'error' => fn() => $request->session()->get('error'),
'success' => fn() => $request->session()->get('success'),
'message' => fn () => $request->session()->get('message'),
'error' => fn () => $request->session()->get('error'),
'success' => fn () => $request->session()->get('success'),
],
];
}