feat: profile & leader board changes fix: google login verified at
This commit is contained in:
@@ -431,19 +431,10 @@ public function updateProfile(Request $request)
|
||||
|
||||
public function profile()
|
||||
{
|
||||
$user = auth()->user();
|
||||
$templates = BreathingTemplate::where('user_id', $user->id)->get();
|
||||
$sessions = UserBreathingSession::with('template')->where('user_id', $user->id)->get();
|
||||
$user = auth()->user()->load(['breathingSessions.template']);
|
||||
|
||||
return response()->json([
|
||||
'email' => $user->email,
|
||||
'name' => $user->name,
|
||||
// 'last_name' => $user->last_name,
|
||||
'mobile'=> $user->mobile,
|
||||
'birthday' => $user ->birthday,
|
||||
'xp' => $user->xp,
|
||||
'templates' => $templates,
|
||||
'sessions' => $sessions
|
||||
'user' => $user
|
||||
]);
|
||||
}
|
||||
public function status(Request $request)
|
||||
@@ -544,6 +535,7 @@ public function googleLogin(Request $request)
|
||||
'first_name' => $response['given_name'] ?? null,
|
||||
'last_name' => $response['family_name'] ?? null,
|
||||
'password' => config('app.default_password'),
|
||||
'email_verified_at' => now(),
|
||||
]);
|
||||
|
||||
if (!$user->packageNames()->where('package_names.id', $packageName->id)->exists()) {
|
||||
@@ -552,6 +544,12 @@ public function googleLogin(Request $request)
|
||||
'source' => $data['source'] ?? 0,
|
||||
]);
|
||||
}
|
||||
}else {
|
||||
if (!$user->email_verified_at) {
|
||||
$user->update([
|
||||
'email_verified_at' => now(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
$token = $user->createToken('token', ['user'])->plainTextToken;
|
||||
@@ -563,7 +561,7 @@ public function googleLogin(Request $request)
|
||||
}
|
||||
|
||||
public function leaderBoard(){
|
||||
$users = User::where('xp', '>', 0)
|
||||
$users = User::with(['breathingSessions.template'])->where('xp', '>', 0)
|
||||
->orderBy('xp', 'desc')
|
||||
->get();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user