Skip to content

Commit f6e9aa1

Browse files
committed
Merge branch 'feat-upload-avatar' of https://github.com/Sma1lboy/codefox into feat-upload-avatar
2 parents 4c35014 + 90f9d52 commit f6e9aa1

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

frontend/src/components/avatar-uploader.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ import { toast } from 'sonner';
99
import { useAuthContext } from '@/providers/AuthProvider';
1010

1111
// Avatar URL normalization helper
12-
export function normalizeAvatarUrl(avatarUrl: string | null | undefined): string {
12+
export function normalizeAvatarUrl(
13+
avatarUrl: string | null | undefined
14+
): string {
1315
if (!avatarUrl) return '';
1416

17+
<<<<<<< HEAD
18+
=======
19+
console.log('Avatar URL ' + avatarUrl);
20+
>>>>>>> 90f9d529cd6d3c8a6522d5f08744bc8573d68365
1521
// Check if it's already an absolute URL (S3 case)
1622
if (avatarUrl.startsWith('https:') || avatarUrl.startsWith('http:')) {
1723
return avatarUrl;

0 commit comments

Comments
 (0)