Update src/services/horoscopeService.js

src/services/horoscopeService.js

@@ -23,46 +23,60 @@ const decodeBase64UTF8 = (base64String) => {
   }
 };
 
-// Thay đổi cách lấy token cho Static Space
 export const fetchHoroscopeData = async (category, period) => {
   try {
     const currentDate = getCurrentDate();
     const fileName = `${category}_${period}.json`;
-    const rawUrl = `https://raw.githubusercontent.com/preview4r/AstroLens-Horoscope-Data-Storage/main/data/${currentDate}/${fileName}`;
-    
-    const headers = {};
-    
-    const githubToken = window?.huggingface?.variables?.REACT_APP_GITHUB_TOKEN;
-    
-    if (githubToken) {
-      headers['Authorization'] = `token ${githubToken}`;
+    const url = `https://api.github.com/repos/ntphuc149/AstroLens-Horoscope-Data-Storage/contents/data/${currentDate}/${fileName}`;
+
+    // Chuẩn bị headers với token
+    const headers = {
+      Accept: "application/vnd.github.v3+json",
+    };
+
+    // Thêm Authorization header nếu có token
+    if (process.env.REACT_APP_GITHUB_TOKEN) {
+      headers["Authorization"] = `token ${process.env.REACT_APP_GITHUB_TOKEN}`;
     }
-    
-    console.log('=== TOKEN DEBUG FOR STATIC SPACE ===');
-    console.log('Huggingface object exists:', !!window.huggingface);
-    console.log('Variables object exists:', !!window?.huggingface?.variables);
-    console.log('Token exists:', !!githubToken);
-    console.log('Token preview:', githubToken ? `${githubToken.substring(0, 8)}...` : 'None');
-    
-    console.log('Fetching from raw URL:', rawUrl);
-    
-    const response = await fetch(rawUrl, { 
-      headers,
-      method: 'GET'
-    });
-    
-    console.log('Response status:', response.status);
-    
+
+    console.log("Fetching from URL:", url);
+    console.log(
+      "Using token:",
+      process.env.REACT_APP_GITHUB_TOKEN ? "Yes" : "No"
+    );
+
+    const response = await fetch(url, { headers });
+
+    console.log("Response status:", response.status);
+
     if (!response.ok) {
-      throw new Error(`Failed to fetch: ${response.status} - ${response.statusText}`);
+      throw new Error(
+        `GitHub API error: ${response.status} - ${response.statusText}`
+      );
+    }
+
+    const githubResponse = await response.json();
+
+    // GitHub API trả về content dạng base64, cần decode UTF-8 đúng cách
+    if (githubResponse.content) {
+      // Loại bỏ line breaks trong base64 content
+      const cleanBase64 = githubResponse.content.replace(/\n/g, "");
+
+      // Decode base64 với UTF-8 support
+      const decodedContent = decodeBase64UTF8(cleanBase64);
+
+      if (!decodedContent) {
+        throw new Error("Failed to decode base64 content");
+      }
+
+      const data = JSON.parse(decodedContent);
+      console.log("Successfully loaded data:", data);
+      return data;
+    } else {
+      throw new Error("No content in GitHub response");
     }
-    
-    const data = await response.json();
-    console.log('Successfully loaded data from raw URL:', data);
-    return data;
-    
   } catch (error) {
-    console.error('Error fetching horoscope data:', error);
+    console.error("Error fetching horoscope data:", error);
     return null;
   }
 };