geo

app/components/analytics/GeoAnalytics.tsx

@@ -27,7 +27,7 @@ export default function GeoAnalytics({ data }: GeoAnalyticsProps) {
         <thead className="bg-gray-50">
           <tr>
             <th scope="col" className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-              Location
+              IP Address
             </th>
             <th scope="col" className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
               Visits
@@ -41,7 +41,8 @@ export default function GeoAnalytics({ data }: GeoAnalyticsProps) {
           </tr>
         </thead>
         <tbody className="bg-white divide-y divide-gray-200">
-          {sortedData.map((item, index) => (
+          {sortedData.length > 0 ? (
+            sortedData.map((item, index) => (
               <tr key={index} className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}>
                 <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
                   {item.location || 'Unknown'}
@@ -64,7 +65,14 @@ export default function GeoAnalytics({ data }: GeoAnalyticsProps) {
                   </div>
                 </td>
               </tr>
-          ))}
+            ))
+          ) : (
+            <tr>
+              <td colSpan={4} className="px-6 py-4 text-center text-sm text-gray-500">
+                No IP data available
+              </td>
+            </tr>
+          )}
         </tbody>
       </table>
     </div>

lib/analytics.ts

@@ -215,23 +215,22 @@ export async function getGeoAnalytics(params: {
   startTime?: string;
   endTime?: string;
   linkId?: string;
-  groupBy?: 'country' | 'city';
   teamIds?: string[];
   projectIds?: string[];
   tagIds?: string[];
 }): Promise<GeoData[]> {
   const filter = buildFilter(params);
-  const groupByField = params.groupBy === 'city' ? 'city' : 'country';
   
+  // Use IP address as the grouping field
   const query = `
     SELECT
-      ${groupByField} as location,
+      ip_address as location,
       count() as visits,
       uniq(ip_address) as visitors,
       count() * 100.0 / sum(count()) OVER () as percentage
     FROM events
     ${filter}
-    GROUP BY ${groupByField}
+    GROUP BY location
     HAVING location != ''
     ORDER BY visits DESC
     LIMIT 20