Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions app/Http/Controllers/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Http\Controllers;

use App\Models\User;
use App\Models\UserAppreciation;
use App\Notifications\WelcomeNotification;
use App\Rules\CleanText;
use App\Services\ChatProfanityFilter;
Expand Down Expand Up @@ -111,10 +112,21 @@ public function showOnboarding(Request $request)
return redirect()->route('login')->with('error', 'Please continue with Google to create an account.');
}

$onboardingUser = $request->session()->get('onboarding_user');
$top = User::withCount('appreciationsReceived')
->orderByDesc('appreciations_received_count')
->take(2)
->get(['id', 'name', 'username', 'image_path', 'institution', 'is_verified']);

$random = User::whereNotIn('id', $top->pluck('id'))
->inRandomOrder()
->take(2)
->get(['id', 'name', 'username', 'image_path', 'institution', 'is_verified']);

$suggestedContributors = $top->concat($random)->values();

return Inertia::render('auth/Onboarding', [
'user' => $onboardingUser,
'user' => $request->session()->get('onboarding_user'),
'suggestedContributors' => $suggestedContributors,
]);
}

Expand Down Expand Up @@ -143,6 +155,8 @@ public function completeOnboarding(Request $request)
],
'school' => ['required', 'string', 'max:255', new CleanText],
'image' => ['sometimes', 'nullable', 'image', 'mimes:jpg,jpeg,png,webp', 'max:5120'],
'appreciations' => ['nullable', 'array', 'max:4'],
'appreciations.*' => ['integer', 'distinct', 'exists:users,id'],
], [
'school.required' => 'Please enter your school, college, or institution name.',
'username.regex' => 'Username can only contain letters, numbers, and underscores.',
Expand Down Expand Up @@ -183,6 +197,17 @@ public function completeOnboarding(Request $request)
}
}

if (! empty($validated['appreciations'])) {
foreach ($validated['appreciations'] as $targetUserId) {
if ((int) $targetUserId !== (int) $user->id) {
UserAppreciation::firstOrCreate([
'user_id' => $targetUserId,
'appreciator_id' => $user->id,
]);
}
}
}

$request->session()->forget('onboarding_user');

Auth::login($user, remember: true);
Expand Down
Loading