Merge branch 'tjtanjin:main' into main

Author: anr2601

src/hooks/useFetchThemes.tsx

@@ -28,21 +28,26 @@ const useFetchThemes = (
 		const fetchData = async () => {
 			setLoading(true);
 			try {
-				let apiThemes;
+				let apiThemes = null;
 				if (url.startsWith("http")) {
 					let finalUrl = `${url}?pageSize=${pageSize}&pageNum=${pageNum}`;
 					if (searchQuery) {
 						finalUrl += `&searchQuery=${encodeURIComponent(searchQuery)}`;
 					}
 
 					const response = await galleryApiFetch(finalUrl);
-					apiThemes = await response.json();
+					const result = await response.json();
+          apiThemes = result.data;
 				} else {
 					apiThemes = Placeholders.themes;
 				}
 
-				const themes = await fetchThemesFromGitHub(apiThemes);
-				setThemes(themes);
+				if (apiThemes) {
+					const themes = await fetchThemesFromGitHub(apiThemes);
+					setThemes(themes);
+				} else {
+					setError(Error("Failed to fetch theme."));
+				}
 			} catch (err: unknown) {
 				setError(err as Error);
 			} finally {

src/hooks/useFetchUserData.tsx

@@ -26,7 +26,7 @@ const useLoginUser = (url: string, provider: string, key: string) => {
 			try {
 				const response = await galleryApiFetch(`${url}?provider=${provider}&key=${key}`);
 				const result = await response.json();
-				setData(result);
+				setData(result.data);
 			} catch (err: unknown) {
 				setError(err as Error);
 			} finally {

src/interfaces/UserData.ts

@@ -8,10 +8,10 @@ export interface UserData {
 	name: string;
 	email: string;
 	handle: string;
-	avatar_url: string;
+	avatarUrl: string;
 	status: string;
 	location: string;
-	profile_url: string;
+	profileUrl: string;
 	provider: string;
-	provider_user_id: string;
+	providerUserId: string;
 }

src/pages/UserProfile.tsx

@@ -22,8 +22,10 @@ const UserProfilePage: React.FC = () => {
 	const refreshUserData = async () => {
 		try {
 			const response = await galleryApiFetch(Endpoints.fetchUserProfile);
-			const result = await response.json();
-			setUserData(result);
+			if (response.ok) {
+				const result = await response.json();
+				setUserData(result.data);
+			}
 		} catch {
 			// no update if error
 		}
@@ -40,7 +42,7 @@ const UserProfilePage: React.FC = () => {
 				<div className="flex items-center">
 					<div className="rounded-full w-32 h-32 bg-gray-700 overflow-hidden mr-6">
 						<img
-							src={userData?.avatar_url || botAvatar}
+							src={userData?.avatarUrl || botAvatar}
 							alt={userData?.name || 'Bot Avatar'}
 							className="w-full h-full object-cover"
 						/>
@@ -56,7 +58,7 @@ const UserProfilePage: React.FC = () => {
 				<div className="mt-6">
 					<div className="flex items-center mb-4">
 						<Github className="mr-2" />
-						<Link to={userData?.profile_url as string} className="text-sm">
+						<Link to={userData?.profileUrl as string} className="text-sm">
 							{userData?.handle}
 						</Link>
 					</div>