Refactor event fetching logic by consolidating getAtprotoEvents function into a single utility import. Update ESLint configuration for compatibility and improve type annotations in Event component.

Author: didierkrux

devconnect-app/eslint.config.mjs

@@ -10,7 +10,7 @@ const compat = new FlatCompat({
 });
 
 const eslintConfig = [
-  ...compat.extends(['next/core-web-vitals']),
+  ...compat.extends('next/core-web-vitals'),
 ];
 
 export default eslintConfig;

devconnect-app/src/app/page.tsx

@@ -1,5 +1,5 @@
 import HomePageContent from './page-content';
-import { getAtprotoEvents } from './worlds-fair/page';
+import { getAtprotoEvents } from '@/utils/atproto-events';
 
 export default async function HomePage() {
   const atprotoEvents = await getAtprotoEvents();

devconnect-app/src/app/schedule/page.tsx

@@ -1,27 +1,5 @@
 import ProgrammePageContent from './page-content';
-import { apiResultToCalendarFormat } from 'lib/components/event-schedule-new/atproto-to-calendar-format';
-
-export async function getAtprotoEvents() {
-  try {
-    const atprotoEvents = await fetch(
-      process.env.NODE_ENV === 'development' && !process.env.FORCE_PROD_ENV
-        ? 'http://localhost:4000/calendar-events'
-        : 'https://at-slurper.onrender.com/calendar-events',
-      {
-        next: { revalidate: 300 }, // Cache for 5 minutes
-      }
-    );
-
-    const atprotoEventsData = await atprotoEvents.json();
-
-    const formattedAtprotoEvents = apiResultToCalendarFormat(atprotoEventsData);
-
-    return formattedAtprotoEvents;
-  } catch (error) {
-    console.error(error);
-    return [];
-  }
-}
+import { getAtprotoEvents } from '@/utils/atproto-events';
 
 export default async function ProgrammePage() {
   const atprotoEvents = await getAtprotoEvents();

devconnect-app/src/app/worlds-fair/page.tsx

@@ -1,27 +1,5 @@
 import ProgrammePageContent from './page-content';
-import { apiResultToCalendarFormat } from 'lib/components/event-schedule-new/atproto-to-calendar-format';
-
-export async function getAtprotoEvents() {
-  try {
-    const atprotoEvents = await fetch(
-      process.env.NODE_ENV === 'development' && !process.env.FORCE_PROD_ENV
-        ? 'http://localhost:4000/calendar-events'
-        : 'https://at-slurper.onrender.com/calendar-events',
-      {
-        next: { revalidate: 300 }, // Cache for 5 minutes
-      }
-    );
-
-    const atprotoEventsData = await atprotoEvents.json();
-
-    const formattedAtprotoEvents = apiResultToCalendarFormat(atprotoEventsData);
-
-    return formattedAtprotoEvents;
-  } catch (error) {
-    console.error(error);
-    return [];
-  }
-}
+import { getAtprotoEvents } from '@/utils/atproto-events';
 
 export default async function ProgrammePage() {
   const atprotoEvents = await getAtprotoEvents();

devconnect-app/src/utils/atproto-events.ts

@@ -0,0 +1,23 @@
+import { apiResultToCalendarFormat } from 'lib/components/event-schedule-new/atproto-to-calendar-format';
+
+export async function getAtprotoEvents() {
+  try {
+    const atprotoEvents = await fetch(
+      process.env.NODE_ENV === 'development' && !process.env.FORCE_PROD_ENV
+        ? 'http://localhost:4000/calendar-events'
+        : 'https://at-slurper.onrender.com/calendar-events',
+      {
+        next: { revalidate: 300 }, // Cache for 5 minutes
+      }
+    );
+
+    const atprotoEventsData = await atprotoEvents.json();
+
+    const formattedAtprotoEvents = apiResultToCalendarFormat(atprotoEventsData);
+
+    return formattedAtprotoEvents;
+  } catch (error) {
+    console.error(error);
+    return [];
+  }
+}

lib/components/event-schedule-new/event/event.tsx

@@ -228,7 +228,7 @@ const ExportEvent = ({
   );
 };
 
-const Event: React.FC<EventProps> = ({
+function Event({
   compact,
   event,
   isDialog,
@@ -238,7 +238,7 @@ const Event: React.FC<EventProps> = ({
   setExports,
   toggleFavoriteEvent,
   favoriteEvents,
-}) => {
+}: EventProps): React.JSX.Element {
   const [showMobileProgramming, setShowMobileProgramming] = useState(false);
   const [imageLoaded, setImageLoaded] = useState(false);
   const imageRef = useRef<any>(null);